From fb3ec146a9e1444ece749d0bcf232a554e933fb0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:56:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/comtableconfig/index.jsx | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 8117f1c..f36afd9 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -135,7 +135,7 @@
}
this.setState({
- chartview: _config.charts[0].uuid,
+ chartview: _config.charts ? _config.charts[0].uuid : '',
config: _config,
openEdition: menu.open_edition || '',
activeKey: menu.activeKey || '0',
@@ -378,6 +378,7 @@
}
_config.action.forEach(item => {
+ if (item.hidden === 'true') return
_sort++
if (item.OpenType === 'popview') {
btntabs.push({
@@ -1111,7 +1112,7 @@
config: null
}, () => {
this.setState({
- chartview: _config.charts[0].uuid,
+ chartview: _config.charts ? _config.charts[0].uuid : '',
config: _config,
openEdition: res.open_edition || '',
activeKey: menu.activeKey || '0',
@@ -1264,12 +1265,12 @@
config={config}
updatesearch={this.updatesearch}
/>
- <div className="chart-view" style={{position: 'relative'}}>
- {/* 瑙嗗浘缁� 鏉冮檺 浼氬憳绛夌骇20+ */}
- {this.props.memberLevel >= 20 ? <ChartGroupComponent
+ {config.charts ? <div className="chart-view" style={{position: 'relative'}}>
+ {/* 瑙嗗浘缁� 宸插純鐢� */}
+ <ChartGroupComponent
config={config}
updatechartgroup={this.updatechartgroup}
- /> : null}
+ />
{config.charts.map(item => {
if (!config.expand && chartview !== item.uuid) return ''
@@ -1314,7 +1315,21 @@
)
}
})}
- </div>
+ </div> : <>
+ <ActionComponent
+ type="main"
+ menu={{ MenuID: this.props.menu.MenuID, MenuName: config.MenuName, MenuNo: config.MenuNo, fstMenuList: this.props.menu.fstMenuList }}
+ config={config}
+ tabs={this.state.tabviews}
+ setSubConfig={(_btn) => this.setSubConfig(_btn, 'button')}
+ updateaction={this.updateaction}
+ />
+ <ColumnComponent
+ config={config}
+ menu={this.props.menu}
+ updatecolumn={this.updateconfig}
+ />
+ </>}
{/* 鏍囩缁� */}
<TabsComponent
config={config}
--
Gitblit v1.8.0