@visactor/vtable-calendar 1.17.1-alpha.2 → 1.17.1-alpha.4

package/dist/vtable-calendar.js

@@ -41410,8 +41410,7 @@
         updateReactContainer(this.table);
       }
       setLoadingHierarchyState(col, row) {
-        const cellGroup = this.getCell(col, row),
-          iconGraphic = cellGroup.getChildByName("collapse", !0) || cellGroup.getChildByName("expand", !0);
+        const iconGraphic = this.getCell(col, row).getChildByName("collapse", !0);
         if (iconGraphic) {
           const loadingIcon = get$2()[InternalIconName.loadingIconName];
           loadingIcon && dealWithIcon(loadingIcon, iconGraphic, col, row);
@@ -42314,7 +42313,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
         });
       }
@@ -44538,7 +44544,7 @@
 
     function bindGroupTitleCheckboxChange(table) {
       table.on("checkbox_state_change", args => {
-        var _a;
+        var _a, _b;
         if (!0 !== (null === (_a = table.internalProps.rowSeriesNumber) || void 0 === _a ? void 0 : _a.enableTreeCheckbox)) return;
         const {
             col: col,
@@ -44549,7 +44555,7 @@
           indexedData = table.dataSource.currentPagerIndexedData,
           titleShowIndex = table.getRecordShowIndexByCell(col, row);
         let titleIndex = indexedData[titleShowIndex];
-        if (isNumber$4(titleIndex) && (titleIndex = [titleIndex]), record.vtableMerge) {
+        if (isNumber$4(titleIndex) && (titleIndex = [titleIndex]), record.vtableMerge || (null === (_b = record.children) || void 0 === _b ? void 0 : _b.length)) {
           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);
             const oldHeaderCheckedState = table.stateManager.headerCheckedState._vtable_rowSeries_number,
@@ -44587,8 +44593,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);
         }
@@ -47419,7 +47440,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.2", 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.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");
         !1 === (null === (_a = options.customConfig) || void 0 === _a ? void 0 : _a.imageAnonymous) && (vglobal.isImageAnonymous = !1);
         const {
           frozenColCount = 0,
@@ -52512,7 +52533,18 @@
       }
       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));
+          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[field]);
         }
         return new Array(...this.stateManager.checkedState.values());