@visactor/vtable-gantt 1.17.1-alpha.7 → 1.17.1-alpha.9

package/cjs/index.d.ts

@@ -5,5 +5,5 @@ import { Gantt } from './Gantt';
 import * as tools from './tools';
 import * as VRender from './vrender';
 import * as VTable from './vtable';
-export declare const version = "1.17.1-alpha.7";
+export declare const version = "1.17.1-alpha.9";
 export { TYPES, GanttConstructorOptions, Gantt, ColumnsDefine, ColumnDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, TextAlignType, TextBaselineType, tools, VRender, VTable };

package/cjs/index.js

@@ -52,5 +52,5 @@ exports.VRender = VRender;
 
 const VTable = __importStar(require("./vtable"));
 
-exports.VTable = VTable, exports.version = "1.17.1-alpha.7";
+exports.VTable = VTable, exports.version = "1.17.1-alpha.9";
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAuBlC,sBAAK;AATP,mCAAgC;AAW9B,sFAXO,aAAK,OAWP;AAVP,+CAAiC;AAsB/B,sBAAK;AArBP,mDAAqC;AAsBnC,0BAAO;AArBT,iDAAmC;AAsBjC,wBAAM;AArBK,QAAA,OAAO,GAAG,gBAAgB,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';\nimport * as VRender from './vrender';\nimport * as VTable from './vtable';\nexport const version = \"1.17.1-alpha.7\";\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  VRender,\n  VTable\n};\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAuBlC,sBAAK;AATP,mCAAgC;AAW9B,sFAXO,aAAK,OAWP;AAVP,+CAAiC;AAsB/B,sBAAK;AArBP,mDAAqC;AAsBnC,0BAAO;AArBT,iDAAmC;AAsBjC,wBAAM;AArBK,QAAA,OAAO,GAAG,gBAAgB,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';\nimport * as VRender from './vrender';\nimport * as VTable from './vtable';\nexport const version = \"1.17.1-alpha.9\";\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  VRender,\n  VTable\n};\n"]}

package/cjs/tools/inertia.js

@@ -33,5 +33,4 @@ class Inertia {
     }
 }
 
-exports.Inertia = Inertia;
-//# sourceMappingURL=inertia.js.map
+exports.Inertia = Inertia;

package/cjs/ts-types/gantt-engine.js

@@ -11,4 +11,5 @@ Object.defineProperty(exports, "__esModule", {
     TasksShowMode.Tasks_Separate = "tasks_separate", TasksShowMode.Sub_Tasks_Inline = "sub_tasks_inline", 
     TasksShowMode.Sub_Tasks_Separate = "sub_tasks_separate", TasksShowMode.Sub_Tasks_Arrange = "sub_tasks_arrange", 
     TasksShowMode.Sub_Tasks_Compact = "sub_tasks_compact";
-}(TasksShowMode = exports.TasksShowMode || (exports.TasksShowMode = {}));
+}(TasksShowMode = exports.TasksShowMode || (exports.TasksShowMode = {}));
+//# sourceMappingURL=gantt-engine.js.map

package/dist/vtable-gantt.js

@@ -41907,12 +41907,12 @@
         isWidthNumber = !Array.isArray(strokeArrayWidth),
         isStrokeTrue = !Array.isArray(stroke),
         isSplitDraw = Array.isArray(strokeArrayColor) || widthInfo.isSplitDraw;
-      context.stroke(), context.setStrokeStyle(rect, rect.attribute, x, y, rectAttribute);
+      context.setStrokeStyle(rect, rect.attribute, x, y, rectAttribute);
       const {
         lineDash = groupAttribute.lineDash
       } = group.attribute;
       let isDash = !1;
-      lineDash.length && lineDash.some(dash => Array.isArray(dash)) && (isDash = !0), context.beginPath(), context.moveTo(x, y);
+      lineDash.length && lineDash.some(dash => Array.isArray(dash)) && (isDash = !0), context.moveTo(x, y);
       const strokeTop = (isStrokeTrue || stroke[0]) && (isWidthNumber || strokeArrayWidth[0]),
         strokeRight = (isStrokeTrue || stroke[1]) && (isWidthNumber || strokeArrayWidth[1]),
         strokeBottom = (isStrokeTrue || stroke[2]) && (isWidthNumber || strokeArrayWidth[2]),
