@visactor/vtable-calendar 1.17.4-alpha.4 → 1.17.4

package/dist/vtable-calendar.js

@@ -34049,7 +34049,7 @@
     function _generateCustomElementsGroup(table, define, col, row, cellWidth, cellHeight, padding, range, customResult) {
       let customElementsGroup,
         renderDefault = !0;
-      if (customResult) customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;else {
+      if (customResult) customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;else if (null == range ? void 0 : range.isCustom) ;else {
         let customRender, customLayout;
         if ("body" !== table.getCellLocation(col, row) ? (customRender = null == define ? void 0 : define.headerCustomRender, customLayout = null == define ? void 0 : define.headerCustomLayout) : (customRender = (null == define ? void 0 : define.customRender) || table.customRender, customLayout = null == define ? void 0 : define.customLayout), customLayout || customRender) {
           const customResult = dealWithCustom(customLayout, customRender, col, row, cellWidth, cellHeight, !1, table.isAutoRowHeight(row), padding, range, table);
@@ -36576,17 +36576,13 @@
     }
     Chart.temp = 1;
 
-    let chartRenderKeys = [];
-    let chartRenderQueueList = [];
-    let requestAnimationFrameId,
-      batchRenderChartCount = 5,
+    const chartRenderKeys = [];
+    const chartRenderQueueList = [];
+    let batchRenderChartCount = 5,
       isHandlingChartQueue = !1;
     function setBatchRenderChartCount(count) {
       isValid$3(count) && (batchRenderChartCount = count);
     }
-    function clearChartRenderQueue() {
-      chartRenderKeys = [], chartRenderQueueList = [], isHandlingChartQueue = !1, cancelAnimationFrame(requestAnimationFrameId);
-    }
     function IsHandlingChartQueue() {
       return isHandlingChartQueue;
     }
@@ -36680,7 +36676,7 @@
       cacheStageCanvas(chartInstance.getStage(), chart);
     }
     function startRenderChartQueue(table) {
-      isHandlingChartQueue = !0, chartRenderQueueList.length > 0 ? requestAnimationFrameId = requestAnimationFrame(() => {
+      isHandlingChartQueue = !0, chartRenderQueueList.length > 0 ? requestAnimationFrame(() => {
         const chartsToRender = chartRenderQueueList.splice(0, batchRenderChartCount);
         chartRenderKeys.splice(0, batchRenderChartCount), chartsToRender.forEach(chart => {
           renderChart(chart), chart.addUpdateBoundTag();
@@ -42352,7 +42348,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
         });
       }
@@ -42433,7 +42436,7 @@
       } = state;
       let source, target;
       if (table.internalProps.transpose ? (sourceIndex = table.getRecordShowIndexByCell(sourceIndex, 0), targetIndex = table.getRecordShowIndexByCell(targetIndex, 0)) : (source = table.isPivotTable() ? void 0 : table.getRecordIndexByCell(0, sourceIndex), target = table.isPivotTable() ? void 0 : table.getRecordIndexByCell(0, targetIndex)), isNumber$4(source) && isNumber$4(target)) {
-        if (sourceIndex > targetIndex) {
+        if ((sourceIndex = source) > (targetIndex = target)) {
           const sourceRecord = checkedState.get(sourceIndex.toString());
           for (let i = sourceIndex; i > targetIndex; i--) checkedState.set(i.toString(), checkedState.get((i - 1).toString()));
           checkedState.set(targetIndex.toString(), sourceRecord);
@@ -44676,20 +44679,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);
@@ -44725,8 +44730,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);
         }
@@ -44736,20 +44756,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 => {
@@ -44859,7 +44919,7 @@
         }, 0);
       }
       bindSelfEvent() {
-        this.table.isReleased || (bindIconClickEvent(this.table), bindDropdownMenuClickEvent(this.table), this.updateEventBinder(), bindMediaClick(this.table), bindDBClickAutoColumnWidthEvent(this.table), this.table.isPivotTable() && checkHaveDrill(this.table) && bindDrillEvent(this.table), bindSparklineHoverEvent(this.table), bindAxisClickEvent(this.table), bindAxisHoverEvent(this.table), bindGroupTitleCheckboxChange(this.table), bindButtonClickEvent(this.table), rightButtonClickEvent(this.table));
+        this.table.isReleased || (bindIconClickEvent(this.table), bindDropdownMenuClickEvent(this.table), this.updateEventBinder(), bindMediaClick(this.table), bindDBClickAutoColumnWidthEvent(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), rightButtonClickEvent(this.table));
       }
       dealTableHover(eventArgsSet) {
         if (!eventArgsSet) return void this.table.stateManager.updateHoverPos(-1, -1);
@@ -45053,8 +45113,8 @@
       constructor() {
         let style = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         let bodyStyle = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-        super(style, bodyStyle), this._showBar = null === (_a = style.showBar) || void 0 === _a || _a, this._barColor = null !== (_b = style.barColor) && void 0 !== _b ? _b : DEFAULT_BAR_COLOR, this._barPositiveColor = null !== (_c = style.barPositiveColor) && void 0 !== _c ? _c : "#4dbd74", this._barNegativeColor = null !== (_d = style.barNegativeColor) && void 0 !== _d ? _d : "#f86c6b", this._barAxisColor = null !== (_e = style.barAxisColor) && void 0 !== _e ? _e : "black", this._barBgColor = style.barBgColor, this._barHeight = null !== (_f = style.barHeight) && void 0 !== _f ? _f : 3, this._barHeight = null !== (_g = style.barHeight) && void 0 !== _g ? _g : 3, this._barBottom = null !== (_h = style.barBottom) && void 0 !== _h ? _h : 0, this._barPadding = null !== (_j = style.barPadding) && void 0 !== _j ? _j : [0, 0, 0, 0], this._showBarMark = null !== (_k = style.showBarMark) && void 0 !== _k && _k, this._barMarkPositiveColor = null !== (_l = style.barMarkPositiveColor) && void 0 !== _l ? _l : "#4dbd74", this._barMarkNegativeColor = null !== (_m = style.barMarkNegativeColor) && void 0 !== _m ? _m : "#f86c6b", this._barMarkWidth = null !== (_o = style.barMarkWidth) && void 0 !== _o ? _o : 2, this._barMarkPosition = null !== (_p = style.barMarkPosition) && void 0 !== _p ? _p : "right", this._barRightToLeft = null !== (_q = style.barRightToLeft) && void 0 !== _q && _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        super(style, bodyStyle), this._showBar = null === (_a = style.showBar) || void 0 === _a || _a, this._barColor = null !== (_b = style.barColor) && void 0 !== _b ? _b : DEFAULT_BAR_COLOR, this._barPositiveColor = null !== (_c = style.barPositiveColor) && void 0 !== _c ? _c : "#4dbd74", this._barNegativeColor = null !== (_d = style.barNegativeColor) && void 0 !== _d ? _d : "#f86c6b", this._barAxisColor = null !== (_e = style.barAxisColor) && void 0 !== _e ? _e : "black", this._barBgColor = style.barBgColor, this._barHeight = null !== (_f = style.barHeight) && void 0 !== _f ? _f : 3, this._barHeight = null !== (_g = style.barHeight) && void 0 !== _g ? _g : 3, this._barBottom = null !== (_h = style.barBottom) && void 0 !== _h ? _h : 0, this._barPadding = null !== (_j = style.barPadding) && void 0 !== _j ? _j : [0, 0, 0, 0], this._showBarMark = null !== (_k = style.showBarMark) && void 0 !== _k && _k, this._barMarkPositiveColor = null !== (_l = style.barMarkPositiveColor) && void 0 !== _l ? _l : "#4dbd74", this._barMarkNegativeColor = null !== (_m = style.barMarkNegativeColor) && void 0 !== _m ? _m : "#f86c6b", this._barMarkWidth = null !== (_o = style.barMarkWidth) && void 0 !== _o ? _o : 2, this._barMarkPosition = null !== (_p = style.barMarkPosition) && void 0 !== _p ? _p : "right", this._barRightToLeft = null !== (_q = style.barRightToLeft) && void 0 !== _q && _q, this._barMarkInBar = null === (_r = style.barMarkInBar) || void 0 === _r || _r;
       }
       get showBar() {
         return this._showBar;
@@ -45146,6 +45206,12 @@
       set barRightToLeft(value) {
         this._barRightToLeft = value;
       }
+      get barMarkInBar() {
+        return this._barMarkInBar;
+      }
+      set barMarkInBar(value) {
+        this._barMarkInBar = value;
+      }
       clone() {
         return new ProgressBarStyle(this, null);
       }
@@ -47610,7 +47676,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, _q, _r;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.17.4-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.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,
@@ -48436,7 +48502,7 @@
         const {
           parentElement: parentElement
         } = internalProps.element;
-        parentElement && !this.options.canvas && parentElement.removeChild(internalProps.element), null === (_q = null === (_p = null === (_o = this.editorManager) || void 0 === _o ? void 0 : _o.editingEditor) || void 0 === _p ? void 0 : _p.onEnd) || void 0 === _q || _q.call(_p), this.isReleased = !0, this.scenegraph = null, this.internalProps = null, null === (_r = this.reactCustomLayout) || void 0 === _r || _r.clearCache(), clearChartRenderQueue();
+        parentElement && !this.options.canvas && parentElement.removeChild(internalProps.element), null === (_q = null === (_p = null === (_o = this.editorManager) || void 0 === _o ? void 0 : _o.editingEditor) || void 0 === _p ? void 0 : _p.onEnd) || void 0 === _q || _q.call(_p), this.isReleased = !0, this.scenegraph = null, this.internalProps = null, null === (_r = this.reactCustomLayout) || void 0 === _r || _r.clearCache();
       }
       fireListeners(type, event) {
         return super.fireListeners(type, event);
@@ -48485,7 +48551,7 @@
         const internalProps = this.internalProps;
         if ("node" === Env.mode || options.canvas || updateRootElementPadding(internalProps.element, this.padding), this.columnWidthComputeMode = null !== (_a = options.columnWidthComputeMode) && void 0 !== _a ? _a : "normal", internalProps.frozenColCount = frozenColCount, internalProps.unfreezeAllOnExceedsMaxWidth = null == unfreezeAllOnExceedsMaxWidth || unfreezeAllOnExceedsMaxWidth, internalProps.defaultRowHeight = defaultRowHeight, internalProps.defaultHeaderRowHeight = null != defaultHeaderRowHeight ? defaultHeaderRowHeight : defaultRowHeight, internalProps.defaultColWidth = defaultColWidth, internalProps.defaultHeaderColWidth = null != defaultHeaderColWidth ? defaultHeaderColWidth : defaultColWidth, internalProps.keyboardOptions = keyboardOptions, internalProps.eventOptions = eventOptions, internalProps.rowSeriesNumber = rowSeriesNumber, internalProps.columnResizeMode = null !== (_b = null == resize ? void 0 : resize.columnResizeMode) && void 0 !== _b ? _b : columnResizeMode, internalProps.rowResizeMode = null !== (_c = null == resize ? void 0 : resize.rowResizeMode) && void 0 !== _c ? _c : rowResizeMode, internalProps.dragHeaderMode = null !== (_e = null !== (_d = null == dragOrder ? void 0 : dragOrder.dragHeaderMode) && void 0 !== _d ? _d : dragHeaderMode) && void 0 !== _e ? _e : "none", internalProps.renderChartAsync = renderChartAsync, setBatchRenderChartCount(renderChartAsyncBatchCount), internalProps.overscrollBehavior = null != overscrollBehavior ? overscrollBehavior : "auto", internalProps.cellTextOverflows = {}, internalProps._rowHeightsMap = new NumberRangeMap(this), internalProps._rowRangeHeightsMap = new Map(), internalProps._colRangeWidthsMap = new Map(), internalProps._widthResizedColMap = new Set(), internalProps._heightResizedRowMap = new Set(), this.colWidthsMap = new NumberMap(), this.colContentWidthsMap = new NumberMap(), this.colWidthsLimit = {}, internalProps.stick.changedCells.clear(), internalProps.theme = themes.of(null !== (_f = options.theme) && void 0 !== _f ? _f : themes.DEFAULT), internalProps.theme.isPivot = this.isPivotTable(), setIconColor(internalProps.theme.functionalIconsStyle), this.scenegraph.updateStageBackground(), internalProps.autoWrapText = options.autoWrapText, internalProps.enableLineBreak = options.enableLineBreak, internalProps.allowFrozenColCount = null !== (_g = options.allowFrozenColCount) && void 0 !== _g ? _g : 0, internalProps.limitMaxAutoWidth = null !== (_h = options.limitMaxAutoWidth) && void 0 !== _h ? _h : 450, internalProps.limitMinWidth = null != limitMinWidth ? "number" == typeof limitMinWidth ? limitMinWidth : limitMinWidth ? 10 : 0 : 10, internalProps.limitMinHeight = null != limitMinHeight ? "number" == typeof limitMinHeight ? limitMinHeight : limitMinHeight ? 10 : 0 : 10, null === (_j = internalProps.legends) || void 0 === _j || _j.forEach(legend => {
           null == legend || legend.release();
-        }), null === (_k = internalProps.title) || void 0 === _k || _k.release(), internalProps.title = null, null === (_l = internalProps.emptyTip) || void 0 === _l || _l.release(), internalProps.emptyTip = null, internalProps.layoutMap.release(), clearChartRenderQueue(), this.scenegraph.clearCells(), this.scenegraph.updateComponent(), this.stateManager.updateOptionSetState(), this._updateSize(), this.eventManager.updateEventBinder(), options.legends) {
+        }), null === (_k = internalProps.title) || void 0 === _k || _k.release(), internalProps.title = null, null === (_l = internalProps.emptyTip) || void 0 === _l || _l.release(), internalProps.emptyTip = null, internalProps.layoutMap.release(), this.scenegraph.clearCells(), this.scenegraph.updateComponent(), this.stateManager.updateOptionSetState(), this._updateSize(), this.eventManager.updateEventBinder(), options.legends) {
           internalProps.legends = [];
           const createLegend = Factory.getFunction("createLegend");
           if (Array.isArray(options.legends)) {
@@ -48748,7 +48814,8 @@
               end: {
                 col: Math.min(customMerge.range.end.col, this.colCount - 1),
                 row: Math.min(customMerge.range.end.row, this.rowCount - 1)
-              }
+              },
+              isCustom: !0
             };
           }
         }
@@ -48774,7 +48841,17 @@
                 }, styleClass, this.options.autoWrapText, this.theme);
               customMerge.style = fullStyle;
             }
