From 8881f69f5d7127a4090184b3ea7c9cbf9574100e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 18 三月 2024 18:01:51 +0800
Subject: [PATCH] 2024-03-18
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index d1f3338..7362e15 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -593,7 +593,7 @@
loading: false
})
reject()
- }, verify.scripts)
+ }, verify.scripts, 'submit')
})
})
} else if (activeKey === 'columns') {
@@ -612,7 +612,7 @@
loading: false
})
reject()
- }, verify.scripts)
+ }, verify.scripts, 'submit')
}
} else if (activeKey === 'scripts') {
this.setState({loading: true})
@@ -626,7 +626,7 @@
loading: false
})
reject()
- }, verify.scripts)
+ }, verify.scripts, 'submit')
} else {
resolve(verify)
}
@@ -923,7 +923,7 @@
}
}
- sqlverify = (_resolve, _reject, scripts) => {
+ sqlverify = (_resolve, _reject, scripts, type) => {
const { searches, verify, debugId } = this.state
if (verify.dataType !== 'custom') {
@@ -945,10 +945,24 @@
this.setState({debugId: _debugId})
_resolve()
} else {
- _reject()
- Modal.error({
- title: result.message
- })
+ if (type === 'submit') {
+ Modal.confirm({
+ title: result.message,
+ okText: '鐭ラ亾浜�',
+ cancelText: '寮哄埗淇濆瓨',
+ onOk: () => {
+ _reject()
+ },
+ onCancel() {
+ _resolve()
+ }
+ })
+ } else {
+ _reject()
+ Modal.error({
+ title: result.message
+ })
+ }
}
})
}
--
Gitblit v1.8.0