From 8e8f505f37ecc4e6945e7d0d6e9883e4e9352437 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 十一月 2022 23:59:47 +0800
Subject: [PATCH] 2022-11-10
---
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 612666b..97a19f4 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -1,7 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import moment from 'moment'
-import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
import { Button, Modal, notification, message } from 'antd'
@@ -20,7 +19,6 @@
BID: PropTypes.string, // 涓昏〃ID
BData: PropTypes.any, // 涓昏〃鏁版嵁
selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁
- Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
btn: PropTypes.object, // 鎸夐挳
setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
disabled: PropTypes.any, // 琛屾寜閽鐢�
@@ -118,13 +116,13 @@
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
actionTrigger = (triggerId, record, type) => {
- const { setting, Tab, BID, btn, selectedData } = this.props
+ const { setting, BID, btn, selectedData } = this.props
const { loading, disabled } = this.state
if (loading || disabled) return
if (triggerId && btn.uuid !== triggerId) return
- if (((Tab && Tab.supMenu) || setting.supModule) && !BID) {
+ if (setting.supModule && !BID) {
notification.warning({
top: 92,
message: '闇�瑕佷笂绾т富閿�硷紒',
@@ -343,7 +341,7 @@
param.LText = Utils.formatOptions(result.sql)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
- if (this.props.menuType === 'HS' && param.timestamp) { // 浜戠楠岃瘉
+ if (window.GLOB.mkHS && param.timestamp) { // 浜戠楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
@@ -410,9 +408,11 @@
// 澶栭儴璇锋眰
_outParam = fromJS(res).toJS()
- if (this.props.menuType === 'HS') {
+ if (window.GLOB.mkHS) {
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
param.rduri = options.cloudServiceApi
+ param.userid = sessionStorage.getItem('CloudUserID') || ''
+ param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
} else if (btn.sysInterface !== 'true') {
if (window.GLOB.systemType === 'production' && btn.proInterface) {
param.rduri = btn.proInterface
@@ -421,13 +421,25 @@
}
}
} else {
- if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
- } else if (btn.sysInterface !== 'true') {
+ if (btn.sysInterface === 'true') {
+ if (window.GLOB.mainSystemApi) {
+ param.rduri = window.GLOB.mainSystemApi
+ }
+ } else if (btn.sysInterface === 'external') {
+ if (window.GLOB.systemType === 'production') {
+ param.$token = btn.exProInterface || ''
+ } else {
+ param.$token = btn.exInterface || ''
+ }
+ } else {
if (window.GLOB.systemType === 'production' && btn.proInterface) {
param.rduri = btn.proInterface
} else {
param.rduri = btn.interface
+ }
+ let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
+ if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
+ param.$login = true
}
}
}
@@ -436,7 +448,7 @@
res.func = btn.outerFunc
}
- if (this.props.menuType === 'HS' && res.func === 's_sDataDictb_excelIn') { // s_sDataDictb_excelIn 浜戠楠岃瘉
+ if (window.GLOB.mkHS && res.func === 's_sDataDictb_excelIn') { // s_sDataDictb_excelIn 浜戠楠岃瘉
param.LText = Utils.formatOptions(result.sql)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
@@ -505,7 +517,7 @@
className = 'mk-btn mk-' + btn.class
}
- return <div style={{display: 'inline-block'}} onClick={(e) => e.stopPropagation()}>
+ return <>
<Button
type={type}
title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
@@ -514,21 +526,11 @@
style={btn.style}
icon={icon}
className={className}
- onClick={() => {this.actionTrigger()}}
+ onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
<ExcelIn btn={btn} triggerExcelIn={() => this.setState({ loading: true })} returndata={this.getexceldata} ref="excelIn" />
- </div>
+ </>
}
}
-const mapStateToProps = (state) => {
- return {
- menuType: state.editLevel
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(ExcelInButton)
\ No newline at end of file
+export default ExcelInButton
\ No newline at end of file
--
Gitblit v1.8.0