From 6781ba45775af16872ac68f7e459b1072b16c4cc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 十月 2023 17:33:47 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 9b72d05..8d56325 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
@@ -25,18 +25,18 @@
value: 'number',
text: '鏁板瓧'
}, {
- value: 'textarea',
- text: '澶氳鏂囨湰'
- }, {
value: 'custom',
text: '鑷畾涔夊垪'
}, {
- value: 'colspan',
- text: '鍚堝苟鍒�'
- }, {
value: 'formula',
text: '鍏紡'
}, {
+ value: 'textarea',
+ text: '澶氳鏂囨湰'
+ }, {
+ value: 'colspan',
+ text: '鍚堝苟鍒�'
+ }, {
value: 'index',
text: '搴忓彿'
}]
--
Gitblit v1.8.0