From b541e03cd3a1c7d73ed6b9dc55bd956f39e4108b Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 08 一月 2025 15:44:16 +0800
Subject: [PATCH] 调整图标在树、列表中的显示,按钮配置修改样式

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue |    6 ++-
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue               |    4 +-
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue       |   51 ++++++++++++++++---------
 Source/plt-web/plt-web-ui/src/styles/ui.scss                                                   |   28 +++++++-------
 4 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/styles/ui.scss b/Source/plt-web/plt-web-ui/src/styles/ui.scss
index 7842105..1faae30 100644
--- a/Source/plt-web/plt-web-ui/src/styles/ui.scss
+++ b/Source/plt-web/plt-web-ui/src/styles/ui.scss
@@ -405,15 +405,6 @@
 .avue--detail .el-col{
   margin-bottom: 0;
 }
-.avue-crud .avue-crud__menu{
-  min-height: 26px;
-}
-.avue-crud .avue-crud__menu .el-button{
-
-}
-.avue-crud .avue-crud__menu .el-button--text{
-  padding: 2px 6px;
-}
 .avue-crud table td{
   line-height: 22px;
 }
@@ -424,9 +415,19 @@
 }
 /**琛ㄥ唴鎿嶄綔鏍�**/
 .avue-crud .avue-crud__menu{
-  min-height: 22px;
+  min-height: 18px;
   display: flex;
   justify-content: space-around;
+}
+.avue-crud .avue-crud__menu .el-button{
+
+}
+.avue-crud .avue-crud__menu .el-button--text{
+  padding: 2px 6px;
+  display: flex;
+}
+.avue-crud .avue-crud__menu .el-button--text > span {
+  display: flex;
 }
 .el-table--small, .el-table__expand-icon{
   font-size: 14px;
@@ -604,10 +605,6 @@
   margin-right: 3px;
 }
 
-.avue-crud .avue-crud__menu .el-button--text >span {
-  display: flex;
-}
-
 /*
   鏍�
  */
@@ -616,6 +613,9 @@
   display: none !important;
 }
 /*鍥炬爣**/
