From 423ca1c5d4e4cc7eba9e12125e74f47f5756f967 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 六月 2021 17:29:59 +0800
Subject: [PATCH] 2021-06-24
---
src/tabviews/custom/components/chart/antv-dashboard/index.jsx | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-dashboard/index.jsx b/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
index 6fcdc2f..21eb35b 100644
--- a/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
@@ -68,7 +68,7 @@
title: '', // 缁勪欢鏍囬
sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
plot: null, // 鍥捐〃璁剧疆
- data: null, // 鏁版嵁
+ data: {}, // 鏁版嵁
}
UNSAFE_componentWillMount () {
@@ -302,7 +302,7 @@
if (config.subtype === 'ratioboard') {
data = result.data || []
} else {
- let data = {}
+ data = {}
if (result.data && result.data[0] && result.data[0].hasOwnProperty(config.plot.valueField)) {
data.value = result.data[0][config.plot.valueField]
}
@@ -363,7 +363,6 @@
ratioboardrender = () => {
const { plot, chartId } = this.state
-
const data = this.getratiodata()
const chart = new Chart({
@@ -458,8 +457,19 @@
const { plot, chartId, data } = this.state
let _data = fromJS(data).toJS()
- if (_data.value && _data.value > plot.maxValue) {
- _data.value = plot.maxValue
+
+ if (_data.hasOwnProperty('value')) {
+ if (_data.value === '' || _data.value === null) {
+ delete _data.value
+ } else {
+ _data.value = +_data.value
+
+ if (isNaN(_data.value)) {
+ delete _data.value
+ } else if (_data.value > plot.maxValue) {
+ _data.value = plot.maxValue
+ }
+ }
}
const chart = new Chart({
@@ -468,7 +478,7 @@
height: plot.height,
padding: [0, 0, 0, 0],
})
- chart.data([_data]);
+ chart.data([_data])
chart.scale('value', {
min: 0,
max: plot.maxValue,
@@ -480,7 +490,7 @@
radius: 0.75,
})
- chart.axis('1', false);
+ chart.axis('1', false)
chart.axis('value', {
line: null,
label: {
--
Gitblit v1.8.0