From 822bc67061448c6e3a1eb77d39be4ad2b84b416a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 27 二月 2020 09:36:34 +0800
Subject: [PATCH] 2020-02-27
---
src/tabviews/subtable/index.jsx | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index a86dfc6..3edd335 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -13,12 +13,14 @@
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
+import options from '@/store/options.js'
import './index.scss'
const SubTabTable = asyncComponent(() => import('@/tabviews/subtabtable'))
class SubTabViewTable extends Component {
static propTpyes = {
+ menuType: PropTypes.any, // 鑿滃崟绫诲瀷锛屾櫘閫氳彍鍗曟垨HS
Tab: PropTypes.object, // 鏍囩淇℃伅
BID: PropTypes.string, // 涓婄骇鏁版嵁ID
BData: PropTypes.any, // 涓婄骇鏁版嵁
@@ -114,7 +116,9 @@
let colMap = new Map()
// 鏉冮檺杩囨护
- config.action = config.action.filter(item => permAction[item.uuid])
+ if (this.props.menuType !== 'HS') {
+ config.action = config.action.filter(item => permAction[item.uuid])
+ }
// 1銆佺瓫閫夊瓧娈甸泦锛�2銆佽繃婊ら殣钘忓垪鍙婂悎骞跺垪涓殑瀛楁uuid
config.columns.forEach(col => {
@@ -348,10 +352,18 @@
if (setting.interType === 'inner') {
param.func = setting.innerFunc
} else {
- if (setting.sysInterface === 'true') {
- param.rduri = window.GLOB.mainSystemApi || window.GLOB.subSystemApi
+ if (this.props.menuType === 'HS') {
+ if (setting.sysInterface === 'true' && options.cloudServiceApi) {
+ param.rduri = options.cloudServiceApi
+ } else if (setting.sysInterface !== 'true') {
+ param.rduri = setting.interface
+ }
} else {
- param.rduri = setting.interface
+ if (setting.sysInterface === 'true') {
+ param.rduri = window.GLOB.mainSystemApi || window.GLOB.subSystemApi
+ } else {
+ param.rduri = setting.interface
+ }
}
param.appkey = window.GLOB.appkey || '' // 璋冪敤澶栭儴鎺ュ彛澧炲姞appkey
@@ -625,6 +637,7 @@
<SubAction
ref="subButton"
type="sub"
+ menuType={this.props.menuType}
setting={setting}
actions={actions}
Tab={this.props.Tab}
@@ -669,6 +682,7 @@
>
{<SubTabTable
BID={this.props.BID}
+ menuType={this.props.menuType}
BData={this.props.BData}
SupMenuID={this.props.MenuID}
ContainerId={this.props.ContainerId}
--
Gitblit v1.8.0