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

package/dist/vtable-calendar.js

@@ -37386,12 +37386,12 @@
         isWidthNumber = !Array.isArray(strokeArrayWidth),
         isStrokeTrue = !Array.isArray(stroke),
         isSplitDraw = Array.isArray(strokeArrayColor) || widthInfo.isSplitDraw;
-      context.setStrokeStyle(rect, rect.attribute, x, y, rectAttribute);
+      context.stroke(), 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.moveTo(x, y);
+      lineDash.length && lineDash.some(dash => Array.isArray(dash)) && (isDash = !0), context.beginPath(), 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]),
@@ -37412,7 +37412,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);
-      isSplitDraw || isDash || (!isWidthNumber && widthInfo.width && (context.lineWidth = widthInfo.width), context.stroke()), context.lineDashOffset = 0, context.setLineDash([]), context.closePath();
+      context.closePath(), isSplitDraw || isDash || (!isWidthNumber && widthInfo.width && (context.lineWidth = widthInfo.width), context.stroke()), context.lineDashOffset = 0, context.setLineDash([]), context.beginPath();
     }
 
     var __decorate$1 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
@@ -39393,7 +39393,7 @@
     }
 
     function createCellSelectBorder(scene, start_Col, start_Row, end_Col, end_Row, selectRangeType, selectId, strokes) {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j;
       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),
@@ -39419,7 +39419,8 @@
           y: firstCellBound.y1 - scene.tableGroup.attribute.y,
           width: 0,
           height: 0,
-          visible: !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)
         });
       let fillhandle;
       isHasFillHandleRect && (fillhandle = createRect({
@@ -39437,6 +39438,15 @@
         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) => {
@@ -42313,14 +42323,7 @@
       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];
-        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, {
+        state.checkedState.has(dataIndex) ? state.checkedState.get(dataIndex)[field] = checked : state.checkedState.set(dataIndex, {
           [field]: checked
         });
       }
@@ -44544,7 +44547,7 @@
 
     function bindGroupTitleCheckboxChange(table) {
       table.on("checkbox_state_change", args => {
-        var _a, _b;
+        var _a;
         if (!0 !== (null === (_a = table.internalProps.rowSeriesNumber) || void 0 === _a ? void 0 : _a.enableTreeCheckbox)) return;
         const {
             col: col,
@@ -44555,7 +44558,7 @@
           indexedData = table.dataSource.currentPagerIndexedData,
           titleShowIndex = table.getRecordShowIndexByCell(col, row);
         let titleIndex = indexedData[titleShowIndex];
-        if (isNumber$4(titleIndex) && (titleIndex = [titleIndex]), record.vtableMerge || (null === (_b = record.children) || void 0 === _b ? void 0 : _b.length)) {
+        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);
             const oldHeaderCheckedState = table.stateManager.headerCheckedState._vtable_rowSeries_number,
@@ -44593,23 +44596,8 @@
         key = currentIndex.toString(),
         currentIndexLength = isArray$7(currentIndex) ? currentIndex.length : 1;
       let start = !1;
-      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;
+      const result = [];
+      if (checkedState.forEach((value, index) => {
         if (start) {
           index.split(",").length === currentIndexLength ? start = !1 : result.push(value._vtable_rowSeries_number);
         }
@@ -47440,7 +47428,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.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");
+        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");
         !1 === (null === (_a = options.customConfig) || void 0 === _a ? void 0 : _a.imageAnonymous) && (vglobal.isImageAnonymous = !1);
         const {
           frozenColCount = 0,
@@ -52533,18 +52521,7 @@
       }
       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) => {
-            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));
+          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]);
         }
         return new Array(...this.stateManager.checkedState.values());