From ff2ba12cdcc4ece62154e561d5877eb63f81eba6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 13 七月 2024 23:27:22 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/components/normalform/modalform/index.jsx | 75 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/src/components/normalform/modalform/index.jsx b/src/components/normalform/modalform/index.jsx
index aafd7bf..59a1ea6 100644
--- a/src/components/normalform/modalform/index.jsx
+++ b/src/components/normalform/modalform/index.jsx
@@ -7,7 +7,6 @@
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'
@@ -18,6 +17,7 @@
const MKCheckbox = asyncComponent(() => import('./mkCheckbox'))
const StyleInput = asyncComponent(() => import('./styleInput'))
const MKFileUpload = asyncComponent(() => import('@/tabviews/zshare/fileupload'))
+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'))
@@ -32,6 +32,7 @@
state = {
formlist: [], // 琛ㄥ崟椤�
+ formId: ''
}
record = {}
@@ -40,6 +41,15 @@
let record = {}
let controlFields = {}
let fieldMap = new Map()
+ let formId = (() => {
+ let uuid = []
+ let _options = '0123456789abcdefghigklmnopqrstuv'
+ for (let i = 0; i < 19; i++) {
+ uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
+ }
+ uuid = uuid.join('')
+ return uuid
+ })()
let formlist = this.props.formlist.filter(item => {
if (item.controlFields) { // 澶氬眰琛ㄥ崟鎺у埗
@@ -56,6 +66,7 @@
if (item.options) {
item.oriOptions = fromJS(item.options).toJS()
}
+ item.$formId = formId
if (item.type === 'text') {
let _rules = [{
@@ -154,7 +165,7 @@
if (item.linkField) {
let supInitVal = fieldMap.get(item.linkField).initval || ''
- item.options = item.oriOptions.filter(option => option.ParentID === supInitVal)
+ item.options = item.oriOptions.filter(option => option.ParentID === supInitVal || option.ParentID === '')
}
return item
@@ -162,7 +173,7 @@
this.record = record
- this.setState({ formlist })
+ this.setState({ formlist, formId })
}
checkNumber = (rule, value, callback, item) => {
@@ -242,30 +253,27 @@
if (item && item.linkField) {
let supInitVal = this.record[item.linkField] || ''
- item.options = item.oriOptions.filter(option => option.ParentID === supInitVal)
+ item.options = item.oriOptions.filter(option => option.ParentID === supInitVal || option.ParentID === '')
}
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
+ let reOptions = item.callback(this.record)
+
+ if (reOptions) {
+ this.setState({
+ formlist: this.state.formlist.map(cell => {
+ if (!cell.field || !reOptions[cell.field]) return cell
+
+ cell.options = reOptions[cell.field]
+ cell.timestamp = new Date().getTime()
+
+ return cell
+ })
})
- })
+ }
}
}
@@ -279,12 +287,19 @@
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') {
@@ -306,7 +321,7 @@
} else if (item.type === 'source') {
content = (<SourceComponent type="" placement="right"/>)
} else if (item.type === 'table') {
- content = (<MKTable tip={item.tip || ''} fixed={item.fixed === true} columns={item.columns || []} actions={item.actions || []}/>)
+ content = (<MKTable tip={item.tip || ''} columns={item.columns || []} actions={item.actions || []}/>)
} else if (item.type === 'hint') {
fields.push(
<Col span={24} key={index}>
@@ -314,14 +329,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
@@ -373,7 +396,7 @@
}
return (
- <Form {...formItemLayout} className="normal-form-field">
+ <Form {...formItemLayout} className="normal-form-field" id={this.state.formId}>
<Row gutter={24}>{this.getFields()}</Row>
</Form>
)
--
Gitblit v1.8.0