From 1b89aa4493d1c9768447f2f480d594cdb8077fdc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 26 十月 2020 09:24:19 +0800
Subject: [PATCH] 2020-10-26
---
src/tabviews/custom/index.jsx | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index c1a736d..7a3c2f1 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -18,10 +18,11 @@
// 閫氱敤缁勪欢
const AntvBarAndLine = asyncSpinComponent(() => import('./components/chart/antv-bar-line'))
+const AntvPie = asyncSpinComponent(() => import('./components/chart/antv-pie'))
const AntvTabs = asyncSpinComponent(() => import('./components/tabs/antv-tabs'))
const DataCard = asyncSpinComponent(() => import('./components/card/data-card'))
-class NormalTable extends Component {
+class CustomPage extends Component {
static propTpyes = {
param: PropTypes.any, // 鍏朵粬椤甸潰浼犻�掔殑鍙傛暟
MenuID: PropTypes.string, // 鑿滃崟Id
@@ -445,6 +446,12 @@
<AntvBarAndLine config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} />
</Col>
)
+ } else if (item.type === 'pie') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <AntvPie config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} />
+ </Col>
+ )
} else if (item.type === 'tabs') {
return (
<Col span={item.width} key={item.uuid}>
@@ -469,14 +476,14 @@
render() {
- const { menuType } = this.props
+ const { menuType, MenuNo } = this.props
const { loadingview, viewlost, config } = this.state
return (
<div className="custom-page-wrap" id={this.state.ContainerId} style={config ? config.style : null}>
{loadingview && <Spin size="large" />}
<Row>{this.getComponents()}</Row>
- {options.sysType !== 'cloud' && menuType !== 'HS' ? <Button
+ {MenuNo && options.sysType !== 'cloud' && menuType !== 'HS' ? <Button
icon="copy"
shape="circle"
className="common-table-copy"
@@ -505,4 +512,4 @@
}
}
-export default connect(mapStateToProps, mapDispatchToProps)(NormalTable)
\ No newline at end of file
+export default connect(mapStateToProps, mapDispatchToProps)(CustomPage)
\ No newline at end of file
--
Gitblit v1.8.0