Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "fix: repeat call computeColsWidth adaptive mode result error\n\n",
"type": "none",
"packageName": "@visactor/vtable"
}
],
"packageName": "@visactor/vtable",
"email": "892739385@qq.com"
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,15 @@ export function createGroupForFirstScreen(

if (distCol < table.colCount - table.rightFrozenColCount) {
// compute right frozen row height
computeColsWidth(table, table.colCount - table.rightFrozenColCount, table.colCount - 1);
if (table.colCount - table.rightFrozenColCount <= table.colCount - 1) {
computeColsWidth(table, table.colCount - table.rightFrozenColCount, table.colCount - 1);
}
}
if (distRow < table.rowCount - table.bottomFrozenRowCount) {
// compute bottom frozen row height
computeRowsHeight(table, table.rowCount - table.bottomFrozenRowCount, table.rowCount - 1);
if (table.rowCount - table.bottomFrozenRowCount <= table.rowCount - 1) {
computeRowsHeight(table, table.rowCount - table.bottomFrozenRowCount, table.rowCount - 1);
}
}

// update colHeaderGroup rowHeaderGroup bodyGroup position
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,9 @@ export class SceneProxy {
createColGroup(onceCount: number) {
// compute rows height
const endCol = Math.min(this.totalCol, this.currentCol + onceCount);
computeColsWidth(this.table, this.currentCol + 1, endCol);
if (this.table.widthMode !== 'adaptive') {
computeColsWidth(this.table, this.currentCol + 1, endCol);
}

this.colEnd = endCol;

Expand Down Expand Up @@ -693,7 +695,9 @@ export class SceneProxy {
// colGroup.needUpdate = false;
// }
// }
computeColsWidth(this.table, this.colUpdatePos, distCol);
if (this.table.widthMode === 'autoWidth') {
computeColsWidth(this.table, this.colUpdatePos, distCol);
}
updateColContent(this.colUpdatePos, distCol, this);
this.colUpdatePos = distCol + 1;
}
Expand Down
Loading