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/modeling/attributePool/option.js |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/option.js b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/option.js
index e2d889d..6b28509 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/option.js
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/option.js
@@ -2,21 +2,41 @@
   {
     label: '灞炴�у悕',
     prop: 'id',
-    search:true,
-    sortable:true,
+    search: true,
+    sortable: true,
+    type:'select',
+    allowCreate:true,
+    filterable:true,
+    props:{
+      label:'id',
+      value:'id'
+    },
+    dicUrl:"/api/attributeController/gridAttribute",
+    dicQuery:{
+      page:1,
+      limit:-1
+    }
+  },
+  {
+    label: '鏍囩',
+    prop: 'name',
+    sortable: true,
   },
   {
     label: '绫诲瀷',
     prop: 'attributeDataTypeText',
-    sortable:true,
+    sortable: true,
+    width:100
   },
   {
     label: '榛樿鍊�',
     prop: 'defaultValue',
-    sortable:true,
+    sortable: true,
+    width: 120
   },
   {
     label: '鎻忚堪',
     prop: 'description',
+    overHidden:true,
   },
 ];

--
Gitblit v1.9.3