From 0fab1a1df84637d7c78b353c29a3c6a256705a0f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 四月 2023 10:24:31 +0800
Subject: [PATCH] 2023-04-06
---
src/menu/components/table/edit-table/columns/editColumn/index.jsx | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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..00c47c3 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,20 +350,18 @@
}
handleSubmit = () => {
- const { columns, column } = 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.type === 'number' && values.editable === 'true') {
+ if (typeof(values.max) === 'number' && typeof(values.min) === 'number' && values.max < values.min) {
+ notification.warning({
+ top: 92,
+ message: '鏈�澶у�间笉鍙皬浜庢渶灏忓�硷紒',
+ duration: 5
+ })
+ return
+ }
}
this.setState({visible: false, formlist: null})
this.props.submitCol(values)
--
Gitblit v1.8.0