From 4fdb46f7feb7b63ca860c377bcc1be4bc2c2e16a Mon Sep 17 00:00:00 2001 From: wisonic-s <51065359+wisonic-s@users.noreply.github.com> Date: Sun, 27 Apr 2025 14:38:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8F=90=E7=A4=BA=20#15953?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/en.ts | 3 ++- core/core-frontend/src/locales/tw.ts | 3 ++- core/core-frontend/src/locales/zh-CN.ts | 4 ++-- core/core-frontend/src/models/chart/chart-attr.d.ts | 4 ++++ .../chart/components/editor/editor-style/ChartStyle.vue | 5 ----- .../src/views/chart/components/editor/util/chart.ts | 3 ++- .../chart/components/js/panel/charts/table/table-info.ts | 4 ++-- .../chart/components/js/panel/charts/table/table-normal.ts | 4 ++-- .../chart/components/js/panel/charts/table/table-pivot.ts | 4 ++-- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 9e795fd8d4..a49303a5ea 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -2090,7 +2090,8 @@ export default { quota_position_row: 'Row', quota_col_label: 'Quota Column Label', table_grand_total_label: 'Total Alias', - table_field_total_label: 'Field Alias' + table_field_total_label: 'Field Alias', + table_row_header_freeze: 'Row Header Freeze' }, dataset: { field_value: 'Field Value', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 467686c5c4..635f4044c2 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -2031,7 +2031,8 @@ export default { quota_position_row: '行頭展示', quota_col_label: '指標列名', table_grand_total_label: '總計別名', - table_field_total_label: '字段別名' + table_field_total_label: '字段別名', + table_row_header_freeze: '行頭凍結' }, dataset: { field_value: '欄位值', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 52654cdf27..81c4d71286 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -2037,7 +2037,8 @@ export default { quota_position_row: '行头展示', quota_col_label: '指标列名', table_grand_total_label: '总计别名', - table_field_total_label: '字段别名' + table_field_total_label: '字段别名', + table_row_header_freeze: '行头冻结' }, dataset: { field_value: '字段值', @@ -3177,7 +3178,6 @@ export default { space_left: '左', space_width: '宽', space_height: '高', - to_top: '置顶', down: '下载', mobile_style_setting: '样式设置', mobile_style_setting_tips: '自定义移动端背景', diff --git a/core/core-frontend/src/models/chart/chart-attr.d.ts b/core/core-frontend/src/models/chart/chart-attr.d.ts index 3be07452b0..52d924d7ee 100644 --- a/core/core-frontend/src/models/chart/chart-attr.d.ts +++ b/core/core-frontend/src/models/chart/chart-attr.d.ts @@ -485,6 +485,10 @@ declare interface ChartTableHeaderAttr { name: string }[] } + /** + * 透视表行头冻结 + */ + rowHeaderFreeze: boolean } /** * 单元格属性 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 8a6ce4a35a..1279bc5872 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 @@ -489,12 +489,7 @@ watch( @onLabelChange="onLabelChange" /> - { newChart.on(S2Event.COL_CELL_HOVER, event => this.showTooltip(newChart, event, meta)) newChart.on(S2Event.DATA_CELL_HOVER, event => this.showTooltip(newChart, event, meta)) newChart.on(S2Event.MERGED_CELLS_HOVER, event => this.showTooltip(newChart, event, meta)) + // touch + this.configTouchEvent(newChart, drawOption, meta) } // header resize newChart.on(S2Event.LAYOUT_RESIZE_COL_WIDTH, ev => resizeAction(ev)) // right click newChart.on(S2Event.GLOBAL_CONTEXT_MENU, event => copyContent(newChart, event, meta)) - // touch - this.configTouchEvent(newChart, drawOption, meta) // theme const customTheme = this.configTheme(chart) newChart.setThemeCfg({ theme: customTheme }) diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts index 5697e84847..80f7c6c525 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts @@ -269,13 +269,13 @@ export class TableNormal extends S2ChartView { if (show) { newChart.on(S2Event.COL_CELL_HOVER, event => this.showTooltip(newChart, event, meta)) newChart.on(S2Event.DATA_CELL_HOVER, event => this.showTooltip(newChart, event, meta)) + // touch + this.configTouchEvent(newChart, drawOption, meta) } // header resize newChart.on(S2Event.LAYOUT_RESIZE_COL_WIDTH, ev => resizeAction(ev)) // right click newChart.on(S2Event.GLOBAL_CONTEXT_MENU, event => copyContent(newChart, event, meta)) - // touch - this.configTouchEvent(newChart, drawOption, meta) // theme const customTheme = this.configTheme(chart) newChart.setThemeCfg({ theme: customTheme }) diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts index 633ebf0e79..f8a8712038 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts @@ -585,6 +585,8 @@ export class TablePivot extends S2ChartView { s2.on(S2Event.COL_CELL_HOVER, event => this.showTooltip(s2, event, meta)) s2.on(S2Event.ROW_CELL_HOVER, event => this.showTooltip(s2, event, meta)) s2.on(S2Event.DATA_CELL_HOVER, event => this.showTooltip(s2, event, meta)) + // touch + this.configTouchEvent(s2, drawOption, meta) } // empty data tip configEmptyDataStyle(s2, newData) @@ -594,8 +596,6 @@ export class TablePivot extends S2ChartView { s2.on(S2Event.COL_CELL_CLICK, ev => this.headerCellClickAction(chart, ev, s2, action)) // right click s2.on(S2Event.GLOBAL_CONTEXT_MENU, event => copyContent(s2, event, meta)) - // touch - this.configTouchEvent(s2, drawOption, meta) // theme const customTheme = this.configTheme(chart) s2.setThemeCfg({ theme: customTheme })