From 68a65838dd44b02cb1b3666a4383232af413b558 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 四月 2023 17:33:09 +0800
Subject: [PATCH] 2023-04-06
---
src/menu/components/table/base-table/columns/editColumn/index.jsx | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/editColumn/index.jsx b/src/menu/components/table/base-table/columns/editColumn/index.jsx
index aa252c7..7af08ee 100644
--- a/src/menu/components/table/base-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/base-table/columns/editColumn/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Cascader, Modal } from 'antd'
+import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Cascader, Modal, Checkbox } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import { getColumnForm } from './formconfig'
@@ -45,9 +45,7 @@
editColumn = (column) => {
let fields = fromJS(this.props.fields).toJS().map(item => {
- if (item.label.toLowerCase() !== item.field.toLowerCase()) {
- item.text = item.label + '锛�' + item.field + '锛�'
- }
+ item.text = `${item.field}锛�${item.label}锛塦
return item
})
@@ -169,7 +167,15 @@
if (item.type === 'text') {
let rules = []
- if (item.key !== 'linkurl') {
+ if (item.key === 'field') {
+ rules = [{
+ pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig,
+ message: '瀛楁鍚嶅彧鍏佽鍖呭惈鏁板瓧銆佸瓧姣嶃�佹眽瀛椾互鍙奯'
+ }, {
+ max: formRule.input.max,
+ message: formRule.input.message
+ }]
+ } else if (item.key !== 'linkurl') {
rules = [{
max: formRule.input.max,
message: formRule.input.message
@@ -278,6 +284,25 @@
</Form.Item>
</Col>
)
+ } else if (item.type === 'checkbox') {
+ fields.push(
+ <Col span={12} key={index}>
+ <Form.Item label={item.tooltip ?
+ <Tooltip placement="topLeft" title={item.tooltip}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal
+ })(
+ <Checkbox.Group>
+ {item.options.map(option => <Checkbox key={option.value} value={option.value}>{option.text}</Checkbox>)}
+ </Checkbox.Group>
+ )}
+ </Form.Item>
+ </Col>
+ )
} else if (item.type === 'multiselect') { // 澶氶��
fields.push(
<Col span={12} key={index}>
--
Gitblit v1.8.0