From 8cdfdd9914d1c4f6cd59176d61869522f51f39e4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 10 十月 2021 13:53:57 +0800
Subject: [PATCH] 2021-10-10
---
src/menu/components/table/edit-table/columns/editColumn/index.jsx | 36 ++++++++++++++++++++++++------------
1 files changed, 24 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 17cfbda..df36da4 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
@@ -1,16 +1,16 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Icon, Modal } from 'antd'
+import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Icon, Modal, notification } from 'antd'
import { getColumnForm } from './formconfig'
import { formRule } from '@/utils/option.js'
import './index.scss'
const columnTypeOptions = {
- text: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'prefix', 'postfix', 'textFormat', 'editable', 'blacklist'],
- number: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'decimal', 'format', 'prefix', 'postfix', 'editable', 'sum', 'blacklist'],
- textarea: ['label', 'field', 'type', 'Align', 'Hide', 'Width', 'prefix', 'postfix', 'blacklist'],
+ text: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'prefix', 'postfix', 'textFormat', 'editable', 'initval', 'blacklist'],
+ 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'],
action: ['label', 'type', 'Align', 'Width'],
index: ['label', 'type', 'Align', 'Width']
@@ -44,9 +44,9 @@
if (column.editable === 'true') {
if (column.type === 'text') {
- _options.push('required', 'initval', 'enter', 'footEnter')
+ _options.push('required', 'enter', 'footEnter')
} else if (column.type === 'number') {
- _options.push('max', 'min', 'initval', 'enter', 'footEnter')
+ _options.push('max', 'min', 'enter', 'footEnter')
}
}
@@ -78,9 +78,9 @@
if (editable === 'true') {
if (value === 'text') {
- _options.push('required', 'initval', 'enter', 'footEnter')
+ _options.push('required', 'enter', 'footEnter')
} else if (value === 'number') {
- _options.push('max', 'min', 'initval', 'enter', 'footEnter')
+ _options.push('max', 'min', 'enter', 'footEnter')
}
}
@@ -117,9 +117,9 @@
if (editable === 'true') {
if (values.type === 'text') {
- _options.push('required', 'initval', 'enter', 'footEnter')
+ _options.push('required', 'enter', 'footEnter')
} else if (values.type === 'number') {
- _options.push('max', 'min', 'initval', 'enter', 'footEnter')
+ _options.push('max', 'min', 'enter', 'footEnter')
}
}
@@ -146,9 +146,9 @@
if (value === 'true') {
if (type === 'text') {
- _options.push('required', 'initval', 'enter', 'footEnter')
+ _options.push('required', 'enter', 'footEnter')
} else if (type === 'number') {
- _options.push('max', 'min', 'initval', 'enter', 'footEnter')
+ _options.push('max', 'min', 'enter', 'footEnter')
}
}
@@ -310,9 +310,21 @@
}
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
+ }
this.setState({visible: false, formlist: null})
this.props.submitCol(values)
}
--
Gitblit v1.8.0