From 958377f8ed9ca55070da9aa319f23e3ee9d94701 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 07 七月 2020 10:06:50 +0800
Subject: [PATCH] 2020-07-07
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 760a4be..d967530 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -205,10 +205,18 @@
delete res.message
delete res.status
- if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
- res.rduri = window.GLOB.mainSystemApi
- } else if (btn.sysInterface !== 'true') {
- res.rduri = btn.interface
+ if (this.props.menuType === 'HS') {
+ if (btn.sysInterface === 'true' && options.cloudServiceApi) {
+ res.rduri = options.cloudServiceApi
+ } else if (btn.sysInterface !== 'true') {
+ res.rduri = btn.interface
+ }
+ } else {
+ if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
+ res.rduri = window.GLOB.mainSystemApi
+ } else if (btn.sysInterface !== 'true') {
+ res.rduri = btn.interface
+ }
}
if (btn.outerFunc) {
@@ -260,15 +268,15 @@
if (this.props.menuType === 'HS') {
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
- param.rduri = options.cloudServiceApi
+ res.rduri = options.cloudServiceApi
} else if (btn.sysInterface !== 'true') {
- param.rduri = btn.interface
+ res.rduri = btn.interface
}
} else {
if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
+ res.rduri = window.GLOB.mainSystemApi
} else if (btn.sysInterface !== 'true') {
- param.rduri = btn.interface
+ res.rduri = btn.interface
}
}
@@ -540,6 +548,11 @@
..._search
}
+ // 鏁版嵁绠＄悊鏉冮檺
+ if (this.props.dataManager) {
+ param.dataM = 'Y'
+ }
+
if (this.props.BID) {
param.BID = this.props.BID
}
@@ -567,8 +580,12 @@
obj_name: 'data',
arr_field: arr_field,
custom_script: setting.customScript || '',
- default_sql: setting.default || 'true',
- dataM: this.props.dataManager ? 'Y' : ''
+ default_sql: setting.default || 'true'
+ }
+
+ // 鏁版嵁绠＄悊鏉冮檺
+ if (this.props.dataManager) {
+ param.dataM = 'Y'
}
if (this.props.BID) {
--
Gitblit v1.8.0