Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/improve interactive performance while resize column #33

Merged
merged 12 commits into from
Jun 14, 2023
Merged

Feature/improve interactive performance while resize column #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fc86397
chore: update vrender version
fangsmile Jun 8, 2023
851499a
chore: add pre-commit to generate rush log
fangsmile Jun 8, 2023
c48d5f0
Merge pull request #6 from VisActor/chore/updateNpm
fangsmile Jun 8, 2023
fe8ca9f
chore: add bugserver ci
Rui-Sun Jun 8, 2023
24d2910
chore: change ci script package name
Rui-Sun Jun 9, 2023
cc97ed6
chore: update vchart version
fangsmile Jun 9, 2023
e02a2ee
Merge pull request #17 from VisActor/demo/vchart-in-vtables-demo
fangsmile Jun 9, 2023
3e61614
fix: ci workflow unit test occur error
fangsmile Jun 9, 2023
bec02e5
Merge pull request #19 from VisActor/test/18-test-solve-errors-in-ci-…
fangsmile Jun 9, 2023
5d836a3
Merge pull request #24 from VisActor/7-feature-refactor-sparklines-spec
fangsmile Jun 12, 2023
55c35e4
Merge branch 'main' into feature/improve-interactive-performance-whil…
Rui-Sun Jun 14, 2023
984ab62
feat: optimize updateWidth performance
Rui-Sun Jun 14, 2023
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
1 change: 0 additions & 1 deletion common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 40 additions & 30 deletions packages/vtable/src/scenegraph/layout/update-width.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function updateColWidth(scene: Scenegraph, col: number, detaX: number) {
// }

const { autoRowHeight } = scene.table.internalProps;

let needRerangeRow = false;
const colOrCornerHeaderColumn = scene.getColGroup(col, true) as Group;
const oldColOrCornerHeaderColumnWidth = colOrCornerHeaderColumn.attribute.width;
colOrCornerHeaderColumn?.setAttribute('width', oldColOrCornerHeaderColumnWidth + detaX);
Expand All @@ -59,9 +59,28 @@ export function updateColWidth(scene: Scenegraph, col: number, detaX: number) {
} else {
resetRowHeight(scene, cell.row);
}
needRerangeRow = true;
}
});

if (needRerangeRow) {
let newTotalHeight = 0;
for (let col = 0; col < scene.table.colCount; col++) {
const colGroup = scene.getColGroup(col, true);
let y = 0;
colGroup.forEachChildren((cellGroup: Group) => {
if (cellGroup.role !== 'cell') {
return;
}
cellGroup.setAttribute('y', y);
y += cellGroup.attribute.height;
});
newTotalHeight = y;
}
scene.updateContainerHeight(0, newTotalHeight - scene.colHeaderGroup.attribute.height);
}

needRerangeRow = false;
const rowHeaderOrBodyColumn = scene.getColGroup(col) as Group;
const oldRowHeaderOrBodyColumn = rowHeaderOrBodyColumn.attribute.width;
rowHeaderOrBodyColumn?.setAttribute('width', oldRowHeaderOrBodyColumn + detaX);
Expand All @@ -88,9 +107,27 @@ export function updateColWidth(scene: Scenegraph, col: number, detaX: number) {
} else {
resetRowHeight(scene, cell.row);
}
needRerangeRow = true;
}
});

if (needRerangeRow) {
let newTotalHeight = 0;
for (let col = 0; col < scene.table.colCount; col++) {
const colGroup = scene.getColGroup(col, false);
let y = 0;
colGroup.forEachChildren((cellGroup: Group) => {
if (cellGroup.role !== 'cell') {
return;
}
cellGroup.setAttribute('y', y);
y += cellGroup.attribute.height;
});
newTotalHeight = y;
}
scene.updateContainerHeight(scene.table.frozenRowCount, newTotalHeight - scene.bodyGroup.attribute.height);
}

// 更新剩余列位置
if (col < scene.frozenColCount) {
scene.cornerHeaderGroup.forEachChildrenSkipChild((column: Group, index) => {
Expand Down Expand Up @@ -250,7 +287,7 @@ function resetRowHeight(scene: Scenegraph, row: number) {
let maxHeight = 0;
// 获取高度
for (let col = 0; col < scene.table.colCount; col++) {
const cell = scene.getCell(col, row);
const cell = scene.highPerformanceGetCell(col, row);
let cellHeight = getCleanCellHeight(cell, scene);
const mergeInfo = getCellMergeInfo(scene.table, col, row);
if (mergeInfo && mergeInfo.end.row - mergeInfo.start.row) {
Expand All @@ -262,7 +299,7 @@ function resetRowHeight(scene: Scenegraph, row: number) {
// 更新高度
for (let col = 0; col < scene.table.colCount; col++) {
let distHeight = maxHeight;
const cell = scene.getCell(col, row);
const cell = scene.highPerformanceGetCell(col, row);
const mergeInfo = getCellMergeInfo(scene.table, col, row);
if (mergeInfo && mergeInfo.end.row - mergeInfo.start.row) {
for (let rowIndex = mergeInfo.start.row; rowIndex <= mergeInfo.end.row; rowIndex++) {
Expand All @@ -274,33 +311,6 @@ function resetRowHeight(scene: Scenegraph, row: number) {
updateCellHeightForRow(scene, cell, col, row, distHeight, 0, scene.table.isHeader(col, row));
}

const deltaHeight = maxHeight - scene.table.getRowHeight(row);
let rowStart = 0;
let rowEnd = 0;
// 更新header 高度
if (row < scene.table.columnHeaderLevelCount) {
rowStart = row + 1;
rowEnd = scene.table.columnHeaderLevelCount - 1;
} else {
rowStart = row + 1;
rowEnd = scene.table.rowCount - 1;
}

// 更新以下行位置
for (let rowIndex = rowStart; rowIndex <= rowEnd; rowIndex++) {
// if (rowIndex === 2) debugger;
for (let colIndex = 0; colIndex < scene.table.colCount; colIndex++) {
const cellGroup = scene.getCell(colIndex, rowIndex);
const mergeInfo = getCellMergeInfo(scene.table, colIndex, rowIndex);
if (mergeInfo && (mergeInfo.start.col !== colIndex || mergeInfo.start.row !== rowIndex)) {
continue;
}

cellGroup.setAttribute('y', cellGroup.attribute.y + deltaHeight);
}
}

scene.updateContainerHeight(row, deltaHeight);
// 更新table行高存储
scene.table.setRowHeight(row, maxHeight, true);
}
Expand Down