From c659560c7ee8d8f8278b938421de13bf65d1e1b1 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 15 一月 2025 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
index c8b8209..b3519cc 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
@@ -45,12 +45,8 @@
         <avue-crud  ref="crud"
                     @selection-change="selectionChange"
                     @row-click="rowClick"
-                    :data="crudData" :option="crudOption" :table-loading="tableLoading" style="margin-top: 10px">
+                    :data="crudData" :option="crudOption" :table-loading="tableLoading" style="margin-top: 10px;">
         </avue-crud>
-        <form-dialog ref="formRef" @refresh="getTemp"></form-dialog>
-        <!--瀵煎叆    -->
-        <upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" title="瀵煎叆"
-                     @updata="uploadCallBack"></upload-file>
         <div>
           <fieldset>
             <legend>&nbsp;鏌ヨ鏉′欢&nbsp;</legend>
@@ -63,6 +59,11 @@
             ></form-query-dialog>
           </fieldset>
         </div>
+        <!--娣诲姞 淇敼寮圭獥-->
+        <form-dialog ref="formRef" @refresh="getTemp"></form-dialog>
+        <!--瀵煎叆    -->
+        <upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" title="瀵煎叆"
+                     @updata="uploadCallBack"></upload-file>
       </basic-container>
     </el-main>
   </el-container>
@@ -112,7 +113,7 @@
         selection: true,
         menu: false,
         height: "auto",
-        calcHeight: 300,
+        calcHeight: 305,
         tip: false,
         header:false,
         column: [{
@@ -140,7 +141,11 @@
           prop: 'btmType',
           width: 130,
           formatter:function (row, value) {
-            return row.queryTemplate.btmType;
+            if (row.queryTemplate.btmType == '*') {
+              return '鎵�鏈夌被鍨�'
+            } else {
+              return row.queryTemplate.btmType;
+            }
           }
         }, {
           label: '鐗堟湰鐗堟',
@@ -163,7 +168,11 @@
           prop: 'queryISLeaf',
           width: 120,
           formatter:function (row, value) {
-            return row.queryTemplate.queryISLeaf
+            if(row.queryTemplate.queryISLeaf=='false' || row.queryTemplate.queryISLeaf==false){
+              return '鍚�'
+            }else{
+              return '鏄�'
+            }
           }
         }, {
           label: '瀛愯妭鐐瑰眰娆℃暟',
@@ -220,9 +229,17 @@
 
     // 鏍戠偣鍑�
     nodeClick(row) {
-      this.nodeRow = row;
-      this.tableLoading = true;
-      this.getTemp();
+      if(row.oid=="topNode"){
+        this.nodeRow = null;
+        this.crudData=[];
+        this.queryCondition=[];
+        this.queryTree={};
+        this.levelFlag=0;
+      }else{
+        this.nodeRow = row;
+        this.tableLoading = true;
+        this.getTemp();
+      }
     },
     //鑾峰彇鏌ヨ妯℃澘鍒楄〃
     getTemp() {
@@ -344,6 +361,9 @@
   .el-scrollbar__wrap {
     overflow: auto !important;
   }
+  .el-main .avue-crud .avue-crud__body .el-card__body .el-form .el-table--small{
+    min-height: 300px;
+  }
 }
 
 fieldset {

--
Gitblit v1.9.3