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

Fix/fs 0.17.2 #816

Merged
merged 3 commits into from
Dec 29, 2023
Merged

Fix/fs 0.17.2 #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e06ca0a
fix: fix jsx parse error in react-vtable
Rui-Sun Dec 28, 2023
b852af5
fix: fix select update when change frozen
Rui-Sun Dec 28, 2023
52c8c13
fix: options.columns judge optional chaining
fangsmile Dec 29, 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
10 changes: 10 additions & 0 deletions common/changes/@visactor/vtable/fix-fs-0.17.2_2023-12-28-12-00.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@visactor/react-vtable",
"comment": "fix: fix jsx parse error in react-vtable",
"type": "none"
}
],
"packageName": "@visactor/react-vtable"
}
10 changes: 10 additions & 0 deletions common/changes/@visactor/vtable/fix-fs-0.17.2_2023-12-28-12-56.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@visactor/vtable",
"comment": "fix: fix select update when change frozen",
"type": "none"
}
],
"packageName": "@visactor/vtable"
}
2 changes: 1 addition & 1 deletion packages/vtable/src/ListTable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class ListTable extends BaseTable implements ListTableAPI {
: options.header
? cloneDeep(options.header)
: [];
options.columns.forEach((colDefine, index) => {
options.columns?.forEach((colDefine, index) => {
//如果editor 是一个IEditor的实例 需要这样重新赋值 否则clone后变质了
if (colDefine.editor) {
internalProps.columns[index].editor = colDefine.editor;
Expand Down
6 changes: 4 additions & 2 deletions packages/vtable/src/scenegraph/component/custom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,11 +395,13 @@ export function decodeReactDom(dom: any) {
const g = type({ attribute });
g.id = attribute.id;
g.name = attribute.name;
children &&
children.length &&
if (children && children.length) {
children.forEach((item: any) => {
const c = decodeReactDom(item);
g.add(c);
});
} else if (children) {
g.add(decodeReactDom(children));
}
return g;
}
5 changes: 5 additions & 0 deletions packages/vtable/src/scenegraph/layout/frozen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ export function resetFrozen(scene: Scenegraph) {
}
}

scene.deleteAllSelectBorder();
scene.table.stateManager.select.ranges.forEach(range => {
scene.updateCellSelectBorder(range.start.col, range.start.row, range.end.col, range.end.row);
});

// scene.frozenColCount = scene.rowHeaderGroup.childrenCount;
scene.frozenColCount = scene.table.frozenColCount;
scene.frozenRowCount = scene.colHeaderGroup.firstChild?.childrenCount ?? 0;
Expand Down
Loading