From 6781ba45775af16872ac68f7e459b1072b16c4cc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 十月 2023 17:33:47 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
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 50fae57..015c25e 100644
--- a/src/menu/components/form/formaction/index.jsx
+++ b/src/menu/components/form/formaction/index.jsx
@@ -65,6 +65,8 @@
group.nextButton.style = style
} else if (card.type === 'close') {
group.closeButton.style = style
+ } else if (card.type === 'reset') {
+ group.resetButton.style = style
}
this.props.updateconfig(group)
@@ -148,6 +150,9 @@
} else if (res.type === 'close') {
res.enable = group.closeButton.enable || 'true'
group.closeButton = res
+ } else if (res.type === 'reset') {
+ res.enable = group.resetButton.enable || 'true'
+ group.resetButton = res
}
this.setState({
@@ -220,13 +225,21 @@
} trigger="hover">
<Button type="link" className="submit mk-primary" onDoubleClick={this.changeMenu} style={resetStyle(group.subButton.style)}>{group.subButton.label}</Button>
</Popover>
+ {group.resetButton && group.resetButton.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.resetButton)} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.handleStyle(group.resetButton)}/>
+ </div>
+ } trigger="hover">
+ <Button type="link" className="reset" style={resetStyle(group.resetButton.style)}>{group.resetButton.label}</Button>
+ </Popover> : null}
{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>
+ <Button type="link" className="reset" 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">
--
Gitblit v1.8.0