From 391eec3114a17e68652434c6eae610799d80290e Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 11:13:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue
index c2c0e08..0a87d9b 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue
@@ -13,14 +13,27 @@
       @selection-change="selectChangeHandler"
       @row-click="rowClickHandler">
       <template slot="menuLeft">
-        <el-button v-if="permissionChildrenList.UiTabAddBtn" icon="el-icon-plus" size="small" type="primary" @click="addHandler">鍒涘缓</el-button>
+        <el-button v-if="permissionChildrenList.UiTabAddBtn" class="button-custom-icon" size="small" type="primary" @click="addHandler">
+          <icon-show :name="permissionChildrenList.UiTabAddBtn.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>-->
       </template>
       <template slot="menu" slot-scope="scope">
-        <el-button v-if="permissionChildrenList.UiTabEditBtn" icon="el-icon-edit" size="small" type="text" @click="rowEditBtnClick(scope.row)">缂栬緫</el-button>
-        <el-button v-if="permissionChildrenList.UiTabDelBtn" icon="el-icon-delete" size="small" type="text" @click="rowDeleteHandler(scope.row)">鍒犻櫎</el-button>
-        <el-button v-if="permissionChildrenList.UiTabCloneBtn" icon="el-icon-document-copy" size="small" type="text" @click="rowCloneHandler(scope.row)">鍏嬮殕</el-button>
+        <el-button v-if="permissionChildrenList.UiTabEditBtn" size="small" type="text"
+                   @click="rowEditBtnClick(scope.row)">
+          <icon-show :name="permissionChildrenList.UiTabEditBtn.source"></icon-show>
+          缂栬緫
+        </el-button>
+        <el-button v-if="permissionChildrenList.UiTabDelBtn" size="small" type="text" @click="rowDeleteHandler(scope.row)">
+          <icon-show :name="permissionChildrenList.UiTabDelBtn.source"></icon-show>
+          鍒犻櫎
+        </el-button>
+        <el-button v-if="permissionChildrenList.UiTabCloneBtn"  size="small" type="text" @click="rowCloneHandler(scope.row)">
+          <icon-show :name="permissionChildrenList.UiTabCloneBtn.source"></icon-show>
+          鍏嬮殕
+        </el-button>
       </template>
       <template slot="plIsOpen" slot-scope="{row}">
         <el-tag v-if="row.plIsOpen === 1" type="success">鍚敤</el-tag>
@@ -172,7 +185,8 @@
           prop: 'plExtAttr'
         }, {
           label: '鎻忚堪',
-          prop: 'plDesc'
+          prop: 'plDesc',
+          overHidden: true
         }]
       },
       data: [],
@@ -213,10 +227,10 @@
     ...mapGetters(["permission"]),
     permissionChildrenList() {
       return {
-        UiTabAddBtn: this.vaildData(this.permission[this.$route.query.id].UiTabADD, false),
-        UiTabEditBtn: this.vaildData(this.permission[this.$route.query.id].UiTabEdit, false),
-        UiTabDelBtn: this.vaildData(this.permission[this.$route.query.id].UiTabDel, false),
-        UiTabCloneBtn: this.vaildData(this.permission[this.$route.query.id].UiTabClone, false),
+        UiTabAddBtn: this.vaildData(this.permission[this.$route.query.id].ADD2, false),
+        UiTabEditBtn: this.vaildData(this.permission[this.$route.query.id].EDIT2, false),
+        UiTabDelBtn: this.vaildData(this.permission[this.$route.query.id].DELETE2, false),
+        UiTabCloneBtn: this.vaildData(this.permission[this.$route.query.id].CLONE, false),
       }
     }
   },
@@ -251,9 +265,9 @@
         areaType:this.areaType
       }
       getTabByContextIdAndType( params).then(res => {
+        this.$refs.crud.clearSelection();
         this.data = res.data.data;
         this.selectList=[];
-        this.$refs.crud.clearSelection();
         this.tableLoading = false;
       })
     },

--
Gitblit v1.9.3