From ab949bb71eadda3ec1736ccdcfaa1b12b04cce6a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 05 十一月 2023 10:35:56 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 9e795e5..0c32473 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
@@ -600,6 +600,14 @@
options: fields
},
{
+ type: 'text',
+ key: 'ctrlValue',
+ label: '绂佹鍊�',
+ initVal: card.ctrlValue || '',
+ tooltip: '澶氫釜鍊肩敤閫楀彿鍒嗛殧銆�',
+ required: false
+ },
+ {
type: 'select',
key: 'clearField',
label: '娓呯┖瀛楁',
@@ -608,14 +616,6 @@
allowClear: true,
required: false,
options: fields
- },
- {
- type: 'text',
- key: 'ctrlValue',
- label: '绂佹鍊�',
- initVal: card.ctrlValue || '',
- tooltip: '澶氫釜鍊肩敤閫楀彿鍒嗛殧銆�',
- required: false
},
{
type: 'number',
--
Gitblit v1.8.0