From b22890f662d4d8bc312a489290fa471fbb040dbc Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Thu, 26 Sep 2024 11:28:11 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E5=A0=86?=
 =?UTF-8?q?=E5=8F=A0=E6=9F=B1=E7=8A=B6=E5=9B=BE=E6=80=BB=E8=AE=A1=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=92=8C=E4=B8=BB=E6=A0=87=E7=AD=BE=E5=88=86=E5=BC=80?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/editor-style/ChartStyle.vue        |  7 ++---
 .../editor-style/components/LabelSelector.vue | 28 +++++++++++++------
 .../components/js/panel/charts/bar/bar.ts     |  3 --
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
index f5b0d906e4..92ab219fe1 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
@@ -432,12 +432,9 @@ watch(
               @onChangeMiscStyleForm="onChangeMiscStyleForm"
             />
           </el-collapse-item>
-          <collapse-switch-item
+          <el-collapse-item
             :themes="themes"
             v-if="showProperties('label-selector')"
-            v-model="chart.customAttr.label.show"
-            :change-model="chart.customAttr.label"
-            @modelChange="val => onLabelChange({ data: val }, 'show')"
             :title="t('chart.label')"
             name="label"
           >
@@ -449,7 +446,7 @@ watch(
               :all-fields="props.allFields"
               @onLabelChange="onLabelChange"
             />
-          </collapse-switch-item>
+          </el-collapse-item>
           <collapse-switch-item
             v-if="showProperties('tooltip-selector')"
             v-model="chart.customAttr.tooltip.show"
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
index 6f72dc89db..60a339ee76 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
@@ -396,6 +396,15 @@ const conversionPrecision = [
 </script>
 
 <template>
+  <el-form-item class="form-item" :class="'form-item-' + themes">
+    <el-checkbox
+      size="small"
+      :effect="themes"
+      v-model="state.labelForm.show"
+      @change="changeLabelAttr('show')"
+      :label="t('chart.show')"
+    />
+  </el-form-item>
   <el-form
     ref="labelForm"
     :disabled="!state.labelForm.show"
@@ -665,15 +674,6 @@ const conversionPrecision = [
         />
       </el-form-item>
     </template>
-    <el-form-item v-if="showProperty('showTotal')" class="form-item" :class="'form-item-' + themes">
-      <el-checkbox
-        size="small"
-        :effect="themes"
-        v-model="state.labelForm.showTotal"
-        @change="changeLabelAttr('showTotal')"
-        :label="t('chart.total_show')"
-      />
-    </el-form-item>
     <template v-if="false && showProperty('totalFormatter')">
       <el-divider class="m-divider" :class="{ 'divider-dark': themes === 'dark' }" />
       <div v-show="state.labelForm.showTotal">
@@ -1470,6 +1470,16 @@ const conversionPrecision = [
       </el-row>
     </div>
   </el-form>
+  <el-form-item v-if="showProperty('showTotal')" class="form-item" :class="'form-item-' + themes">
+    <el-checkbox
+      size="small"
+      :effect="themes"
+      :disabled="false"
+      v-model="state.labelForm.showTotal"
+      @change="changeLabelAttr('showTotal')"
+      :label="t('chart.total_show')"
+    />
+  </el-form-item>
 </template>
 
 <style lang="less" scoped>
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 83424e0b38..17ab2ca800 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
@@ -348,9 +348,6 @@ export class StackBar extends Bar {
   }
 
   protected configTotalLabel(chart: Chart, options: ColumnOptions): ColumnOptions {
-    if (!options.label) {
-      return options
-    }
     const { label } = parseJson(chart.customAttr)
     if (label.showTotal) {
       const formatterCfg = label.labelFormatter ?? formatterItem