From bf4c5ac6a6e80b40d404e0cf2856f3c0ef9ee413 Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Wed, 24 Jul 2024 15:18:55 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=A4=9A=E5=BA=8F=E5=88=97=E5=9B=BE=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=A2=9C=E8=89=B2=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/locales/zh-CN.ts                       | 2 +-
 .../views/chart/components/editor/editor-style/ChartStyle.vue | 4 ++--
 .../editor/editor-style/components/CustomColorStyleSelect.vue | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index b89041b7aa..556d0678db 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -1228,7 +1228,7 @@ export default {
     table_layout_tree: '树形展示',
     top_n_desc: '合并数据',
     top_n_input_1: '显示 Top',
-    top_n_input_2: ', 其余合并至其他',
+    top_n_input_2: ', 其余合并',
     top_n_label: '其他项名称',
     progress_target: '目标值',
     progress_current: '实际值',
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 8332d3b4b7..9bbcbe3ca2 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
@@ -485,7 +485,7 @@ watch(
             :change-model="chart.customStyle.xAxis"
             @modelChange="val => onChangeXAxisForm(val, 'show')"
             name="xAxis"
-            :title="selectorSpec['x-axis-selector']?.title"
+            :title="selectorSpec['x-axis-selector']?.title || t('chart.xAxis')"
           >
             <x-axis-selector
               class="attr-selector"
@@ -502,7 +502,7 @@ watch(
             :change-model="chart.customStyle.yAxis"
             @modelChange="val => onChangeYAxisForm(val, 'show')"
             name="yAxis"
-            :title="$t('chart.yAxis')"
+            :title="t('chart.yAxis')"
           >
             <y-axis-selector
               class="attr-selector"
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/CustomColorStyleSelect.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/CustomColorStyleSelect.vue
index 4166745052..45a60376d5 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/CustomColorStyleSelect.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/CustomColorStyleSelect.vue
@@ -238,7 +238,7 @@ const colorItemBorderColor = (index, state) => {
     <el-row>
       <el-form-item
         v-if="showProperty('gradient-color')"
-        :label="$t('chart.color_case')"
+        :label="t('chart.color_case')"
         class="form-item"
         :class="'form-item-' + themes"
         style="flex: 1; padding-right: 8px; margin-bottom: 16px"
@@ -342,7 +342,7 @@ const colorItemBorderColor = (index, state) => {
         </span>
       </div>
 
-      <div class="custom-color-extend-setting colors">
+      <div v-if="!showProperty('seriesColor')" class="custom-color-extend-setting colors">
         <div
           v-for="(c, index) in state.basicStyleForm.colors"
           :key="index"