@visactor/vtable-gantt 1.7.3 → 1.7.4

package/cjs/index.d.ts

@@ -3,5 +3,5 @@ import * as TYPES from './ts-types';
 import type { ColumnDefine, ColumnsDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, TextAlignType, TextBaselineType } from '@visactor/vtable';
 import { Gantt } from './Gantt';
 import * as tools from './tools';
-export declare const version = "1.7.3";
+export declare const version = "1.7.4";
 export { TYPES, GanttConstructorOptions, Gantt, ColumnsDefine, ColumnDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, TextAlignType, TextBaselineType, tools };

package/cjs/index.js

@@ -44,5 +44,5 @@ Object.defineProperty(exports, "Gantt", {
 
 const tools = __importStar(require("./tools"));
 
-exports.tools = tools, exports.version = "1.7.3";
+exports.tools = tools, exports.version = "1.7.4";
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAqBlC,sBAAK;AAPP,mCAAgC;AAS9B,sFATO,aAAK,OASP;AARP,+CAAiC;AAoB/B,sBAAK;AAnBM,QAAA,OAAO,GAAG,OAAO,CAAC","file":"index.js","sourcesContent":["import type { GanttConstructorOptions } from './ts-types';\nimport * as TYPES from './ts-types';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType\n} from '@visactor/vtable';\nimport { Gantt } from './Gantt';\nimport * as tools from './tools';\nexport const version = \"1.7.3\";\n/**\n * @namespace VTable\n */\nexport {\n  TYPES,\n  GanttConstructorOptions,\n  Gantt,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  tools\n};\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAqBlC,sBAAK;AAPP,mCAAgC;AAS9B,sFATO,aAAK,OASP;AARP,+CAAiC;AAoB/B,sBAAK;AAnBM,QAAA,OAAO,GAAG,OAAO,CAAC","file":"index.js","sourcesContent":["import type { GanttConstructorOptions } from './ts-types';\nimport * as TYPES from './ts-types';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType\n} from '@visactor/vtable';\nimport { Gantt } from './Gantt';\nimport * as tools from './tools';\nexport const version = \"1.7.4\";\n/**\n * @namespace VTable\n */\nexport {\n  TYPES,\n  GanttConstructorOptions,\n  Gantt,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  tools\n};\n"]}

package/dist/vtable-gantt.js

@@ -21758,7 +21758,7 @@
     }(AggregationType || (AggregationType = {}));
     var SortType;
     !function (SortType) {
-      SortType.ASC = "ASC", SortType.DESC = "DESC";
+      SortType.ASC = "ASC", SortType.DESC = "DESC", SortType.NORMAL = "NORMAL", SortType.desc = "desc", SortType.asc = "asc", SortType.normal = "normal";
     }(SortType || (SortType = {}));
 
     var IconPosition;
@@ -24390,7 +24390,7 @@
         return this._formatedValue || (this.formatFun ? this._formatedValue = this.formatFun(this.value(), col, row, table) : this._formatedValue = this.value()), this._formatedValue;
       }
       reset() {
-        this.records = [];
+        this.records = [], this.clearCacheValue();
       }
     }
     class RecordAggregator extends Aggregator {
@@ -24447,14 +24447,15 @@
       push(record) {
         if (record) if (this.isRecord && this.records && ("Aggregator" === record.className ? this.records.push(...record.records) : this.records.push(record)), "Aggregator" === record.className) {
           const value = record.value();
-          this.sum += value, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum += value : value < 0 && (this.nagetiveSum += value));
+          this.sum += null != value ? value : 0, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum += value : value < 0 && (this.nagetiveSum += value));
         } else if (this.field && !isNaN(parseFloat(record[this.field]))) {
           const value = parseFloat(record[this.field]);
           this.sum += value, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum += value : value < 0 && (this.nagetiveSum += value));
         }
       }
       value() {
-        return this.sum;
+        var _a;
+        return (null === (_a = this.records) || void 0 === _a ? void 0 : _a.length) >= 1 ? this.sum : void 0;
       }
       positiveValue() {
         return this.positiveSum;
@@ -24463,14 +24464,14 @@
         return this.nagetiveSum;
       }
       reset() {
-        this.records = [], this.sum = 0;
+        super.reset(), this.records = [], this.sum = 0;
       }
       recalculate() {
         if (this.sum = 0, this._formatedValue = void 0, this.records) for (let i = 0; i < this.records.length; i++) {
           const record = this.records[i];
           if ("Aggregator" === record.className) {
             const value = record.value();
-            this.sum += value, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum += value : value < 0 && (this.nagetiveSum += value));
+            this.sum += null != value ? value : 0, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum += value : value < 0 && (this.nagetiveSum += value));
           } else if (this.field && !isNaN(parseFloat(record[this.field]))) {
             const value = parseFloat(record[this.field]);
             this.sum += value, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum += value : value < 0 && (this.nagetiveSum += value));
