From 4b5f5a39cbea1de91839d252fc345d15d4a57453 Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Tue, 18 Feb 2025 17:53:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8B=E7=A6=81=E7=94=A8=E6=96=91=E9=A9=AC=E7=BA=B9=E7=9A=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= 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/tw.ts | 5 +++-- core/core-frontend/src/locales/zh-CN.ts | 5 +++-- .../components/table/TableCellSelector.vue | 21 +++++++++++++++++-- .../js/panel/common/common_table.ts | 5 +++-- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index b32deb73c3..d87d304374 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/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', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index a331390339..bd8155ac3b 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/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: '欄位值', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 5e4ce9c7e9..d078e7ae98 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/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: '字段值', diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableCellSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableCellSelector.vue index d43f889bbd..ccdfd05d36 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableCellSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableCellSelector.vue @@ -122,10 +122,27 @@ onMounted(() => { > + > + + {{ t('chart.stripe') }} + + + + + + + + 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)