Merge pull request #1970 from VisActor/main

Merge main into develop
VisActor · Jun 21, 2024 · 0a8bd43 · 0a8bd43
2 parents 33297bd + fc3191e
commit 0a8bd43
Show file tree

Hide file tree

Showing 22 changed files with 99 additions and 150 deletions.
diff --git a/common/changes/@visactor/vtable/1939-bug-updatesortstate-set-null_2024-06-21-03-46.json b/common/changes/@visactor/vtable/1939-bug-updatesortstate-set-null_2024-06-21-03-46.json
diff --git a/common/changes/@visactor/vtable/1941-feature-support-calculate-field_2024-06-18-12-05.json b/common/changes/@visactor/vtable/1941-feature-support-calculate-field_2024-06-18-12-05.json
diff --git a/.../changes/@visactor/vtable/1945-bug-error-when-editing-corner-header_2024-06-20-03-03.json b/.../changes/@visactor/vtable/1945-bug-error-when-editing-corner-header_2024-06-20-03-03.json
diff --git a/...hanges/@visactor/vtable/1953-feature-pivotTable-setRecords-emptytip_2024-06-19-11-17.json b/...hanges/@visactor/vtable/1953-feature-pivotTable-setRecords-emptytip_2024-06-19-11-17.json
diff --git a/common/changes/@visactor/vtable/1955-bug-getCellRect-api_2024-06-20-12-24.json b/common/changes/@visactor/vtable/1955-bug-getCellRect-api_2024-06-20-12-24.json
diff --git a/.../changes/@visactor/vtable/1956-bug-error-when-editing-corner-header_2024-06-20-09-05.json b/.../changes/@visactor/vtable/1956-bug-error-when-editing-corner-header_2024-06-20-09-05.json
diff --git a/common/changes/@visactor/vtable/chore-updateVrender_2024-06-19-06-19.json b/common/changes/@visactor/vtable/chore-updateVrender_2024-06-19-06-19.json
diff --git a/common/changes/@visactor/vtable/feat-export-indent_2024-06-20-13-09.json b/common/changes/@visactor/vtable/feat-export-indent_2024-06-20-13-09.json
diff --git a/common/changes/@visactor/vtable/feat-react-component-container_2024-05-07-09-28.json b/common/changes/@visactor/vtable/feat-react-component-container_2024-05-07-09-28.json
diff --git a/common/changes/@visactor/vtable/feat-react-component-container_2024-05-15-06-22.json b/common/changes/@visactor/vtable/feat-react-component-container_2024-05-15-06-22.json
diff --git a/common/changes/@visactor/vtable/fix-compute-size_2024-06-21-06-26.json b/common/changes/@visactor/vtable/fix-compute-size_2024-06-21-06-26.json
diff --git a/common/changes/@visactor/vtable/fix-compute-size_2024-06-21-06-28.json b/common/changes/@visactor/vtable/fix-compute-size_2024-06-21-06-28.json
diff --git a/common/changes/@visactor/vtable/fix-pivot-sort-size-update_2024-06-21-09-20.json b/common/changes/@visactor/vtable/fix-pivot-sort-size-update_2024-06-21-09-20.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.3.3","mainProject":"@visactor/vtable","nextBump":"patch"}]
+[{"definitionName":"lockStepVersion","policyName":"vtableMain","version":"1.4.0","mainProject":"@visactor/vtable","nextBump":"minor"}]
diff --git a/packages/openinula-vtable/package.json b/packages/openinula-vtable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/openinula-vtable",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "description": "The openinula version of VTable",
   "keywords": [
     "openinula",
@@ -93,4 +93,4 @@
   "peerDependencies": {
     "openinula": "~0.1.2-SNAPSHOT"
   }
-}
+}
diff --git a/packages/react-vtable/package.json b/packages/react-vtable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/react-vtable",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "description": "The react version of VTable",
   "keywords": [
     "react",
@@ -101,4 +101,4 @@
     "@arco-design/web-react": "2.60.2",
     "@types/react-reconciler": "0.28.8"
   }
