From 3cff8e1589fd8e319ee6a35facfa63cf02f92f6a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 十二月 2021 21:55:24 +0800
Subject: [PATCH] 2021-12-21
---
src/menu/components/form/formaction/index.jsx | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/menu/components/form/formaction/index.jsx b/src/menu/components/form/formaction/index.jsx
index a1819fd..12cc00f 100644
--- a/src/menu/components/form/formaction/index.jsx
+++ b/src/menu/components/form/formaction/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Modal, Button, Popover, Icon } from 'antd'
+import { Modal, Button, Popover } from 'antd'
+import { FontColorsOutlined, EditOutlined, ProfileOutlined } from '@ant-design/icons'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
@@ -88,7 +89,7 @@
if (usefulFields) {
try {
usefulFields = JSON.parse(usefulFields)
- } catch {
+ } catch (e) {
usefulFields = []
}
} else {
@@ -100,7 +101,7 @@
<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 modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid) || []
this.setState({
visible: true,
@@ -197,25 +198,25 @@
<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={
<div className="mk-popover-control">
- <Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.handleAction(group.prevButton)} />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={() => this.handleStyle(group.prevButton)} type="font-colors" />
+ <EditOutlined className="edit" title="缂栬緫" onClick={() => this.handleAction(group.prevButton)} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.handleStyle(group.prevButton)}/>
</div>
} trigger="hover">
<Button type="link" className="prev" style={resetStyle(group.prevButton.style)}>{group.prevButton.label}</Button>
</Popover> : null}
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.handleAction(group.subButton)} />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={() => this.handleStyle(group.subButton)} type="font-colors" />
- <Icon className="profile" title="setting" type="profile" onClick={() => this.profileAction()} />
+ <EditOutlined className="edit" title="缂栬緫" onClick={() => this.handleAction(group.subButton)} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.handleStyle(group.subButton)}/>
+ <ProfileOutlined className="profile" title="setting" onClick={() => this.profileAction()} />
</div>
} 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={
<div className="mk-popover-control">
- <Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.handleAction(group.nextButton)} />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={() => this.handleStyle(group.nextButton)} type="font-colors" />
+ <EditOutlined className="edit" title="缂栬緫" onClick={() => this.handleAction(group.nextButton)} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.handleStyle(group.nextButton)}/>
</div>
} trigger="hover">
<Button type="link" className="skip" style={resetStyle(group.nextButton.style)}>{group.nextButton.label}</Button>
@@ -251,7 +252,15 @@
maskClosable={false}
okText={dict['model.submit']}
onOk={this.verifySubmit}
- onCancel={() => { this.setState({ profVisible: false }) }}
+ onCancel={() => {
+ if (this.verifyRef.handleCancel) {
+ this.verifyRef.handleCancel().then(() => {
+ this.setState({ profVisible: false })
+ })
+ } else {
+ this.setState({ profVisible: false })
+ }
+ }}
destroyOnClose
>
<VerifyCard
--
Gitblit v1.8.0