+.el-tree-node__label > span{
+  display: flex;
+}
 .el-tree-node__label .iconShow{
   display: inline-block;
   width: 14px !important;
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
index 04e6ac3..47fc795 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
@@ -21,7 +21,7 @@
               @node-click="nodeClick">
           <span slot-scope="{ node, data }" class="el-tree-node__label">
            <span>
-              <i class="el-icon-s-promotion"></i>
+             <icon-show v-if="data.icon" :name="data.icon"></icon-show>
                 {{ (node || {}).label }}
             </span>
           </span>
@@ -111,7 +111,7 @@
             prop: 'plImage',
             search: true,
             searchLabelWidth:120,
-            overHidden: true,
+            width:80
           },
           {
             label: 'B/S閾炬帴鍦板潃',
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
index 9eef2a3..a2b6c9e 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
@@ -176,7 +176,7 @@
                   </el-col>
 
                   <el-col :span="12">
-                    <el-form-item :inline-message='true' label="鍚嶇О锛�" prop="label">
+                    <el-form-item  label="鍚嶇О锛�" prop="label">
                       <el-input v-model="basicForm.label" :disabled="disabledBtn"></el-input>
                     </el-form-item>
                   </el-col>
@@ -374,13 +374,14 @@
         delBtn: false,
         refreshBtn: false,
         dialogWidth:'600',
-        menuWidth:'150',
+        menuWidth:'140',
         column: [
           {
             label: '鍚嶇О',
             prop: 'name',
             width:180,
             span: 24,
+            overHidden:true,
             rules: [
               {
                 required: true,
@@ -394,6 +395,7 @@
             prop: 'value',
             type:'textarea',
             span: 24,
+            overHidden:true,
             rules: [
               {
                 required: true,
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue
index 6a96108..5b340ce 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue
@@ -11,7 +11,6 @@
     <el-container style="height: 580px">
       <el-aside style="width: 380px">
         <basic-container v-loading="leftLoading" style="height: 530px">
-          <h3 style="margin: 0 0 10px 0">涓氬姟绫诲瀷</h3>
           <div style="height: 435px">
             <avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
               <span slot-scope="{ node, data }" class="el-tree-node__label">
@@ -66,6 +65,7 @@
       treeOption: {
         menu: false,
         addBtn: false,
+        defaultExpandAll:true,
         props: {
           label: 'text',
           value: 'oid',
@@ -78,7 +78,8 @@
       uiTreeOption: {
         nodeKey: 'oid',
         checkOnClickNode: true,
-        defaultExpandedKeys: [],
+        defaultExpandAll:true,
+        //defaultExpandedKeys: this.defaultExpandKeys,
         multiple: false,
         menu: false,
         addBtn: false,
@@ -104,7 +105,6 @@
     },
     submitDialog() {
       const node = this.$refs.uiTree.getCurrentNode();
-      console.log(node);
       if (!node.leaf) {
         this.$message.error('璇烽�夋嫨鏈�涓嬪眰瀛愯妭鐐硅繘琛屽厠闅�');
         return;
@@ -135,7 +135,17 @@
     getTreeList() {
       this.leftLoading = true;
       getBizTree().then(res => {
-        this.treeData = res.data.obj.children;
+        this.treeData = [{
+          attributes: {},
+          checked: false,
+          expanded: true,
+          data: "root",
+          level: res.data.obj.level,
+          icon: 'vci:home',
+          oid: res.data.obj.oid,
+          text: res.data.obj.text,
+          children: res.data.obj.children
+        }] ;
         this.leftLoading = false;
       }).catch(error => {
         this.leftLoading = false;
@@ -143,15 +153,22 @@
     },
     // 瑙掕壊鐐瑰嚮
     nodeClick(row, node) {
+      if(row.oid==''){
+        return false;
+      }
       this.nodeRow = row;
       this.rightLoading = true;
       const params = {
         btmName: this.nodeRow.attributes.name,
         level: this.paramsType
       }
-      this.defaultExpandKeys = ['root'];
+      //this.defaultExpandKeys = ['UILayout'];
       getAllLevelTreeByBtm(params).then(res => {
-        this.uiTreeOption.defaultExpandedKeys = [res.data.obj.oid];
+        //this.defaultExpandedKeys = [res.data.obj.oid];
+        res.data.obj.icon='el-icon-s-home';
+        let level=0;
+        this.processChildren(res.data.obj,level); // 澶勭悊姣忎釜鑺傜偣
+        //this.uiTreeOption.defaultExpandedKeys = this.defaultExpandKeys;
         this.uiTreeData = [res.data.obj];
         this.rightLoading = false;
       }).catch(error => {
@@ -160,29 +177,25 @@
     },
 
     //澶勭悊鏍�
-    processChildren(item) {
+    processChildren(item,level) {
       if (item.children && item.children.length > 0) {
+        level++;
         item.children = item.children.map(child => {
           if (child.level < 4) {
-            this.defaultExpandKeys.push(child.oid)
+            //this.defaultExpandKeys.push(child.oid)
           }
-          if (child.level == 1) {
+          if (level == 1) {
             child.icon = 'el-icon-s-promotion';
-            child.label = child.data.label + '(' + child.data.name + ')'
-          } else if (child.level == 2) {
+          } else if (level == 2) {
             child.icon = 'el-icon-s-order';
-            child.label = child.text
-          } else if (child.level == 3) {
+          } else if (level == 3) {
             child.icon = 'el-icon-office-building';
-            child.label = child.text
-          } else if (child.level == 4) {
+          } else if (level == 4) {
             child.icon = 'el-icon-document';
-            child.label = child.text
-          } else if (child.level == 5) {
+          } else if (level == 5) {
             child.icon = 'el-icon-s-tools';
-            child.label = child.text
           }
-          this.processChildren(child); // 閫掑綊澶勭悊姣忎釜瀛愯妭鐐�
+          this.processChildren(child,level); // 閫掑綊澶勭悊姣忎釜瀛愯妭鐐�
           return child; // 鍙繑鍥炲瓙鑺傜偣鐨� attributes
         });
       }

--
Gitblit v1.9.3