Merge remote-tracking branch 'origin/develop' into 3653-feature-pivotTable-corner

fangsmile · fangsmile · commit 680e4df06758 · 2025-04-02T16:31:31.000+08:00
diff --git a/common/changes/@visactor/vtable/3582-feature-fillHandle-function_2025-03-19-10-33.json b/common/changes/@visactor/vtable/3582-feature-fillHandle-function_2025-03-19-10-33.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "refactor: fillHandle function #3582\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "892739385@qq.com"
+}
diff --git a/common/changes/@visactor/vtable/3583-feature-mark-style_2025-03-25-06-30.json b/common/changes/@visactor/vtable/3583-feature-mark-style_2025-03-25-06-30.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "feat: cell support marked function #3583\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "892739385@qq.com"
+}
diff --git a/common/changes/@visactor/vtable/3612-bug-gantt-renderProblem_2025-03-24-08-21.json b/common/changes/@visactor/vtable/3612-bug-gantt-renderProblem_2025-03-24-08-21.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: gantt scale set quarter parser problem #3612\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "892739385@qq.com"
+}
diff --git a/common/changes/@visactor/vtable/3638-bug-gantt-overscrollbehavior_2025-03-28-03-49.json b/common/changes/@visactor/vtable/3638-bug-gantt-overscrollbehavior_2025-03-28-03-49.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: gantt overscrollBehavior none work #3638\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "892739385@qq.com"
+}
diff --git a/common/changes/@visactor/vtable/3639-bug-gantt-createSchedule_2025-03-27-12-11.json b/common/changes/@visactor/vtable/3639-bug-gantt-createSchedule_2025-03-27-12-11.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: gantt chart updateRecords error when table is tree mode #3639\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "892739385@qq.com"
+}
diff --git a/common/changes/@visactor/vtable/3640-bug-adaptive-heightmode_2025-03-26-09-15.json b/common/changes/@visactor/vtable/3640-bug-adaptive-heightmode_2025-03-26-09-15.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: rowHeight error when set adaptive heightMode #3640\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "892739385@qq.com"
+}
diff --git a/common/changes/@visactor/vtable/3661-bug-renderchartasync-setrecords-renderError_2025-03-31-11-43.json b/common/changes/@visactor/vtable/3661-bug-renderchartasync-setrecords-renderError_2025-03-31-11-43.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: when set renderChartAsync setRecords api render error #3661\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "892739385@qq.com"
+}
diff --git a/docs/assets/changelog/en/release.md b/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
diff --git a/docs/assets/changelog/zh/release.md b/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
diff --git a/docs/assets/option/en/common/style-item-define.md b/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;
+};
 
 ```
 
diff --git a/docs/assets/option/en/common/style.md b/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
 
diff --git a/docs/assets/option/zh/common/style-item-define.md b/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 }}
diff --git a/docs/assets/option/zh/common/style.md b/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)
 设置单元格是否自动换行
 
diff --git a/packages/vtable-gantt/src/Gantt.ts b/packages/vtable-gantt/src/Gantt.ts
@@ -782,6 +782,13 @@ export class Gantt extends EventTarget {
     //     index + this.taskListTableInstance.columnHeaderLevelCount
     //   );
     // }
+    if (this.taskListTableInstance.rowHierarchyType === 'tree' && typeof index === 'number') {
+      //如果是树形结构 需要获取数据源对应的索引
+      index = this.taskListTableInstance.getRecordIndexByCell(
+        0,
+        index + this.taskListTableInstance.columnHeaderLevelCount
+      );
+    }
     this.taskListTableInstance.updateRecords([record], [index]);
   }
   /**
diff --git a/packages/vtable-gantt/src/event/scroll.ts b/packages/vtable-gantt/src/event/scroll.ts
@@ -41,7 +41,7 @@ export function handleWhell(
   }
   isWheelEvent && state.resetInteractionState();
   if (
-    event.cancelable &&
+    event.nativeEvent?.cancelable &&
     (state._gantt.parsedOptions.overscrollBehavior === 'none' ||
       (Math.abs(deltaY) >= Math.abs(deltaX) && deltaY !== 0 && isVerticalScrollable(deltaY, state)) ||
       (Math.abs(deltaY) <= Math.abs(deltaX) && deltaX !== 0 && isHorizontalScrollable(deltaX, state)))
diff --git a/packages/vtable-gantt/src/tools/util.ts b/packages/vtable-gantt/src/tools/util.ts
@@ -704,11 +704,9 @@ export function computeCountToTimeScale(
     case 'quarter':
       difference =
         (adjusted_date.getFullYear() - startDate.getFullYear()) * 4 +
-        Math.floor(adjusted_date.getMonth() / 3) -
-        Math.floor(startDate.getMonth() / 3);
+        (adjusted_date.getMonth() - startDate.getMonth()) / 3;
       difference +=
-        (adjusted_date.getTime() - startDate.getTime()) /
-        DayTimes /
+        (adjusted_date.getDate() - startDate.getDate()) /
         (3 * new Date(adjusted_date.getFullYear(), adjusted_date.getMonth() + 1, 0).getDate());
       break;
     case 'year':
diff --git a/packages/vtable/examples/interactive/fill-handle.ts b/packages/vtable/examples/interactive/fill-handle.ts
@@ -82,7 +82,27 @@ export function createTable() {
         columns,
         widthMode: 'standard',
         excelOptions: {
-          fillHandle: true
+          fillHandle: args => {
+            const { selectRanges, table } = args;
+            if (selectRanges.length === 1) {
+              const { start, end } = selectRanges[0];
+              console.log('fillHandle', start, end);
+              const minCol = Math.min(start.col, end.col);
+              const maxCol = Math.max(start.col, end.col);
+              const minRow = Math.min(start.row, end.row);
+              const maxRow = Math.max(start.row, end.row);
+              //判断start到end 所有单元格有没有不能编辑的
+              for (let col = minCol; col <= maxCol; col++) {
+                for (let row = minRow; row <= maxRow; row++) {
+                  if (row === 2 && col === 2) {
+                    return false;
+                  }
+                }
+              }
+              return true;
+            }
+            return false;
+          }
         }
       };
       const tableInstance = new VTable.ListTable(document.getElementById(CONTAINER_ID), option);
diff --git a/packages/vtable/examples/list/list.ts b/packages/vtable/examples/list/list.ts
@@ -62,7 +62,35 @@ export function createTable() {
       title: 'email',
       width: 200,
       sort: true,
+      headerStyle: {
+        marked: {
+          bgColor: 'red',
+          shape: 'rect',
+          position: 'right-top',
+          size: 10,
+          offset: 6
+        }
+      },
       style: {
+        marked: args => {
+          const value = args.value;
+          if (value === '4@xxx.com') {
+            return {
+              bgColor: 'red',
+              shape: 'rect',
+              position: 'right-top',
+              size: 10,
+              offset: 6
+            };
+          }
+          return {
+            bgColor: 'red',
+            shape: 'triangle',
+            position: 'right-top',
+            size: 10,
+            offset: 6
+          };
+        },
         underline: true,
         underlineDash: [2, 0],
         underlineOffset: 3
@@ -191,6 +219,10 @@ export function createTable() {
     container: document.getElementById(CONTAINER_ID),
     emptyTip: true,
     records,
+    rowSeriesNumber: {
+      dragOrder: true
+    },
+
     columns: [
       ...columns
       // ...columns,
diff --git a/packages/vtable/src/ListTable.ts b/packages/vtable/src/ListTable.ts
@@ -55,6 +55,7 @@ import {
 } from './core/record-helper';
 import type { IListTreeStickCellPlugin, ListTreeStickCellPlugin } from './plugins/list-tree-stick-cell';
 import { fixUpdateRowRange } from './tools/update-row';
+import { clearChartRenderQueue } from './scenegraph/graphic/contributions/chart-render-helper';
 // import {
 //   registerAxis,
 //   registerEmptyTip,
@@ -1158,6 +1159,7 @@ export class ListTable extends BaseTable implements ListTableAPI {
    * @param option 附近参数，其中的sortState为排序状态，如果设置null 将清除目前的排序状态
    */
   setRecords(records: Array<any>, option?: { sortState?: SortState | SortState[] | null }): void {
+    clearChartRenderQueue();
     // 释放事件 及 对象
     this.internalProps.dataSource?.release();
     // 过滤掉dataSource的引用
diff --git a/packages/vtable/src/PivotChart.ts b/packages/vtable/src/PivotChart.ts
@@ -73,7 +73,7 @@ import {
   registerVideoCell
 } from './scenegraph/group-creater/cell-type';
 import { hasLinearAxis } from './layout/chart-helper/get-axis-config';
-import { cacheStageCanvas } from './scenegraph/graphic/contributions/chart-render-helper';
+import { cacheStageCanvas, clearChartRenderQueue } from './scenegraph/graphic/contributions/chart-render-helper';
 
 registerAxis();
 registerEmptyTip();
@@ -1529,6 +1529,8 @@ export class PivotChart extends BaseTable implements PivotChartAPI {
    * @param sort
    */
   setRecords(records: Array<any>): void {
+    this.internalProps.layoutMap.release();
+    clearChartRenderQueue();
     const oldHoverState = { col: this.stateManager.hover.cellPos.col, row: this.stateManager.hover.cellPos.row };
     this.options.records = this.internalProps.records = records;
     const options = this.options;
diff --git a/packages/vtable/src/PivotTable.ts b/packages/vtable/src/PivotTable.ts
@@ -53,6 +53,7 @@ import {
 import type { IEmptyTipComponent } from './components/empty-tip/empty-tip';
 import { Factory } from './core/factory';
 import { callUpdateColOnScenegraph, callUpdateRowOnScenegraph } from './tools/diff-cell';
+import { clearChartRenderQueue } from './scenegraph/graphic/contributions/chart-render-helper';
 
 export class PivotTable extends BaseTable implements PivotTableAPI {
   layoutNodeId: { seqId: number } = { seqId: 0 };
@@ -1697,6 +1698,7 @@ export class PivotTable extends BaseTable implements PivotTableAPI {
    * @param sort
    */
   setRecords(records: Array<any>): void {
+    clearChartRenderQueue();
     const oldHoverState = { col: this.stateManager.hover.cellPos.col, row: this.stateManager.hover.cellPos.row };
     this.options.records = this.internalProps.records = records;
     this.internalProps.recordsIsTwoDimensionalArray = false;
diff --git a/packages/vtable/src/core/BaseTable.ts b/packages/vtable/src/core/BaseTable.ts
diff --git a/packages/vtable/src/event/event.ts b/packages/vtable/src/event/event.ts
diff --git a/packages/vtable/src/scenegraph/graphic/contributions/chart-render-helper.ts b/packages/vtable/src/scenegraph/graphic/contributions/chart-render-helper.ts
diff --git a/packages/vtable/src/scenegraph/graphic/mark.ts b/packages/vtable/src/scenegraph/graphic/mark.ts
diff --git a/packages/vtable/src/scenegraph/group-creater/cell-helper.ts b/packages/vtable/src/scenegraph/group-creater/cell-helper.ts
diff --git a/packages/vtable/src/scenegraph/group-creater/cell-type/text-cell.ts b/packages/vtable/src/scenegraph/group-creater/cell-type/text-cell.ts
diff --git a/packages/vtable/src/scenegraph/group-creater/progress/proxy.ts b/packages/vtable/src/scenegraph/group-creater/progress/proxy.ts
diff --git a/packages/vtable/src/scenegraph/select/update-select-border.ts b/packages/vtable/src/scenegraph/select/update-select-border.ts
diff --git a/packages/vtable/src/ts-types/base-table.ts b/packages/vtable/src/ts-types/base-table.ts
diff --git a/packages/vtable/src/ts-types/style-define.ts b/packages/vtable/src/ts-types/style-define.ts
