From 5cfe6db94c1449810a44660b299dba8e7e98e5c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 六月 2021 14:43:39 +0800
Subject: [PATCH] 2021-06-10
---
src/tabviews/custom/components/chart/antv-pie/index.jsx | 37 ++++++++++++++-----------------------
1 files changed, 14 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 ec281d5..df47548 100644
--- a/src/tabviews/custom/components/chart/antv-pie/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-pie/index.jsx
@@ -207,11 +207,18 @@
}
handleData = () => {
- let _element = document.getElementById(this.state.chartId)
+ const { plot, chartId } = this.state
+
+ let _element = document.getElementById(chartId)
if (_element) {
_element.innerHTML = ''
}
- this.pierender()
+
+ if (plot.shape === 'nest') {
+ this.nestrender()
+ } else {
+ this.pierender()
+ }
}
async loadData (hastimer) {
@@ -682,19 +689,13 @@
chart2.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',
@@ -706,22 +707,17 @@
})
} else {
chart2.label(Y_axis, {
- layout: { type: 'pie-spider' },
+ layout: { type: plot.label === 'outer' ? 'pie-spider' : 'fixed-overlap' },
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: {
@@ -747,11 +743,6 @@
*/
pierender = () => {
const { plot, chartId } = this.state
-
- if (plot.shape === 'nest') {
- this.nestrender()
- return
- }
let color = plot.color
@@ -898,7 +889,7 @@
})
} else {
_chart.label(Y_axis, {
- layout: { type: 'pie-spider' },
+ layout: { type: plot.label === 'outer' ? 'pie-spider' : 'fixed-overlap' },
labelHeight: 20,
content: (data) => {
let _val = ''
--
Gitblit v1.8.0