center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #12678 from dataease/pr@dev-v2@fix_table_freeze_switch

Browse Source 
fix(图表): 表格行列冻结开关无效
This commit is contained in:
wisonic-s 2024-10-14 11:19:07 +08:00 committed by GitHub
commit 272c8df9c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts
View File

@ -157,9 +157,11 @@ export class TableInfo extends S2ChartView<TableSheet> {
tooltip: { tooltip: {
getContainer: () => containerDom, getContainer: () => containerDom,
renderTooltip: sheet => new SortTooltip(sheet) renderTooltip: sheet => new SortTooltip(sheet)
}, }
frozenColCount: customAttr.tableCell.tableColumnFreezeHead ?? 0, }
frozenRowCount: customAttr.tableCell.tableRowFreezeHead ?? 0 if (customAttr.tableCell.tableFreeze) {
s2Options.frozenColCount = customAttr.tableCell.tableColumnFreezeHead ?? 0
s2Options.frozenRowCount = customAttr.tableCell.tableRowFreezeHead ?? 0
} }
// 开启序号之后，第一列就是序号列，修改 label 即可 // 开启序号之后，第一列就是序号列，修改 label 即可
if (s2Options.showSeriesNumber) { if (s2Options.showSeriesNumber) {

8
core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts
View File

@ -138,9 +138,11 @@ export class TableNormal extends S2ChartView<TableSheet> {
tooltip: { tooltip: {
getContainer: () => containerDom, getContainer: () => containerDom,
renderTooltip: sheet => new SortTooltip(sheet) renderTooltip: sheet => new SortTooltip(sheet)
}, }
frozenColCount: customAttr.tableCell.tableColumnFreezeHead ?? 0, }
frozenRowCount: customAttr.tableCell.tableRowFreezeHead ?? 0 if (customAttr.tableCell.tableFreeze) {
s2Options.frozenColCount = customAttr.tableCell.tableColumnFreezeHead ?? 0
s2Options.frozenRowCount = customAttr.tableCell.tableRowFreezeHead ?? 0
} }
// 开启序号之后，第一列就是序号列，修改 label 即可 // 开启序号之后，第一列就是序号列，修改 label 即可
if (s2Options.showSeriesNumber) { if (s2Options.showSeriesNumber) {