From 306eb5f035302baef95995437e2dc735110b6536 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 23 二月 2023 17:38:37 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/mutilform/index.jsx | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index e69e00d..325f5ab 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -41,6 +41,7 @@
state = {
formlist: [], // 琛ㄥ崟椤�
+ ID: ''
}
record = {}
@@ -506,7 +507,7 @@
this.record = record
- this.setState({ formlist }, () => {
+ this.setState({ formlist, ID: this.props.data ? this.props.data.$$uuid || '' : '' }, () => {
if (unload) return
if (action.setting && action.setting.focus && fieldMap.has(action.setting.focus)) {
@@ -565,7 +566,8 @@
obj_name: '',
arr_field: '',
table_type: 'Y',
- BID: BID || ''
+ BID: BID || '',
+ ID: this.state.ID || ''
}
if (param.LText) {
@@ -600,7 +602,8 @@
obj_name: '',
arr_field: '',
table_type: 'Y',
- BID: BID || ''
+ BID: BID || '',
+ ID: this.state.ID || ''
}
if (mainparam.LText) {
@@ -661,7 +664,8 @@
LText: _sql + form.base_sql,
obj_name: form.field,
arr_field: form.arr_field,
- BID: this.props.BID || ''
+ BID: this.props.BID || '',
+ ID: this.state.ID || ''
}
if (debug) {
@@ -886,6 +890,7 @@
formlist.forEach((item, index) => {
if (item.hidden) return
+ if (item.empty === 'hidden' && item.options.length === 0) return
if (item.type === 'split') {
fields.push(
--
Gitblit v1.8.0