-}
+}
diff --git a/packages/vtable-editors/package.json b/packages/vtable-editors/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vtable-editors",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "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.3.3",
+  "version": "1.4.0",
   "description": "The export util of VTable",
   "author": {
     "name": "VisActor",
@@ -87,4 +87,4 @@
     "@types/react-is": "^17.0.3",
     "rollup-plugin-node-resolve": "5.2.0"
   }
-}
+}
diff --git a/packages/vtable-search/package.json b/packages/vtable-search/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vtable-search",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "description": "The search util of VTable",
   "author": {
     "name": "VisActor",
@@ -83,4 +83,4 @@
     "@types/react-is": "^17.0.3",
     "rollup-plugin-node-resolve": "5.2.0"
   }
-}
+}
diff --git a/packages/vtable/CHANGELOG.json b/packages/vtable/CHANGELOG.json
@@ -1,6 +1,56 @@
 {
   "name": "@visactor/vtable",
   "entries": [
+    {
+      "version": "1.4.0",
+      "tag": "@visactor/vtable_v1.4.0",
+      "date": "Fri, 21 Jun 2024 10:26:08 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "fix: updateSortState api occor error #1939\n\n"
+          },
+          {
+            "comment": "feat: support corner header cell edit value #1945\n\n"
+          },
+          {
+            "comment": "fix: when setRecords should update emptyTip #1953\n\n"
+          },
+          {
+            "comment": "fix: getCellRect api when cell is frozen get bounds error #1955\n\n"
+          },
+          {
+            "comment": "fix: when drag cell and enter edit state but can not exit edit rightly #1956\n\n"
+          },
+          {
+            "comment": "chore: update vrender version\n\n"
+          },
+          {
+            "comment": "feat: add indent in vtable-export"
+          },
+          {
+            "comment": "feat: add CustomComponent in react-vtable"
+          },
+          {
+            "comment": "feat: add CustomLayout component in react-vtable"
+          },
+          {
+            "comment": "fix: fix custom width problem #1905"
+          },
+          {
+            "comment": "fix: fix content judgement in getCellRange() #1911"
+          },
+          {
+            "comment": "fix: fix size update problem in pivot table sort #1958"
+          }
+        ],
+        "minor": [
+          {
+            "comment": "feat: support calculate field for PivotTable #1941\n\n"
+          }
+        ]
+      }
+    },
     {
       "version": "1.3.3",
       "tag": "@visactor/vtable_v1.3.3",

diff --git a/packages/vtable/CHANGELOG.md b/packages/vtable/CHANGELOG.md
@@ -1,6 +1,42 @@
 # Change Log - @visactor/vtable
 
-This log was last generated on Thu, 20 Jun 2024 12:19:07 GMT and should not be manually modified.
+This log was last generated on Fri, 21 Jun 2024 10:26:08 GMT and should not be manually modified.
+
+## 1.4.0
+Fri, 21 Jun 2024 10:26:08 GMT
+
+### Minor changes
+
+- feat: support calculate field for PivotTable #1941
+
+
+
+### Updates
+
+- fix: updateSortState api occor error #1939
+
+
+- feat: support corner header cell edit value #1945
+
+
+- fix: when setRecords should update emptyTip #1953
+
+
+- fix: getCellRect api when cell is frozen get bounds error #1955
+
+
+- fix: when drag cell and enter edit state but can not exit edit rightly #1956
+
+
+- chore: update vrender version
+
+
+- feat: add indent in vtable-export
+- feat: add CustomComponent in react-vtable
+- feat: add CustomLayout component in react-vtable
+- fix: fix custom width problem #1905
+- fix: fix content judgement in getCellRange() #1911
+- fix: fix size update problem in pivot table sort #1958
 
 ## 1.3.3
 Thu, 20 Jun 2024 12:19:07 GMT

diff --git a/packages/vtable/package.json b/packages/vtable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vtable",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "description": "canvas table width high performance",
   "keywords": [
     "grid",
@@ -123,4 +123,4 @@
     "url": "https://github.com/VisActor/VTable.git",
     "directory": "packages/vtable"
   }
-}
+}