From 1da6506bf58270bacc2a4345002c6b082835580e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 21 十月 2021 23:17:08 +0800
Subject: [PATCH] 2021-10-21
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index c151133..0c1fdb3 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -37,11 +37,7 @@
}
componentDidMount () {
- const { position } = this.props
-
- if (position === 'toolbar') {
- MKEmitter.addListener('triggerBtnId', this.actionTrigger)
- }
+ MKEmitter.addListener('triggerBtnId', this.actionTrigger)
MKEmitter.addListener('returnModuleParam', this.triggerExcelout)
}
@@ -525,7 +521,7 @@
this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'})
}
}
- } catch {
+ } catch (e) {
this.execError({ErrCode: 'N', message: 'Excel鐢熸垚澶辫触锛�'})
}
}
@@ -610,10 +606,14 @@
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(script)
if (this.props.menuType === 'HS') { // 鍑芥暟 sPC_TableData_InUpDe 浜戠楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
+ }
+
+ if (window.GLOB.probation) {
+ param.s_debug_type = 'Y'
}
Api.genericInterface(param).then((res) => {
@@ -783,6 +783,10 @@
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
+ if (setting.transaction === 'true') {
+ param.func = 'sPC_Get_TableData_try'
+ }
+
return param
}
@@ -818,6 +822,11 @@
if (btn.execSuccess !== 'never') {
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execSuccess, btn)
}
+ if (btn.switchTab && btn.switchTab.length > 0) {
+ let id = btn.switchTab[btn.switchTab.length - 1]
+ let node = document.getElementById('tab' + id)
+ node && node.click()
+ }
}
/**
--
Gitblit v1.8.0