From e62bed4f742dd29820499cfe745eb381d9f39f87 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 30 六月 2020 17:23:01 +0800
Subject: [PATCH] 2020-06-30
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 1129358..760a4be 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -505,7 +505,12 @@
param.BID = this.props.BID
}
- param.LText = Utils.formatOptions(script)
+ let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(script)
+
+ param.LText2 = LText2
+ param.LText1 = LText1
+ param.LText = LText
+
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
@@ -619,9 +624,9 @@
let LText = ''
if (setting.default !== 'false' && !pagination) {
- LText = `select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows`
+ LText = ` select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
} else if (setting.default !== 'false') {
- LText = `select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows`
+ LText = ` select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows `
}
if (param.custom_script) {
@@ -633,7 +638,7 @@
LText += `
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
`
} else {
param.custom_script += `
--
Gitblit v1.8.0