feat(图表): 表格合并单元格状态下禁用斑马纹的配置

core/core-frontend/src/locales/en.ts

@@ -1933,7 +1933,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     radar_area_color: 'Enable area',
     table_freeze_tip: 'After merging cells, column and row freezing is not supported',
     merge_cells_tips:
-      'After merging cells, freezing rows and columns and automatic line wrapping will become invalid',
+      'After merging cells, row and column freezing, automatic line wrapping, and zebra pattern will become invalid',
     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',
@@ -2009,7 +2009,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     increase: 'Increase',
     decrease: 'Decrease',
     total: 'Total',
-    accumulate: 'Accumulate'
+    accumulate: 'Accumulate',
+    table_cross_bg_tip: 'After merging cells，the zebra pattern is not supported'
   },
   dataset: {
     field_value: 'Field Value',

core/core-frontend/src/locales/tw.ts

@@ -1887,7 +1887,7 @@ export default {
     radar_point_size: '輔助點大小',
     radar_area_color: '開啟面積',
     table_freeze_tip: '合併儲存格後，不支持行列凍結',
-    merge_cells_tips: '合併儲存格後，行列凍結、自動換行會失效',
+    merge_cells_tips: '合併儲存格後，行列凍結、自動換行、班馬紋會失效',
     merge_cells_break_line_tip: '合併儲存格後，不支持自動換行',
     font_family_ya_hei: '微軟雅黙',
     font_family_song_ti: '宋體',
@@ -1959,7 +1959,8 @@ export default {
     increase: '增加',
     decrease: '減少',
     total: '合計',
-    accumulate: '累加'
+    accumulate: '累加',
+    table_cross_bg_tip: '合併儲存格後，不支持斑馬紋'
   },
   dataset: {
     field_value: '欄位值',

core/core-frontend/src/locales/zh-CN.ts

@@ -1889,7 +1889,7 @@ export default {
     radar_point_size: '辅助点大小',
     radar_area_color: '开启面积',
     table_freeze_tip: '合并单元格后，不支持行列冻结',
-    merge_cells_tips: '合并单元格后，行列冻结、自动换行会失效',
+    merge_cells_tips: '合并单元格后，行列冻结、自动换行、班马纹会失效',
     merge_cells_break_line_tip: '合并单元格后，不支持自动换行',
     font_family_ya_hei: '微软雅黑',
     font_family_song_ti: '宋体',
@@ -1961,7 +1961,8 @@ export default {
     increase: '增加',
     decrease: '减少',
     total: '合计',
-    accumulate: '累加'
+    accumulate: '累加',
+    table_cross_bg_tip: '合并单元格后，不支持班马纹'
   },
   dataset: {
     field_value: '字段值',

core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableCellSelector.vue

@@ -122,10 +122,27 @@ onMounted(() => {
     >
       <el-checkbox
         v-model="state.tableCellForm.enableTableCrossBG"
-        :label="t('chart.stripe')"
         :effect="themes"
+        :disabled="showProperty('mergeCells') && state.tableCellForm.mergeCells"
         @change="changeTableCell('enableTableCrossBG')"
-      />
+      >
+        <span class="data-area-label">
+          <span style="margin-right: 4px">{{ t('chart.stripe') }}</span>
+          <el-tooltip
+            class="item"
+            effect="dark"
+            placement="bottom"
+            v-if="state.tableCellForm.mergeCells"
+          >
+            <template #content>
+              <div>{{ t('chart.table_cross_bg_tip') }}</div>
+            </template>
+            <el-icon class="hint-icon" :class="{ 'hint-icon--dark': themes === 'dark' }">
+              <Icon name="icon_info_outlined"><icon_info_outlined class="svg-icon" /></Icon>
+            </el-icon>
+          </el-tooltip>
+        </span>
+      </el-checkbox>
     </el-form-item>
     <el-form-item
       :class="'form-item-' + themes"

core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts

@@ -401,7 +401,7 @@ export function getCustomTheme(chart: Chart): S2Theme {
         },
         dataCell: {
           cell: {
-            crossBackgroundColor: enableTableCrossBG ? tableItemSubBgColor : tableItemBgColor,
+            crossBackgroundColor: enableTableCrossBG && !tableCell.mergeCells ? tableItemSubBgColor : tableItemBgColor,
             backgroundColor: tableItemBgColor
           },
           bolderText: {
@@ -602,7 +602,8 @@ 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 = tableCell.enableTableCrossBG
+    // 合并单元格时，班马纹失效
+    const enableTableCrossBG = chart.type === 'table-info' ? tableCell.enableTableCrossBG && !tableCell.mergeCells : tableCell.enableTableCrossBG
     const valueColor = isAlphaColor(tableCell.tableFontColor)
       ? tableCell.tableFontColor
       : hexColorToRGBA(tableCell.tableFontColor, basicStyle.alpha)