From 3f462923f10be2a7f88747300af11568e4ed33bf Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Wed, 6 Aug 2025 20:16:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E6=9D=BFid=E7=BC=BA?=
 =?UTF-8?q?=E5=A4=B1=E6=97=B6=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E8=80=85=E6=A8=A1=E6=9D=BF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dashboard/src2/components/DomainOwner.vue | 14 +++----
 jcloud/api/domain_west.py                 | 45 ++++++++++++-----------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/dashboard/src2/components/DomainOwner.vue b/dashboard/src2/components/DomainOwner.vue
index 372fac1..337ad53 100644
--- a/dashboard/src2/components/DomainOwner.vue
+++ b/dashboard/src2/components/DomainOwner.vue
@@ -58,7 +58,7 @@
 				<!-- 空状态 -->
 				<div v-else-if="filteredOwners.length === 0" class="flex flex-col items-center justify-center py-12 text-gray-500">
 					<UsersIcon class="mb-4 h-12 w-12 text-gray-300" />
-					<p class="text-lg font-medium">暂无域名所有者模板</p>
+					<p class="text-lg font-medium">暂无所有者模板</p>
 					<p class="text-sm">点击上方按钮创建第一个模板</p>
 				</div>
 
@@ -185,7 +185,7 @@
 				<!-- 标题栏 -->
 				<div class="p-4 border-b border-gray-200 bg-white rounded-t-lg flex-shrink-0">
 					<div class="flex items-center justify-between">
-						<h3 class="text-lg font-medium text-gray-900">域名所有者详情</h3>
+						<h3 class="text-lg font-medium text-gray-900">所有者详细信息</h3>
 						<button 
 							@click="closeDetailDialog"
 							class="text-gray-400 hover:text-gray-600 transition-colors duration-200"
@@ -716,7 +716,7 @@ export default {
 					params: data,
 					onSuccess: (response) => {
 						if (response.status === 'Success') {
-							toast.success('域名所有者模板创建成功！');
+							toast.success('所有者模板创建成功！');
 							this.fetchOwners(); // 刷新列表
 							this.handleCloseDialog(); // 关闭弹窗
 						} else {
@@ -737,7 +737,7 @@ export default {
 			}
 		},
 
-		// 查看域名所有者详情
+		// 查看所有者详细信息
 		viewOwner(owner) {
 			this.selectedOwner = owner;
 			this.showDetailDialog = true;
@@ -804,7 +804,7 @@ export default {
 					onSuccess: (response) => {
 						
 						if (response.status === 'Success') {
-							toast.success('域名所有者模板更新成功！');
+							toast.success('所有者模板更新成功！');
 							this.fetchOwners(); // 刷新列表
 							this.closeEditDialog(); // 关闭编辑弹窗
 						} else {
@@ -832,7 +832,7 @@ export default {
 		async deleteOwner(owner) {
 			confirmDialog({
 				title: '确认删除',
-				message: `确定要删除域名所有者模板 "<strong>${this.getDisplayName(owner)}</strong>" 吗？<br><br>此操作将不可逆。`,
+				message: `确定要删除所有者模板 "<strong>${this.getDisplayName(owner)}</strong>" 吗？<br><br>此操作将不可逆。`,
 				primaryAction: {
 					label: '删除',
 					variant: 'solid',
@@ -843,7 +843,7 @@ export default {
 								params: { name: owner.name },
 								onSuccess: (response) => {
 									if (response.status === 'Success') {
-										toast.success('域名所有者模板删除成功！');
+										toast.success('所有者模板删除成功！');
 										this.fetchOwners(); // 刷新列表
 										hide();
 									} else {
diff --git a/jcloud/api/domain_west.py b/jcloud/api/domain_west.py
index 49c3f1b..6866408 100644
--- a/jcloud/api/domain_west.py
+++ b/jcloud/api/domain_west.py
@@ -3432,7 +3432,7 @@ def update_domain_owner(name, **data):
 
 @jingrow.whitelist()
 def delete_domain_owner(name):
-    """删除域名所有者模板"""
+    """删除所有者模板"""
     try:
         if not name:
             return {"status": "Error", "message": "域名所有者名称不能为空"}
@@ -3452,35 +3452,36 @@ def delete_domain_owner(name):
         
         # 检查是否有 c_sysid（西部数码模板标识）
         c_sysid = getattr(domain_owner, 'c_sysid', None)
-        if not c_sysid:
-            return {"status": "Error", "message": "域名所有者没有模板标识，无法删除"}
         
-        # 先删除西部数码的模板
+        # 如果有模板标识，先删除西部数码的模板
+        if c_sysid:
+            try:
+                client = get_west_client()
+                if not client:
+                    return {"status": "Error", "message": "API客户端初始化失败"}
+                
+                # 调用西部数码删除模板接口
+                west_result = client.delete_contact_template(c_sysid)
+                
+                if west_result.get('result') != 200:
+                    error_msg = west_result.get('msg', west_result.get('message', '所有者模板删除失败'))
+                    return {"status": "Error", "message": f"所有者模板删除失败: {error_msg}"}
+                
+            except Exception as e:
+                return {"status": "Error", "message": f"所有者模板删除失败: {str(e)}"}
+        
+        # 删除本地记录（无论是否有模板标识）
         try:
-            client = get_west_client()
-            if not client:
-                return {"status": "Error", "message": "API客户端初始化失败"}
+            domain_owner.delete(ignore_permissions=True)
+            jingrow.db.commit()
             
-            # 调用西部数码删除模板接口
-            west_result = client.delete_contact_template(c_sysid)
-            
-            if west_result.get('result') != 200:
-                error_msg = west_result.get('msg', west_result.get('message', '所有者模板删除失败'))
-                return {"status": "Error", "message": f"所有者模板删除失败: {error_msg}"}
+            return {"status": "Success", "message": "所有者模板删除成功"}
             
         except Exception as e:
             return {"status": "Error", "message": f"所有者模板删除失败: {str(e)}"}
-        
-        # 西部数码模板删除成功后，删除本地记录
-        try:
-            domain_owner.delete(ignore_permissions=True)
-            return {"status": "Success", "message": "域名所有者模板删除成功"}
-            
-        except Exception as e:
-            return {"status": "Error", "message": f"本地记录删除失败: {str(e)}"}
             
     except Exception as e:
-        return {"status": "Error", "message": f"删除失败: {str(e)}"}
+        return {"status": "Error", "message": f"所有者模板删除失败: {str(e)}"}
 
 
 @jingrow.whitelist()