From d891a5169bef4e64ca8acd354bfe5eab75dbbb4d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 十月 2023 17:33:14 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/base-table/columns/editColumn/formconfig.jsx | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..aed7101 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: '搴忓彿'
--
Gitblit v1.8.0