From b91c28df2f734b680198e755b7828666e238cea0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:43:44 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/index.jsx | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index f38a70b..b59417f 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -4,7 +4,6 @@
import { Form, Tabs, Popconfirm, notification, Modal, Typography, Spin, message, Button, Input } from 'antd'
import { StopOutlined, CheckCircleOutlined, TableOutlined, EditOutlined, SwapOutlined, DeleteOutlined, CopyOutlined, BorderOutlined, SnippetsOutlined } from '@ant-design/icons'
import moment from 'moment'
-import md5 from 'md5'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -683,8 +682,6 @@
let r = SettingUtils.getDebugSql(setting, _scripts, _columns, searches, config.subtype, config.hasExtend)
- let _debugId = md5(r.sql)
-
if (r.custompage && setting.laypage === 'true' && _columns.findIndex(col => col.field === 'mk_total') === -1) {
if (config.subtype !== 'basetable') {
Modal.warning({
@@ -704,7 +701,7 @@
}
}
- if (debugId === _debugId) {
+ if (debugId === r.debugId) {
resolve()
return
}
@@ -719,7 +716,7 @@
Api.sDebug(r.sql).then(result => {
if (result.status || result.ErrCode === '-2') {
- this.setState({debugId: _debugId}, () => {
+ this.setState({debugId: r.debugId}, () => {
resolve()
})
} else {
--
Gitblit v1.8.0