From e62150eed77965519199d83d4988c4dde91f5069 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 20 一月 2022 17:02:35 +0800
Subject: [PATCH] 2022-01-20
---
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 8792192..b83a695 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -598,7 +598,7 @@
if (plot.repeat === 'average') {
let _mdata = new Map()
_cdata.forEach(item => {
- if (!item[plot.Xaxis]) return
+ if (!item[plot.Xaxis] && item[plot.Xaxis] !== 0) return
vFields.forEach(col => {
if (typeof(item[col.field]) !== 'number') {
@@ -615,6 +615,8 @@
// dodge is not support linear attribute, please use category attribute! 鏃堕棿鏍煎紡
if (/^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}:\d{2})?/.test(item[plot.Xaxis])) {
item[plot.Xaxis] = ' ' + item[plot.Xaxis]
+ } else {
+ item[plot.Xaxis] = '' + item[plot.Xaxis]
}
if (!_mdata.has(item[plot.Xaxis])) {
@@ -643,7 +645,7 @@
} else if (plot.repeat === 'cumsum') {
let _mdata = new Map()
_cdata.forEach(item => {
- if (!item[plot.Xaxis]) return
+ if (!item[plot.Xaxis] && item[plot.Xaxis] !== 0) return
vFields.forEach(col => {
if (typeof(item[col.field]) !== 'number') {
@@ -659,6 +661,8 @@
if (/^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}:\d{2})?/.test(item[plot.Xaxis])) {
item[plot.Xaxis] = ' ' + item[plot.Xaxis]
+ } else {
+ item[plot.Xaxis] = '' + item[plot.Xaxis]
}
if (!_mdata.has(item[plot.Xaxis])) {
@@ -684,10 +688,12 @@
} else { // plot.repeat === 'unrepeat'
let _mdata = new Map()
_cdata.forEach(item => {
- if (!item[plot.Xaxis]) return
+ if (!item[plot.Xaxis] && item[plot.Xaxis] !== 0) return
if (/^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}:\d{2})?/.test(item[plot.Xaxis])) {
item[plot.Xaxis] = ' ' + item[plot.Xaxis]
+ } else {
+ item[plot.Xaxis] = '' + item[plot.Xaxis]
}
if (!_mdata.has(item[plot.Xaxis])) {
--
Gitblit v1.8.0