From 823c72bc5918bf9d2fdd8415607908b68ebcd399 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 11 五月 2022 08:34:15 +0800
Subject: [PATCH] 2022-05-11
---
src/tabviews/commontable/index.jsx | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 10 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index c57cdb6..b16e840 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -183,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)
@@ -1129,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 => (
@@ -1209,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