From c0e017668d780c40f85230f227ea0160b5d22d4d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 二月 2024 14:13:00 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/base-table/columns/editColumn/formconfig.jsx | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
index 0ebdd54..44db9f8 100644
--- a/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
@@ -33,6 +33,12 @@
value: 'number',
text: '鏁板瓧'
}, {
+ value: 'custom',
+ text: '鑷畾涔夊垪'
+ }, {
+ value: 'formula',
+ text: '鍏紡'
+ }, {
value: 'picture',
text: '鍥剧墖'
}, {
@@ -45,14 +51,8 @@
value: 'textarea',
text: '澶氳鏂囨湰'
}, {
- value: 'custom',
- text: '鑷畾涔夊垪'
- }, {
value: 'colspan',
text: '鍚堝苟鍒�'
- }, {
- value: 'formula',
- text: '鍏紡'
}, {
value: 'index',
text: '搴忓彿'
@@ -151,7 +151,7 @@
type: 'radio',
key: 'IsSort',
label: '鎺掑簭',
- initVal: card.IsSort || (card.isSub ? 'false' : 'true'),
+ initVal: card.IsSort || (card.isSub || card.type === 'custom' ? 'false' : 'true'),
required: true,
options: [{
value: 'true',
@@ -160,6 +160,14 @@
value: 'false',
text: '鍚�'
}]
+ },
+ {
+ type: 'select',
+ key: 'sortField',
+ label: '鎺掑簭瀛楁',
+ initVal: card.sortField || '',
+ required: true,
+ options: fields
},
{
type: 'radio',
@@ -393,6 +401,18 @@
},
{
type: 'radio',
+ key: 'lostTip',
+ label: '鍥剧墖缂哄け',
+ initVal: card.lostTip || 'true',
+ tooltip: '鍥剧墖鍦板潃涓嶅瓨鍦ㄦ椂锛屾槸鍚︽彁绀哄浘鐗囦涪澶便��',
+ required: false,
+ options: [
+ { value: 'true', text: '鎻愮ず' },
+ { value: 'false', text: '涓嶆彁绀�' }
+ ]
+ },
+ {
+ type: 'radio',
key: 'perspective',
label: '瀛楁閫忚',
initVal: card.perspective || '',
--
Gitblit v1.8.0