From 2c573446cd5059b09c06c8673eaf1f51f43967ce Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 六月 2024 13:44:27 +0800
Subject: [PATCH] 2024-06-14
---
src/menu/components/table/edit-table/columns/editColumn/index.jsx | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 4e086b5..4a6a3b5 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/edit-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, Modal, notification, Popover } from 'antd'
+import { Form, Row, Col, Input, Select, InputNumber, Radio, Checkbox, Tooltip, Modal, notification, Popover } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import Api from '@/api'
@@ -107,8 +107,13 @@
_options.push('hourFormat')
}
}
- if (this.record.type === 'formula' && this.record.eval === 'true') {
- _options.push('decimal')
+ if (this.record.type === 'formula') {
+ if (this.record.eval === 'true') {
+ _options.push('decimal')
+ }
+ if (this.record.eval !== 'func') {
+ _options.push('evalchars')
+ }
} else if (this.record.type === 'custom' && this.record.IsSort === 'true') {
_options.push('sortField')
}
@@ -402,6 +407,15 @@
content = <Radio.Group onChange={(e) => {this.typeChange(item.key, e.target.value)}}>
{item.options.map(option => <Radio key={option.value} value={option.value}>{option.text}</Radio>)}
</Radio.Group>
+ } else if (item.type === 'checkbox') {
+ rules = [
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
+ ]
+ initVal = item.initVal
+
+ content = <Checkbox.Group onChange={(e) => {this.typeChange(item.key, e.target.value)}}>
+ {item.options.map(option => <Checkbox key={option.value} value={option.value}>{option.text}</Checkbox>)}
+ </Checkbox.Group>
} else if (item.type === 'multiselect') { // 澶氶��
content = <Select
showSearch
--
Gitblit v1.8.0