From 074937332ab285984195bf844cc5fb17e312ece3 Mon Sep 17 00:00:00 2001
From: wisonic-s <51065359+wisonic-s@users.noreply.github.com>
Date: Tue, 11 Mar 2025 20:17:56 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20typo=20(#15291)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/locales/en.ts                         | 5 ++---
 core/core-frontend/src/locales/zh-CN.ts                      | 4 ++--
 .../views/chart/components/js/panel/common/common_table.ts   | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index cf5ef9c4cb..a969825fe2 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -1961,7 +1961,7 @@ export default {
     radar_area_color: 'Enable area',
     table_freeze_tip: 'After merging cells, column and row freezing is not supported',
     merge_cells_tips:
-      'After merging cells, row and column freezing, automatic line wrapping, and zebra pattern will become invalid',
+      'After merging cells, row and column freezing, automatic line wrapping, and zebra pattern will become invalid, the serial number of the current page will start from 1',
     merge_cells_break_line_tip: 'After merging cells, automatic line wrapping is not supported',
     font_family_ya_hei: 'Microsoft YaHei',
     font_family_song_ti: 'SimSun',
@@ -2037,8 +2037,7 @@ export default {
     increase: 'Increase',
     decrease: 'Decrease',
     accumulate: 'Accumulate',
-    table_cross_bg_tip:
-      'After merging cells, the zebra pattern is not supported, and the serial number of the current page will start from 1',
+    table_cross_bg_tip: 'After merging cells, the zebra pattern is not supported',
     pivot_export_invalid_field:
       'The row dimension or indicator dimension is empty and can not be exported !',
     pivot_export_invalid_col_exceed:
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index b5e99eacae..892da29128 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -1916,7 +1916,7 @@ export default {
     radar_point_size: '辅助点大小',
     radar_area_color: '开启面积',
     table_freeze_tip: '合并单元格后，不支持行列冻结',
-    merge_cells_tips: '合并单元格后，行列冻结、自动换行、班马纹会失效，当前页的序号会从 1 开始',
+    merge_cells_tips: '合并单元格后，行列冻结、自动换行和斑马纹会失效，当前页的序号会从 1 开始',
     merge_cells_break_line_tip: '合并单元格后，不支持自动换行',
     font_family_ya_hei: '微软雅黑',
     font_family_song_ti: '宋体',
@@ -1989,7 +1989,7 @@ export default {
     decrease: '减少',
     waterfall_total: '合计',
     accumulate: '累加',
-    table_cross_bg_tip: '合并单元格后，不支持班马纹',
+    table_cross_bg_tip: '合并单元格后，不支斑马纹',
     pivot_export_invalid_field: '行维度或指标维度为空不可导出!',
     pivot_export_invalid_col_exceed: '表格列数超过最大限制不可导出!',
     expand_all: '全展开',
diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
index ef0b7b5264..07a9235313 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
@@ -602,7 +602,7 @@ export function getConditions(chart: Chart) {
   const dimFields = [...chart.xAxis, ...chart.xAxisExt].map(i => i.dataeaseName)
   if (conditions?.length > 0) {
     const { tableCell, basicStyle, tableHeader } = parseJson(chart.customAttr)
-    // 合并单元格时，班马纹失效
+    // 合并单元格时斑马纹失效
     const enableTableCrossBG = chart.type === 'table-info' ? tableCell.enableTableCrossBG && !tableCell.mergeCells : tableCell.enableTableCrossBG
     const valueColor = isAlphaColor(tableCell.tableFontColor)
       ? tableCell.tableFontColor