From f6626b05f1275cc2f8ca77f773d4f6a6af1b0a89 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:11:55 +0800
Subject: [PATCH] 2022-11-21
---
src/menu/components/form/formaction/index.jsx | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/menu/components/form/formaction/index.jsx b/src/menu/components/form/formaction/index.jsx
index f0e70b2..57d9865 100644
--- a/src/menu/components/form/formaction/index.jsx
+++ b/src/menu/components/form/formaction/index.jsx
@@ -96,7 +96,7 @@
supId = config.wrap.supModule[config.wrap.supModule.length - 1]
}
- let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid, supId) || []
+ 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) {
@@ -136,11 +136,16 @@
let group = fromJS(this.props.group).toJS()
if (res.type === 'prev') {
+ res.enable = group.prevButton.enable || 'true'
group.prevButton = res
} else if (res.type === 'submit') {
group.subButton = res
} else if (res.type === 'next') {
+ res.enable = group.nextButton.enable || 'true'
group.nextButton = res
+ } else if (res.type === 'close') {
+ res.enable = group.closeButton.enable || 'true'
+ group.closeButton = res
}
this.setState({
@@ -157,7 +162,6 @@
this.setState({
profVisible: true
})
- MKEmitter.emit('modalStatus', '楠岃瘉淇℃伅')
}
/**
@@ -173,7 +177,6 @@
profVisible: false
})
this.props.updateconfig(group)
- MKEmitter.emit('modalStatus', false)
})
}
@@ -198,7 +201,7 @@
return (
<div className="mk-form-action">
- {group.prevButton && group.prevButton.enable !== 'false' && group.sort !== 1 ? <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+ {group.prevButton && group.prevButton.enable === 'true' ? <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<EditOutlined className="edit" title="缂栬緫" onClick={() => this.handleAction(group.prevButton)} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.handleStyle(group.prevButton)}/>
@@ -215,7 +218,15 @@
} trigger="hover">
<Button type="link" className="submit mk-primary" onDoubleClick={this.changeMenu} style={resetStyle(group.subButton.style)}>{group.subButton.label}</Button>
</Popover>
- {group.nextButton && group.nextButton.enable !== 'false' && group.sort !== config.subcards.length ? <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+ {group.closeButton && group.closeButton.enable === 'true' ? <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+ <div className="mk-popover-control">
+ <EditOutlined className="edit" title="缂栬緫" onClick={() => this.handleAction(group.closeButton)} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.handleStyle(group.closeButton)}/>
+ </div>
+ } trigger="hover">
+ <Button type="link" style={resetStyle(group.closeButton.style)}>{group.closeButton.label}</Button>
+ </Popover> : null}
+ {group.nextButton && group.nextButton.enable === 'true' ? <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<EditOutlined className="edit" title="缂栬緫" onClick={() => this.handleAction(group.nextButton)} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.handleStyle(group.nextButton)}/>
@@ -256,11 +267,9 @@
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