From d7eba1786ed1fba2b3674f9da3af4fbf1a3f8692 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 01 六月 2023 18:49:05 +0800
Subject: [PATCH] 解决冲突

---
 Source/UBCS-WEB/src/const/code/selectAttrOptionDialog.js |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS-WEB/src/const/code/selectAttrOptionDialog.js b/Source/UBCS-WEB/src/const/code/selectAttrOptionDialog.js
index 2437b44..c03a7aa 100644
--- a/Source/UBCS-WEB/src/const/code/selectAttrOptionDialog.js
+++ b/Source/UBCS-WEB/src/const/code/selectAttrOptionDialog.js
@@ -11,6 +11,8 @@
     viewBtn: false,
     selection: true,
     menu: false,
+    columnBtn: false,
+    searchShowBtn: false, //	琛ㄦ牸鎼滅储鏄鹃殣鎸夐挳
     dialogClickModal: false,
     highlightCurrentRow: true,
     column: [
@@ -30,12 +32,12 @@
       },
       {
         label: "灞炴�ч暱搴�",
-        prop: "attrLength",
+        prop: "attrlength",
         search: false,
       },
       {
         label: "灞炴�х被鍨�",
-        prop: "attributeDataTypeText",
+        prop: "attributedatatypetext",
         search: false,
       }
     ]

--
Gitblit v1.9.3