From bb7fd13cb2c76a1cab8ecc3464a4e2115b1d4845 Mon Sep 17 00:00:00 2001
From: dagongren <53748875+wang-liang0615@users.noreply.github.com>
Date: Fri, 29 Mar 2024 15:02:18 +0800
Subject: [PATCH] =?UTF-8?q?style=20and=20=E6=96=87=E6=A1=88=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=20(#457)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmdb-ui/src/modules/cmdb/lang/en.js                  |  1 +
 cmdb-ui/src/modules/cmdb/lang/zh.js                  |  1 +
 .../src/modules/cmdb/views/ci_types/triggerForm.vue  |  1 +
 .../src/modules/cmdb/views/relation_views/index.vue  |  2 +-
 .../views/relation_views/modules/ContextMenu.vue     |  2 +-
 cmdb-ui/src/views/setting/companyStructure/index.vue | 12 +++++-------
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cmdb-ui/src/modules/cmdb/lang/en.js b/cmdb-ui/src/modules/cmdb/lang/en.js
index 5b258cc..6aa4dac 100644
--- a/cmdb-ui/src/modules/cmdb/lang/en.js
+++ b/cmdb-ui/src/modules/cmdb/lang/en.js
@@ -505,6 +505,7 @@ const cmdb_en = {
         noPermission: 'No Permission'
     },
     serviceTree: {
+        remove: 'Remove',
         deleteNode: 'Delete {name}',
         tips1: 'For example: q=os_version:centos&sort=os_version',
         tips2: 'Expression search',
diff --git a/cmdb-ui/src/modules/cmdb/lang/zh.js b/cmdb-ui/src/modules/cmdb/lang/zh.js
index 2416ae1..3960c11 100644
--- a/cmdb-ui/src/modules/cmdb/lang/zh.js
+++ b/cmdb-ui/src/modules/cmdb/lang/zh.js
@@ -504,6 +504,7 @@ const cmdb_zh = {
         noPermission: '暂无权限'
     },
     serviceTree: {
+        remove: '移除',
         deleteNode: '移除 {name}',
         tips1: '例：q=os_version:centos&sort=os_version',
         tips2: '表达式搜索',
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
index dac013c..c8c9378 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
@@ -6,6 +6,7 @@
     :visible="visible"
     @close="handleCancel"
     @ok="handleOk"
+    destroyOnClose
   >
     <div class="custom-drawer-bottom-action">
       <a-button type="primary" ghost @click="handleCancel">{{ $t('cancel') }}</a-button>
diff --git a/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue b/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue
index 4facb88..e1ef72f 100644
--- a/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue
+++ b/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue
@@ -33,7 +33,7 @@
               >{{ $t('revoke') }}</span
               >
               <template v-if="showBatchLevel > 0">
-                <span @click="batchDeleteCIRelationFromTree">{{ $t('delete') }}</span>
+                <span @click="batchDeleteCIRelationFromTree">{{ $t('cmdb.serviceTree.remove') }}</span>
               </template>
               <span
                 @click="
diff --git a/cmdb-ui/src/modules/cmdb/views/relation_views/modules/ContextMenu.vue b/cmdb-ui/src/modules/cmdb/views/relation_views/modules/ContextMenu.vue
index 5d8f36e..1c9c8e2 100644
--- a/cmdb-ui/src/modules/cmdb/views/relation_views/modules/ContextMenu.vue
+++ b/cmdb-ui/src/modules/cmdb/views/relation_views/modules/ContextMenu.vue
@@ -88,7 +88,7 @@
               <a-menu-item
                 :disabled="!batchTreeKey || !batchTreeKey.length"
                 key="batchDelete"
-              ><ops-icon type="icon-xianxing-delete" />{{ $t('delete') }}</a-menu-item
+              ><ops-icon type="icon-xianxing-delete" />{{ $t('cmdb.serviceTree.remove') }}</a-menu-item
               >
               <a-menu-divider />
             </template>
diff --git a/cmdb-ui/src/views/setting/companyStructure/index.vue b/cmdb-ui/src/views/setting/companyStructure/index.vue
index f4e7bbd..12216bf 100644
--- a/cmdb-ui/src/views/setting/companyStructure/index.vue
+++ b/cmdb-ui/src/views/setting/companyStructure/index.vue
@@ -136,14 +136,12 @@
               </div>
               <div>
                 <a-space v-if="isEditable">
-                  <a-button
+                  <a
                     @click="openEmployeeModal({}, 'add')"
-                    size="small"
-                    type="primary"
-                    shape="circle"
-                    icon="plus"
-                    ghost
-                  />
+                  ><ops-icon
+                    :style="{ fontSize: '18px' }"
+                    type="veops-increase"
+                  /></a>
                   <a-button type="primary" size="small" ghost @click="batchUpload">
                     {{ $t('cs.companyStructure.batchImport') }}
                   </a-button>