From 2ae980243b7ad705dea575eadcfc4cf4e24073bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:57:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/commontable/index.jsx | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 3b32650..b16e840 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -159,7 +159,7 @@
// 鏉冮檺杩囨护
if (this.props.menuType !== 'HS') {
- config.action = config.action.filter(item => permAction[item.uuid])
+ config.action = config.action.filter(item => item.hidden !== 'true' && permAction[item.uuid])
config.tabgroups.forEach(group => {
group.sublist = group.sublist.filter(tab => {
if (tab.supMenu === 'mainTable') {
@@ -169,6 +169,7 @@
})
})
} else {
+ config.action = config.action.filter(item => item.hidden !== 'true')
config.tabgroups.forEach(group => {
group.sublist = group.sublist.map(tab => {
if (tab.supMenu === 'mainTable') {
@@ -182,17 +183,22 @@
config.tabgroups = config.tabgroups.filter(group => group.sublist.length > 0)
let roleId = sessionStorage.getItem('role_id') || '' // 瑙掕壊ID
- // 瑙嗗浘鏉冮檺
- config.charts = config.charts.filter(item => {
- if (item.Hide === 'true') return false
- if (!item.blacklist || item.blacklist.length === 0) return true
- return item.blacklist.filter(v => roleId.indexOf(v) > -1).length === 0
- })
- if (config.charts.length <= 1) {
- config.expand = true
+ let chartId = ''
+
+ if (config.charts) {
+ // 瑙嗗浘鏉冮檺
+ config.charts = config.charts.filter(item => {
+ if (item.Hide === 'true') return false
+ if (!item.blacklist || item.blacklist.length === 0) return true
+ return item.blacklist.filter(v => roleId.indexOf(v) > -1).length === 0
+ })
+
+ if (config.charts.length <= 1) {
+ config.expand = true
+ }
+ chartId = config.charts[0] ? config.charts[0].uuid : ''
}
- let chartId = config.charts[0] ? config.charts[0].uuid : ''
config.search = Utils.initSearchVal(config.search)
@@ -1128,7 +1134,7 @@
{searchlist && searchlist.length ?
<MainSearch BID={BID} searchlist={searchlist} setting={setting} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
}
- {setting ? <Row className="chart-view" gutter={16}>
+ {setting && config.charts ? <Row className="chart-view" gutter={16}>
{/* 瑙嗗浘缁� */}
{!config.expand ? <Tabs activeKey={chartId} onChange={this.changeChart}>
{config.charts.map(item => (
@@ -1208,6 +1214,41 @@
}
})}
</Row> : null }
+ {setting && !config.charts ? <div className="chart-view">
+ <div className="commontable-main-action">
+ <MainAction
+ BID={BID}
+ setting={setting}
+ actions={actions}
+ columns={columns}
+ dict={this.state.dict}
+ MenuID={MenuID}
+ selectedData={selectedData}
+ ContainerId={this.state.ContainerId}
+ />
+ </div>
+ <div className="main-table-box">
+ {(setting.tableType === 'radio' || setting.tableType === 'checkbox') && this.state.data && this.state.data.length > 0 ?
+ <Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /> : null
+ }
+ <MainTable
+ MenuID={MenuID}
+ tableId={MenuID}
+ pickup={pickup}
+ setting={setting}
+ columns={columns}
+ pageSize={pageSize}
+ dict={this.state.dict}
+ data={this.state.data}
+ total={this.state.total}
+ loading={this.state.loading}
+ statFValue={this.state.statFValue}
+ ContainerId={this.state.ContainerId}
+ refreshdata={this.refreshbytable}
+ chgSelectData={this.changeSelectedData}
+ />
+ </div>
+ </div> : null }
{setting && config.tabgroups.map(group => (
<Tabs key={group.uuid}>
{group.sublist.map(_tab => {
--
Gitblit v1.8.0