From 16b1c7949af03dad5e9ab2a6805233b6dd416f37 Mon Sep 17 00:00:00 2001 From: Rui-Sun Date: Fri, 11 Oct 2024 11:50:40 +0000 Subject: [PATCH 1/4] docs: generate changelog of release v1.9.0 --- docs/assets/changelog/en/release.md | 29 +++++++++++++++++++++++++++++ docs/assets/changelog/zh/release.md | 29 +++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/docs/assets/changelog/en/release.md b/docs/assets/changelog/en/release.md index 62da692fb..d24d00eb5 100644 --- a/docs/assets/changelog/en/release.md +++ b/docs/assets/changelog/en/release.md @@ -1,3 +1,32 @@ +# v1.9.0 + +2024-10-11 + + +**🆕 New feature** + +- **@visactor/vtable**: add scrollTo animation function + +**🐛 Bug fix** + +- **@visactor/vtable**: when dimension set width auto but no records, the col width not compute [#2515](https://github.com/VisActor/VTable/issues/2515) +- **@visactor/vtable**: when call updateColumns should update aggregation [#2519](https://github.com/VisActor/VTable/issues/2519) +- **@visactor/vtable**: change outsideClickDeselect trigger time when pointerdown [#2553](https://github.com/VisActor/VTable/issues/2553) +- **@visactor/vtable**: when sort with row series number occor error [#2558](https://github.com/VisActor/VTable/issues/2558) +- **@visactor/vtable**: fix select auto-scroll in bottom [#2546](https://github.com/VisActor/VTable/issues/2546) +- **@visactor/vtable**: fix auto size in react custom component +- **@visactor/vtable**: fix custom component flash when cell resizes [#2516](https://github.com/VisActor/VTable/issues/2516) +- **@visactor/vtable**: fix custom component in forzen cell [#2568](https://github.com/VisActor/VTable/issues/2568) +- **@visactor/vtable**: fix legend with padding layout size +- **@visactor/vtable**: fix cellLocation in createComplexColumn [#2517](https://github.com/VisActor/VTable/issues/2517) +- **@visactor/vtable**: fix merge cell select range [#2521](https://github.com/VisActor/VTable/issues/2521) + +**🔨 Refactor** + +- **@visactor/vtable**: when value is promise cell style function should await [#2549](https://github.com/VisActor/VTable/issues/2549) + +[more detail about v1.9.0](https://github.com/VisActor/VTable/releases/tag/v1.9.0) + # v1.8.2 2024-10-08 diff --git a/docs/assets/changelog/zh/release.md b/docs/assets/changelog/zh/release.md index 2156485e6..a9efb598f 100644 --- a/docs/assets/changelog/zh/release.md +++ b/docs/assets/changelog/zh/release.md @@ -1,3 +1,32 @@ +# v1.9.0 + +2024-10-11 + + +**🆕 新增功能** + +- **@visactor/vtable**: add scrollTo animation function + +**🐛 功能修复** + +- **@visactor/vtable**: when dimension set width auto but no records, the col width not compute [#2515](https://github.com/VisActor/VTable/issues/2515) +- **@visactor/vtable**: when call updateColumns should update aggregation [#2519](https://github.com/VisActor/VTable/issues/2519) +- **@visactor/vtable**: change outsideClickDeselect trigger time when pointerdown [#2553](https://github.com/VisActor/VTable/issues/2553) +- **@visactor/vtable**: when sort with row series number occor error [#2558](https://github.com/VisActor/VTable/issues/2558) +- **@visactor/vtable**: fix select auto-scroll in bottom [#2546](https://github.com/VisActor/VTable/issues/2546) +- **@visactor/vtable**: fix auto size in react custom component +- **@visactor/vtable**: fix custom component flash when cell resizes [#2516](https://github.com/VisActor/VTable/issues/2516) +- **@visactor/vtable**: fix custom component in forzen cell [#2568](https://github.com/VisActor/VTable/issues/2568) +- **@visactor/vtable**: fix legend with padding layout size +- **@visactor/vtable**: fix cellLocation in createComplexColumn [#2517](https://github.com/VisActor/VTable/issues/2517) +- **@visactor/vtable**: fix merge cell select range [#2521](https://github.com/VisActor/VTable/issues/2521) + +**🔨 功能重构** + +- **@visactor/vtable**: when value is promise cell style function should await [#2549](https://github.com/VisActor/VTable/issues/2549) + +[更多详情请查看 v1.9.0](https://github.com/VisActor/VTable/releases/tag/v1.9.0) + # v1.8.2 2024-10-08 From ef13d6552537ff970d4442c8c6f92424f519a695 Mon Sep 17 00:00:00 2001 From: Rui-Sun Date: Fri, 11 Oct 2024 20:46:20 +0800 Subject: [PATCH 2/4] docs: translate release changelog --- docs/assets/changelog/zh/release.md | 46 ++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/assets/changelog/zh/release.md b/docs/assets/changelog/zh/release.md index a9efb598f..9d90d973c 100644 --- a/docs/assets/changelog/zh/release.md +++ b/docs/assets/changelog/zh/release.md @@ -4,26 +4,26 @@ **🆕 新增功能** - -- **@visactor/vtable**: add scrollTo animation function - -**🐛 功能修复** - -- **@visactor/vtable**: when dimension set width auto but no records, the col width not compute [#2515](https://github.com/VisActor/VTable/issues/2515) -- **@visactor/vtable**: when call updateColumns should update aggregation [#2519](https://github.com/VisActor/VTable/issues/2519) -- **@visactor/vtable**: change outsideClickDeselect trigger time when pointerdown [#2553](https://github.com/VisActor/VTable/issues/2553) -- **@visactor/vtable**: when sort with row series number occor error [#2558](https://github.com/VisActor/VTable/issues/2558) -- **@visactor/vtable**: fix select auto-scroll in bottom [#2546](https://github.com/VisActor/VTable/issues/2546) -- **@visactor/vtable**: fix auto size in react custom component -- **@visactor/vtable**: fix custom component flash when cell resizes [#2516](https://github.com/VisActor/VTable/issues/2516) -- **@visactor/vtable**: fix custom component in forzen cell [#2568](https://github.com/VisActor/VTable/issues/2568) -- **@visactor/vtable**: fix legend with padding layout size -- **@visactor/vtable**: fix cellLocation in createComplexColumn [#2517](https://github.com/VisActor/VTable/issues/2517) -- **@visactor/vtable**: fix merge cell select range [#2521](https://github.com/VisActor/VTable/issues/2521) + +- **@visactor/vtable**: 增加scrollTo动画功能 + +**🐛 功能修复** + +- **@visactor/vtable**: 修复无数据时维度列宽计算 [#2515](https://github.com/VisActor/VTable/issues/2515) +- **@visactor/vtable**: 修复updateColumns调用时的聚合更新 [#2519](https://github.com/VisActor/VTable/issues/2519) +- **@visactor/vtable**: 修复pointerdown事件中outsideClickDeselect判断时机 [#2553](https://github.com/VisActor/VTable/issues/2553) +- **@visactor/vtable**: 修复序号列排序问题 [#2558](https://github.com/VisActor/VTable/issues/2558) +- **@visactor/vtable**: 修复底部单元格选中无法自动滚动问题 [#2546](https://github.com/VisActor/VTable/issues/2546) +- **@visactor/vtable**: 修复自定义组件自动行高列宽的计算问题 +- **@visactor/vtable**: 修复拖拽行列时自定义组件的闪烁问题 [#2516](https://github.com/VisActor/VTable/issues/2516) +- **@visactor/vtable**: 修复冻结单元格中自定义组件的更新问题 [#2568](https://github.com/VisActor/VTable/issues/2568) +- **@visactor/vtable**: 修复带有padding的图例布局计算 +- **@visactor/vtable**: 修复创建单元格时的cellLocation计算问题 [#2517](https://github.com/VisActor/VTable/issues/2517) +- **@visactor/vtable**: 修复合并单元格选中区域记录 [#2521](https://github.com/VisActor/VTable/issues/2521) **🔨 功能重构** - -- **@visactor/vtable**: when value is promise cell style function should await [#2549](https://github.com/VisActor/VTable/issues/2549) + +- **@visactor/vtable**: 异步单元格样式获取增加等待 [#2549](https://github.com/VisActor/VTable/issues/2549) [更多详情请查看 v1.9.0](https://github.com/VisActor/VTable/releases/tag/v1.9.0) @@ -33,9 +33,9 @@ **🐛 功能修复** - -- **@visactor/vtable**: fix richtext icon update [#2281](https://github.com/VisActor/VTable/issues/2281) - + +- **@visactor/vtable**: 修复富文本图标状态更新问题 [#2281](https://github.com/VisActor/VTable/issues/2281) + [更多详情请查看 v1.8.2](https://github.com/VisActor/VTable/releases/tag/v1.8.2) @@ -46,8 +46,8 @@ **🔨 功能重构** - -- **@visactor/vue-vtable**: rename vue component name + +- **@visactor/vue-vtable**: 重命名vue组件 [更多详情请查看 v1.8.1](https://github.com/VisActor/VTable/releases/tag/v1.8.1) From 6345d768796a6f217b40864490f05febd1cd6dcc Mon Sep 17 00:00:00 2001 From: Rui-Sun Date: Fri, 11 Oct 2024 20:38:54 +0800 Subject: [PATCH 3/4] fix: fix sort icon update in merge cell --- .../vtable/fix-merge-sort-icon_2024-10-11-12-38.json | 10 ++++++++++ packages/vtable/src/state/state.ts | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 common/changes/@visactor/vtable/fix-merge-sort-icon_2024-10-11-12-38.json diff --git a/common/changes/@visactor/vtable/fix-merge-sort-icon_2024-10-11-12-38.json b/common/changes/@visactor/vtable/fix-merge-sort-icon_2024-10-11-12-38.json new file mode 100644 index 000000000..456de9910 --- /dev/null +++ b/common/changes/@visactor/vtable/fix-merge-sort-icon_2024-10-11-12-38.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vtable", + "comment": "fix: fix sort icon update in merge cell", + "type": "none" + } + ], + "packageName": "@visactor/vtable" +} \ No newline at end of file diff --git a/packages/vtable/src/state/state.ts b/packages/vtable/src/state/state.ts index 1a3c71026..00be2059f 100644 --- a/packages/vtable/src/state/state.ts +++ b/packages/vtable/src/state/state.ts @@ -1274,7 +1274,8 @@ export class StateManager { // 执行sort dealSort(col, row, this.table as ListTableAPI, event); - const currentSortItem = this.sort.find(item => item.col === col && item.row === row); + const range = this.table.getCellRange(col, row); + const currentSortItem = this.sort.find(item => item.col === range.start.col && item.row === range.start.row); const oldSortCol = this.table.internalProps.multipleSort || !previousSortItem ? null : previousSortItem.col; const oldSortRow = this.table.internalProps.multipleSort || !previousSortItem ? null : previousSortItem.row; From c338f131f2e4346b2321cc4f17f5199912d8366e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 12 Oct 2024 07:12:04 +0000 Subject: [PATCH 4/4] build: prelease version 1.9.1 --- .../vtable/fix-merge-sort-icon_2024-10-11-12-38.json | 10 ---------- common/config/rush/version-policies.json | 2 +- packages/openinula-vtable/package.json | 2 +- packages/react-vtable/package.json | 2 +- packages/vtable-editors/package.json | 2 +- packages/vtable-export/package.json | 2 +- packages/vtable-gantt/package.json | 2 +- packages/vtable-search/package.json | 2 +- packages/vtable/CHANGELOG.json | 12 ++++++++++++ packages/vtable/CHANGELOG.md | 9 ++++++++- packages/vtable/package.json | 2 +- packages/vue-vtable/package.json | 2 +- 12 files changed, 29 insertions(+), 20 deletions(-) delete mode 100644 common/changes/@visactor/vtable/fix-merge-sort-icon_2024-10-11-12-38.json diff --git a/common/changes/@visactor/vtable/fix-merge-sort-icon_2024-10-11-12-38.json b/common/changes/@visactor/vtable/fix-merge-sort-icon_2024-10-11-12-38.json deleted file mode 100644 index 456de9910..000000000 --- a/common/changes/@visactor/vtable/fix-merge-sort-icon_2024-10-11-12-38.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vtable", - "comment": "fix: fix sort icon update in merge cell", - "type": "none" - } - ], - "packageName": "@visactor/vtable" -} \ No newline at end of file diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index 739a6b1d9..06908a314 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vtableMain","version":"1.9.0","mainProject":"@visactor/vtable","nextBump":"minor"}] +[{"definitionName":"lockStepVersion","policyName":"vtableMain","version":"1.9.1","mainProject":"@visactor/vtable","nextBump":"patch"}] diff --git a/packages/openinula-vtable/package.json b/packages/openinula-vtable/package.json index bc88cca65..905afabab 100644 --- a/packages/openinula-vtable/package.json +++ b/packages/openinula-vtable/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/openinula-vtable", - "version": "1.9.0", + "version": "1.9.1", "description": "The openinula version of VTable", "keywords": [ "openinula", diff --git a/packages/react-vtable/package.json b/packages/react-vtable/package.json index 980988430..fbc39498f 100644 --- a/packages/react-vtable/package.json +++ b/packages/react-vtable/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vtable", - "version": "1.9.0", + "version": "1.9.1", "description": "The react version of VTable", "keywords": [ "react", diff --git a/packages/vtable-editors/package.json b/packages/vtable-editors/package.json index 863286d92..1f2f18013 100644 --- a/packages/vtable-editors/package.json +++ b/packages/vtable-editors/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vtable-editors", - "version": "1.9.0", + "version": "1.9.1", "description": "", "sideEffects": false, "main": "cjs/index.js", diff --git a/packages/vtable-export/package.json b/packages/vtable-export/package.json index 43ff45dd5..a9f96618c 100644 --- a/packages/vtable-export/package.json +++ b/packages/vtable-export/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vtable-export", - "version": "1.9.0", + "version": "1.9.1", "description": "The export util of VTable", "author": { "name": "VisActor", diff --git a/packages/vtable-gantt/package.json b/packages/vtable-gantt/package.json index 47a2dc355..c78023f7a 100644 --- a/packages/vtable-gantt/package.json +++ b/packages/vtable-gantt/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vtable-gantt", - "version": "1.9.0", + "version": "1.9.1", "description": "canvas table width high performance", "keywords": [ "vtable-gantt", diff --git a/packages/vtable-search/package.json b/packages/vtable-search/package.json index ccb6b0fd0..c9be76494 100644 --- a/packages/vtable-search/package.json +++ b/packages/vtable-search/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vtable-search", - "version": "1.9.0", + "version": "1.9.1", "description": "The search util of VTable", "author": { "name": "VisActor", diff --git a/packages/vtable/CHANGELOG.json b/packages/vtable/CHANGELOG.json index 8307d7383..921462616 100644 --- a/packages/vtable/CHANGELOG.json +++ b/packages/vtable/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@visactor/vtable", "entries": [ + { + "version": "1.9.1", + "tag": "@visactor/vtable_v1.9.1", + "date": "Sat, 12 Oct 2024 07:07:25 GMT", + "comments": { + "none": [ + { + "comment": "fix: fix sort icon update in merge cell" + } + ] + } + }, { "version": "1.9.0", "tag": "@visactor/vtable_v1.9.0", diff --git a/packages/vtable/CHANGELOG.md b/packages/vtable/CHANGELOG.md index 84dc2349c..b4a1eca1f 100644 --- a/packages/vtable/CHANGELOG.md +++ b/packages/vtable/CHANGELOG.md @@ -1,6 +1,13 @@ # Change Log - @visactor/vtable -This log was last generated on Fri, 11 Oct 2024 11:35:17 GMT and should not be manually modified. +This log was last generated on Sat, 12 Oct 2024 07:07:25 GMT and should not be manually modified. + +## 1.9.1 +Sat, 12 Oct 2024 07:07:25 GMT + +### Updates + +- fix: fix sort icon update in merge cell ## 1.9.0 Fri, 11 Oct 2024 11:35:17 GMT diff --git a/packages/vtable/package.json b/packages/vtable/package.json index 801fd1127..29610bfdb 100644 --- a/packages/vtable/package.json +++ b/packages/vtable/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vtable", - "version": "1.9.0", + "version": "1.9.1", "description": "canvas table width high performance", "keywords": [ "grid", diff --git a/packages/vue-vtable/package.json b/packages/vue-vtable/package.json index 43d886095..6f7122959 100644 --- a/packages/vue-vtable/package.json +++ b/packages/vue-vtable/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vue-vtable", - "version": "1.9.0", + "version": "1.9.1", "description": "The vue version of VTable", "keywords": [ "vue",