Merge pull request #3687 from VisActor/release/1.17.5

[Auto release] release 1.17.5

Author: fangsmile

common/config/rush/version-policies.json

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

docs/assets/changelog/en/release.md

@@ -1,3 +1,22 @@
+# v1.17.4
+
+2025-03-31
+
+
+**🆕 New feature**
+
+- **@visactor/vtable**: add barMarkInBar style config in progressbar [#3616](https://github.com/VisActor/VTable/issues/3616)
+
+**🐛 Bug fix**
+
+- **@visactor/vtable**: fix button style problem [#3614](https://github.com/VisActor/VTable/issues/3614)
+- **@visactor/vtable**: fix checkbox state order update [#3606](https://github.com/VisActor/VTable/issues/3606)
+- **@visactor/vtable**: add isCustom tag for merge cell range [#3504](https://github.com/VisActor/VTable/issues/3504)
+- **@visactor/vtable**: fix tree checkbox state update problem
+- **@visactor/vtable**: disable group title editor
+
+[more detail about v1.17.4](https://github.com/VisActor/VTable/releases/tag/v1.17.4)
+
 # v1.17.3
 
 2025-03-24

docs/assets/changelog/zh/release.md

@@ -1,3 +1,21 @@
+# v1.17.4
+
+2025-03-31
+
+**🆕 新增功能**
+
+- **@visactor/vtable**: 在进度条中添加条形标记样式配置 [#3616](https://github.com/VisActor/VTable/issues/3616)
+
+**🐛 功能修复**
+
+- **@visactor/vtable**: 修复按钮样式问题 [#3614](https://github.com/VisActor/VTable/issues/3614)
+- **@visactor/vtable**: 修复复选框状态顺序更新问题 [#3606](https://github.com/VisActor/VTable/issues/3606)
+- **@visactor/vtable**: 为合并单元格范围添加自定义标记 [#3504](https://github.com/VisActor/VTable/issues/3504)
+- **@visactor/vtable**: 修复树形复选框状态更新问题
+- **@visactor/vtable**: 禁用分组标题编辑器
+
+[更多详情请查看 v1.17.4](https://github.com/VisActor/VTable/releases/tag/v1.17.4)
+
 # v1.17.3
 
 2025-03-24

docs/assets/option/en/common/style-item-define.md

@@ -134,7 +134,20 @@ type CursorPropertyDefine = string | ((args: StylePropertyFunctionArg) => string
 {{ target: common-marked }}
 
 ```
-type MarkedPropertyDefine = boolean | ((args: StylePropertyFunctionArg) => boolean);
+type MarkedPropertyDefine = boolean | MarkCellStyle | ((args: StylePropertyFunctionArg) => boolean | MarkCellStyle);
+
+type MarkCellStyle = {
+  /** 标记背景色 默认蓝色*/
+  bgColor?: CanvasRenderingContext2D['fillStyle'];
+  /** 标记形状 默认'sector' */
+  shape?: 'rect' | 'triangle' | 'sector';
+  /** 标记位置 默认'right-top' */
+  position?: 'left-top' | 'left-bottom' | 'right-top' | 'right-bottom';
+  /** 标记大小 默认10 */
+  size?: number;
+  /** 标记偏移量 默认0 */
+  offset?: number;
+};
 
 ```
 

docs/assets/option/en/common/style.md

@@ -123,10 +123,12 @@ Set whether the text in the cell has a sticking effect 【Text can dynamically a
 When the cell text has an adsorption effect [the text can dynamically adjust its position when scrolling], the basis for adsorption is the horizontal alignment of the cell. For example, when `textStickBaseOnAlign` is `true` and `textAlign` is `'center'`, the text will be adsorbed to the horizontal center of the cell; otherwise, it will be adsorbed to the left or right edge of the cell (depending on the scroll position)
 
 #${prefix} marked(MarkedPropertyDefine)
+
 Set whether the cell has a marked style
 {{ use: common-marked(
   prefix = ${prefix}
   ) }}
+  
 #${prefix} autoWrapText(boolean)
 Set whether the cell's text should automatically wrap
 

docs/assets/option/zh/common/style-item-define.md

@@ -134,8 +134,20 @@ type CursorPropertyDefine = string | ((args: StylePropertyFunctionArg) => string
 {{ target: common-marked }}
 
 ```
-type MarkedPropertyDefine = boolean | ((args: StylePropertyFunctionArg) => boolean);
-
+type MarkedPropertyDefine = boolean | MarkCellStyle | ((args: StylePropertyFunctionArg) => boolean | MarkCellStyle);
+
+type MarkCellStyle = {
+  /** 标记背景色 默认蓝色*/
+  bgColor?: CanvasRenderingContext2D['fillStyle'];
+  /** 标记形状 默认'sector' */
+  shape?: 'rect' | 'triangle' | 'sector';
+  /** 标记位置 默认'right-top' */
+  position?: 'left-top' | 'left-bottom' | 'right-top' | 'right-bottom';
+  /** 标记大小 默认10 */
+  size?: number;
+  /** 标记偏移量 默认0 */
+  offset?: number;
+};
 ```
 
 {{ target: common-colorsDef }}

docs/assets/option/zh/common/style.md

@@ -124,10 +124,12 @@
 当单元格的文本有吸附效果【当滚动时文本可动态调整位置】时，吸附的基准是单元格的水平对齐方式。例如当`textStickBaseOnAlign`为`true`时，`textAlign`为`'center'`时，文本会吸附在单元格的水平中心位置；否则就会吸附在单元格左边缘或右边缘（依据滚动位置决定）。
 
 #${prefix} marked(MarkedPropertyDefine)
+
 设置单元格是否有标记样式
 {{ use: common-marked(
   prefix = ${prefix}
   ) }}
+  
 #${prefix} autoWrapText(boolean)
 设置单元格是否自动换行
 

packages/openinula-vtable/package.json

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

packages/react-vtable/package.json

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

packages/vtable-calendar/package.json

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