@@ -24506,7 +24507,8 @@
         record && (this.isRecord && this.records && ("Aggregator" === record.className ? this.records.push(...record.records) : this.records.push(record)), "Aggregator" === record.className && record.type === AggregationType.AVG ? (this.sum += record.sum, this.count += record.count) : this.field && !isNaN(parseFloat(record[this.field])) && (this.sum += parseFloat(record[this.field]), this.count++));
       }
       value() {
-        return this.sum / this.count;
+        var _a;
+        return (null === (_a = this.records) || void 0 === _a ? void 0 : _a.length) >= 1 ? this.sum / this.count : void 0;
       }
       reset() {
         this.records = [], this.sum = 0, this.count = 0;
@@ -24526,7 +24528,8 @@
         record && (this.isRecord && this.records && ("Aggregator" === record.className ? this.records.push(...record.records) : this.records.push(record)), "Aggregator" === record.className ? this.max = record.max > this.max ? record.max : this.max : "number" == typeof record ? this.max = record > this.max ? record : this.max : this.field && "number" == typeof record[this.field] ? this.max = record[this.field] > this.max ? record[this.field] : this.max : this.field && !isNaN(record[this.field]) && (this.max = parseFloat(record[this.field]) > this.max ? parseFloat(record[this.field]) : this.max));
       }
       value() {
-        return this.max;
+        var _a;
+        return (null === (_a = this.records) || void 0 === _a ? void 0 : _a.length) >= 1 ? this.max : void 0;
       }
       reset() {
         this.records = [], this.max = Number.MIN_SAFE_INTEGER;
@@ -24546,7 +24549,8 @@
         record && (this.isRecord && this.records && ("Aggregator" === record.className ? this.records.push(...record.records) : this.records.push(record)), "Aggregator" === record.className ? this.min = record.min < this.min ? record.min : this.min : "number" == typeof record ? this.min = record < this.min ? record : this.min : this.field && "number" == typeof record[this.field] && (this.min = record[this.field] < this.min ? record[this.field] : this.min));
       }
       value() {
-        return this.min;
+        var _a;
+        return (null === (_a = this.records) || void 0 === _a ? void 0 : _a.length) >= 1 ? this.min : void 0;
       }
       reset() {
         this.records = [], this.min = Number.MAX_SAFE_INTEGER;
@@ -25221,7 +25225,7 @@
             aggregationFun: (values, records, field) => {
               const groupMap = new Map(),
                 groupResult = [];
-              for (let i = 0; i < records.length; i++) dealWithGroup(records[i], groupResult, groupMap, groupByKeys, 0);
+              for (let i = 0; i < records.length; i++) dealWithGroup(records[i], groupResult, groupMap, groupByKeys, 0), records[i].vtableOriginIndex = i;
               return groupResult;
             }
           }), this.fieldAggregators.push(this.groupAggregator);
@@ -25269,15 +25273,18 @@
       const groupByKey = groupByKeys[level];
       if (!isValid$1(groupByKey)) return void children.push(record);
       const value = record[groupByKey];
