From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
index 8c57a29..2a3173e 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
@@ -11,7 +11,7 @@
             <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
           <span slot-scope="{ node, data }" class="el-tree-node__label">
            <span>
-              <i class="el-icon-s-promotion"></i>
+              <icon-show :name="data.icon"></icon-show>
                 {{ (node || {}).label }}
             </span>
           </span>
@@ -63,6 +63,7 @@
         ref="dialogCrud"
         :data="attrData"
         :option="dialogAttrOption"
+        @select-all="selectAllHandler"
         @select="selectHandler">
       </avue-crud>
       <span slot="footer" class="dialog-footer">
@@ -218,6 +219,7 @@
         const data = res.data.data.map(item => {
           this.processChildren(item); // 澶勭悊姣忎釜鑺傜偣
           item.attributes.label = item.attributes.id;
+          item.attributes.icon = item.attributes.imageName;
           return item.attributes;
         });
         this.treeData = data;
@@ -231,6 +233,7 @@
       if (item.children && item.children.length > 0) {
         item.attributes.children = item.children.map(child => {
           child.attributes.label = child.attributes.id;
+          child.attributes.icon = child.attributes.imageName;
           this.processChildren(child); // 閫掑綊澶勭悊姣忎釜瀛愯妭鐐�
           return child.attributes; // 鍙繑鍥炲瓙鑺傜偣鐨� attributes
         });
@@ -272,7 +275,10 @@
       })
     },
     selectHandler(selection, row){
-      this.dialogSelectionRow=selection
+      this.dialogSelectionRow = selection;
+    },
+    selectAllHandler(selection){
+      this.dialogSelectionRow = selection;
     },
     changeTemp(data) {
       this.$refs.queryCrud.clearSelection();
@@ -326,6 +332,7 @@
           let abNames=this.dialogSelectionRow.map(item => {
             return item.id
           })
+
           if(abNames.length==0){
             this.$message.error('璇烽�夋嫨鏌ヨ灞炴��');
             return false;

--
Gitblit v1.9.3