merge develop

common/config/rush/version-policies.json

@@ -1 +1 @@
-[{"definitionName":"lockStepVersion","policyName":"vtableMain","version":"1.17.2","mainProject":"@visactor/vtable","nextBump":"patch"}]
+[{"definitionName":"lockStepVersion","policyName":"vtableMain","version":"1.17.3","mainProject":"@visactor/vtable","nextBump":"patch"}]

docs/assets/changelog/en/release.md

@@ -1,3 +1,28 @@
+# v1.17.3
+
+2025-03-24
+
+
+**🆕 New feature**
+
+- **@visactor/vtable**: rowSeriesNumber support cell type radio [#3558](https://github.com/VisActor/VTable/issues/3558)
+- **@visactor/vtable**: add custom reactAttributePlugin in react-vtable
+- **@visactor/vtable**: add maintainedColumnCount config
+
+**🐛 Bug fix**
+
+- **@visactor/vtable**: selection mergeCell extend range [#3529](https://github.com/VisActor/VTable/issues/3529)
+- **@visactor/vtable**: set cellInnerBorder false frame border render error [#3574](https://github.com/VisActor/VTable/issues/3574)
+- **@visactor/vtable**: fix cell border in cell with corner-radius
+- **@visactor/vtable**: fix axis label autosize computation
+- **@visactor/vtable**: fix small window size frozen column count
+- **@visactor/vtable**: columnWidthConfig match dimension error
+- **@visactor/vtable**: fix react component update [#3474](https://github.com/VisActor/VTable/issues/3474)
+- **@visactor/vtable**: fix right button select problem
+- **@visactor/vtable**: fix row update range [#3468](https://github.com/VisActor/VTable/issues/3468)
+
+[more detail about v1.17.3](https://github.com/VisActor/VTable/releases/tag/v1.17.3)
+
 # v1.17.2
 
 2025-03-11

docs/assets/changelog/zh/release.md

@@ -1,3 +1,27 @@
+# v1.17.3
+
+2025-03-24
+
+**🆕 新增功能**
+
+- **@visactor/vtable**: 行序号支持单选按钮类型 [#3558](https://github.com/VisActor/VTable/issues/3558)
+- **@visactor/vtable**: 在 react-vtable 中添加自定义 reactAttributePlugin
+- **@visactor/vtable**: 添加 maintainedColumnCount 配置
+
+**🐛 功能修复**
+
+- **@visactor/vtable**: 修复选择合并单元格扩展范围问题 [#3529](https://github.com/VisActor/VTable/issues/3529)
+- **@visactor/vtable**: 修复设置 cellInnerBorder 为 false 时边框渲染错误 [#3574](https://github.com/VisActor/VTable/issues/3574)
+- **@visactor/vtable**: 修复带圆角单元格的边框问题
+- **@visactor/vtable**: 修复坐标轴标签自动大小计算
+- **@visactor/vtable**: 修复小窗口大小下冻结列数问题
+- **@visactor/vtable**: 修复 columnWidthConfig 维度匹配错误
+- **@visactor/vtable**: 修复 React 组件更新问题 [#3474](https://github.com/VisActor/VTable/issues/3474)
+- **@visactor/vtable**: 修复右键选择问题
+- **@visactor/vtable**: 修复行更新范围问题 [#3468](https://github.com/VisActor/VTable/issues/3468)
+
+[更多详情请查看 v1.17.3](https://github.com/VisActor/VTable/releases/tag/v1.17.3)
+
 # v1.17.2
 
 2025-03-11

packages/openinula-vtable/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/openinula-vtable",
-  "version": "1.17.2",
+  "version": "1.17.3",
   "description": "The openinula version of VTable",
   "keywords": [
     "openinula",

packages/react-vtable/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/react-vtable",
-  "version": "1.17.2",
+  "version": "1.17.3",
   "description": "The react version of VTable",
   "keywords": [
     "react",

packages/react-vtable/src/table-components/custom/custom-layout.tsx

@@ -31,21 +31,28 @@ export const CustomLayout: React.FC<CustomLayoutProps> = (props: PropsWithChildr
   // customLayout function for vtable
   const createGraphic: ICustomLayoutFuc = useCallback(
     args => {
-      const key = `${args.originCol ?? args.col}-${args.originRow ?? args.row}`;
+      const key = `${args.originCol ?? args.col}-${args.originRow ?? args.row}${
+        args.forComputation ? '-forComputation' : ''
+      }`;
       let group;
       if (container.current.has(key)) {
         const currentContainer = container.current.get(key);
-        // reconcilor.updateContainer(React.cloneElement(children, { ...args }), currentContainer, null);
         reconcilorUpdateContainer(children, currentContainer, args);
         group = currentContainer.containerInfo;
-        // 这里更新group，可能会残留dx dy
       } else {
         group = new Group({});
-        const currentContainer = reconcilor.createContainer(group, LegacyRoot, null, null, null, 'custom', null, null);
+        const currentContainer = reconcilor.createContainer(
+          group as any,
+          LegacyRoot,
+          null,
+          null,
+          null,
+          'custom',
+          null,
+          null
+        );
         container.current.set(key, currentContainer);
         reconcilorUpdateContainer(children, currentContainer, args);
-        // const ele = React.cloneElement(children, { ...args });
-        // reconcilor.updateContainer(ele, currentContainer, null);
       }
 
       return {

packages/vtable-calendar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vtable-calendar",
-  "version": "1.17.2",
+  "version": "1.17.3",
   "description": "The calendar component of VTable",
   "author": {
     "name": "VisActor",

packages/vtable-editors/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vtable-editors",
-  "version": "1.17.2",
+  "version": "1.17.3",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",

packages/vtable-export/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vtable-export",
-  "version": "1.17.2",
+  "version": "1.17.3",
   "description": "The export util of VTable",
   "author": {
     "name": "VisActor",

packages/vtable-gantt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vtable-gantt",
-  "version": "1.17.2",
+  "version": "1.17.3",
   "description": "canvas table width high performance",
   "keywords": [
     "vtable-gantt",

packages/vtable-plugins/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vtable-plugins",
-  "version": "1.17.2",
+  "version": "1.17.3",
   "description": "The search util of VTable",
   "author": {
     "name": "VisActor",

packages/vtable-search/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vtable-search",
-  "version": "1.17.2",
+  "version": "1.17.3",
   "description": "The search util of VTable",
   "author": {
     "name": "VisActor",

packages/vtable/CHANGELOG.json

@@ -1,6 +1,51 @@
 {
   "name": "@visactor/vtable",
   "entries": [
+    {
+      "version": "1.17.3",
+      "tag": "@visactor/vtable_v1.17.3",
+      "date": "Mon, 24 Mar 2025 09:35:45 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "fix: selection mergeCell extend range #3529\n\n"
+          },
+          {
+            "comment": "feat: rowSeriesNumber support cell type radio #3558\n\n"
+          },
+          {
+            "comment": "fix: set cellInnerBorder false frame border render error #3574\n\n"
+          },
+          {
+            "comment": "feat: add custom reactAttributePlugin in react-vtable"
+          },
+          {
+            "comment": "feat: add maintainedColumnCount config"
+          },
+          {
+            "comment": "fix: fix cell border in cell with corner-radius"
+          },
+          {
+            "comment": "fix: fix axis label autosize computation"
+          },
+          {
+            "comment": "fix: fix small window size frozen column count"
+          },
+          {
+            "comment": "fix: columnWidthConfig match dimension error\n\n"
+          },
+          {
+            "comment": "fix: fix react component update #3474"
+          },
+          {
+            "comment": "fix: fix right button select problem"
+          },
+          {
+            "comment": "fix: fix row update range #3468"
+          }
+        ]
+      }
+    },
     {
       "version": "1.17.2",
       "tag": "@visactor/vtable_v1.17.2",

packages/vtable/CHANGELOG.md

@@ -1,6 +1,32 @@
 # Change Log - @visactor/vtable
 
-This log was last generated on Tue, 11 Mar 2025 08:19:47 GMT and should not be manually modified.
+This log was last generated on Mon, 24 Mar 2025 09:35:45 GMT and should not be manually modified.
+
+## 1.17.3
+Mon, 24 Mar 2025 09:35:45 GMT
+
+### Updates
+
+- fix: selection mergeCell extend range #3529
+
+
+- feat: rowSeriesNumber support cell type radio #3558
+
+
+- fix: set cellInnerBorder false frame border render error #3574
+
+
+- feat: add custom reactAttributePlugin in react-vtable
+- feat: add maintainedColumnCount config
+- fix: fix cell border in cell with corner-radius
+- fix: fix axis label autosize computation
+- fix: fix small window size frozen column count
+- fix: columnWidthConfig match dimension error
+
+
+- fix: fix react component update #3474
+- fix: fix right button select problem
+- fix: fix row update range #3468
 
 ## 1.17.2
 Tue, 11 Mar 2025 08:19:47 GMT

packages/vtable/__tests__/listTable-highlightInRange.test.ts

@@ -195,7 +195,7 @@ describe('listTable init test', () => {
     expect(listTable.stateManager?.select.ranges).toEqual([
       { start: { col: 1, row: 3 }, end: { col: 4, row: 6 }, skipBodyMerge: true },
       { start: { col: 0, row: 4 }, end: { col: 7, row: 4 }, skipBodyMerge: true },
-      { start: { col: 4, row: 36 }, end: { col: 7, row: 36 }, skipBodyMerge: true }
+      { start: { col: 4, row: 20 }, end: { col: 7, row: 20 }, skipBodyMerge: true }
     ]);
     expect(listTable.getScrollTop()).toBe(scrollTop);
   });

packages/vtable/__tests__/listTable.test.ts

@@ -192,7 +192,7 @@ describe('listTable init test', () => {
     expect(listTable.stateManager?.select.ranges).toEqual([
       { start: { col: 1, row: 3 }, end: { col: 4, row: 6 }, skipBodyMerge: true },
       { start: { col: 0, row: 4 }, end: { col: 7, row: 4 }, skipBodyMerge: true },
-      { start: { col: 4, row: 36 }, end: { col: 7, row: 36 }, skipBodyMerge: true }
+      { start: { col: 4, row: 20 }, end: { col: 7, row: 20 }, skipBodyMerge: true }
     ]);
     expect(listTable.getScrollTop()).toBe(scrollTop);
   });