From 2efbc6474a6a2431611fb836abc78bc2895c3115 Mon Sep 17 00:00:00 2001
From: dagongren <53748875+wang-liang0615@users.noreply.github.com>
Date: Fri, 29 Mar 2024 11:53:43 +0800
Subject: [PATCH] style && service tree define (#454)

---
 cmdb-ui/src/modules/cmdb/lang/en.js             |  2 +-
 cmdb-ui/src/modules/cmdb/lang/zh.js             |  2 +-
 .../preference_relation/serviceTreeModal.vue    | 17 +++--------------
 cmdb-ui/src/style/global.less                   |  4 ++--
 cmdb-ui/src/style/static.less                   |  1 +
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/cmdb-ui/src/modules/cmdb/lang/en.js b/cmdb-ui/src/modules/cmdb/lang/en.js
index 5929927..5b258cc 100644
--- a/cmdb-ui/src/modules/cmdb/lang/en.js
+++ b/cmdb-ui/src/modules/cmdb/lang/en.js
@@ -341,7 +341,7 @@ const cmdb_en = {
         tips1: 'Cannot form a view with the currently selected node, please select again!',
         tips2: 'Please enter the new serviceTree name!',
         tips3: 'Please select at least two nodes!',
-        tips4: 'Select at least one in leaf node or tree node',
+        tips4: 'Leaf node must be selected',
         tips5: 'Select the tree directory node and display the service tree sub nodes as a Table',
         showLeafNode: 'Show Leaf Node',
         showTreeNode: 'Show Tree Node',
diff --git a/cmdb-ui/src/modules/cmdb/lang/zh.js b/cmdb-ui/src/modules/cmdb/lang/zh.js
index ff966a3..2416ae1 100644
--- a/cmdb-ui/src/modules/cmdb/lang/zh.js
+++ b/cmdb-ui/src/modules/cmdb/lang/zh.js
@@ -340,7 +340,7 @@ const cmdb_zh = {
         tips1: '不能与当前选中节点形成视图，请重新选择！',
         tips2: '请输入新增服务树名！',
         tips3: '请选择至少两个节点！',
-        tips4: '叶子节点/树节点信息至少展示一个',
+        tips4: '树子节点为必选',
         tips5: '选中树目录节点，服务树子节点展示成Table',
         showLeafNode: '树的子节点展示成Table',
         showTreeNode: '展示树节点信息',
diff --git a/cmdb-ui/src/modules/cmdb/views/preference_relation/serviceTreeModal.vue b/cmdb-ui/src/modules/cmdb/views/preference_relation/serviceTreeModal.vue
index 583206a..02be215 100644
--- a/cmdb-ui/src/modules/cmdb/views/preference_relation/serviceTreeModal.vue
+++ b/cmdb-ui/src/modules/cmdb/views/preference_relation/serviceTreeModal.vue
@@ -11,7 +11,7 @@
         <a-checkbox :checked="form.is_show_leaf_node" @change="changeLeaf"> </a-checkbox>
       </a-form-model-item>
       <a-form-model-item :label="$t('cmdb.preference_relation.showTreeNode')" prop="is_show_tree_node">
-        <a-checkbox :checked="form.is_show_tree_node" @change="changeNode"> </a-checkbox>
+        <a-checkbox v-model="form.is_show_tree_node"> </a-checkbox>
       </a-form-model-item>
       <a-form-model-item
         v-if="form.is_show_leaf_node && form.is_show_tree_node"
@@ -49,7 +49,7 @@ export default {
       rules: {
         name: [{ required: true, message: this.$t('cmdb.preference_relation.serviceTreeNamePlaceholder') }],
         is_public: [{ required: false }],
-        is_show_leaf_node: [{ required: false }],
+        is_show_leaf_node: [{ required: true }],
         is_show_tree_node: [{ required: false }],
       },
     }
@@ -83,7 +83,7 @@ export default {
     },
     changeLeaf(e) {
       const checked = e.target.checked
-      if (!checked && !this.form.is_show_tree_node) {
+      if (!checked) {
         this.$message.warning(this.$t('cmdb.preference_relation.tips4'))
         return
       }
@@ -92,17 +92,6 @@ export default {
         is_show_leaf_node: checked,
       }
     },
-    changeNode(e) {
-      const checked = e.target.checked
-      if (!checked && !this.form.is_show_leaf_node) {
-        this.$message.warning(this.$t('cmdb.preference_relation.tips4'))
-        return
-      }
-      this.form = {
-        ...this.form,
-        is_show_tree_node: checked,
-      }
-    },
   },
 }
 </script>
diff --git a/cmdb-ui/src/style/global.less b/cmdb-ui/src/style/global.less
index 8bf021c..dba1ca9 100644
--- a/cmdb-ui/src/style/global.less
+++ b/cmdb-ui/src/style/global.less
@@ -521,7 +521,7 @@ body {
       align-items: center;
       color: @layout-sidebar-font-color;
       i {
-        color: @text-color_5;
+        color: @layout-sidebar-icon-color;
       }
     }
     &:hover {
@@ -590,7 +590,7 @@ body {
   .ant-menu-submenu {
     color: @layout-sidebar-font-color;
     i {
-      color: @text-color_5;
+      color: @layout-sidebar-icon-color;
     }
   }
   .ant-menu-submenu-title:hover {
diff --git a/cmdb-ui/src/style/static.less b/cmdb-ui/src/style/static.less
index 0e3b422..80b4cd5 100644
--- a/cmdb-ui/src/style/static.less
+++ b/cmdb-ui/src/style/static.less
@@ -41,6 +41,7 @@
 @layout-sidebar-selected-color: @primary-color_5; //selected bg
 @layout-sidebar-arrow-color: @text-color_4;
 @layout-sidebar-font-color: @text-color_2;
+@layout-sidebar-icon-color: @text-color_4;
 @layout-sidebar-selected-font-color: @primary-color;
 @layout-sidebar-disabled-font-color: @text-color_4;