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.

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

Main #3228

Merged
merged 6 commits into from
Dec 27, 2024
Merged

Main #3228

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

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion common/config/rush/version-policies.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"definitionName":"lockStepVersion","policyName":"vtableMain","version":"1.14.2","mainProject":"@visactor/vtable","nextBump":"patch"}]
[{"definitionName":"lockStepVersion","policyName":"vtableMain","version":"1.14.3","mainProject":"@visactor/vtable","nextBump":"patch"}]
2 changes: 1 addition & 1 deletion packages/openinula-vtable/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/openinula-vtable",
"version": "1.14.2",
"version": "1.14.3",
"description": "The openinula version of VTable",
"keywords": [
"openinula",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-vtable/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/react-vtable",
"version": "1.14.2",
"version": "1.14.3",
"description": "The react version of VTable",
"keywords": [
"react",
Expand Down
2 changes: 1 addition & 1 deletion packages/vtable-calendar/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vtable-calendar",
"version": "1.14.2",
"version": "1.14.3",
"description": "The calendar component of VTable",
"author": {
"name": "VisActor",
Expand Down
2 changes: 1 addition & 1 deletion packages/vtable-editors/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vtable-editors",
"version": "1.14.2",
"version": "1.14.3",
"description": "",
"sideEffects": false,
"main": "cjs/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/vtable-export/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vtable-export",
"version": "1.14.2",
"version": "1.14.3",
"description": "The export util of VTable",
"author": {
"name": "VisActor",
Expand Down
2 changes: 1 addition & 1 deletion packages/vtable-gantt/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vtable-gantt",
"version": "1.14.2",
"version": "1.14.3",
"description": "canvas table width high performance",
"keywords": [
"vtable-gantt",
Expand Down
2 changes: 1 addition & 1 deletion packages/vtable-plugins/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vtable-plugins",
"version": "1.14.2",
"version": "1.14.3",
"description": "The search util of VTable",
"author": {
"name": "VisActor",
Expand Down
2 changes: 1 addition & 1 deletion packages/vtable-search/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vtable-search",
"version": "1.14.2",
"version": "1.14.3",
"description": "The search util of VTable",
"author": {
"name": "VisActor",
Expand Down
24 changes: 24 additions & 0 deletions packages/vtable/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
{
"name": "@visactor/vtable",
"entries": [
{
"version": "1.14.3",
"tag": "@visactor/vtable_v1.14.3",
"date": "Fri, 27 Dec 2024 09:48:26 GMT",
"comments": {
"none": [
{
"comment": "feat: showSort support function type #2630\n\n"
},
{
"comment": "feat: add hide for indicator setting #2257 #2451\n\n"
},
{
"comment": "feat: add enableTreeCheckbox config"
},
{
"comment": "fix: fix borderLineWidth array config #3183"
},
{
"comment": "fix: when set resizable false hover taskbar occor error #3189\n\n"
}
]
}
},
{
"version": "1.14.2",
"tag": "@visactor/vtable_v1.14.2",
Expand Down
19 changes: 18 additions & 1 deletion packages/vtable/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
# Change Log - @visactor/vtable

This log was last generated on Wed, 25 Dec 2024 09:27:34 GMT and should not be manually modified.
This log was last generated on Fri, 27 Dec 2024 09:48:26 GMT and should not be manually modified.

## 1.14.3
Fri, 27 Dec 2024 09:48:26 GMT

### Updates

- feat: showSort support function type #2630


- feat: add hide for indicator setting #2257 #2451


- feat: add enableTreeCheckbox config
- fix: fix borderLineWidth array config #3183
- fix: when set resizable false hover taskbar occor error #3189



## 1.14.2
Wed, 25 Dec 2024 09:27:34 GMT
Expand Down
4 changes: 2 additions & 2 deletions packages/vtable/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vtable",
"version": "1.14.2",
"version": "1.14.3",
"description": "canvas table width high performance",
"keywords": [
"grid",
Expand Down Expand Up @@ -127,4 +127,4 @@
"url": "https://github.com/VisActor/VTable.git",
"directory": "packages/vtable"
}
}
}
4 changes: 2 additions & 2 deletions packages/vtable/src/layout/simple-header-layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1220,7 +1220,7 @@ export class SimpleHeaderLayoutMap implements LayoutMapAPI {
sourceCellRange.start.col - this.leftRowSeriesNumberColumnCount,
targetIndex - this.leftRowSeriesNumberColumnCount
);
this.columnTree.reset(this.columnTree.tree.children, true);
this.columnTree.reset(this.columnTree.tree.children);
this._cellRangeMap = new Map();
return {
sourceIndex: sourceCellRange.start.col,
Expand Down Expand Up @@ -1270,7 +1270,7 @@ export class SimpleHeaderLayoutMap implements LayoutMapAPI {
sourceCellRange.start.row,
targetIndex + (target.row > source.row ? sourceCellRange.end.row - sourceCellRange.start.row : 0)
);
this.columnTree.reset(this.columnTree.tree.children, true);
this.columnTree.reset(this.columnTree.tree.children);
this._cellRangeMap = new Map();
return {
sourceIndex: sourceCellRange.start.row,
Expand Down
19 changes: 12 additions & 7 deletions packages/vtable/src/layout/tree-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,22 +130,27 @@ export class DimensionTree {
if (node.dimensionKey ?? node.indicatorKey) {
if (
!node.virtual &&
!this.dimensionKeys.contain(node.indicatorKey ? IndicatorDimensionKeyPlaceholder : node.dimensionKey)
!this.dimensionKeys.contain(
(node as any).indicatorKey ? IndicatorDimensionKeyPlaceholder : (node as any).dimensionKey
)
) {
this.dimensionKeys.put(node.level, node.indicatorKey ? IndicatorDimensionKeyPlaceholder : node.dimensionKey);
this.dimensionKeys.put(
(node as any).level,
(node as any).indicatorKey ? IndicatorDimensionKeyPlaceholder : (node as any).dimensionKey
);
}
if (
!this.dimensionKeysIncludeVirtual.contain(
node.indicatorKey ? IndicatorDimensionKeyPlaceholder : node.dimensionKey
(node as any).indicatorKey ? IndicatorDimensionKeyPlaceholder : (node as any).dimensionKey
)
) {
this.dimensionKeysIncludeVirtual.put(
node.level,
node.indicatorKey ? IndicatorDimensionKeyPlaceholder : node.dimensionKey
(node as any).level,
(node as any).indicatorKey ? IndicatorDimensionKeyPlaceholder : (node as any).dimensionKey
);
}
if (!node.id) {
node.id = ++this.sharedVar.seqId;
if (!(node as any).id) {
(node as any).id = ++this.sharedVar.seqId;
}
}
let size = node.dimensionKey ? (this.sizeIncludeParent ? 1 : 0) : 0;
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-vtable/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vue-vtable",
"version": "1.14.2",
"version": "1.14.3",
"description": "The vue version of VTable",
"keywords": [
"vue",
Expand Down
Loading