From 742f7d11557526038d332e60a8c8ca18177bc4e4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 十月 2023 15:51:58 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
index 8dd1c49..ccd6013 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
@@ -143,7 +143,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',
@@ -154,6 +154,14 @@
}]
},
{
+ type: 'select',
+ key: 'sortField',
+ label: '鎺掑簭瀛楁',
+ initVal: card.sortField || '',
+ required: true,
+ options: fields
+ },
+ {
type: 'radio',
key: 'eval',
label: '瑙ｆ瀽鏂瑰紡',
--
Gitblit v1.8.0