-      if (void 0 !== value) if (map.has(value)) {
-        const index = map.get(value);
-        dealWithGroup(record, children[index].children, children[index].map, groupByKeys, level + 1);
-      } else map.set(value, children.length), children.push({
-        vtableMerge: !0,
-        vtableMergeName: value,
-        children: [],
-        map: new Map()
-      }), dealWithGroup(record, children[children.length - 1].children, children[children.length - 1].map, groupByKeys, level + 1);
+      if (void 0 !== value) {
+        if (map.has(value)) {
+          const index = map.get(value);
+          return dealWithGroup(record, children[index].children, children[index].map, groupByKeys, level + 1);
+        }
+        return map.set(value, children.length), children.push({
+          vtableMerge: !0,
+          vtableMergeName: value,
+          children: [],
+          map: new Map()
+        }), dealWithGroup(record, children[children.length - 1].children, children[children.length - 1].map, groupByKeys, level + 1);
+      }
     }
     function syncGroupCollapseState(oldSource, newSource, oldGroupMap, newGroupMap) {
       if (!oldGroupMap) {
@@ -28213,7 +28220,7 @@
             const cellLocation = scene.table.getCellLocation(col, row),
               {
                 vtableMerge: vtableMerge
-              } = scene.table.getCellRawRecord(col, row);
+              } = scene.table.getCellRawRecord(col, row) || {};
             if (vtableMerge && scene.table.options.groupTitleCustomLayout) customLayout = scene.table.options.groupTitleCustomLayout;else if ("body" !== cellLocation) {
               const define = scene.table.getHeaderDefine(col, row);
               customRender = null == define ? void 0 : define.headerCustomRender, customLayout = null == define ? void 0 : define.headerCustomLayout;
@@ -28417,7 +28424,7 @@
             const cellType = scene.table.getCellLocation(col, row),
               {
                 vtableMerge: vtableMerge
-              } = scene.table.getCellRawRecord(col, row);
+              } = scene.table.getCellRawRecord(col, row) || {};
             if (vtableMerge && scene.table.options.groupTitleCustomLayout) customLayout = scene.table.options.groupTitleCustomLayout;else if ("body" !== cellType) {
               const define = scene.table.getHeaderDefine(col, row);
               customRender = null == define ? void 0 : define.headerCustomRender, customLayout = null == define ? void 0 : define.headerCustomLayout;
@@ -30385,76 +30392,37 @@
       constructor() {
         this.time = BaseRenderContributionTime.beforeFillStroke, this.useStyle = !0, this.order = 0;
       }
-      drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb, doFillOrStroke) {
+      drawShape(group, context, xOrigin, yOrigin, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb, doFillOrStroke) {
         var _a, _b, _c, _d, _e, _f;
         const table = group.stage.table;
         if (table) if ("body" === group.role) {
-          const x = -(null !== (_a = group.attribute.x) && void 0 !== _a ? _a : 0) + table.getFrozenColsWidth(),
-            y = -(null !== (_b = group.attribute.y) && void 0 !== _b ? _b : 0) + table.getFrozenRowsHeight(),
-            width = group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth(),
-            height = group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();
-          context.beginPath(), context.rect(x, y, width, height);
+          drawClipRect(context, -(null !== (_a = group.attribute.x) && void 0 !== _a ? _a : 0) + table.getFrozenColsWidth(), -(null !== (_b = group.attribute.y) && void 0 !== _b ? _b : 0) + table.getFrozenRowsHeight(), group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth(), group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight());
         } else if ("row-header" === group.role) {
-          const x = 0,
-            y = -(null !== (_c = group.attribute.y) && void 0 !== _c ? _c : 0) + table.getFrozenRowsHeight(),
-            width = table.getFrozenColsWidth(),
-            height = group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();
-          context.beginPath(), context.rect(x, y, width, height);
+          drawClipRect(context, 0, -(null !== (_c = group.attribute.y) && void 0 !== _c ? _c : 0) + table.getFrozenRowsHeight(), table.getFrozenColsWidth(), group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight());
         } else if ("col-header" === group.role) {
-          const x = -(null !== (_d = group.attribute.x) && void 0 !== _d ? _d : 0) + table.getFrozenColsWidth(),
-            y = 0,
-            width = group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth(),
-            height = table.getFrozenRowsHeight();
-          context.beginPath(), context.rect(x, y, width, height);
+          drawClipRect(context, -(null !== (_d = group.attribute.x) && void 0 !== _d ? _d : 0) + table.getFrozenColsWidth(), 0, group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth(), table.getFrozenRowsHeight());
         } else if ("right-frozen" === group.role) {
-          const x = 0,
-            y = -(null !== (_e = group.attribute.y) && void 0 !== _e ? _e : 0) + table.getFrozenRowsHeight(),
-            width = table.getRightFrozenColsWidth(),
-            height = group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();
-          context.beginPath(), context.rect(x, y, width, height);
+          drawClipRect(context, 0, -(null !== (_e = group.attribute.y) && void 0 !== _e ? _e : 0) + table.getFrozenRowsHeight(), table.getRightFrozenColsWidth(), group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight());
         } else if ("bottom-frozen" === group.role) {
-          const x = -(null !== (_f = group.attribute.x) && void 0 !== _f ? _f : 0) + table.getFrozenColsWidth(),
-            y = 0,
-            width = group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth(),
-            height = table.getBottomFrozenRowsHeight();
-          context.beginPath(), context.rect(x, y, width, height);
+          drawClipRect(context, -(null !== (_f = group.attribute.x) && void 0 !== _f ? _f : 0) + table.getFrozenColsWidth(), 0, group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth(), table.getBottomFrozenRowsHeight());
         } else if ("corner-header" === group.role) {
-          const x = 0,
-            y = 0,
-            width = table.getFrozenColsWidth(),
-            height = table.getFrozenRowsHeight();
-          context.beginPath(), context.rect(x, y, width, height);
+          drawClipRect(context, 0, 0, table.getFrozenColsWidth(), table.getFrozenRowsHeight());
         } else if ("corner-right-top-header" === group.role) {
-          const x = 0,
-            y = 0,
-            width = table.getRightFrozenColsWidth(),
-            height = table.getFrozenRowsHeight();
-          context.beginPath(), context.rect(x, y, width, height);
+          drawClipRect(context, 0, 0, table.getRightFrozenColsWidth(), table.getFrozenRowsHeight());
         } else if ("corner-right-bottom-header" === group.role) {
-          const x = 0,
-            y = 0,
-            width = table.getRightFrozenColsWidth(),
-            height = table.getBottomFrozenRowsHeight();
-          context.beginPath(), context.rect(x, y, width, height);
+          drawClipRect(context, 0, 0, table.getRightFrozenColsWidth(), table.getBottomFrozenRowsHeight());
         } else if ("corner-left-bottom-header" === group.role) {
-          const x = 0,
-            y = 0,
-            width = table.getFrozenColsWidth(),
-            height = table.getBottomFrozenRowsHeight();
-          context.beginPath(), context.rect(x, y, width, height);
+          drawClipRect(context, 0, 0, table.getFrozenColsWidth(), table.getBottomFrozenRowsHeight());
         }
       }
     };
     ClipBodyGroupBeforeRenderContribution = __decorate$3([injectable()], ClipBodyGroupBeforeRenderContribution);
-    let ClipBodyGroupAfterRenderContribution = class {
-      constructor() {
-        this.time = BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, this.order = 0;
-      }
-      drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
-        group.role;
-      }
-    };
-    ClipBodyGroupAfterRenderContribution = __decorate$3([injectable()], ClipBodyGroupAfterRenderContribution);
+    const precision = Math.pow(2, 24);
+    function drawClipRect(context, x, y, width, height) {
+      context.beginPath();
+      const matrix = context.applyedMatrix;
+      Math.abs(matrix.f) > precision || Math.abs(matrix.g) > precision ? context.rect(x - precision, y - precision, width + 2 * precision, height + 2 * precision) : context.rect(x, y, width, height);
+    }
     function getCellSizeForDraw(group, width, height, bottomRight) {
       const table = group.stage.table;
       if ("cell" === group.role) {
@@ -30709,7 +30677,7 @@
     SuffixTextBeforeRenderContribution = __decorate([injectable()], SuffixTextBeforeRenderContribution);
 
     var splitModule = new ContainerModule((bind, unbind, isBound, rebind) => {
-      isBound(SplitRectBeforeRenderContribution$1) ? rebind(SplitRectBeforeRenderContribution$1).to(SplitRectBeforeRenderContribution).inSingletonScope() : (bind(SplitRectBeforeRenderContribution).toSelf().inSingletonScope(), bind(RectRenderContribution).toService(SplitRectBeforeRenderContribution)), isBound(SplitRectAfterRenderContribution$1) ? rebind(SplitRectAfterRenderContribution$1).to(SplitRectAfterRenderContribution).inSingletonScope() : (bind(SplitRectAfterRenderContribution).toSelf().inSingletonScope(), bind(RectRenderContribution).toService(SplitRectAfterRenderContribution)), bind(DefaultCanvasChartRender).toSelf().inSingletonScope(), bind(ChartRender).to(DefaultCanvasChartRender), bind(GraphicRender).to(DefaultCanvasChartRender), bind(BeforeImageRenderContribution).toSelf().inSingletonScope(), bind(ImageRenderContribution).toService(BeforeImageRenderContribution), bind(AfterImageRenderContribution).toSelf().inSingletonScope(), bind(ImageRenderContribution).toService(AfterImageRenderContribution), bind(AdjustColorGroupBeforeRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(AdjustColorGroupBeforeRenderContribution), bind(AdjustColorGroupAfterRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(AdjustColorGroupAfterRenderContribution), bind(SplitGroupAfterRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(SplitGroupAfterRenderContribution), bind(SplitGroupBeforeRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(SplitGroupBeforeRenderContribution), bind(DashGroupBeforeRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(DashGroupBeforeRenderContribution), bind(DashGroupAfterRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(DashGroupAfterRenderContribution), bind(AdjustPosGroupBeforeRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(AdjustPosGroupBeforeRenderContribution), bind(AdjustPosGroupAfterRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(AdjustPosGroupAfterRenderContribution), bind(ClipBodyGroupBeforeRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(ClipBodyGroupBeforeRenderContribution), bind(ClipBodyGroupAfterRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(ClipBodyGroupAfterRenderContribution), bind(VTableDrawItemInterceptorContribution).toSelf().inSingletonScope(), bind(DrawItemInterceptor).toService(VTableDrawItemInterceptorContribution), bind(SuffixTextBeforeRenderContribution).toSelf().inSingletonScope(), bind(TextRenderContribution).toService(SuffixTextBeforeRenderContribution);
+      isBound(SplitRectBeforeRenderContribution$1) ? rebind(SplitRectBeforeRenderContribution$1).to(SplitRectBeforeRenderContribution).inSingletonScope() : (bind(SplitRectBeforeRenderContribution).toSelf().inSingletonScope(), bind(RectRenderContribution).toService(SplitRectBeforeRenderContribution)), isBound(SplitRectAfterRenderContribution$1) ? rebind(SplitRectAfterRenderContribution$1).to(SplitRectAfterRenderContribution).inSingletonScope() : (bind(SplitRectAfterRenderContribution).toSelf().inSingletonScope(), bind(RectRenderContribution).toService(SplitRectAfterRenderContribution)), bind(DefaultCanvasChartRender).toSelf().inSingletonScope(), bind(ChartRender).to(DefaultCanvasChartRender), bind(GraphicRender).to(DefaultCanvasChartRender), bind(BeforeImageRenderContribution).toSelf().inSingletonScope(), bind(ImageRenderContribution).toService(BeforeImageRenderContribution), bind(AfterImageRenderContribution).toSelf().inSingletonScope(), bind(ImageRenderContribution).toService(AfterImageRenderContribution), bind(AdjustColorGroupBeforeRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(AdjustColorGroupBeforeRenderContribution), bind(AdjustColorGroupAfterRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(AdjustColorGroupAfterRenderContribution), bind(SplitGroupAfterRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(SplitGroupAfterRenderContribution), bind(SplitGroupBeforeRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(SplitGroupBeforeRenderContribution), bind(DashGroupBeforeRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(DashGroupBeforeRenderContribution), bind(DashGroupAfterRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(DashGroupAfterRenderContribution), bind(AdjustPosGroupBeforeRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(AdjustPosGroupBeforeRenderContribution), bind(AdjustPosGroupAfterRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(AdjustPosGroupAfterRenderContribution), bind(ClipBodyGroupBeforeRenderContribution).toSelf().inSingletonScope(), bind(GroupRenderContribution).toService(ClipBodyGroupBeforeRenderContribution), bind(VTableDrawItemInterceptorContribution).toSelf().inSingletonScope(), bind(DrawItemInterceptor).toService(VTableDrawItemInterceptorContribution), bind(SuffixTextBeforeRenderContribution).toSelf().inSingletonScope(), bind(TextRenderContribution).toService(SuffixTextBeforeRenderContribution);
     });
 
     function computeColsWidth(table, colStart, colEnd, update) {
@@ -35033,6 +35001,19 @@
         checkedState[sourceIndex] = checkedState[targetIndex], checkedState[targetIndex] = sourceRecord;
       }
     }
+    function getGroupCheckboxState(table) {
+      const result = [],
+        dataSource = table.dataSource,
+        groupKeyLength = dataSource.dataConfig.groupByRules.length + 1;
+      return dataSource.currentIndexedData.forEach((indexArr, index) => {
+        if (isArray$1(indexArr) && indexArr.length === groupKeyLength) {
+          const {
+            vtableOriginIndex: vtableOriginIndex
+          } = dataSource.getRawRecord(indexArr);
+          result[vtableOriginIndex] = table.stateManager.checkedState[indexArr];
+        }
+      }), result;
+    }
 
     function updateResizeRow(xInTable, yInTable, state) {
       xInTable = Math.ceil(xInTable), yInTable = Math.ceil(yInTable);
@@ -35607,8 +35588,8 @@
       triggerSort(col, row, iconMark, event) {
         if (this.table.isPivotTable()) {
           const sortState = this.table.getPivotSortState(col, row),
-            order = sortState ? sortState.toUpperCase() : "DESC",
-            new_order = "ASC" === order ? "DESC" : "ASC";
+            order = sortState ? sortState.toUpperCase() : "NORMAL",
+            new_order = "ASC" === order ? "DESC" : "DESC" === order ? "NORMAL" : "ASC";
           return this.table.sort(col, row, new_order), void this.table.fireListeners(PIVOT_TABLE_EVENT_TYPE.PIVOT_SORT_CLICK, {
             col: col,
             row: row,
@@ -36125,41 +36106,38 @@
         }
       }), table.scenegraph.tableGroup.addEventListener("pointertap", e => {
         var _a, _b, _c, _d, _e;
-        if (table.stateManager.columnResize.resizing || table.stateManager.columnMove.moving) return;
         const eventArgsSet = getCellEventArgsSet(e);
-        if (eventManager.dealIconClick(e, eventArgsSet), null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) {
-          if (eventManager.touchSetTimeout && "touch" === e.pointerType) {
-            const eventArgsSet = getCellEventArgsSet(e);
-            if (eventManager.touchSetTimeout) {
-              clearTimeout(eventManager.touchSetTimeout);
-              const isHasSelected = !!(null === (_a = stateManager.select.ranges) || void 0 === _a ? void 0 : _a.length);
-              eventManager.dealTableSelect(eventArgsSet), stateManager.endSelectCells(!0, isHasSelected), eventManager.touchSetTimeout = void 0;
-            }
+        if (!eventManager.touchMove && 0 === e.button && eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.CLICK_CELL)) {
+          const {
+              col: col,
+              row: row
+            } = eventArgsSet.eventArgs,
+            cellInfo = table.getCellInfo(col, row);
+          let icon, position;
+          if (null === (_a = eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target) {
+            const iconInfo = getIconAndPositionFromTarget(null === (_b = eventArgsSet.eventArgs) || void 0 === _b ? void 0 : _b.target);
+            iconInfo && (icon = iconInfo.icon, position = iconInfo.position);
           }
-          if (!eventManager.touchMove && 0 === e.button && table.hasListeners(TABLE_EVENT_TYPE.CLICK_CELL)) {
-            const {
-                col: col,
-                row: row
-              } = eventArgsSet.eventArgs,
-              cellInfo = table.getCellInfo(col, row);
-            let icon, position;
-            if (null === (_b = eventArgsSet.eventArgs) || void 0 === _b ? void 0 : _b.target) {
-              const iconInfo = getIconAndPositionFromTarget(null === (_c = eventArgsSet.eventArgs) || void 0 === _c ? void 0 : _c.target);
-              iconInfo && (icon = iconInfo.icon, position = iconInfo.position);
-            }
-            const cellsEvent = Object.assign(Object.assign({}, cellInfo), {
-              event: e.nativeEvent,
-              federatedEvent: e,
-              cells: [],
-              targetIcon: icon ? {
-                name: icon.name,
-                position: position,
-                funcType: icon.attribute.funcType
-              } : void 0,
-              target: null === (_d = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _d ? void 0 : _d.target,
-              mergeCellInfo: null === (_e = eventArgsSet.eventArgs) || void 0 === _e ? void 0 : _e.mergeInfo
-            });
-            table.fireListeners(TABLE_EVENT_TYPE.CLICK_CELL, cellsEvent);
+          const cellsEvent = Object.assign(Object.assign({}, cellInfo), {
+            event: e.nativeEvent,
+            federatedEvent: e,
+            cells: [],
+            targetIcon: icon ? {
+              name: icon.name,
+              position: position,
+              funcType: icon.attribute.funcType
+            } : void 0,
+            target: null === (_c = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _c ? void 0 : _c.target,
+            mergeCellInfo: null === (_d = eventArgsSet.eventArgs) || void 0 === _d ? void 0 : _d.mergeInfo
+          });
+          table.fireListeners(TABLE_EVENT_TYPE.CLICK_CELL, cellsEvent);
+        }
+        if (!table.stateManager.columnResize.resizing && !table.stateManager.columnMove.moving && (eventManager.dealIconClick(e, eventArgsSet), (null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) && eventManager.touchSetTimeout && "touch" === e.pointerType)) {
+          const eventArgsSet = getCellEventArgsSet(e);
+          if (eventManager.touchSetTimeout) {
+            clearTimeout(eventManager.touchSetTimeout);
+            const isHasSelected = !!(null === (_e = stateManager.select.ranges) || void 0 === _e ? void 0 : _e.length);
+            eventManager.dealTableSelect(eventArgsSet), stateManager.endSelectCells(!0, isHasSelected), eventManager.touchSetTimeout = void 0;
           }
         }
       }), table.scenegraph.stage.addEventListener("pointerdown", e => {
@@ -37714,7 +37692,7 @@
       getSortIconForPivotTable(order, _table, col, row) {
         const headerC = _table.getHeaderDefine(col, row);
         if (!headerC || !1 === headerC.showSort || !isValid$1(headerC.showSort) && !headerC.sort || headerC.columns && headerC.columns.length > 0) return null;
-        return "ASC" === order ? this.downIcon : "DESC" === order ? this.upIcon : this.normalIcon;
+        return "ASC" === (null == order ? void 0 : order.toUpperCase()) ? this.downIcon : "DESC" === (null == order ? void 0 : order.toUpperCase()) ? this.upIcon : this.normalIcon;
       }
       getDropDownStateIcons(_table, col, row) {
         var _a, _b, _c;
@@ -38637,7 +38615,7 @@
       constructor(container) {
         let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.7.3", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
+        if (super(), this.showFrozenIcon = !0, this.version = "1.7.4", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
         const {
           frozenColCount = 0,
           frozenRowCount: frozenRowCount,
@@ -42320,7 +42298,11 @@
         this.scenegraph.clearCells(), this.sortState ? (this.dataSource.updateFilterRulesForSorted(filterRules), sortRecords(this)) : this.dataSource.updateFilterRules(filterRules), this.refreshRowColCount(), this.scenegraph.createSceneGraph();
       }
       getCheckboxState(field) {
-        return this.stateManager.checkedState.length < this.rowCount - this.columnHeaderLevelCount && this.stateManager.initLeftRecordsCheckState(this.records), isValid$1(field) ? this.stateManager.checkedState.map(state => state[field]) : this.stateManager.checkedState;
+        if (this.stateManager.checkedState.length < this.rowCount - this.columnHeaderLevelCount && this.stateManager.initLeftRecordsCheckState(this.records), isValid$1(field)) {
+          let stateArr = this.stateManager.checkedState;
+          return this.options.groupBy && (stateArr = getGroupCheckboxState(this)), stateArr.map(state => state[field]);
+        }
+        return this.stateManager.checkedState;
       }
       getCellCheckboxState(col, row) {
         var _a;
@@ -44943,7 +44925,7 @@
         getWeekday: getWeekday
     });
 
-    const version = "1.7.3";
+    const version = "1.7.4";
 
     exports.Gantt = Gantt;
     exports.TYPES = index$1;