Merge branch 'master-fetch-dev' into master-fetch

Merge branch 'dev' into master-fetch-dev
!152 fix: 柱状图传入错误数据后展示问题
2026-07-14 11:31:06 +08:00 · 2023-04-05 16:39:50 +08:00 · 2023-04-05 16:39:39 +08:00 · 2023-04-05 08:27:11 +00:00 · 2023-04-04 09:35:28 +08:00 · 2023-04-04 09:34:47 +08:00
1 changed files with 4 additions and 1 deletions
--- a/src/packages/components/Charts/Bars/BarCommon/index.vue
+++ b/src/packages/components/Charts/Bars/BarCommon/index.vue
@ -63,10 +63,13 @@ watch(
        if (dimensionsGap < 0) {
          props.chartConfig.option.series.splice(newDimensions - 1)
        } else if (dimensionsGap > 0) {
+          if(!oldData || !oldData?.dimensions || !Array.isArray(oldData?.dimensions) || !oldData?.dimensions.length ) {
+              props.chartConfig.option.series=[]
+          }
          for (let i = 0; i < dimensionsGap; i++) {
            seriesArr.push(cloneDeep(seriesItem))
          }
-          props.chartConfig.option.series = [...seriesArr]
+          props.chartConfig.option.series.push(...seriesArr)
        }
        replaceMergeArr.value = ['series']
        nextTick(() => {
Author	SHA1	Message	Date
奔跑的面条	15f2d77bec	Merge branch 'master-fetch-dev' into master-fetch	2023-04-05 16:39:50 +08:00
奔跑的面条	2e6611bf8b	Merge branch 'dev' into master-fetch-dev	2023-04-05 16:39:39 +08:00
奔跑的面条	10c5e1d810	!152 fix: 柱状图传入错误数据后展示问题 Merge pull request !152 from szy/fix/barcommon	2023-04-05 08:27:11 +00:00
headmasterZhao	3cdbafa200	fix: 柱状图传入错误数据后展示问题	2023-04-04 09:35:28 +08:00
headmasterZhao	ef7efc768c	fix: 柱状图传入错误数据后展示问题	2023-04-04 09:34:47 +08:00
headmasterZhao	30bf9c0f41	fix: 柱状图传入错误数据后展示问题	2023-04-04 08:46:56 +08:00
headmasterZhao	e733a181de	fix: 柱状图传入错误数据后展示问题	2023-04-04 08:41:26 +08:00