From fa76b73b7a1c9671a76c9821ed1a28e2f2b9e2b7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 二月 2024 14:19:19 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/tabviews/zshare/actionList/printbutton/index.jsx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index 68bc347..da72ac9 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -962,7 +962,7 @@
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
- exec_type: 'y',
+ exec_type: window.GLOB.execType || 'y',
arr_field: arrFields,
default_sql: btn.verify.setting.defaultSql
}
@@ -1168,8 +1168,8 @@
param.menuname = btn.logLabel
}
- param.custom_script = Utils.formatOptions(_customScript)
- param.LText = Utils.formatOptions(LText)
+ param.custom_script = Utils.formatOptions(_customScript, param.exec_type)
+ param.LText = Utils.formatOptions(LText, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
--
Gitblit v1.8.0