Merge pull request #3228 from VisActor/main

Main
VisActor · Dec 27, 2024 · bfa4f33 · bfa4f33
2 parents 3bbc110 + ff3c006
commit bfa4f33
Show file tree

Hide file tree

Showing 20 changed files with 68 additions and 75 deletions.
diff --git a/common/changes/@visactor/vtable/2630-feature-showSort-function_2024-12-23-08-39.json b/common/changes/@visactor/vtable/2630-feature-showSort-function_2024-12-23-08-39.json
diff --git a/common/changes/@visactor/vtable/2630-feature-showSort-function_2024-12-25-07-49.json b/common/changes/@visactor/vtable/2630-feature-showSort-function_2024-12-25-07-49.json
diff --git a/common/changes/@visactor/vtable/feat-tree-checkbox_2024-12-27-08-44.json b/common/changes/@visactor/vtable/feat-tree-checkbox_2024-12-27-08-44.json
diff --git a/common/changes/@visactor/vtable/fix-stroke-array_2024-12-25-07-33.json b/common/changes/@visactor/vtable/fix-stroke-array_2024-12-25-07-33.json
diff --git a/common/changes/@visactor/vtable/fix-updateListTabelOption_2024-12-25-09-34.json b/common/changes/@visactor/vtable/fix-updateListTabelOption_2024-12-25-09-34.json
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
@@ -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"}]
diff --git a/packages/openinula-vtable/package.json b/packages/openinula-vtable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/openinula-vtable",
-  "version": "1.14.2",
+  "version": "1.14.3",
   "description": "The openinula version of VTable",
   "keywords": [
     "openinula",

diff --git a/packages/react-vtable/package.json b/packages/react-vtable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/react-vtable",
-  "version": "1.14.2",
+  "version": "1.14.3",
   "description": "The react version of VTable",
   "keywords": [
     "react",

diff --git a/packages/vtable-calendar/package.json b/packages/vtable-calendar/package.json
@@ -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",

diff --git a/packages/vtable-editors/package.json b/packages/vtable-editors/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vtable-editors",
-  "version": "1.14.2",
+  "version": "1.14.3",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",

diff --git a/packages/vtable-export/package.json b/packages/vtable-export/package.json
@@ -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",

diff --git a/packages/vtable-gantt/package.json b/packages/vtable-gantt/package.json
@@ -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",

diff --git a/packages/vtable-plugins/package.json b/packages/vtable-plugins/package.json
@@ -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",

diff --git a/packages/vtable-search/package.json b/packages/vtable-search/package.json
@@ -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",

diff --git a/packages/vtable/CHANGELOG.json b/packages/vtable/CHANGELOG.json
@@ -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",

diff --git a/packages/vtable/CHANGELOG.md b/packages/vtable/CHANGELOG.md
@@ -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

diff --git a/packages/vtable/package.json b/packages/vtable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vtable",
-  "version": "1.14.2",
+  "version": "1.14.3",
   "description": "canvas table width high performance",
   "keywords": [
     "grid",
@@ -127,4 +127,4 @@
     "url": "https://github.com/VisActor/VTable.git",
     "directory": "packages/vtable"
   }
-}
+}
diff --git a/packages/vtable/src/layout/simple-header-layout.ts b/packages/vtable/src/layout/simple-header-layout.ts
@@ -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,
@@ -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,

diff --git a/packages/vtable/src/layout/tree-helper.ts b/packages/vtable/src/layout/tree-helper.ts
@@ -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;

diff --git a/packages/vue-vtable/package.json b/packages/vue-vtable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vue-vtable",
-  "version": "1.14.2",
+  "version": "1.14.3",
   "description": "The vue version of VTable",
   "keywords": [
     "vue",
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"}]