From 354cad3d3ab22ba147169beb6a0f6f51b9bab3a8 Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 08 一月 2025 09:07:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue |   53 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
index be0476c..65fac14 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
@@ -7,8 +7,8 @@
           <div style="height:  calc(100vh - 190px);">
             <avue-tree v-loading="loading" :data="treeData" :option="treeOption" @node-click="nodeClick">
               <span slot-scope="{ node, data }" class="el-tree-node__label">
-               <span style="font-size: 15px">
-                  <i class="el-icon-s-promotion"></i>
+               <span>
+                 <icon-show :name="data.icon"></icon-show>
                     {{ (node || {}).label }}
                 </span>
               </span>
@@ -33,30 +33,42 @@
           @search-reset="handleReset"
           @row-click="rowClickHandler">
           <template slot="menuLeft">
-            <el-button v-if="permissionList.addBtn" icon="el-icon-plus" size="small" type="primary" @click="addHandler">
+            <el-button v-if="permissionList.addBtn" class="button-custom-icon" size="small" type="primary"
+                       @click="addHandler">
+              <icon-show :name="permissionList.addBtn.source"></icon-show>
               鍒涘缓
             </el-button>
-            <!--<el-button icon="el-icon-edit" plain size="small" type="primary" @click="editHandler">淇敼</el-button>
-            <el-button icon="el-icon-delete" plain size="small" type="danger" @click="delHandler">鍒犻櫎</el-button>-->
-            <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary"
-                       @click="upLoadClickHandler">瀵煎叆
+            <el-button v-if="!permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary"
+                       @click="upLoadClickHandler">
+              <icon-show :name="permissionList.importBtn.source"></icon-show>
+              瀵煎叆
             </el-button>
-            <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary"
-                       @click="exportClickHandler">瀵煎嚭
+            <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary"
+                       @click="exportClickHandler">
+              <icon-show :name="permissionList.exportBtn.source"></icon-show>
+              瀵煎嚭
             </el-button>
-            <el-button v-if="permissionList.RIGHTBtn" icon="el-icon-place" plain size="small" type="primary"
-                       @click="uiAuthorHandler">鎺堟潈
+            <el-button v-if="permissionList.RIGHTBtn" class="button-custom-icon" plain size="small" type="primary"
+                       @click="uiAuthorHandler">
+              <icon-show :name="permissionList.RIGHTBtn.source"></icon-show>
+              鎺堟潈
             </el-button>
           </template>
           <template slot="menu" slot-scope="scope">
-            <el-button v-if="permissionList.editBtn" icon="el-icon-edit" size="small" type="text"
-                       @click="rowEditBtnClick(scope.row)">缂栬緫
+            <el-button v-if="permissionList.editBtn" size="small" type="text"
+                       @click="rowEditBtnClick(scope.row)">
+              <icon-show :name="permissionList.editBtn.source"></icon-show>
+              缂栬緫
             </el-button>
-            <el-button v-if="permissionList.delBtn" icon="el-icon-delete" size="small" type="text"
-                       @click="rowDeleteHandler(scope.row)">鍒犻櫎
+            <el-button v-if="permissionList.delBtn" size="small" type="text"
+                       @click="rowDeleteHandler(scope.row)">
+              <icon-show :name="permissionList.delBtn.source"></icon-show>
+              鍒犻櫎
             </el-button>
-            <el-button v-if="permissionList.cloneBtn" icon="el-icon-document-copy" size="small" type="text"
-                       @click="rowCloneHandler(scope.row)">鍏嬮殕
+            <el-button v-if="permissionList.cloneBtn" size="small" type="text"
+                       @click="rowCloneHandler(scope.row)">
+              <icon-show :name="permissionList.cloneBtn.source"></icon-show>
+              鍏嬮殕
             </el-button>
           </template>
           <template slot="plName" slot-scope="{row}">
@@ -223,7 +235,6 @@
         addBtn: false,
         editBtn: false,
         delBtn: false,
-        tip: false,
         searchMenuSpan: 6,
         align: 'left',
         column: [{
@@ -377,7 +388,7 @@
         editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
         exportBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
         importBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
-        cloneBtn: this.vaildData(this.permission[this.$route.query.id].clone, false),
+        cloneBtn: this.vaildData(this.permission[this.$route.query.id].CLONE, false),
         RIGHTBtn: this.vaildData(this.permission[this.$route.query.id].RIGHT, false),
       };
     },
@@ -472,7 +483,7 @@
           this.lastIndex = newIndex;
         },
         () => {
-          this.selectList = [];
+          this.selectList = [row];
         }
       );
     },
@@ -607,8 +618,6 @@
         func.downloadFileByBlobHandler(res);
         this.$message.success('瀵煎嚭鎴愬姛');
         this.expDialogVisible = false;
-      }).catch(err => {
-        this.$message.error(err);
       });
     },
 

--
Gitblit v1.9.3