From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/form/formaction/index.jsx | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/form/formaction/index.jsx b/src/menu/components/form/formaction/index.jsx
index 35ebf53..5460f4f 100644
--- a/src/menu/components/form/formaction/index.jsx
+++ b/src/menu/components/form/formaction/index.jsx
@@ -101,8 +101,17 @@
<p style={{marginBottom: '5px'}}>{this.state.dict['model.tooltip.func.innerface'].replace('@ableField', ableField)}</p>
</div>
- let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid) || []
+ let supId = ''
+ if (config.wrap.linkType === 'sup') {
+ supId = config.wrap.supModule[config.wrap.supModule.length - 1]
+ }
+
+ let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid, supId) || []
let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, config.uuid) || []
+
+ if (card.type === 'submit' && !card.Ot) {
+ card.Ot = config.wrap.datatype === 'static' ? 'notRequired' : 'requiredSgl'
+ }
this.setState({
visible: true,
@@ -158,6 +167,7 @@
this.setState({
profVisible: true
})
+ MKEmitter.emit('modalStatus', '楠岃瘉淇℃伅')
}
/**
@@ -173,6 +183,7 @@
profVisible: false
})
this.props.updateconfig(group)
+ MKEmitter.emit('modalStatus', false)
})
}
@@ -257,9 +268,11 @@
if (this.verifyRef.handleCancel) {
this.verifyRef.handleCancel().then(() => {
this.setState({ profVisible: false })
+ MKEmitter.emit('modalStatus', false)
})
} else {
this.setState({ profVisible: false })
+ MKEmitter.emit('modalStatus', false)
}
}}
destroyOnClose
--
Gitblit v1.8.0