From b5e8b537d4baafb675033e3db77804c487a93978 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Fri, 24 Nov 2023 14:47:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]Tree=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E8=B0=83=E6=95=B4=E6=88=90=E4=B8=80=E8=87=B4=20=20-?=
 =?UTF-8?q?=20[=E5=85=B3=E8=81=94]#[1028802367422464]Tree=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E8=B0=83=E6=95=B4=E6=88=90=E4=B8=80=E8=87=B4=20http:/?=
 =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93?=
 =?UTF-8?q?9050947543057/1028802367422464?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/css/common.less          | 20 +++++++++++--------
 src/resources/assets/css/theme.less           |  4 ++++
 src/resources/plugins/TsForm/TsFormTree.vue   |  4 ++++
 .../config/app/app-config-tree.vue            |  5 ++++-
 .../config/app/app-module-list.vue            |  4 ++--
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/resources/assets/css/common.less b/src/resources/assets/css/common.less
index d47402d4..bd5dc450 100644
--- a/src/resources/assets/css/common.less
+++ b/src/resources/assets/css/common.less
@@ -1189,6 +1189,10 @@ span {
     -webkit-user-select: none;
     user-select: none;
   }
+  .ivu-icon-ios-arrow-forward:before {
+    font-family: 'tsfont';
+    content: '\e899'; // tsfont-drop-right字体图标
+  }
 }
 
 //操作分类组
