From b69b5f6329ca5f87932436b7a6c1ddfc3377e10f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 五月 2024 10:56:41 +0800
Subject: [PATCH] 2024-05-16
---
src/components/normalform/modalform/index.jsx | 85 ++++++++++++++++++++++++++++++++----------
1 files changed, 64 insertions(+), 21 deletions(-)
diff --git a/src/components/normalform/modalform/index.jsx b/src/components/normalform/modalform/index.jsx
index c3e3144..8a7599f 100644
--- a/src/components/normalform/modalform/index.jsx
+++ b/src/components/normalform/modalform/index.jsx
@@ -7,6 +7,7 @@
import asyncComponent from '@/utils/asyncComponent'
import MKEInput from './mkInput'
import MKNumberInput from './mkNumberInput'
+import MKEmitter from '@/utils/events.js'
import MKSelect from './mkSelect'
import './index.scss'
@@ -17,14 +18,17 @@
const MKCheckbox = asyncComponent(() => import('./mkCheckbox'))
const StyleInput = asyncComponent(() => import('./styleInput'))
const MKFileUpload = asyncComponent(() => import('@/tabviews/zshare/fileupload'))
-const MKColor = asyncComponent(() => import('@/tabviews/zshare/mutilform/mkColor'))
+const MkPrintTemps = asyncComponent(() => import('@/menu/components/share/actioncomponent/actionform/mkPrintTemps'))
+const MKColor = asyncComponent(() => import('@/mob/colorsketch'))
+// const MKColor = asyncComponent(() => import('@/tabviews/zshare/mutilform/mkColor'))
const MkEditIcon = asyncComponent(() => import('@/components/mkIcon'))
const SourceComponent = asyncComponent(() => import('@/menu/components/share/sourcecomponent'))
class ModalForm extends Component {
static propTpyes = {
- formlist: PropTypes.array, // 琛ㄥ崟鍒楄〃
- inputSubmit: PropTypes.func // input鍥炶溅鎻愪氦
+ formlist: PropTypes.array,
+ inputSubmit: PropTypes.func,
+ transVals: PropTypes.func,
}
state = {
@@ -70,7 +74,7 @@
required: item.required,
message: item.label + '涓嶅彲涓虹┖!'
}, {
- validator: (rule, value, callback) => this.handleConfirmPassword(rule, value, callback, item)
+ validator: (rule, value, callback) => this.checkNumber(rule, value, callback, item)
}]
} else if (item.type === 'textarea') {
item.rules = [
@@ -108,7 +112,7 @@
let supItem = fieldMap.get(key)
let supval = supItem.initval
- if (supItem.initval && supItem.type !== 'checkbox' && JSON.stringify(supItem.initval) === '[]') {
+ if (supval && JSON.stringify(supval) === '[]') {
supval = ''
}
@@ -124,13 +128,13 @@
} else if (supItem.hidden) {
cell.hidden = true
- } else if (supItem.type === 'checkbox') {
- let vals = [...supval, ...item.values]
+ } else if (item.notNull) {
+ cell.hidden = !supval
+ } else if (supItem.type === 'checkbox' || supItem.type === 'multiselect') {
+ let vals = [...(supval || []), ...item.values]
if (vals.length === new Set(vals).size) {
cell.hidden = true
}
- } else if (item.notNull) {
- cell.hidden = !supval
} else if (!item.values.includes(supval)) {
cell.hidden = true
}
@@ -162,7 +166,7 @@
this.setState({ formlist })
}
- handleConfirmPassword = (rule, value, callback, item) => {
+ checkNumber = (rule, value, callback, item) => {
let val = parseFloat(value)
if (!isNaN(val)) {
@@ -178,7 +182,13 @@
recordChange = (values, item) => {
this.record = {...this.record, ...values}
- if (item && item.controlFields) {
+ if (!item) return
+
+ if (item.$trans) {
+ this.props.transVals && this.props.transVals(values, item.field)
+ }
+
+ if (item.controlFields) {
let map = new Map()
this.state.formlist.forEach(cell => {
if (!cell.field) return
@@ -188,7 +198,7 @@
let reset = (current) => {
let val = this.record[current.field]
- if (val && current.type !== 'checkbox' && JSON.stringify(val) === '[]') {
+ if (val && JSON.stringify(val) === '[]') {
val = ''
}
@@ -197,15 +207,15 @@
if (current.hidden) {
m.hidden = true
- } else if (current.type === 'checkbox') {
- let vals = [...val, ...cell.values]
+ } else if (cell.notNull) {
+ m.hidden = !val
+ } else if (current.type === 'checkbox' || current.type === 'multiselect') {
+ let vals = [...(val || []), ...cell.values]
if (vals.length !== new Set(vals).size) {
m.hidden = false
} else {
m.hidden = true
}
- } else if (cell.notNull) {
- m.hidden = !val
} else {
m.hidden = !cell.values.includes(val)
}
@@ -239,6 +249,24 @@
return item || cell
})
})
+ } else if (item.reset_source) {
+ let map = new Map()
+ this.state.formlist.forEach(cell => {
+ if (!cell.field) return
+ map.set(cell.field, cell)
+ })
+
+ item.callback(map, this.record, MKEmitter)
+
+ this.setState({
+ formlist: this.state.formlist.map(cell => {
+ if (!cell.field) return cell
+
+ let item = map.get(cell.field)
+
+ return item || cell
+ })
+ })
}
}
@@ -252,16 +280,23 @@
if (item.hidden || item.forbid) return
let content = null
- let label = item.tooltip ? <Tooltip placement="topLeft" title={item.tooltip}><QuestionCircleOutlined className="mk-form-tip" />{item.label}</Tooltip> : item.label
+ 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') {
- content = (<MKEInput config={item} onChange={(val, defer) => !defer && this.recordChange({[item.field]: val})} onSubmit={this.props.inputSubmit} />)
+ content = (<MKEInput config={item} onChange={(val, defer) => !defer && this.recordChange({[item.field]: val}, item)} onSubmit={this.props.inputSubmit} />)
} else if (item.type === 'number') {
- content = (<MKNumberInput config={item} onChange={(val, defer) => !defer && this.recordChange({[item.field]: val})} onSubmit={this.props.inputSubmit} />)
+ content = (<MKNumberInput config={item} onChange={(val, defer) => !defer && this.recordChange({[item.field]: val}, item)} onSubmit={this.props.inputSubmit} />)
} else if (item.type === 'select' || item.type === 'multiselect') {
content = (<MKSelect config={item} onChange={(val, other) => this.recordChange({[item.field]: val, ...other}, item)} />)
} else if (item.type === 'color') {
- content = (<MKColor config={item} onChange={(val) => this.recordChange({[item.field]: val})}/>)
+ content = (<MKColor config={item} allowClear={item.allowClear} onChange={(val) => this.recordChange({[item.field]: val})}/>)
} else if (item.type === 'styleInput') {
content = (<StyleInput config={item} onChange={(val) => this.recordChange({[item.field]: val})}/>)
} else if (item.type === 'radio') {
@@ -287,14 +322,22 @@
</Col>
)
return
+ } else if (item.type === 'printTemps') {
+ content = <MkPrintTemps onChange={(val) => this.recordChange({[item.field]: val})}/>
}
if (!content) return
if (item.help) {
+ let help = null
+ if (typeof(item.help) === 'function') {
+ help = item.help(this.record)
+ } else {
+ help = <span style={{fontSize: '12px'}}>{item.help}</span>
+ }
fields.push(
<Col span={item.span || 12} key={index}>
- <Form.Item label={label} help={<span style={{fontSize: '12px'}}>{item.help}</span>}>
+ <Form.Item label={label} help={help}>
{getFieldDecorator(item.field, {
initialValue: item.initval,
rules: item.rules
--
Gitblit v1.8.0