From 5944c2832820a8bfa86e3efb5085f5a2463897f9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 22 九月 2020 09:14:49 +0800
Subject: [PATCH] 2020-09-22
---
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
index c74f855..6334862 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -43,7 +43,8 @@
chartData: [], // 鍥捐〃鏁版嵁
chartFields: [], // 缁熻鍥捐〃鐢熸垚瀛楁闆�
selectFields: [], // 缁熻鍥捐〃閫夋嫨瀛楁
- percentFields: [] // 璁剧疆涓虹櫨鍒嗘瘮鐨勫瓧娈碉紝tooltip鏃跺鍔�%
+ percentFields: [], // 璁剧疆涓虹櫨鍒嗘瘮鐨勫瓧娈碉紝tooltip鏃跺鍔�%
+ showHeader: false // 瀛樺湪鏍囬銆佹悳绱€�佹垨缁熻鏁版嵁鏃舵樉绀�
}
UNSAFE_componentWillMount () {
@@ -100,6 +101,11 @@
})
}
+ let showHeader = false
+ if (config.setting.title || _config.plot.datatype === 'statistics') {
+ showHeader = true
+ }
+
this.setState({
config: _config,
data: _data,
@@ -110,7 +116,8 @@
plot: _config.plot,
sync: _sync,
title: config.setting.title,
- search: Utils.initMainSearch(config.search)
+ search: Utils.initMainSearch(config.search),
+ showHeader
}, () => {
if (config.setting.sync !== 'true') {
this.loadData()
@@ -200,11 +207,10 @@
let result = await Api.genericInterface(param)
if (result.status) {
this.setState({
- data: result.data.map((item, index) => {
- item.key = index
- return item
- }),
+ data: result.data,
loading: false
+ }, () => {
+ this.handleData()
})
} else {
this.setState({
@@ -1017,29 +1023,31 @@
render() {
const { BID } = this.props
- const { config, loading, title, plot, empty, chartFields, selectFields } = this.state
+ const { showHeader, config, loading, title, plot, empty, chartFields, selectFields } = this.state
return (
<div className="custom-line-chart-plot-box">
- {/* <searchLine /> */}
- {title ? <p className="chart-title">{title}</p> : null}
{loading ?
<div className="loading-mask">
<div className="ant-spin-blur"></div>
<Spin />
</div> : null
}
- {plot.datatype === 'statistics' && chartFields.length > 0 ? <Select
- mode="multiple"
- showSearch
- showArrow={true}
- value={selectFields}
- onChange={this.handleChange}
- maxTagCount={0}
- maxTagPlaceholder={(option) => <div className="type-label">{option.join('銆�')}</div>}
- >
- {chartFields.map((item, i) => <Select.Option key={i} value={item}>{item}</Select.Option>)}
- </Select> : null}
+ {showHeader ? <div className="chart-header">
+ <span className="chart-title">{title}</span>
+ {/* <searchLine /> */}
+ {plot.datatype === 'statistics' && chartFields.length > 0 ? <Select
+ mode="multiple"
+ showSearch
+ showArrow={true}
+ value={selectFields}
+ onChange={this.handleChange}
+ maxTagCount={0}
+ maxTagPlaceholder={(option) => <div className="type-label">{option.join('銆�')}</div>}
+ >
+ {chartFields.map((item, i) => <Select.Option key={i} value={item}>{item}</Select.Option>)}
+ </Select> : null}
+ </div> : null}
<div className="canvas-wrap">
<div className={'chart-action ' + (plot.title ? 'with-title' : '')}>
{config.action.map(item => {
--
Gitblit v1.8.0