From fb3ec146a9e1444ece749d0bcf232a554e933fb0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:56:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/form/normal-form/index.jsx | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/custom/components/form/normal-form/index.jsx b/src/tabviews/custom/components/form/normal-form/index.jsx
index 6876ca4..a8ad272 100644
--- a/src/tabviews/custom/components/form/normal-form/index.jsx
+++ b/src/tabviews/custom/components/form/normal-form/index.jsx
@@ -71,10 +71,16 @@
config.subcards = config.subcards.map(group => {
group.subButton.uuid = group.uuid
group.subButton.$menuId = group.uuid
- group.subButton.Ot = 'requiredSgl'
+ group.subButton.Ot = config.wrap.datatype === 'static' ? 'notRequired' : 'requiredSgl'
group.subButton.$forbid = true
group.subButton.OpenType = 'formSubmit'
group.subButton.execError = 'never'
+
+ group.subButton.syncComponentId = group.subButton.syncComponent ? group.subButton.syncComponent.pop() : ''
+
+ if (group.subButton.syncComponentId === config.uuid) {
+ group.subButton.syncComponentId = ''
+ }
if (group.subButton.enable === 'false') {
group.subButton.style.display = 'none'
@@ -201,12 +207,12 @@
if (group.uuid !== menuId) return
- if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
- MKEmitter.emit('reloadData', btn.syncComponentId) // 鍚岀骇鏍囩鍒锋柊
- }
+ btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
- if (config.wrap.datatype !== 'static' && config.setting) {
- this.loadData()
+ if (!btn.syncComponentId || btn.syncComponentId !== config.setting.supModule) {
+ if (config.wrap.datatype !== 'static' && config.setting) {
+ this.loadData()
+ }
}
if (id) {
@@ -218,7 +224,9 @@
resetParentParam = (MenuID, id) => {
const { config } = this.state
+
if (config.wrap.datatype === 'static' || !config.setting.supModule || config.setting.supModule !== MenuID) return
+
if (id !== this.state.BID || id !== '') {
this.setState({ BID: id }, () => {
this.loadData()
@@ -351,7 +359,7 @@
const { config, loading, BID, data, group, dict, step } = this.state
return (
- <div className="custom-normal-form-box" style={{...config.style}}>
+ <div className="custom-normal-form-box" id={'anchor' + config.uuid} style={{...config.style}}>
{loading ?
<div className="loading-mask">
<div className="ant-spin-blur"></div>
--
Gitblit v1.8.0