From c2580fb8de3bdaabb4179b0ce0fcd2fbac802441 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 三月 2023 00:49:14 +0800
Subject: [PATCH] 2023-03-01
---
src/menu/components/table/edit-table/columns/editColumn/index.jsx | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/editColumn/index.jsx b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
index 88c227d..e445b43 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
@@ -17,6 +17,7 @@
number: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'decimal', 'format', 'prefix', 'postfix', 'editable', 'initval', 'sum', 'blacklist'],
textarea: ['label', 'field', 'type', 'Align', 'Hide', 'Width', 'prefix', 'initval', 'postfix', 'blacklist'],
custom: ['label', 'type', 'Align', 'Hide', 'Width', 'blacklist'],
+ colspan: ['label', 'type', 'Align', 'Hide', 'blacklist'],
action: ['label', 'type', 'Align', 'Width'],
formula: ['label', 'type', 'Align', 'Hide', 'Width', 'prefix', 'postfix', 'eval', 'formula', 'blacklist'],
index: ['label', 'type', 'Align', 'Width']
@@ -131,7 +132,7 @@
return item
})
}, () => {
- if (value === 'action') {
+ if (value === 'action' || value === 'colspan') {
this.props.form.setFieldsValue({Align: 'center'})
}
})
@@ -349,21 +350,18 @@
}
handleSubmit = () => {
- const { columns, column } = this.props
+ // const { columns } = this.props
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
- values.uuid = column.uuid
- values.marks = column.marks || []
-
- if (values.field && columns.filter(col => col.field && col.uuid !== values.uuid && col.field === values.field).length > 0) {
- notification.warning({
- top: 92,
- message: '瀛楁宸叉坊鍔狅紒',
- duration: 5
- })
- return
- }
+ // if (values.field && columns.filter(col => col.field && col.uuid !== values.uuid && col.field === values.field).length > 0) {
+ // notification.warning({
+ // top: 92,
+ // message: '瀛楁宸叉坊鍔狅紒',
+ // duration: 5
+ // })
+ // return
+ // }
this.setState({visible: false, formlist: null})
this.props.submitCol(values)
--
Gitblit v1.8.0