@@ -1987,31 +1991,31 @@ span {
   .radius-md {
     border-radius: @block-border-radius-min;
   }
-  .radius-md-tl{
+  .radius-md-tl {
     border-top-left-radius: @block-border-radius-min;
   }
-  .radius-md-tr{
+  .radius-md-tr {
     border-top-right-radius: @block-border-radius-min;
   }
-  .radius-md-bl{
+  .radius-md-bl {
     border-bottom-left-radius: @block-border-radius-min;
   }
-  .radius-md-br{
+  .radius-md-br {
     border-bottom-right-radius: @block-border-radius-min;
   }
   .radius-sm {
     border-radius: @item-border-radius;
   }
-  .radius-sm-tl{
+  .radius-sm-tl {
     border-top-left-radius: @item-border-radius;
   }
-  .radius-sm-tr{
+  .radius-sm-tr {
     border-top-right-radius: @item-border-radius;
   }
-  .radius-sm-bl{
+  .radius-sm-bl {
     border-bottom-left-radius: @item-border-radius;
   }
-  .radius-sm-br{
+  .radius-sm-br {
     border-bottom-right-radius: @item-border-radius;
   }
   .radius-mi {
diff --git a/src/resources/assets/css/theme.less b/src/resources/assets/css/theme.less
index 0a2cd68b..eb475f45 100644
--- a/src/resources/assets/css/theme.less
+++ b/src/resources/assets/css/theme.less
@@ -1251,6 +1251,10 @@
       padding: 2px 10px;
       //line-height: 32px;
     }
+    .ivu-icon-ios-arrow-forward:before {
+      font-family: 'tsfont';
+      content: '\e899'; // tsfont-drop-right字体图标
+    }
   }
 
   // 公共样式
diff --git a/src/resources/plugins/TsForm/TsFormTree.vue b/src/resources/plugins/TsForm/TsFormTree.vue
index 7b447221..a70e7f26 100755
--- a/src/resources/plugins/TsForm/TsFormTree.vue
+++ b/src/resources/plugins/TsForm/TsFormTree.vue
@@ -754,6 +754,10 @@ function setWidth($contain, $target, transfer) {
             cursor: default;
           }
       }
+      .ivu-icon-ios-arrow-forward:before {
+        font-family: 'tsfont';
+        content: '\e899'; // tsfont-drop-right字体图标
+      }
     }
 }
 .form-transfer-tree {
diff --git a/src/views/pages/deploy/application-config/config/app/app-config-tree.vue b/src/views/pages/deploy/application-config/config/app/app-config-tree.vue
index 946a4ec3..52edd152 100644
--- a/src/views/pages/deploy/application-config/config/app/app-config-tree.vue
+++ b/src/views/pages/deploy/application-config/config/app/app-config-tree.vue
@@ -621,6 +621,9 @@ export default {
   /deep/ .ivu-tree-arrow {
     padding-top: 5px;
   }
-  
+  /deep/ .ivu-icon-ios-arrow-forward:before {
+    font-family: 'tsfont';
+    content: '\e899'; // tsfont-drop-right字体图标
+  }
 }
 </style>
diff --git a/src/views/pages/deploy/application-config/config/app/app-module-list.vue b/src/views/pages/deploy/application-config/config/app/app-module-list.vue
index fcdf1a79..e105835a 100644
--- a/src/views/pages/deploy/application-config/config/app/app-module-list.vue
+++ b/src/views/pages/deploy/application-config/config/app/app-module-list.vue
@@ -19,7 +19,7 @@
             @click="selectApp(app)"
           >
             <span v-if="(level === 'module' || level === 'env') && app.isHasModule">
-              <span v-if="!app.isLoading" :class="{ 'tsfont-right': !app.isExpand, 'tsfont-down': !!app.isExpand }" @click.stop="showModule(app)"></span>
+              <span v-if="!app.isLoading" :class="{ 'tsfont-drop-right': !app.isExpand, 'tsfont-drop-down': !!app.isExpand }" @click.stop="showModule(app)"></span>
               <Icon
                 v-else
                 type="ios-loading"
@@ -50,7 +50,7 @@
             <div v-for="module in app.appModuleList" :key="module.id">
               <div class="module-item ml-nm pb-xs pt-xs radius-sm overflow cursor module-flex" :class="{ 'item-selected': !!module.isSelected }" @click="selectModule(app, module)">
                 <span v-if="level === 'env' && module.isHasEnv">
-                  <span v-if="!module.isLoading" :class="{ 'tsfont-right': !module.isExpand, 'tsfont-down': !!module.isExpand }" @click.stop="showEnv(app, module)"></span>
+                  <span v-if="!module.isLoading" :class="{ 'tsfont-drop-right': !module.isExpand, 'tsfont-drop-down': !!module.isExpand }" @click.stop="showEnv(app, module)"></span>
                   <Icon
                     v-else
                     type="ios-loading"
-- 
Gitee


From 169891d5b78ed73a86b4d9c0b09ff36a5a01eedd Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Thu, 30 Nov 2023 10:32:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]Tree=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E7=BB=9F=E4=B8=80=20=20-=20[=E5=85=B3=E8=81=94]#[1028?=
 =?UTF-8?q?802367422464]Tree=E5=9B=BE=E6=A0=87=E7=BB=9F=E4=B8=80=20http://?=
 =?UTF-8?q?192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939?=
 =?UTF-8?q?050947543057/1028802367422464?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/css/common.less                 | 3 +++
 src/resources/assets/css/theme.less                  | 3 +++
 src/resources/plugins/TsForm/TsFormTree.vue          | 3 +++
 src/views/pages/cmdb/application/app-module-tree.vue | 4 ++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/resources/assets/css/common.less b/src/resources/assets/css/common.less
index 6f5d0831..4fd5662b 100644
--- a/src/resources/assets/css/common.less
+++ b/src/resources/assets/css/common.less
@@ -1193,6 +1193,9 @@ span {
     font-family: 'tsfont';
     content: '\e899'; // tsfont-drop-right字体图标
   }
+  .ivu-tree-arrow i {
+    vertical-align: baseline; // 修复drop箭头和文案对不齐问题
+  }
 }
 
 //操作分类组
diff --git a/src/resources/assets/css/theme.less b/src/resources/assets/css/theme.less
index eb475f45..ada9f4cc 100644
--- a/src/resources/assets/css/theme.less
+++ b/src/resources/assets/css/theme.less
@@ -1250,6 +1250,9 @@
       //margin:3px 0px;
       padding: 2px 10px;
       //line-height: 32px;
+      i {
+        vertical-align: baseline; // 修复图标和文案对不齐问题
+      }
     }
     .ivu-icon-ios-arrow-forward:before {
       font-family: 'tsfont';
diff --git a/src/resources/plugins/TsForm/TsFormTree.vue b/src/resources/plugins/TsForm/TsFormTree.vue
index a70e7f26..47538066 100755
--- a/src/resources/plugins/TsForm/TsFormTree.vue
+++ b/src/resources/plugins/TsForm/TsFormTree.vue
@@ -758,6 +758,9 @@ function setWidth($contain, $target, transfer) {
         font-family: 'tsfont';
         content: '\e899'; // tsfont-drop-right字体图标
       }
+      .ivu-tree-arrow i {
+        vertical-align: baseline; // 修复向下/向左箭头图标和文案不对齐问题
+      }
     }
 }
 .form-transfer-tree {
diff --git a/src/views/pages/cmdb/application/app-module-tree.vue b/src/views/pages/cmdb/application/app-module-tree.vue
index 0ddf65f3..89114004 100644
--- a/src/views/pages/cmdb/application/app-module-tree.vue
+++ b/src/views/pages/cmdb/application/app-module-tree.vue
@@ -20,7 +20,7 @@
         <div v-for="app in appSystemList" :key="app.id">
           <div class="app-item pl-xs pb-xs pt-xs cursor radius-sm overflow" :class="{ 'item-selected': !!app.isSelected }" @click="selectApp(app)">
             <span v-if="(level === 'module' || level === 'env') && app.isHasModule">
-              <span v-if="!app.isLoading" :class="{ 'tsfont-right': !app.isExpand, 'tsfont-down': !!app.isExpand }" @click.stop="showModule(app)"></span>
+              <span v-if="!app.isLoading" :class="{ 'tsfont-drop-right': !app.isExpand, 'tsfont-drop-down': !!app.isExpand }" @click.stop="showModule(app)"></span>
               <Icon
                 v-else
                 type="ios-loading"
@@ -37,7 +37,7 @@
             <div v-for="module in app.appModuleList" :key="module.id">
               <div class="module-item ml-nm pb-xs pt-xs radius-sm overflow cursor module-flex" :class="{ 'item-selected': !!module.isSelected }" @click="selectModule(app, module)">
                 <span v-if="level === 'env' && module.isHasEnv">
-                  <span v-if="!module.isLoading" :class="{ 'tsfont-right': !module.isExpand, 'tsfont-down': !!module.isExpand }" @click.stop="showEnv(app, module)"></span>
+                  <span v-if="!module.isLoading" :class="{ 'tsfont-drop-right': !module.isExpand, 'tsfont-drop-down': !!module.isExpand }" @click.stop="showEnv(app, module)"></span>
                   <Icon
                     v-else
                     type="ios-loading"
-- 
Gitee