From 0c439ced2c97905cb2b02f5f689a37b19369fb8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 22 七月 2022 15:00:58 +0800
Subject: [PATCH] 2022-07-22
---
src/tabviews/subtable/index.jsx | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index 880670d..8d8fc3f 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -133,7 +133,7 @@
config = updateSubTable(config)
// 鏉冮檺杩囨护
- if (this.props.menuType !== 'HS') {
+ if (!window.GLOB.mkHS) {
config.action = config.action.filter(item => item.hidden !== 'true' && permAction[item.uuid])
} else {
config.action = config.action.filter(item => item.hidden !== 'true')
@@ -430,7 +430,7 @@
loadOutResource = (searches) => {
const { setting, BID } = this.state
- let param = UtilsDM.getPrevQueryParams(setting, searches, BID, this.props.menuType)
+ let param = UtilsDM.getPrevQueryParams(setting, searches, BID)
if (setting.execType === 'sync') {
this.setState({
@@ -550,7 +550,7 @@
param.BID = BID
}
- if (this.props.menuType === 'HS') { // 鍑芥暟 sPC_TableData_InUpDe 浜戠楠岃瘉
+ if (window.GLOB.mkHS) { // 鍑芥暟 sPC_TableData_InUpDe 浜戠楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
} else {
@@ -611,7 +611,7 @@
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType)
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID)
let result = await Api.genericInterface(param)
@@ -691,7 +691,7 @@
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType, id)
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, id)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -760,7 +760,7 @@
if (statFields.length === 0 || !(setting.interType === 'system' || (setting.interType === 'custom' && setting.requestMode === 'system')) || !setting.dataresource) return
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getStatQueryDataParams(setting, statFields, searches, _orderBy, BID, this.props.menuType)
+ let param = UtilsDM.getStatQueryDataParams(setting, statFields, searches, _orderBy, BID)
Api.genericInterface(param).then(res => {
if (res.status) {
@@ -999,7 +999,7 @@
<div className="subtable" id={'subtable' + this.props.MenuID}>
{loadingview && <Spin />}
{searchlist && searchlist.length ?
- <SubSearch BID={BID} setting={setting} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
+ <SubSearch BID={BID} setting={setting} searchlist={searchlist} refreshdata={this.refreshbysearch}/> : null
}
{config && config.charts ? <Row className="chart-view" gutter={16}>
{/* 瑙嗗浘缁� */}
@@ -1130,7 +1130,6 @@
const mapStateToProps = (state) => {
return {
- menuType: state.editLevel,
permAction: state.permAction,
permMenus: state.permMenus,
}
--
Gitblit v1.8.0