@@ -41933,7 +41933,7 @@
         isWidthNumber ? widthInfo.width : strokeArrayWidth[3], isWidthNumber ? widthInfo.width : strokeArrayWidth[3];
         context.moveTo(x1, y1), context.lineTo(x2, y2), (isSplitDraw || isDash) && (strokeArrayColor && strokeArrayColor[3] ? context.strokeStyle = strokeArrayColor[3] : strokeArrayColor && !strokeArrayColor[3] && (context.strokeStyle = "transparent"), isWidthNumber || (context.lineWidth = strokeArrayWidth[3]), context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d, isDash && context.setLineDash(null !== (_d = lineDash[3]) && void 0 !== _d ? _d : []), context.stroke(), context.beginPath(), context.moveTo(x, y));
       } else 3 === i && context.moveTo(x, y);
-      context.closePath(), isSplitDraw || isDash || (!isWidthNumber && widthInfo.width && (context.lineWidth = widthInfo.width), context.stroke()), context.lineDashOffset = 0, context.setLineDash([]), context.beginPath();
+      isSplitDraw || isDash || (!isWidthNumber && widthInfo.width && (context.lineWidth = widthInfo.width), context.stroke()), context.lineDashOffset = 0, context.setLineDash([]), context.closePath();
     }
 
     var __decorate$1 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
@@ -43914,7 +43914,7 @@
     }
 
     function createCellSelectBorder(scene, start_Col, start_Row, end_Col, end_Row, selectRangeType, selectId, strokes) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       let isHasFillHandleRect = !!(null === (_a = scene.table.options.excelOptions) || void 0 === _a ? void 0 : _a.fillHandle);
       if ((null === (_b = scene.table.stateManager.select.ranges) || void 0 === _b ? void 0 : _b.length) > 1) isHasFillHandleRect = !1, scene.removeFillHandleFromSelectComponents();else if (1 === (null === (_c = scene.table.stateManager.select.ranges) || void 0 === _c ? void 0 : _c.length)) {
         const maxRow = Math.max(scene.table.stateManager.select.ranges[0].start.row, scene.table.stateManager.select.ranges[0].end.row),
@@ -43940,8 +43940,7 @@
           y: firstCellBound.y1 - scene.tableGroup.attribute.y,
           width: 0,
           height: 0,
-          visible: !0,
-          cornerRadius: getCornerRadius(selectRangeType, null === (_j = scene.table.theme.frameStyle) || void 0 === _j ? void 0 : _j.cornerRadius, start_Col, start_Row, end_Col, end_Row, scene.table)
+          visible: !0
         });
       let fillhandle;
       isHasFillHandleRect && (fillhandle = createRect({
@@ -43959,15 +43958,6 @@
         role: selectRangeType
       }), scene.tableGroup.insertAfter(rect, "body" === selectRangeType ? scene.bodyGroup : "columnHeader" === selectRangeType ? scene.colHeaderGroup : "rowHeader" === selectRangeType ? scene.rowHeaderGroup : "cornerHeader" === selectRangeType ? scene.cornerHeaderGroup : "rightTopCorner" === selectRangeType ? scene.rightTopCornerGroup : "rightFrozen" === selectRangeType ? scene.rightFrozenGroup : "leftBottomCorner" === selectRangeType ? scene.leftBottomCornerGroup : "bottomFrozen" === selectRangeType ? scene.bottomFrozenGroup : scene.rightBottomCornerGroup), isHasFillHandleRect && scene.tableGroup.insertAfter(fillhandle, "body" === selectRangeType ? scene.bodyGroup : "columnHeader" === selectRangeType ? scene.colHeaderGroup : "rowHeader" === selectRangeType ? scene.rowHeaderGroup : "cornerHeader" === selectRangeType ? scene.cornerHeaderGroup : "rightTopCorner" === selectRangeType ? scene.rightTopCornerGroup : "rightFrozen" === selectRangeType ? scene.rightFrozenGroup : "leftBottomCorner" === selectRangeType ? scene.leftBottomCornerGroup : "bottomFrozen" === selectRangeType ? scene.bottomFrozenGroup : scene.rightBottomCornerGroup);
     }
