From 1090ecbbc2d88cc577324710017a4d332a4dd714 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 22 九月 2021 18:13:00 +0800 Subject: [PATCH] 2021-09-22 --- src/menu/datasource/verifycard/index.jsx | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx index e98c763..e21bfda 100644 --- a/src/menu/datasource/verifycard/index.jsx +++ b/src/menu/datasource/verifycard/index.jsx @@ -609,12 +609,12 @@ } if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) { - let result = SettingUtils.getDebugSql(setting, _scripts, columns, searches, defaultSearch) + let r = SettingUtils.getDebugSql(setting, _scripts, columns, searches, defaultSearch) - if (result.error) { + if (r.error) { notification.warning({ top: 92, - message: result.error, + message: r.error, duration: 5 }) reject() @@ -624,15 +624,40 @@ let param = { func: 's_debug_sql', exec_type: 'y', - LText: result.sql + LText: r.sql } param.LText = Utils.formatOptions(param.LText) param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') param.secretkey = Utils.encrypt('', param.timestamp) + + let sumParam = null + if (r.sumSql) { + sumParam = { + func: 's_debug_sql', + exec_type: 'y', + LText: r.sumSql + } + sumParam.LText = Utils.formatOptions(sumParam.LText) + sumParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + sumParam.secretkey = Utils.encrypt('', sumParam.timestamp) + } Api.getLocalConfig(param).then(result => { if (result.status) { - resolve() + if (sumParam) { + Api.getLocalConfig(sumParam).then(res => { + if (res.status) { + resolve() + } else { + reject() + Modal.error({ + title: res.message + }) + } + }) + } else { + resolve() + } } else { reject() Modal.error({ -- Gitblit v1.8.0