From bf772e586c29b4858366dbad143b1eaeca3c46ed Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 17 四月 2020 10:18:09 +0800 Subject: [PATCH] 2020-04-17 --- src/tabviews/subtabtable/index.jsx | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx index 43b61fd..10f7670 100644 --- a/src/tabviews/subtabtable/index.jsx +++ b/src/tabviews/subtabtable/index.jsx @@ -391,14 +391,12 @@ param.rduri = setting.interface } } else { - if (setting.sysInterface === 'true') { - param.rduri = window.GLOB.mainSystemApi || window.GLOB.subSystemApi - } else { + if (setting.sysInterface === 'true' && window.GLOB.mainSystemApi) { + param.rduri = window.GLOB.mainSystemApi + } else if (setting.sysInterface !== 'true') { param.rduri = setting.interface } } - - param.appkey = window.GLOB.appkey || '' // 璋冪敤澶栭儴鎺ュ彛澧炲姞appkey if (setting.outerFunc) { param.func = setting.outerFunc @@ -421,8 +419,7 @@ func: 'sPC_Get_TableData', obj_name: 'data', arr_field: arr_field, - BID: this.props.BID, - appkey: window.GLOB.appkey || '' + BID: this.props.BID } let _orderBy = orderBy || setting.order @@ -631,6 +628,7 @@ BData={this.props.BData} MenuID={this.props.SupMenuID} permRoles={this.props.permRoles} + logcolumns={this.state.logcolumns} refreshdata={this.refreshbyaction} ContainerId={this.props.ContainerId} gettableselected={this.gettableselected} @@ -640,6 +638,7 @@ {columns && <SubTable ref="subTable" + menuType={this.props.menuType} tableId="" dict={this.state.dict} MenuID={this.props.MenuID} @@ -648,7 +647,6 @@ data={this.state.data} total={this.state.total} loading={this.state.loading} - logcolumns={this.state.logcolumns} refreshdata={this.refreshbytable} buttonTrigger={this.buttonTrigger} handleTableId={() => {}} -- Gitblit v1.8.0