VisActor · fangsmile · Dec 23, 2024 · Dec 20, 2024 · Dec 20, 2024 · Dec 20, 2024
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.0","mainProject":"@visactor/vtable","nextBump":"minor"}]
+[{"definitionName":"lockStepVersion","policyName":"vtableMain","version":"1.14.1","mainProject":"@visactor/vtable","nextBump":"patch"}]
diff --git a/docs/assets/changelog/en/release.md b/docs/assets/changelog/en/release.md
@@ -1,3 +1,37 @@
+# v1.14.0
+
+2024-12-20
+
+**🆕 New feature**
+
+- **@visactor/vtable-gantt**: add contextmenu_task_bar event [#3013](https://github.com/VisActor/VTable/issues/3013)
+- **@visactor/vtable-gantt**: add milestone type [#3097](https://github.com/VisActor/VTable/issues/3097)
+- **@visactor/vtable**: add mergeCell function to support more detailed conditions
+- **@visactor/vtable**: support tickAlign in PivotChart
+- **@visactor/vtable-gantt**: add updateMarkLine
+- **@visactor/vtable**: add enums in validateValue of vtable-editor [#3039](https://github.com/VisActor/VTable/issues/3039)
+
+**🐛 Bug fix**
+
+- **@visactor/vtable**: validateValue not promise case can not be recalled [#3144](https://github.com/VisActor/VTable/issues/3144)
+- **@visactor/vtable**: adjust scroll hot area limited on table group [#3152](https://github.com/VisActor/VTable/issues/3152)
+- **@visactor/vtable**: fix react-component update in tree table
+- **@visactor/vtable**: fix customStyle update not work [#3068](https://github.com/VisActor/VTable/issues/3068)
+- **@visactor/vtable**: fix font-weight in vtable-export [#3005](https://github.com/VisActor/VTable/issues/3005)
+- **@visactor/vtable**: fix graphic html attribute error
+- **@visactor/vtable**: application define in react-vtable umd file [#3093](https://github.com/VisActor/VTable/issues/3093)
+- **@visactor/vtable**: fix customRender error in react-vtable [#3142](https://github.com/VisActor/VTable/issues/3142)
+- **@visactor/vtable**: fix group title link click [#3022](https://github.com/VisActor/VTable/issues/3022)
+- **@visactor/vtable**: fix cell group judgement when scroll [#3149](https://github.com/VisActor/VTable/issues/3149)
+- **@visactor/vtable**: fix undeline height in text measurement [#3112](https://github.com/VisActor/VTable/issues/3112)
+- **@visactor/vtable**: change checkboxState into Map
+
+**🔨 Refactor**
+
+- **@visactor/vtable**: customComputeRowHeight logic
+
+[more detail about v1.14.0](https://github.com/VisActor/VTable/releases/tag/v1.14.0)
+
 # v1.13.2
 
 2024-12-16

diff --git a/docs/assets/changelog/zh/release.md b/docs/assets/changelog/zh/release.md
@@ -1,3 +1,37 @@
+# v1.14.0
+
+2024-12-20
+
+**🆕 新增功能**
+
+- **@visactor/vtable-gantt**：甘特图添加 contextmenu_task_bar 事件 #3013
+- **@visactor/vtable-gantt**：甘特图添加里程碑类型 #3097
+- **@visactor/vtable**：添加合并单元格功能以支持更详细的条件
+- **@visactor/vtable**：在数据透视表中支持刻度对齐
+- **@visactor/vtable-gantt**：添加更新标记线接口
+- **@visactor/vtable**：在 vtable 编辑器的 validateValue 中添加枚举类型 #3039
+
+**🐛 修复**
+
+- **@visactor/vtable**：validateValue 非 Promise 情况无法被回调 #3144
+- **@visactor/vtable**：调整表格组上的滚动热区限制 #3152
+- **@visactor/vtable**：修复树状表格中 React 组件的更新问题
+- **@visactor/vtable**：修复自定义样式更新不生效的问题 #3068
+- **@visactor/vtable**：修复 vtable 导出中的字体粗细问题 #3005
+- **@visactor/vtable**：修复图形 HTML 属性错误
+- **@visactor/vtable**：在 react-vtable 的 UMD 文件中定义应用程序 #3093
+- **@visactor/vtable**：修复 react-vtable 中的自定义渲染错误 #3142
+- **@visactor/vtable**：修复组标题链接点击问题 #3022
+- **@visactor/vtable**：修复滚动时单元格组判断问题 #3149
+- **@visactor/vtable**：修复文本测量中的下划线高度问题 #3112
+- **@visactor/vtable**：将 checkboxState 改为 Map 类型
+
+**🔨 重构**
+
+- **@visactor/vtable**：自定义计算行高逻辑
+
+[更多详情请查看 v1.14.0](https://github.com/VisActor/VTable/releases/tag/v1.14.0)
+
 # v1.13.2
 
 2024-12-16

diff --git a/docs/assets/demo-openinula/en/custom-layout/custom-layout.md b/docs/assets/demo-openinula/en/custom-layout/custom-layout.md
@@ -10,7 +10,7 @@ option: ListTable-columns-text#customLayout
 
 # custom layout
 
-You can use jsx in customLayout to customize the layout. For details, please refer to [Custom Layout](../guide/custom_define/custom_layout)
+You can use jsx in customLayout to customize the layout. For details, please refer to [Custom Layout](../../guide/custom_define/custom_layout)
 
 ## code demo
 

diff --git a/docs/assets/demo-openinula/zh/custom-layout/custom-layout.md b/docs/assets/demo-openinula/zh/custom-layout/custom-layout.md
@@ -10,7 +10,7 @@ option: ListTable-columns-text#customLayout
 
 # custom layout
 
-可以在 customLayout 中使用 jsx 进行自定义布局，具体可以参考[自定义布局](../guide/custom_define/custom_layout)
+可以在 customLayout 中使用 jsx 进行自定义布局，具体可以参考[自定义布局](../../guide/custom_define/custom_layout)
 
 ## 代码演示
 

diff --git a/docs/assets/demo-react/en/custom-layout/cell-custom-component.md b/docs/assets/demo-react/en/custom-layout/cell-custom-component.md
@@ -9,7 +9,7 @@ link: custom_define/react-custom-component
 
 # cell custom component
 
-Like customLayout, you can use react components to customize layout. For details, please refer to [Custom Components](../guide/custom_define/react-custom-component)
+Like customLayout, you can use react components to customize layout. For details, please refer to [Custom Components](../../guide/custom_define/react-custom-component)
 
 ## code demo
 

diff --git a/docs/assets/demo-react/en/custom-layout/cell-custom-dom.md b/docs/assets/demo-react/en/custom-layout/cell-custom-dom.md
@@ -9,7 +9,7 @@ link: '../../guide/custom_define/react-custom-component'
 
 # cell custom dom component
 
-Use ArcoDesign in cells. For details, please refer to [Custom Components](../guide/custom_define/react-custom-component)
+Use ArcoDesign in cells. For details, please refer to [Custom Components](../../guide/custom_define/react-custom-component)
 
 ## code demo
 

diff --git a/docs/assets/demo-react/en/custom-layout/cell-custom-layout-dom.md b/docs/assets/demo-react/en/custom-layout/cell-custom-layout-dom.md
@@ -9,7 +9,7 @@ link: custom_define/react-custom-component
 
 # cell custom component + dom component
 
-Use ArcoDesign in the cell pop-up window. For details, please refer to [Custom Components](../guide/custom_define/react-custom-component)
+Use ArcoDesign in the cell pop-up window. For details, please refer to [Custom Components](../../guide/custom_define/react-custom-component)
 
 ## code demo
 

diff --git a/docs/assets/demo-react/zh/custom-layout/cell-custom-component.md b/docs/assets/demo-react/zh/custom-layout/cell-custom-component.md
@@ -9,7 +9,7 @@ link: custom_define/react-custom-component
 
 # 单元格自定义组件
 
-同 customLayout 一样，可以使用 react 组件进行自定义布局，具体可以参考[自定义组件](../guide/custom_define/react-custom-component)
+同 customLayout 一样，可以使用 react 组件进行自定义布局，具体可以参考[自定义组件](../../guide/custom_define/react-custom-component)
 
 ## 代码演示
 

diff --git a/docs/assets/demo-react/zh/custom-layout/cell-custom-dom.md b/docs/assets/demo-react/zh/custom-layout/cell-custom-dom.md
@@ -9,7 +9,7 @@ link: '../../guide/custom_define/react-custom-component'
 
 # 单元格内dom组件
 
-在单元格内使用ArcoDesign，具体可以参考[自定义组件](../guide/custom_define/react-custom-component)
+在单元格内使用ArcoDesign，具体可以参考[自定义组件](../../guide/custom_define/react-custom-component)
 
 ## 代码演示
 

diff --git a/docs/assets/demo-react/zh/custom-layout/cell-custom-layout-dom.md b/docs/assets/demo-react/zh/custom-layout/cell-custom-layout-dom.md
@@ -9,7 +9,7 @@ link: custom_define/react-custom-component
 
 # 单元格自定义组件+dom 组件
 
-在单元格弹窗使用 ArcoDesign，具体可以参考[自定义组件](../guide/custom_define/react-custom-component)
+在单元格弹窗使用 ArcoDesign，具体可以参考[自定义组件](../../guide/custom_define/react-custom-component)
 
 ## 代码演示
 

diff --git a/docs/assets/demo-vue/en/custom-layout/cell-custom-component.md b/docs/assets/demo-vue/en/custom-layout/cell-custom-component.md
@@ -9,7 +9,7 @@ link: Developer_Ecology/vue
 
 # Custom Cell Component
 
-Similar to customLayout, you can use Vue components for custom layouts. For more details, refer to [Custom Component](../guide/Developer_Ecology/react-custom-component).
+Similar to customLayout, you can use Vue components for custom layouts. For more details, refer to [Custom Component](../../guide/Developer_Ecology/react-custom-component).
 
 ## Code Demonstration
 

diff --git a/docs/assets/demo-vue/zh/custom-layout/cell-custom-component.md b/docs/assets/demo-vue/zh/custom-layout/cell-custom-component.md
@@ -9,7 +9,7 @@ link: Developer_Ecology/vue
 
 # 单元格自定义组件
 
-同 customLayout 一样，可以使用 vue 组件进行自定义布局，具体可以参考[自定义组件](../guide/Developer_Ecology/react-custom-component)
+同 customLayout 一样，可以使用 vue 组件进行自定义布局，具体可以参考[自定义组件](../../guide/Developer_Ecology/react-custom-component)
 
 ## 代码演示
 

diff --git a/docs/assets/demo/en/custom-render/custom-cell-layout-jsx.md b/docs/assets/demo/en/custom-render/custom-cell-layout-jsx.md
@@ -127,7 +127,7 @@ const option = {
                     if (stateName === 'hover') {
                       return {
                         background: {
-                          fill: '#ccc',
+                          fill: '#c90',
                           cornerRadius: 5,
                           expandX: 1,
                           expandY: 1

diff --git a/docs/assets/demo/en/gantt/gantt-basic.md b/docs/assets/demo/en/gantt/gantt-basic.md
@@ -646,7 +646,7 @@ const option = {
     }
   },
   grid: {
-    // backgroundColor: 'gray',
+    weekendBackgroundColor: '#f8f8f8',
     verticalLine: {
       lineWidth: 1,
       lineColor: '#e1e4e8'
@@ -696,7 +696,7 @@ const option = {
     }
   },
   timelineHeader: {
-    colWidth: 100,
+    colWidth: 50,
     backgroundColor: '#EEF1F5',
     horizontalLine: {
       lineWidth: 1,

diff --git a/docs/assets/demo/en/gantt/gantt-table-mergeCell.md b/docs/assets/demo/en/gantt/gantt-table-mergeCell.md
@@ -30,6 +30,17 @@ VTableGantt.VTable.register.editor('input', input_editor);
 VTableGantt.VTable.register.editor('date-input', date_input_editor);
 const barColors0 = ['#aecde6', '#c6a49a', '#ffb582', '#eec1de', '#b3d9b3', '#d9d1a5', '#cccccc', '#e59a9c', '#c9bede'];
 const barColors = ['#1f77b4', '#8c564b', '#ff7f0e', '#e377c2', '#2ca02c', '#bcbd22', '#7f7f7f', '#d62728', '#9467bd'];
+const bgColors = [
+  'rgba(174,205,230,0.4)',
+  'rgba(198,164,154,0.4)',
+  'rgba(255,181,130,0.4)',
+  'rgba(238,193,222,0.4)',
+  'rgba(179,217,179,0.4)',
+  'rgba(217,209,165,0.4)',
+  'rgba(204,204,204,0.4)',
+  'rgba(229,154,156,0.4)',
+  'rgba(201,190,222,0.4)'
+];
 
 let ganttInstance;
 const records = [
@@ -245,7 +256,16 @@ const option = {
     theme: {
       bodyStyle: {
         padding: 5,
-        bgColor: 'white'
+        color(args) {
+          const { row } = args;
+          const bgColor = barColors[(row - 1) % 9];
+          return bgColor;
+        },
+        bgColor(args) {
+          const { row } = args;
+          const bgColor = bgColors[(row - 1) % 9];
+          return bgColor;
+        }
       },
       headerStyle: {
         color: 'white'
@@ -263,6 +283,7 @@ const option = {
     verticalSplitLineMoveable: false
   },
   grid: {
+    horizontalBackgroundColor: bgColors,
     horizontalLine: {
       lineWidth: 1,
       lineColor: '#e1e4e8'

diff --git a/docs/assets/demo/zh/custom-render/custom-cell-layout-jsx.md b/docs/assets/demo/zh/custom-render/custom-cell-layout-jsx.md
@@ -127,7 +127,7 @@ const option = {
                     if (stateName === 'hover') {
                       return {
                         background: {
-                          fill: '#ccc',
+                          fill: '#c90',
                           cornerRadius: 5,
                           expandX: 1,
                           expandY: 1

diff --git a/docs/assets/demo/zh/gantt/gantt-basic.md b/docs/assets/demo/zh/gantt/gantt-basic.md
@@ -646,7 +646,7 @@ const option = {
     }
   },
   grid: {
-    // backgroundColor: 'gray',
+    weekendBackgroundColor: '#f8f8f8',
     verticalLine: {
       lineWidth: 1,
       lineColor: '#e1e4e8'
@@ -696,7 +696,7 @@ const option = {
     }
   },
   timelineHeader: {
-    colWidth: 100,
+    colWidth: 50,
     backgroundColor: '#EEF1F5',
     horizontalLine: {
       lineWidth: 1,

diff --git a/docs/assets/demo/zh/gantt/gantt-table-mergeCell.md b/docs/assets/demo/zh/gantt/gantt-table-mergeCell.md
@@ -30,6 +30,17 @@ VTableGantt.VTable.register.editor('input', input_editor);
 VTableGantt.VTable.register.editor('date-input', date_input_editor);
 const barColors0 = ['#aecde6', '#c6a49a', '#ffb582', '#eec1de', '#b3d9b3', '#d9d1a5', '#cccccc', '#e59a9c', '#c9bede'];
 const barColors = ['#1f77b4', '#8c564b', '#ff7f0e', '#e377c2', '#2ca02c', '#bcbd22', '#7f7f7f', '#d62728', '#9467bd'];
+const bgColors = [
+  'rgba(174,205,230,0.4)',
+  'rgba(198,164,154,0.4)',
+  'rgba(255,181,130,0.4)',
+  'rgba(238,193,222,0.4)',
+  'rgba(179,217,179,0.4)',
+  'rgba(217,209,165,0.4)',
+  'rgba(204,204,204,0.4)',
+  'rgba(229,154,156,0.4)',
+  'rgba(201,190,222,0.4)'
+];
 
 let ganttInstance;
 const records = [
@@ -245,7 +256,16 @@ const option = {
     theme: {
       bodyStyle: {
         padding: 5,
-        bgColor: 'white'
+        color(args) {
+          const { row } = args;
+          const bgColor = barColors[(row - 1) % 9];
+          return bgColor;
+        },
+        bgColor(args) {
+          const { row } = args;
+          const bgColor = bgColors[(row - 1) % 9];
+          return bgColor;
+        }
       },
       headerStyle: {
         color: 'white'
@@ -263,6 +283,7 @@ const option = {
     verticalSplitLineMoveable: false
   },
   grid: {
+    horizontalBackgroundColor: bgColors,
     horizontalLine: {
       lineWidth: 1,
       lineColor: '#e1e4e8'

diff --git a/docs/assets/guide/en/custom_define/react-custom-component.md b/docs/assets/guide/en/custom_define/react-custom-component.md
@@ -796,7 +796,7 @@ The following properties are also supported in react:
   * 'bottom-left'
   * 'center'
 
-We recommend that users use the meta tags provided by react-vtable for the content displayed in the cell. For pop-ups, menus and other components triggered in the cell, you can use DOM react components. This is the best performance solution. [Reference example](../../demo-react/component/custom-layout).
+We recommend that users use the meta tags provided by react-vtable for the content displayed in the cell. For pop-ups, menus and other components triggered in the cell, you can use DOM react components. This is the best performance solution. [Reference example](../../demo-react/component/cell-custom-component).
 
 If you need to display content in a cell, use DOM react components. You need to specify `react.container` according to the restrictions on components displayed in the table content area. It should be noted that this method requires frequent updates of component-related DOM, which will have a certain impact on performance. You can refer to [custom layout](../custom_define/custom_layout). We strongly recommend that the content components in the cell use the meta tags provided by react-vtable, which is the best solution for performance.
 

diff --git a/docs/assets/guide/zh/custom_define/react-custom-component.md b/docs/assets/guide/zh/custom_define/react-custom-component.md
@@ -127,7 +127,7 @@ const CustomLayoutComponent = (props: CustomLayoutFunctionArg & { text: string }
 * Circle 圆
 * Group 图元组
 
-具体配置属性可以参考[`VRender图元配置`](https://visactor.io/vrender/option/Group)，具体使用和布局可以参考[自定义布局](../custom_define/custom_layout)，[参考示例](../../demo-react/component/custom-layout)。
+具体配置属性可以参考[`VRender图元配置`](https://visactor.io/vrender/option/Group)，具体使用和布局可以参考[自定义布局](../custom_define/custom_layout)，[参考示例](../../demo-react/component/cell-custom-component)。
 
 <div style="display: flex; justify-content: center;">
   <img src="https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/custom-cell-layout-jsx.png" style="flex: 0 0 50%; padding: 10px;">

diff --git a/docs/assets/option/en/common/gantt/grid.md b/docs/assets/option/en/common/gantt/grid.md
@@ -5,7 +5,15 @@ The IGrid definition is as follows:
 ```
 export interface IGrid {
   backgroundColor?: string;
+  /** 需要按数据行设置不同背景色 */
+  horizontalBackgroundColor?: string[] | ((args: GridHorizontalLineStyleArgumentType) => string);
+  /** 需要按日期列设置不同背景色 */
+  verticalBackgroundColor?: string[] | ((args: GridVerticalLineStyleArgumentType) => string);
+  /** 周末背景色 */
+  weekendBackgroundColor?: string;
+  /** 垂直间隔线样式 */
   verticalLine?: ILineStyle | ((args: GridVerticalLineStyleArgumentType) => ILineStyle);
+  /** 水平间隔线样式 */
   horizontalLine?: ILineStyle | ((args: GridHorizontalLineStyleArgumentType) => ILineStyle);
 }
 
@@ -19,6 +27,13 @@ export type GridVerticalLineStyleArgumentType = {
   ganttInstance: Gantt;
 };
 
+
+export type GridHorizontalLineStyleArgumentType = {
+  /** 横线是第几条线 也代表了左侧表格的body行号 */
+  index: number;
+  ganttInstance: Gantt;
+};
+
 ```
 
 ${prefix} backgroundColor(string)
@@ -27,6 +42,22 @@ Background color of the grid line area
 
 Optional
 
+${prefix} weekendBackgroundColor(string)
+
+Optional
+
+${prefix} horizontalBackgroundColor(string)
+
+Requires setting different background colors horizontally by data rows.
+
+Optional
+
+${prefix} verticalBackgroundColor(string)
+
+Requires setting different background colors vertically by date columns.
+
+Optional
+
 ${prefix} verticalLine(ILineStyle | Function)
 
 Vertical interval line style

diff --git a/docs/assets/option/en/table/listTable.md b/docs/assets/option/en/table/listTable.md
@@ -152,3 +152,7 @@ Code VTable internally calculates the row height. Users can customize the method
 ```
 customComputeRowHeight?: (computeArgs: { row: number; table: ListTableAPI }) => number|'auto'|undefined;
 ```
+
+## tableSizeAntiJitter(boolean) = false
+
+If the table jitter occurs, check whether the width and height of the upper dom container are caused by decimal numbers. If it is not guaranteed to be an integer, set this configuration item to true
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"definitionName":"lockStepVersion","policyName":"vtableMain","version":"1.14.0","mainProject":"@visactor/vtable","nextBump":"minor"}]
		[{"definitionName":"lockStepVersion","policyName":"vtableMain","version":"1.14.1","mainProject":"@visactor/vtable","nextBump":"patch"}]