From b6c7f588b831d6fa4eb23b50ec08ea0b263a0717 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 17 六月 2024 20:27:56 +0800 Subject: [PATCH] 2024-06-17 --- src/components/normalform/modalform/index.jsx | 36 ++++++++++++++++-------------------- 1 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/components/normalform/modalform/index.jsx b/src/components/normalform/modalform/index.jsx index 8a7599f..e30a12a 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' @@ -155,7 +154,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 @@ -243,30 +242,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 + }) }) - }) + } } } @@ -389,7 +385,7 @@ } return ( - <Form {...formItemLayout} className="normal-form-field"> + <Form {...formItemLayout} className="normal-form-field" id="normal-form-field"> <Row gutter={24}>{this.getFields()}</Row> </Form> ) -- Gitblit v1.8.0