From f9816a4078fdba44115c69025d9982997f23b484 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 29 四月 2024 16:00:49 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/mutilform/index.jsx | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 4773693..97da891 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -148,6 +148,7 @@
item.readin = item.readin !== 'false' && item.readin !== 'top'
item.readonly = check || item.readonly === 'true'
item.writein = item.writein !== 'false'
+ item.defHidden = item.hidden === 'true'
item.hidden = item.hidden === 'true'
item.fieldlength = item.fieldlength || 50
@@ -497,7 +498,7 @@
let _hidden = false
- if (supItem.hidden) {
+ if (supItem.hidden && !supItem.defHidden) {
_hidden = true
} else {
let box = [...item.values]
@@ -1280,7 +1281,7 @@
} else if (item.type === 'radio') {
content = (<MKRadio config={item} onChange={(val, other) => this.recordChange({[item.field]: val, ...other}, item)}/>)
} else if (item.type === 'date' || item.type === 'datemonth') {
- content = (<MKDatePicker config={item} onChange={(val) => this.recordChange({[item.field]: val})} />)
+ content = (<MKDatePicker config={item} onChange={(val) => this.recordChange({[item.field]: val})} onSubmit={this.props.inputSubmit}/>)
} else if (item.type === 'fileupload') {
className = item.readonly ? 'readonly' : ''
className += item.fileType === 'picture-card' ? ' file-upload' : ''
--
Gitblit v1.8.0