-            return customMerge;
+            return customMerge.range = {
+              start: {
+                col: Math.max(customMerge.range.start.col, 0),
+                row: Math.max(customMerge.range.start.row, 0)
+              },
+              end: {
+                col: Math.min(customMerge.range.end.col, this.colCount - 1),
+                row: Math.min(customMerge.range.end.row, this.rowCount - 1)
+              },
+              isCustom: !0
+            }, customMerge;
           }
         }
       }
@@ -51723,6 +51800,8 @@
         const editor = this.table.getEditor(col, row);
         if (editor) {
           if (null === (_b = null === (_a = this.table.internalProps.layoutMap) || void 0 === _a ? void 0 : _a.isAggregation) || void 0 === _b ? void 0 : _b.call(_a, col, row)) return;
+          const record = this.table.getCellRawRecord(col, row);
+          if (null == record ? void 0 : record.vtableMerge) return;
           this.editingEditor || (this.editCell = {
             col: col,
             row: row
@@ -52720,8 +52799,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());
       }
@@ -52759,7 +52849,7 @@
       setRecords(records, option) {
         var _a, _b, _c, _d;
         let sort;
-        clearChartRenderQueue(), null === (_a = this.internalProps.dataSource) || void 0 === _a || _a.release(), this.internalProps.releaseList = null === (_b = this.internalProps.releaseList) || void 0 === _b ? void 0 : _b.filter(item => !item.dataSourceObj), this.internalProps.dataSource = null, Array.isArray(option) || (null == option ? void 0 : option.order) ? sort = option : option ? sort = option.sortState : null === option && (sort = null);
+        null === (_a = this.internalProps.dataSource) || void 0 === _a || _a.release(), this.internalProps.releaseList = null === (_b = this.internalProps.releaseList) || void 0 === _b ? void 0 : _b.filter(item => !item.dataSourceObj), this.internalProps.dataSource = null, Array.isArray(option) || (null == option ? void 0 : option.order) ? sort = option : option ? sort = option.sortState : null === option && (sort = null);
         "undefined" != typeof window && window.performance.now();
         const oldHoverState = {
           col: this.stateManager.hover.cellPos.col,
@@ -56919,7 +57009,8 @@
         barMarkPositiveColor: barMarkPositiveColor,
         barMarkNegativeColor: barMarkNegativeColor,
         barMarkWidth: barMarkWidth,
-        barMarkPosition: barMarkPosition
+        barMarkPosition: barMarkPosition,
+        barMarkInBar: barMarkInBar
       } = style;
       let {
         barHeight: barHeight,
@@ -56934,11 +57025,11 @@
         return Number(v);
       });
       const borderWidth = getQuadProps(getProp("borderLineWidth", style, col, row, table)),
-        barPaddingTop = Math.max(barPadding[0], Math.ceil(borderWidth[0] / 2)),
-        barPaddingRight = Math.max(barPadding[1], Math.floor(borderWidth[1] / 2)),
-        barPaddingBottom = Math.max(barPadding[2], Math.floor(borderWidth[2] / 2)),
-        barPaddingLeft = Math.max(barPadding[3], Math.ceil(borderWidth[3] / 2));
-      contentWidth -= barPaddingRight + barPaddingLeft, contentHeight -= barPaddingBottom + barPaddingTop, row === table.rowCount - 1 && [0, "0"].includes(barBottom) && (contentHeight -= 1);
+        barPaddingTop = Math.max(barPadding[0], Math.ceil(borderWidth[0] / 2));
+      let barPaddingRight = Math.max(barPadding[1], Math.floor(borderWidth[1] / 2));
+      const barPaddingBottom = Math.max(barPadding[2], Math.floor(borderWidth[2] / 2));
+      let barPaddingLeft = Math.max(barPadding[3], Math.ceil(borderWidth[3] / 2));
+      showBarMark && barMarkWidth > 0 && "right" === barMarkPosition && !1 === barMarkInBar && (barPaddingRight += barMarkWidth, barPaddingLeft += barMarkWidth), contentWidth -= barPaddingRight + barPaddingLeft, contentHeight -= barPaddingBottom + barPaddingTop, row === table.rowCount - 1 && [0, "0"].includes(barBottom) && (contentHeight -= 1);
       const top = barPaddingTop,
         left = barPaddingLeft,
         right = contentWidth;
@@ -57125,7 +57216,7 @@
                 dataValue: dataValue,
                 percentile: positiveRate
               }) || "#20a8d8", "right" === barMarkPosition) {
-                const markLeft = barRightToLeft ? barRectPosi.left + barMarkWidth / 2 : barRectPosi.left + barRectPosi.width - barMarkWidth / 2;
+                const markLeft = barRightToLeft ? barRectPosi.left + barMarkWidth / 2 : barRectPosi.left + barRectPosi.width + (barMarkInBar ? -barMarkWidth / 2 : barMarkWidth / 2);
                 points.push({
                   x: markLeft,
                   y: barRectPosi.top
@@ -57446,7 +57537,9 @@
             cornerRadius: buttonBorderRadius
           },
           state: {
-            text: {},
+            text: {
+              hover: {}
+            },
             panel: {
               hover: {
                 fill: buttonHoverColor,