From 145a6eb83133497b3863add21610ac6015e6533e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 13 五月 2021 18:33:34 +0800
Subject: [PATCH] 2021-05-13
---
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 108 ++++++++----------------------------------------------
1 files changed, 16 insertions(+), 92 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 cdafdf7..a4f5a9e 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -4,7 +4,7 @@
import { Chart } from '@antv/g2'
import { connect } from 'react-redux'
import DataSet from '@antv/data-set'
-import { Spin, Empty, Select, notification } from 'antd'
+import { Spin, Empty, notification } from 'antd'
import moment from 'moment'
import asyncComponent from './asyncButtonComponent'
@@ -42,9 +42,6 @@
search: null, // 鎼滅储鏉′欢
vFields: [], // 鏁板�煎瓧娈�
vstFields: null, // 缁熻鏁版嵁鍊煎瓧娈典俊鎭�
- chartData: [], // 鍥捐〃鏁版嵁
- chartFields: [], // 缁熻鍥捐〃鐢熸垚瀛楁闆�
- selectFields: [], // 缁熻鍥捐〃閫夋嫨瀛楁
}
UNSAFE_componentWillMount () {
@@ -448,29 +445,11 @@
* @description 鏁版嵁棰勫鐞嗭紝缁熻鏁版嵁闇�瑕侀噸缃�
*/
handleData = () => {
- const { data, plot } = this.state
-
- if (plot.datatype === 'statistics') {
- let result = this.getStaticMsg(data)
-
- this.setState({
- chartData: result.data,
- chartFields: result.chartFields,
- selectFields: result.selectFields
- }, () => {
- let _element = document.getElementById(this.state.chartId)
- if (_element) {
- _element.innerHTML = ''
- }
- this.viewrender()
- })
- } else {
- let _element = document.getElementById(this.state.chartId)
- if (_element) {
- _element.innerHTML = ''
- }
- this.viewrender()
+ let _element = document.getElementById(this.state.chartId)
+ if (_element) {
+ _element.innerHTML = ''
}
+ this.viewrender()
}
/**
@@ -482,7 +461,7 @@
getdata = () => {
const { data, plot, vFields } = this.state
- if (!data) {
+ if (!data || data.length === 0) {
this.setState({empty: true})
return []
}
@@ -590,36 +569,30 @@
}
/**
- * @description 缁熻鏁版嵁棰勫鐞嗭紝鍔ㄦ�佺敓鎴愮粺璁″瓧娈靛苟杩涜鏁版嵁杞崲
+ * @description 缁熻鏁版嵁棰勫鐞�
*/
- getStaticMsg = (data) => {
- const { plot, vstFields } = this.state
+ getStaticMsg = () => {
+ const { plot, vstFields, data } = this.state
let percent = false
- let decimal = 0
+ let decimal = vstFields ? vstFields.decimal : 0
if (plot.show === 'percent') {
percent = true
}
- if (vstFields) {
- decimal = vstFields.decimal
- }
- if (!data) {
+ if (!data || data.length === 0) {
this.setState({empty: true})
- return {data: [], chartFields: [], selectFields: []}
+ return []
}
let _data = []
let _cdata = fromJS(data).toJS()
- let _chartFields = []
- let _selectFields = []
if (plot.repeat === 'average') {
let _mdata = new Map()
_cdata.forEach(item => {
if (!item[plot.InfoType] || !item[plot.Xaxis]) return
- _chartFields.push(item[plot.InfoType])
item.$uuid = item[plot.InfoType] + item[plot.Xaxis]
if (typeof(item[plot.InfoValue]) !== 'number') {
@@ -655,7 +628,6 @@
let _mdata = new Map()
_cdata.forEach(item => {
if (!item[plot.InfoType] || !item[plot.Xaxis]) return
- _chartFields.push(item[plot.InfoType])
item.$uuid = item[plot.InfoType] + item[plot.Xaxis]
@@ -689,7 +661,6 @@
let _mdata = new Map()
_cdata.forEach(item => {
if (!item[plot.InfoType] || !item[plot.Xaxis]) return
- _chartFields.push(item[plot.InfoType])
item.$uuid = item[plot.InfoType] + item[plot.Xaxis]
@@ -714,31 +685,8 @@
_data = [..._mdata.values()]
}
- _chartFields = Array.from(new Set(_chartFields))
-
- if (plot.InfoDefNumber >= _chartFields.length) {
- _selectFields = _chartFields
- } else {
- _selectFields = _chartFields.slice(0, plot.InfoDefNumber)
- }
-
- return {data: _data, chartFields: _chartFields, selectFields: _selectFields}
- }
-
- /**
- * @description 鑾峰彇缁熻鍥捐〃灞曠ず鏁版嵁锛岄�氳繃閫夋嫨绫诲瀷绛涢��
- */
- getStaticData = () => {
- const { plot, chartData, chartFields, selectFields } = this.state
-
- let _data = []
- if (selectFields.length === chartFields.length) {
- _data = chartData
- } else {
- _data = chartData.filter(item => selectFields.includes(item[plot.InfoType]))
- }
-
this.setState({empty: _data.length === 0})
+
return _data
}
@@ -780,7 +728,7 @@
})
}
- _data = this.getStaticData()
+ _data = this.getStaticMsg()
} else {
let data = this.getdata()
@@ -1128,7 +1076,7 @@
})
}
- _data = this.getStaticData()
+ _data = this.getStaticMsg()
} else {
let data = this.getdata()
@@ -1386,19 +1334,6 @@
chart.render()
}
- /**
- * @description 缁熻鍥捐〃锛岀粺璁＄被鍨嬪垏鎹�
- */
- handleChange = (val) => {
- this.setState({selectFields: val}, () => {
- let _element = document.getElementById(this.state.chartId)
- if (_element) {
- _element.innerHTML = ''
- }
- this.viewrender()
- })
- }
-
refreshSearch = (list) => {
this.setState({search: list}, () => {
this.loadData()
@@ -1406,7 +1341,7 @@
}
render() {
- const { config, loading, plot, empty, chartFields, selectFields, BID } = this.state
+ const { config, loading, empty, BID } = this.state
return (
<div className="custom-line-chart-plot-box" style={config.style}>
@@ -1442,17 +1377,6 @@
)
}
})}
- {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>
<div className={'canvas' + (empty ? ' empty' : '')} id={this.state.chartId}></div>
</div>
--
Gitblit v1.8.0