From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/templates/sharecomponent/settingcomponent/settingform/index.jsx |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
index c78bd0a..2fec3e1 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
@@ -323,15 +323,16 @@
     } else if (type === 'scripts' && _scripts.length === 0) {
       _resolve()
     } else { // type 涓� submit 銆� verify 锛屼互鍙婂叾浠栭渶瑕侀獙璇佺殑鍦烘櫙
-      let r = SettingUtils.getDebugSql(setting, _scripts, arr_field, regoptions, search)
+      let timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+      let r = SettingUtils.getDebugSql(setting, _scripts, arr_field, regoptions, search, timestamp)
       let param = {
         func: 's_debug_sql',
         exec_type: 'y',
         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)
+      param.timestamp = timestamp
+      param.secretkey = Utils.encrypt('', timestamp)
 
       let sumParam = null
       if (r.sumSql) {

--
Gitblit v1.8.0