From d87530a16ed85534432e3c60c644dc96d63f6f69 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 02 十二月 2021 17:20:02 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/menu/components/share/actioncomponent/index.jsx | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index ea3fb0c..c7718dc 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -496,7 +496,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
>
{card && !card.execMode && card.OpenType !== 'excelIn' && card.OpenType !== 'excelOut' ?
--
Gitblit v1.8.0