From f830c733cbc071f023c9a9a4e1571b7c81d672bf Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 12 十一月 2020 11:47:33 +0800
Subject: [PATCH] 2020-11-12
---
src/tabviews/custom/components/chart/antv-pie/index.jsx | 29 ++++++-----------------------
1 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-pie/index.jsx b/src/tabviews/custom/components/chart/antv-pie/index.jsx
index ec05d38..1b755b4 100644
--- a/src/tabviews/custom/components/chart/antv-pie/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-pie/index.jsx
@@ -72,14 +72,8 @@
}, () => {
if (config.setting.sync !== 'true' && config.setting.onload === 'true') {
this.loadData()
- } else if (config.setting.sync === 'true') {
- if (!_data) {
- this.setState({
- loading: true
- })
- } else {
- this.handleData()
- }
+ } else if (config.setting.sync === 'true' && _data) {
+ this.handleData()
}
})
}
@@ -103,7 +97,7 @@
_data = nextProps.data[config.dataName] || []
}
- this.setState({sync: false, loading: false, data: _data}, () => {
+ this.setState({sync: false, data: _data}, () => {
this.handleData()
})
} else if (!is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
@@ -374,19 +368,13 @@
_chart.label(Y_axis, {
offset: -30,
content: (data) => {
- let _label = ''
let _val = ''
if (plot.show !== 'value') {
_val = `${(data[Y_axis] * 100).toFixed(2)}%`
} else {
_val = `${data[Y_axis]}`
}
- if (plot.label === 'inner') {
- _label = _val
- } else {
- _label = `${data[X_axis]}: ${_val}`
- }
- return _label
+ return _val
},
style: {
textAlign: 'center',
@@ -401,19 +389,14 @@
layout: { type: 'pie-spider' },
labelHeight: 20,
content: (data) => {
- let _label = ''
let _val = ''
if (plot.show !== 'value') {
_val = `${(data[Y_axis] * 100).toFixed(2)}%`
} else {
_val = `${data[Y_axis]}`
}
- if (plot.label === 'inner') {
- _label = _val
- } else {
- _label = `${data[X_axis]}: ${_val}`
- }
- return _label
+
+ return `${data[X_axis]}: ${_val}`
},
labelLine: {
style: {
--
Gitblit v1.8.0