From 8a6ce370f1aa1c061b76fa3e9d2d4d1df53ca4c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:38:09 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/edit-table/columns/editColumn/index.jsx | 75 +++++++++++++++++++++++++------------
1 files changed, 51 insertions(+), 24 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 fd16488..dd97ea0 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
@@ -23,6 +23,7 @@
textarea: ['label', 'field', 'type', 'Align', 'Hide', 'Width', 'prefix', 'initval', 'postfix', 'blacklist'],
custom: ['label', 'type', 'Align', 'Width', 'blacklist', 'IsSort'],
colspan: ['label', 'type', 'Align', 'Hide', 'blacklist'],
+ extend: ['label', 'field', 'type', 'Align', 'Width', 'colUnit', 'shift', 'quota', 'supField'],
action: ['label', 'type', 'Align', 'Width'],
formula: ['label', 'type', 'Align', 'Hide', 'Width', 'prefix', 'postfix', 'eval', 'formula', 'blacklist'],
index: ['label', 'type', 'Align', 'Width']
@@ -65,6 +66,8 @@
getOptions = () => {
let _options = fromJS(columnTypeOptions[this.record.type]).toJS()
+ let reLabel = {}
+
if (['number', 'text'].includes(this.record.type) && this.record.editable === 'true') {
_options.push('ctrlField')
if (this.record.ctrlField) {
@@ -90,8 +93,18 @@
} else {
_options.push('required', 'enter')
}
+
+ reLabel.required = '蹇呭～'
} else if (this.record.type === 'number') {
- _options.push('max', 'min', 'enter', 'clearField')
+ _options.push('max', 'min', 'required', 'enter', 'clearField')
+
+ reLabel.required = '涓嶇瓑浜�0'
+ }
+ } else if (this.record.type === 'extend') {
+ if (this.record.colUnit === 'day') {
+ _options.push('dayFormat')
+ } else {
+ _options.push('hourFormat')
}
}
if (this.record.type === 'formula' && this.record.eval === 'true') {
@@ -108,7 +121,7 @@
}
}
- return _options
+ return {options: _options, reLabel}
}
editColumn = (column) => {
@@ -124,12 +137,16 @@
this.record[item.key] = item.initVal
})
- let _options = this.getOptions()
+ let { options, reLabel } = this.getOptions()
this.setState({
visible: true,
formlist: formlist.map(item => {
- item.hidden = !_options.includes(item.key)
+ item.hidden = !options.includes(item.key)
+
+ if (reLabel[item.key]) {
+ item.label = reLabel[item.key]
+ }
if (item.key === 'formula') {
item.fields = this.props.fields.map(col => col.field)
@@ -159,7 +176,7 @@
this.record.IsSort = 'false'
}
- let _options = this.getOptions()
+ let { options, reLabel } = this.getOptions()
let _field = ''
if (value === 'formula') {
@@ -173,7 +190,10 @@
}
item.initVal = this.record[item.key]
- item.hidden = !_options.includes(item.key)
+ item.hidden = !options.includes(item.key)
+ if (reLabel[item.key]) {
+ item.label = reLabel[item.key]
+ }
return item
})
@@ -205,12 +225,15 @@
this.record.type = values.type
if (values.type !== _type) {
- let _options = this.getOptions()
+ let { options, reLabel } = this.getOptions()
this.setState({
formlist: this.state.formlist.map(item => {
item.initVal = this.record[item.key]
- item.hidden = !_options.includes(item.key)
+ item.hidden = !options.includes(item.key)
+ if (reLabel[item.key]) {
+ item.label = reLabel[item.key]
+ }
return item
})
@@ -223,7 +246,7 @@
} else if (key === 'format' && value === 'percent') {
this.props.form.setFieldsValue({postfix: '%'})
} else if (key === 'editType') {
- let _options = this.getOptions()
+ let { options, reLabel } = this.getOptions()
this.setState({
formlist: this.state.formlist.map(item => {
@@ -232,18 +255,24 @@
}
item.initVal = this.record[item.key]
- item.hidden = !_options.includes(item.key)
+ item.hidden = !options.includes(item.key)
+ if (reLabel[item.key]) {
+ item.label = reLabel[item.key]
+ }
return item
})
})
} else if (['editable', 'editType', 'resourceType', 'ctrlField', 'eval', 'Hide', 'IsSort', 'textFormat'].includes(key)) {
- let _options = this.getOptions()
+ let { options, reLabel } = this.getOptions()
this.setState({
formlist: this.state.formlist.map(item => {
item.initVal = this.record[item.key]
- item.hidden = !_options.includes(item.key)
+ item.hidden = !options.includes(item.key)
+ if (reLabel[item.key]) {
+ item.label = reLabel[item.key]
+ }
return item
})
@@ -311,6 +340,14 @@
let content = null
let extra = null
let initVal = item.initVal || ''
+ let label = item.label
+ if (item.tooltip) {
+ if (item.toolWidth) {
+ label = <Tooltip placement="topLeft" overlayStyle={{maxWidth: item.toolWidth}} title={<div onClick={(e) => e.stopPropagation()}>{item.tooltip}</div>}><QuestionCircleOutlined className="mk-form-tip" />{item.label}</Tooltip>
+ } else {
+ label = <Tooltip placement="topLeft" title={<div onClick={(e) => e.stopPropagation()}>{item.tooltip}</div>}><QuestionCircleOutlined className="mk-form-tip" />{item.label}</Tooltip>
+ }
+ }
if (item.type === 'text') {
rules = [
@@ -385,12 +422,7 @@
if (item.key === 'formula') {
fields.push(
<Col span={span} key={index}>
- <Form.Item className={className} extra={extra} label={item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
- <QuestionCircleOutlined className="mk-form-tip" />
- {item.label}
- </Tooltip> : item.label
- }>
+ <Form.Item className={className} extra={extra} label={label}>
{getFieldDecorator(item.key, {
initialValue: initVal,
rules: rules
@@ -447,12 +479,7 @@
fields.push(
<Col span={span} key={index}>
- <Form.Item className={className} extra={extra} label={item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
- <QuestionCircleOutlined className="mk-form-tip" />
- {item.label}
- </Tooltip> : item.label
- }>
+ <Form.Item className={className} extra={extra} label={label}>
{getFieldDecorator(item.key, {
initialValue: initVal,
rules: rules
--
Gitblit v1.8.0