From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
index b0b999e..d255dc5 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
@@ -158,7 +158,7 @@
type: 'radio',
key: 'IsSort',
label: '鎺掑簭',
- initVal: card.IsSort || (card.isSub || card.type === 'custom' ? 'false' : 'true'),
+ initVal: card.IsSort || 'false',
required: true,
options: [{
value: 'true',
@@ -673,6 +673,21 @@
},
{
type: 'radio',
+ key: 'showValue',
+ label: '鏄剧ず鍊�',
+ initVal: card.showValue || 'label',
+ tooltip: '鍗曞厓鏍间笉鍙紪杈戞椂鏄剧ず鐨勪俊鎭��',
+ required: false,
+ options: [{
+ value: 'value',
+ text: '鍊悸峰瓧娈�'
+ }, {
+ value: 'label',
+ text: '鏂囨湰路瀛楁'
+ }]
+ },
+ {
+ type: 'radio',
key: 'dropdown',
label: '涓嬫媺瀹藉害',
initVal: card.dropdown || 'flex',
--
Gitblit v1.8.0