-    function getCornerRadius(selectRangeType, cornerRadius, start_Col, start_Row, end_Col, end_Row, table) {
-      if (!cornerRadius) return;
-      const cornerRadiusArray = Array.isArray(cornerRadius) ? cornerRadius : [cornerRadius, cornerRadius, cornerRadius, cornerRadius],
-        tableEndCol = table.colCount - 1,
-        tableEndRow = table.rowCount - 1,
-        result = [0, 0, 0, 0];
-      let changed = !1;
-      return 0 === start_Col && 0 === start_Row ? (result[0] = cornerRadiusArray[0], changed = !0) : end_Col === tableEndCol && end_Row === tableEndRow ? (result[2] = cornerRadiusArray[2], changed = !0) : 0 === start_Col && end_Row === tableEndRow ? (result[3] = cornerRadiusArray[3], changed = !0) : end_Col === tableEndCol && 0 === start_Row && (result[1] = cornerRadiusArray[1], changed = !0), changed ? result : void 0;
-    }
 
     function moveSelectingRangeComponentsToSelectedRangeComponents(scene) {
       scene.selectingRangeComponents.forEach((rangeComponent, key) => {
@@ -46844,7 +46834,14 @@
       if (recordIndex >= 0) {
         const dataIndex = state.table.dataSource.getIndexKey(recordIndex).toString();
         if (isValid$3(null === (_b = state.checkedState.get(dataIndex)) || void 0 === _b ? void 0 : _b[field])) return state.checkedState.get(dataIndex)[field];
-        state.checkedState.has(dataIndex) ? state.checkedState.get(dataIndex)[field] = checked : state.checkedState.set(dataIndex, {
+        if (state.checkedState.has(dataIndex)) state.checkedState.get(dataIndex)[field] = checked;else if (dataIndex.includes(",")) {
+          const parentDataIndex = dataIndex.split(",").slice(0, -1).join(",");
+          state.checkedState.has(parentDataIndex) && !0 === state.checkedState.get(parentDataIndex)[field] ? state.checkedState.set(dataIndex, {
+            [field]: !0
+          }) : state.checkedState.set(dataIndex, {
+            [field]: checked
+          });
+        } else state.checkedState.set(dataIndex, {
           [field]: checked
         });
       }
@@ -49068,20 +49065,22 @@
 
     function bindGroupTitleCheckboxChange(table) {
       table.on("checkbox_state_change", args => {
-        var _a;
-        if (!0 !== (null === (_a = table.internalProps.rowSeriesNumber) || void 0 === _a ? void 0 : _a.enableTreeCheckbox)) return;
+        var _a, _b;
         const {
-            col: col,
-            row: row,
-            checked: checked
-          } = args,
-          record = table.getCellOriginRecord(col, row),
+          col: col,
+          row: row,
+          checked: checked,
+          field: field
+        } = args;
+        if ("_vtable_rowSeries_number" !== field || !0 !== (null === (_a = table.internalProps.rowSeriesNumber) || void 0 === _a ? void 0 : _a.enableTreeCheckbox)) return;
+        if (table.isHeader(col, row)) return;
+        const record = table.getCellOriginRecord(col, row),
           indexedData = table.dataSource.currentPagerIndexedData,
           titleShowIndex = table.getRecordShowIndexByCell(col, row);
         let titleIndex = indexedData[titleShowIndex];
-        if (isNumber$4(titleIndex) && (titleIndex = [titleIndex]), record.vtableMerge) {
-          if (checked) table.getHierarchyState(col, row) === HierarchyState.collapse ? updateChildrenCheckboxState(!0, titleIndex, table) : setAllChildrenCheckboxState(!0, titleShowIndex, titleIndex, indexedData, table), updateGroupTitleCheckboxState(titleShowIndex, titleIndex, indexedData, table);else {
-            table.getHierarchyState(col, row) === HierarchyState.collapse ? updateChildrenCheckboxState(!1, titleIndex, table) : setAllChildrenCheckboxState(!1, titleShowIndex, titleIndex, indexedData, table), updateGroupTitleCheckboxState(titleShowIndex, titleIndex, indexedData, table);
+        if (isNumber$4(titleIndex) && (titleIndex = [titleIndex]), record.vtableMerge || (null === (_b = record.children) || void 0 === _b ? void 0 : _b.length)) {
+          if (checked) getHierarchyState(table, col, row) === HierarchyState.collapse ? updateChildrenCheckboxState(!0, titleIndex, table) : setAllChildrenCheckboxState(!0, titleShowIndex, titleIndex, indexedData, table), updateGroupTitleCheckboxState(titleShowIndex, titleIndex, indexedData, table);else {
+            getHierarchyState(table, col, row) === HierarchyState.collapse ? updateChildrenCheckboxState(!1, titleIndex, table) : setAllChildrenCheckboxState(!1, titleShowIndex, titleIndex, indexedData, table), updateGroupTitleCheckboxState(titleShowIndex, titleIndex, indexedData, table);
             const oldHeaderCheckedState = table.stateManager.headerCheckedState._vtable_rowSeries_number,
               newHeaderCheckedState = table.stateManager.updateHeaderCheckedState("_vtable_rowSeries_number", col, row);
             oldHeaderCheckedState !== newHeaderCheckedState && table.scenegraph.updateHeaderCheckboxCellState(col, row, newHeaderCheckedState);
@@ -49117,8 +49116,23 @@
         key = currentIndex.toString(),
         currentIndexLength = isArray$7(currentIndex) ? currentIndex.length : 1;
       let start = !1;
-      const result = [];
-      if (checkedState.forEach((value, index) => {
+      const result = [],
+        keys = Array.from(checkedState.keys()).sort((a, b) => {
+          var _a, _b;
+          const aArr = a.split(","),
+            bArr = b.split(","),
+            maxLength = Math.max(aArr.length, bArr.length);
+          for (let i = 0; i < maxLength; i++) {
+            const a = null !== (_a = Number(aArr[i])) && void 0 !== _a ? _a : 0,
+              b = null !== (_b = Number(bArr[i])) && void 0 !== _b ? _b : 0;
+            if (a !== b) return a - b;
+          }
+          return 0;
+        }),
+        stateArr = keys.map(key => checkedState.get(key));
+      if (stateArr.forEach((state, i) => {
+        const index = keys[i],
+          value = state;
         if (start) {
           index.split(",").length === currentIndexLength ? start = !1 : result.push(value._vtable_rowSeries_number);
         }
@@ -49128,20 +49142,60 @@
         allUnChecked = result.every(item => !item);
       allChecked ? (table.stateManager.setCheckedState(col, row, "_vtable_rowSeries_number", !0), setCellCheckboxStateByAttribute(col, row, !0, table)) : allUnChecked ? (table.stateManager.setCheckedState(col, row, "_vtable_rowSeries_number", !1), setCellCheckboxStateByAttribute(col, row, !1, table)) : (table.stateManager.setCheckedState(col, row, "_vtable_rowSeries_number", "indeterminate"), setCellCheckboxStateByAttribute(col, row, "indeterminate", table));
     }
-    function updateChildrenCheckboxState(state, currentIndex, table) {
+    function updateChildrenCheckboxState(parentState, currentIndex, table) {
       const {
           checkedState: checkedState
         } = table.stateManager,
         key = currentIndex.toString(),
         currentIndexLength = isArray$7(currentIndex) ? currentIndex.length : 1;
       let start = !1;
-      checkedState.forEach((value, index) => {
+      const keys = Array.from(checkedState.keys()).sort((a, b) => {
+          var _a, _b;
+          const aArr = a.split(","),
+            bArr = b.split(","),
+            maxLength = Math.max(aArr.length, bArr.length);
+          for (let i = 0; i < maxLength; i++) {
+            const a = null !== (_a = Number(aArr[i])) && void 0 !== _a ? _a : 0,
+              b = null !== (_b = Number(bArr[i])) && void 0 !== _b ? _b : 0;
+            if (a !== b) return a - b;
+          }
+          return 0;
+        }),
+        stateArr = keys.map(key => checkedState.get(key));
+      stateArr.forEach((state, i) => {
+        const index = keys[i],
+          value = state;
         if (start) {
-          index.split(",").length === currentIndexLength ? start = !1 : value._vtable_rowSeries_number = state;
+          index.split(",").length === currentIndexLength ? start = !1 : value._vtable_rowSeries_number = parentState;
         }
         index === key && (start = !0);
       });
     }
+    function bindHeaderCheckboxChange(table) {
+      table.on("checkbox_state_change", args => {
+        const {
+          col: col,
+          row: row,
+          checked: checked,
+          field: field
+        } = args;
+        if (table.isHeader(col, row)) {
+          table.stateManager.setHeaderCheckedState(field, checked);
+          "checkbox" === table.getCellType(col, row) && table.scenegraph.updateCheckboxCellState(col, row, checked);
+        } else {
+          table.stateManager.setCheckedState(col, row, field, checked);
+          if ("checkbox" === table.getCellType(col, row)) {
+            const oldHeaderCheckedState = table.stateManager.headerCheckedState[field],
+              newHeaderCheckedState = table.stateManager.updateHeaderCheckedState(field, col, row);
+            oldHeaderCheckedState !== newHeaderCheckedState && table.scenegraph.updateHeaderCheckboxCellState(col, row, newHeaderCheckedState);
+          }
+        }
+      });
+    }
+    function getHierarchyState(table, col, row) {
+      const index = table.getRecordShowIndexByCell(col, row);
+      return table.dataSource.getHierarchyState(index);
+    }
 
     function bindButtonClickEvent(table) {
       table.on(TABLE_EVENT_TYPE.CLICK_CELL, e => {
@@ -49219,7 +49273,7 @@
               });
             }
           }
-        }), this.table.isPivotTable() && checkHaveDrill(this.table) && bindDrillEvent(this.table), bindSparklineHoverEvent(this.table), bindAxisClickEvent(this.table), bindAxisHoverEvent(this.table), bindGroupTitleCheckboxChange(this.table), bindButtonClickEvent(this.table);
+        }), this.table.isPivotTable() && checkHaveDrill(this.table) && bindDrillEvent(this.table), bindSparklineHoverEvent(this.table), bindAxisClickEvent(this.table), bindAxisHoverEvent(this.table), bindGroupTitleCheckboxChange(this.table), bindHeaderCheckboxChange(this.table), bindButtonClickEvent(this.table);
       }
       dealTableHover(eventArgsSet) {
         if (!eventArgsSet) return void this.table.stateManager.updateHoverPos(-1, -1);
@@ -51949,7 +52003,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, _m, _o, _p;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.17.1-alpha.7", 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.17.1-alpha.9", 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");
         !1 === (null === (_a = options.customConfig) || void 0 === _a ? void 0 : _a.imageAnonymous) && (vglobal.isImageAnonymous = !1);
         const {
           frozenColCount = 0,
@@ -57078,8 +57132,19 @@
       }
       getCheckboxState(field) {
         if (this.stateManager.checkedState.size < this.rowCount - this.columnHeaderLevelCount && this.stateManager.initLeftRecordsCheckState(this.records), isValid$3(field)) {
-          let stateArr = Array.from(this.stateManager.checkedState.keys()).sort((a, b) => Number(a) - Number(b)).map(key => this.stateManager.checkedState.get(key));
-          return this.options.groupBy && (stateArr = getGroupCheckboxState(this)), Array.from(stateArr, state => state[field]);
+          let stateArr = Array.from(this.stateManager.checkedState.keys()).sort((a, b) => {
+            var _a, _b;
+            const aArr = a.split(","),
+              bArr = b.split(","),
+              maxLength = Math.max(aArr.length, bArr.length);
+            for (let i = 0; i < maxLength; i++) {
+              const a = null !== (_a = Number(aArr[i])) && void 0 !== _a ? _a : 0,
+                b = null !== (_b = Number(bArr[i])) && void 0 !== _b ? _b : 0;
+              if (a !== b) return a - b;
+            }
+            return 0;
+          }).map(key => this.stateManager.checkedState.get(key));
+          return this.options.groupBy && (stateArr = getGroupCheckboxState(this)), Array.from(stateArr, state => state && state[field]);
         }
         return new Array(...this.stateManager.checkedState.values());
       }
@@ -64848,7 +64913,7 @@
         themes: themes$1
     });
 
-    const version = "1.17.1-alpha.7";
+    const version = "1.17.1-alpha.9";
 
     exports.Gantt = Gantt;
     exports.TYPES = index$3;