From 59db6fab9c1ed1fa5559d423d439e14ea33b1598 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 27 四月 2023 11:18:24 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/index.jsx | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index a8e1e0f..e557a15 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -212,7 +212,8 @@
median: _setting,
searches: search,
defaultSearch: _search,
- searchKey: ''
+ searchKey: '',
+ debugId: _setting.debugId || ''
})
this.getsysScript()
@@ -679,7 +680,7 @@
if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) {
let timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- let r = SettingUtils.getDebugSql(setting, _scripts, columns, searches, defaultSearch, timestamp)
+ let r = SettingUtils.getDebugSql(setting, _scripts, columns, searches, defaultSearch, '2023-04-20 15:29:37')
let _debugId = md5(r.sql)
@@ -722,8 +723,9 @@
if (sumParam) {
Api.genericInterface(sumParam).then(res => {
if (res.status) {
- this.setState({debugId: _debugId})
- resolve()
+ this.setState({debugId: _debugId}, () => {
+ resolve()
+ })
} else {
reject()
Modal.error({
@@ -732,8 +734,9 @@
}
})
} else {
- this.setState({debugId: _debugId})
- resolve()
+ this.setState({debugId: _debugId}, () => {
+ resolve()
+ })
}
} else {
reject()
--
Gitblit v1.8.0