From c6d0dcdccdb898e1abcdb7fb8312d3b7b653743f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 16 八月 2022 01:34:18 +0800
Subject: [PATCH] 2022-08-16
---
src/tabviews/zshare/mutilform/index.jsx | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index ffb77bc..c2b9648 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -45,8 +45,10 @@
record = {}
componentDidMount () {
- const { data, BData, action } = this.props
+ const { action } = this.props
+ let data = {}
+ let BData = {}
let linkFields = {} // 鍏宠仈鑿滃崟
let controlFields = {} // 鎺у埗琛ㄥ崟
let deForms = [] // 闇�瑕佸姩鎬佽幏鍙栦笅鎷夎彍鍗曠殑琛ㄥ崟
@@ -55,6 +57,17 @@
let formlist = fromJS(action.fields).toJS()
let fieldMap = new Map()
let check = action.setting.formType === 'check'
+
+ if (this.props.data) {
+ Object.keys(this.props.data).forEach(key => {
+ data[key.toLowerCase()] = this.props.data[key]
+ })
+ }
+ if (this.props.BData) {
+ Object.keys(this.props.BData).forEach(key => {
+ BData[key.toLowerCase()] = this.props.BData[key]
+ })
+ }
formlist = formlist.filter(item => {
if (item.supField) { // 澶氬眰琛ㄥ崟鎺у埗
@@ -87,8 +100,8 @@
if (item.type === 'split' || item.type === 'formula') return true
if (item.type === 'hint') {
- if (item.field && data && data[item.field]) {
- item.message = data[item.field]
+ if (item.field && data[item.field.toLowerCase()]) {
+ item.message = data[item.field.toLowerCase()]
}
delete item.field
return true
@@ -113,6 +126,8 @@
item.writein = item.writein !== 'false'
item.hidden = item.hidden === 'true'
item.fieldlength = item.fieldlength || 50
+
+ let key = item.field.toLowerCase()
if (item.type === 'funcvar') {
readin = false
@@ -145,11 +160,11 @@
let newval = '$empty'
- if (readin && data && data.hasOwnProperty(item.field)) {
- newval = data[item.field]
+ if (readin && data.hasOwnProperty(key)) {
+ newval = data[key]
}
if (item.type === 'linkMain') {
- newval = BData && BData[item.field] ? BData[item.field] : '$empty'
+ newval = BData[key] || '$empty'
} else if (item.type === 'date') { // 鏃堕棿鎼滅储
let format = 'YYYY-MM-DD'
let _format = 'YYYY-MM-DD HH:mm:ss'
@@ -423,8 +438,8 @@
if (fieldMap.has(item.linkField)) {
item.supInitVal = fieldMap.get(item.linkField).initval || ''
- } else if (data && data.hasOwnProperty(item.linkField)) {
- item.supInitVal = data[item.linkField]
+ } else if (data.hasOwnProperty(item.linkField.toLowerCase())) {
+ item.supInitVal = data[item.linkField.toLowerCase()]
}
item.options = item.oriOptions.filter(option => option.ParentID === item.supInitVal || option.value === '')
--
Gitblit v1.8.0