From 0c7005a79b6dfccc2d25d98defb350de99c672d2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 十一月 2024 16:22:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue |   25 ++++++-------------------
 1 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
index b93849e..2c22f82 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
@@ -174,7 +174,11 @@
     readOnly: {
       type: Boolean,
       default: false
-    }
+    },
+    searchColumn: {
+      type: Array,
+      default: []
+    },
   },
   data() {
     return {
@@ -260,24 +264,7 @@
         header: false,
         height: window.innerHeight - 220,
         menu: false,
-        column: [
-          {
-            label: 'OID',
-            prop: 'OID',
-          },
-          {
-            label: 'REVISIONOID',
-            prop: 'REVISIONOID'
-          },
-          {
-            label: 'NAMEOID',
-            prop: 'NAMEOID'
-          },
-          {
-            label: 'BTMNAME',
-            prop: 'BTMNAME'
-          }
-        ]
+        column: this.searchColumn
       },
       clickNode: {},
       operatorIntDic: [{

--
Gitblit v1.9.3