From 4361949bad003d4ac28f888762d2c43d5c20d1e4 Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Wed, 4 Dec 2024 15:01:14 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=A0=86=E5=8F=A0=E7=8A=B6=E5=9B=BE=E5=92=8C=E6=9D=A1=E5=BD=A2?=
 =?UTF-8?q?=E5=9B=BE=E6=8C=87=E6=A0=87=E6=8E=92=E5=BA=8F=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=9B=BE=E4=BE=8B=E8=87=AA=E5=AE=9A=E4=B9=89=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=20#13341?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/table/TableTotalSelector.vue      |  8 ++++----
 .../chart/components/js/panel/charts/bar/bar.ts  |  4 ++--
 .../js/panel/charts/bar/horizontal-bar.ts        | 16 ++++++++++++++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableTotalSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableTotalSelector.vue
index f579918733..7529b62b74 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableTotalSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableTotalSelector.vue
@@ -249,7 +249,7 @@ onMounted(() => {
           maxlength="20"
           v-model="state.tableTotalForm.row.label"
           clearable
-          @blur="changeTableTotal('row.label')"
+          @change="changeTableTotal('row.label')"
         />
       </el-form-item>
       <el-form-item
@@ -389,7 +389,7 @@ onMounted(() => {
           size="small"
           maxlength="20"
           clearable
-          @blur="changeTableTotal"
+          @change="changeTableTotal('row.subLabel')"
         />
       </el-form-item>
       <el-form-item
@@ -498,7 +498,7 @@ onMounted(() => {
           maxlength="20"
           v-model="state.tableTotalForm.col.label"
           clearable
-          @blur="changeTableTotal('col')"
+          @blur="changeTableTotal('col.label')"
         />
       </el-form-item>
       <el-form-item
@@ -637,7 +637,7 @@ onMounted(() => {
           size="small"
           maxlength="20"
           clearable
-          @change="changeTableTotal('col')"
+          @change="changeTableTotal('col.subLabel')"
         />
       </el-form-item>
       <el-form-item
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts
index 9e77360870..6aaea3b836 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts
@@ -363,6 +363,7 @@ export class StackBar extends Bar {
     return flow(
       this.configTheme,
       this.configEmptyDataStrategy,
+      this.configData,
       this.configColor,
       this.configBasicStyle,
       this.configLabel,
@@ -371,8 +372,7 @@ export class StackBar extends Bar {
       this.configXAxis,
       this.configYAxis,
       this.configSlider,
-      this.configAnalyse,
-      this.configData
+      this.configAnalyse
     )(chart, options, {}, this)
   }
 
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts
index 46e73ea48d..72f8e9361e 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts
@@ -368,8 +368,20 @@ export class HorizontalStackBar extends HorizontalBar {
   }
 
   protected setupOptions(chart: Chart, options: BarOptions): BarOptions {
-    const tmp = super.setupOptions(chart, options)
-    return flow(this.configData)(chart, tmp, {}, this)
+    return flow(
+      this.configTheme,
+      this.configEmptyDataStrategy,
+      this.configData,
+      this.configColor,
+      this.configBasicStyle,
+      this.configLabel,
+      this.configTooltip,
+      this.configLegend,
+      this.configXAxis,
+      this.configYAxis,
+      this.configSlider,
+      this.configAnalyseHorizontal
+    )(chart, options, {}, this)
   }
 
   constructor(name = 'bar-stack-horizontal') {