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/formtab/index.jsx | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/tabviews/formtab/index.jsx b/src/tabviews/formtab/index.jsx index e0a108c..fd2dafa 100644 --- a/src/tabviews/formtab/index.jsx +++ b/src/tabviews/formtab/index.jsx @@ -9,6 +9,7 @@ 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 FormGroup from './formgroup' import FormAction from './actionList' @@ -21,6 +22,7 @@ class NormalTable extends Component { static propTpyes = { + menuType: PropTypes.any, // 鑿滃崟绫诲瀷锛屾櫘閫氳彍鍗曟垨HS // MenuNo: PropTypes.string, // 鑿滃崟鍙傛暟 // MenuName: PropTypes.string, // 鑿滃崟鍙傛暟 MenuID: PropTypes.string, // 鑿滃崟Id @@ -106,7 +108,9 @@ // } // 鏉冮檺杩囨护 - config.action = config.action.filter(item => permAction[item.uuid]) + if (this.props.menuType !== 'HS') { + config.action = config.action.filter(item => permAction[item.uuid]) + } // config.tabgroups.forEach(group => { // if (!config[group]) return // config[group] = config[group].filter(tab => permAction[tab.uuid]) @@ -363,10 +367,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 @@ -551,6 +563,7 @@ } {hasform ? <FormAction + menuType={this.props.menuType} logcolumns={[]} setting={setting} actions={actions} @@ -578,6 +591,7 @@ {_tab.type === 'SubTable' ? <SubTable Tab={_tab} + menuType={this.props.menuType} MenuID={_tab.linkTab} SupMenuID={this.props.MenuID} refreshtabs={this.state.refreshtabs} -- Gitblit v1.8.0