@visactor/vtable-gantt 1.26.7 → 1.26.8

package/dist/vtable-gantt.js

@@ -43314,7 +43314,11 @@
         super(config), this.type = AggregationType.CUSTOM, this.isRecord = !0, this.values = [], this.aggregationFun = config.aggregationFun;
       }
       push(record) {
-        record && (this.isRecord && this.records && (record.isAggregator ? this.records.push(...record.records) : this.records.push(record)), record.isAggregator && this.children && this.children.push(record), this.field && this.values.push(record[this.field])), this.clearCacheValue();
+        if (record) {
+          if (this.recalculateFromChildren && record.isAggregator) return this.isRecord && this.records && this.records.push(...record.records), this.children && this.children.push(record), this.field && this.values.push(...record.records.map(item => item[this.field])), void this.clearCacheValue();
+          this.isRecord && this.records && (record.isAggregator ? this.records.push(...record.records) : this.records.push(record)), record.isAggregator && this.children && this.children.push(record), this.field && this.values.push(record[this.field]);
+        }
+        this.clearCacheValue();
       }
       updateRecord(oldRecord, newRecord) {
         oldRecord && newRecord && (this.isRecord && this.records && (this.records = this.records.map(item => item === oldRecord ? newRecord : item)), oldRecord.isAggregator && newRecord.isAggregator && this.children && (this.children = this.children.map(item => item === oldRecord ? newRecord : item)), this.field && this.records.length && (this.values = this.records.map(item => item[this.field])), this.clearCacheValue());
@@ -43330,7 +43334,18 @@
         this.records = [], this.children = [], this.changedValue = void 0, this.fieldValue = void 0;
       }
       recalculate() {
-        this.fieldValue = void 0, this._formatedValue = void 0;
+        var _a;
+        this.recalculateFromChildren && (null === (_a = this.children) || void 0 === _a ? void 0 : _a.length) && this.field && (this.values = [], this.records = [], this.children.forEach(child => {
+          if (isValid$1(child.changedValue)) {
+            const value = child.value();
+            this.values.push(value), this.records.push({
+              [this.field]: value
+            });
+          } else if (child instanceof CustomAggregator && child.recalculateFromChildren) this.values.push(...child.values), this.records.push(...child.records);else {
+            const records = child.records;
+            this.values.push(...records.map(record => record[this.field])), this.records.push(...records);
+          }
+        })), this.fieldValue = void 0, this._formatedValue = void 0;
       }
     }
     class RecalculateAggregator extends Aggregator {
@@ -44380,8 +44395,8 @@
     function isZeroStyle(style) {
       return 0 === style || isArray$5(style) && style.every(s => 0 === s);
     }
-    function setActiveCellRangeState(table) {
-      const selectRanges = table.stateManager.select.ranges,
+    function setActiveCellRangeState(table, ranges = table.stateManager.select.ranges) {
+      const selectRanges = ranges,
         setRanges = [];
       for (let i = 0; i < selectRanges.length; i++) {
         const range = selectRanges[i];
@@ -44511,12 +44526,6 @@
     function defaultOrderFn(v1, v2, order) {
       return "desc" !== order ? v1 === v2 ? 0 : v1 > v2 ? 1 : -1 : v1 === v2 ? 0 : v1 < v2 ? 1 : -1;
     }
-    function getValueByPath(obj, paths) {
-      let prop,
-        res = obj;
-      for (; (prop = paths.shift()) && (res = res[prop], res););
-      return res;
-    }
     function isAllDigits(str) {
       return /^-?\d+(\.\d+)?$/.test(str);
     }
@@ -46532,7 +46541,7 @@
     const DARK = new TableTheme(darkTheme, darkTheme);
     const BRIGHT = new TableTheme(brightTheme, brightTheme);
     const ARCO = new TableTheme(arcoTheme, arcoTheme);
-    const DEFAULT = new TableTheme(defaultTheme, defaultTheme);
+    let DEFAULT = new TableTheme(defaultTheme, defaultTheme);
     const SIMPLIFY = new TableTheme(materialDesignTheme, materialDesignTheme);
     const builtin$1 = {
       DEFAULT: DEFAULT,
@@ -46541,6 +46550,9 @@
       DARK: DARK,
       BRIGHT: BRIGHT
     };
+    function setDefaultTheme(theme) {
+      DEFAULT = theme instanceof TableTheme ? theme.extends({}) : new TableTheme(theme, theme), builtin$1.DEFAULT = DEFAULT;
+    }
     const theme$1 = {
       TableTheme: TableTheme
     };
@@ -46559,11 +46571,14 @@
       DARK: DARK,
       BRIGHT: BRIGHT,
       ARCO: ARCO,
-      DEFAULT: DEFAULT,
+      get DEFAULT() {
+        return DEFAULT;
+      },
       SIMPLIFY: SIMPLIFY,
       theme: theme$1,
       of: of$1,
-      get: get$5
+      get: get$5,
+      setDefaultTheme: setDefaultTheme
     };
 
     var themes$1 = /*#__PURE__*/Object.freeze({
@@ -46571,12 +46586,13 @@
         ARCO: ARCO,
         BRIGHT: BRIGHT,
         DARK: DARK,
-        DEFAULT: DEFAULT,
+        get DEFAULT () { return DEFAULT; },
         SIMPLIFY: SIMPLIFY,
         TableTheme: TableTheme,
         default: themes,
         get: get$5,
         of: of$1,
+        setDefaultTheme: setDefaultTheme,
         tableThemeIsChanged: tableThemeIsChanged,
         theme: theme$1
     });
@@ -49880,21 +49896,64 @@
       if ((void 0 === fieldGet || "" === fieldGet) && Array.isArray(record)) {
         return record[col - table.leftRowSeriesNumberCount];
       }
-      if (isObject$8(record) && fieldGet in record) {
+      if (Array.isArray(fieldGet)) {
+        return getValue$2(getRecordFieldValue(record, fieldGet), promiseCallBack);
+      }
+      if (isRecordContainer(record) && fieldGet in record) {
         return getValue$2(record[fieldGet], promiseCallBack);
       }
       if ("function" == typeof fieldGet) {
         return getValue$2(fieldGet(record, col, row, table), promiseCallBack);
       }
-      if (Array.isArray(fieldGet)) {
-        return getValue$2(getValueByPath(record, [...fieldGet]), promiseCallBack);
-      }
       const fieldArray = `${fieldGet}`.split(".");
       if (fieldArray.length <= 1) {
         return getValue$2(record[fieldGet], promiseCallBack);
       }
       return getValue$2(applyChainSafe(record, (val, name) => getField(val, name, col, row, table, emptyFn), ...fieldArray), promiseCallBack);
     }
+    function isRecordContainer(value) {
+      return null !== value && "object" == typeof value;
+    }
+    function getRecordFieldPath(field) {
+      return Array.isArray(field) ? field : "string" == typeof field && field.includes(".") ? field.split(".") : void 0;
+    }
+    function hasRecordField(record, field) {
+      if (!isRecordContainer(record)) return !1;
+      const path = getRecordFieldPath(field);
+      if (!Array.isArray(field) && field in record) return !0;
+      if (!path) return !1;
+      let target = record;
+      for (const key of path) {
+        if (!isRecordContainer(target) || !(key in target)) return !1;
+        target = target[key];
+      }
+      return !0;
+    }
+    function getRecordFieldValue(record, field) {
+      if (null == record) return;
+      const path = getRecordFieldPath(field);
+      return !Array.isArray(field) && isRecordContainer(record) && field in record ? record[field] : path ? path.reduce((current, key) => null == current ? void 0 : current[key], record) : record[field];
+    }
+    function setRecordProperty(record, key, value) {
+      "__proto__" !== key && "constructor" !== key && "prototype" !== key ? record[key] = value : Object.defineProperty(record, key, {
+        configurable: !0,
+        enumerable: !0,
+        value: value,
+        writable: !0
+      });
+    }
+    function setRecordFieldValue(record, field, value) {
+      if (null == record) return;
+      const path = getRecordFieldPath(field);
+      if (!path || !Array.isArray(field) && isRecordContainer(record) && field in record) return void setRecordProperty(record, field, value);
+      if (0 === path.length) return;
+      let target = record;
+      for (let i = 0; i < path.length - 1; i++) {
+        const key = path[i];
+        Object.prototype.hasOwnProperty.call(target, key) && null !== target[key] && "object" == typeof target[key] || setRecordProperty(target, key, {}), target = target[key];
+      }
+      setRecordProperty(target, path[path.length - 1], value);
+    }
     function _getIndex(sortedIndexMap, index) {
       if (!sortedIndexMap) return index;
       const mapIndex = sortedIndexMap[index];
@@ -50130,21 +50189,19 @@
         return childrenLength;
       }
       changeFieldValue(value, index, field, col, row, table) {
-        var _a;
         if (null !== field && index >= 0) {
           const dataIndex = this.getIndexKey(index);
-          if (this.cacheBeforeChangedRecord(dataIndex, table), void 0 !== field && "" !== field || (field = col - table.leftRowSeriesNumberCount), "string" == typeof field || "number" == typeof field) {
-            const beforeChangedValue = null === (_a = this.beforeChangedRecordsMap.get(dataIndex.toString())) || void 0 === _a ? void 0 : _a[field],
+          if (this.cacheBeforeChangedRecord(dataIndex, table), void 0 !== field && "" !== field || (field = col - table.leftRowSeriesNumberCount), "string" == typeof field || "number" == typeof field || Array.isArray(field)) {
+            const beforeChangedValue = getRecordFieldValue(this.beforeChangedRecordsMap.get(dataIndex.toString()), field),
               record = this.getOriginalRecord(dataIndex);
             let formatValue = value;
-            "number" == typeof beforeChangedValue && isAllDigits(value) && (formatValue = parseFloat(value)), isPromise(record) ? record.then(record => {
-              record[field] = formatValue;
-            }).catch(err => {}) : record ? record[field] = formatValue : (this.records[dataIndex] = "Array" === this.addRecordRule ? [] : {}, this.records[dataIndex][field] = formatValue);
+            if ("number" == typeof beforeChangedValue && isAllDigits(value) && (formatValue = parseFloat(value)), isPromise(record)) return record.then(record => (setRecordFieldValue(record, field, formatValue), formatValue)).catch(err => {});
+            record ? setRecordFieldValue(record, field, formatValue) : (this.records[dataIndex] = "Array" === this.addRecordRule ? [] : {}, setRecordFieldValue(this.records[dataIndex], field, formatValue));
           }
         }
       }
       changeFieldValueByRecordIndex(value, recordIndex, field, table) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         if (null === field) return;
         if (null == recordIndex) return;
         const rawKey = recordIndex.toString();
@@ -50153,12 +50210,12 @@
             originRecord = rawRecords ? Array.isArray(recordIndex) ? getValueFromDeepArray(rawRecords, recordIndex) : rawRecords[recordIndex] : void 0;
           this.beforeChangedRecordsMap.set(rawKey, null !== (_b = cloneDeep(originRecord, void 0, ["vtable_gantt_linkedFrom", "vtable_gantt_linkedTo"])) && void 0 !== _b ? _b : {});
         }
-        if ("string" == typeof field || "number" == typeof field) {
-          const beforeChangedValue = null === (_c = this.beforeChangedRecordsMap.get(rawKey)) || void 0 === _c ? void 0 : _c[field],
-            rawRecords = Array.isArray(null === (_d = this.dataSourceObj) || void 0 === _d ? void 0 : _d.records) ? this.dataSourceObj.records : null,
+        if ("string" == typeof field || "number" == typeof field || Array.isArray(field)) {
+          const beforeChangedValue = getRecordFieldValue(this.beforeChangedRecordsMap.get(rawKey), field),
+            rawRecords = Array.isArray(null === (_c = this.dataSourceObj) || void 0 === _c ? void 0 : _c.records) ? this.dataSourceObj.records : null,
             record = rawRecords ? Array.isArray(recordIndex) ? getValueFromDeepArray(rawRecords, recordIndex) : rawRecords[recordIndex] : void 0;
           let formatValue = value;
-          "number" == typeof beforeChangedValue && isAllDigits(value) && (formatValue = parseFloat(value)), record ? record[field] = formatValue : rawRecords && "number" == typeof recordIndex && (rawRecords[recordIndex] = "Array" === this.addRecordRule ? [] : {}, rawRecords[recordIndex][field] = formatValue);
+          "number" == typeof beforeChangedValue && isAllDigits(value) && (formatValue = parseFloat(value)), record ? setRecordFieldValue(record, field, formatValue) : rawRecords && "number" == typeof recordIndex && (rawRecords[recordIndex] = "Array" === this.addRecordRule ? [] : {}, setRecordFieldValue(rawRecords[recordIndex], field, formatValue));
         }
       }
       cacheBeforeChangedRecord(dataIndex, table) {
@@ -50533,8 +50590,7 @@
       hasOriginalField(index, field) {
         if (null === field) return !1;
         if ("function" == typeof field) return !0;
-        const record = this.getOriginalRecord(index);
-        return Boolean(record && field in record);
+        return hasRecordField(this.getOriginalRecord(index), field);
       }
       fieldPromiseCallBack(_index, _field, _value) {}
       recordPromiseCallBack(_index, _record) {}
@@ -53032,7 +53088,7 @@
         const cells = rowCells.split("\t"),
           rowValues = [];
         0 === rowIndex && result.push("<tbody>"), cells.forEach(function (cell, cellIndex) {
-          const parsedCellData = cell ? cell.toString().replace(/&/g, "&amp;").replace(/'/g, "&#39;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<br>").replace(/(<br(\s*|\/)>(\r\n|\n)?|\r\n|\n)/g, "<br>\r\n").replace(/\x20{2,}/gi, substring => `<span style="mso-spacerun: yes">${"&nbsp;".repeat(substring.length - 1)} </span>`).replace(/\t/gi, "&#9;") : " ";
+          const parsedCellData = cell ? cell.toString().replace(/&/g, "&amp;").replace(/'/g, "&#39;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<br>").replace(/(<br(\s*|\/)>(\r\n|\n)?|\r\n|\n)/g, "<br>\r\n").replace(/\x20{2,}/gi, substring => `<span style="mso-spacerun: yes">${"&nbsp;".repeat(substring.length - 1)} </span>`).replace(/\t/gi, "&#9;") : "";
           rowValues.push(`<td>${parsedCellData}</td>`);
         }), result.push("<tr>", ...rowValues, "</tr>"), rowIndex === rows.length - 1 && result.push("</tbody>");
       }), result.push("</table>"), [META_HEAD, result.join("")].join("");
@@ -54259,6 +54315,49 @@
       }
     }
 
+    function isCornerCustomMergeRange(range, table) {
+      return !!(null == range ? void 0 : range.isCustom) && (range.start.col !== range.end.col || range.start.row !== range.end.row) && table.isCornerHeader(range.start.col, range.start.row) && table.isCornerHeader(range.end.col, range.end.row);
+    }
+    function shouldRenderCornerCustomMergeContent(col, row, range, table) {
+      return !isCornerCustomMergeRange(range, table) || col === range.end.col && row === range.end.row;
+    }
+    function createCornerCustomMergeContainer(customElementsGroup, width, height, range, table) {
+      if (!customElementsGroup || !isCornerCustomMergeRange(range, table)) return customElementsGroup;
+      const customContainer = new Group$1({
+        x: 0,
+        y: 0,
+        width: width,
+        height: height,
+        fill: !1,
+        stroke: !1,
+        pickable: !1,
+        clip: !0
+      });
+      return customContainer.name = CUSTOM_CONTAINER_NAME, customContainer.col = range.start.col, customContainer.row = range.start.row, customContainer.appendChild(customElementsGroup), customContainer;
+    }
+    function queueCornerCustomMergeContentUpdate(range, table, pendingRanges) {
+      pendingRanges ? pendingRanges.set(getCornerCustomMergeRangeKey(range), range) : refreshCornerCustomMergeContent(range, table);
+    }
+    function flushCornerCustomMergeContentUpdates(pendingRanges, table) {
+      pendingRanges.forEach(range => {
+        refreshCornerCustomMergeContentForResize(range, table);
+      }), pendingRanges.clear();
+    }
+    function getCornerCustomMergeRangeKey(range) {
+      return `${range.start.col}-${range.start.row}-${range.end.col}-${range.end.row}`;
+    }
+    function refreshCornerCustomMergeContent(range, table) {
+      var _a;
+      const cellGroup = table.scenegraph.getCell(range.end.col, range.end.row),
+        customContainer = cellGroup.getChildByName(CUSTOM_CONTAINER_NAME) || cellGroup.getChildByName(CUSTOM_MERGE_CONTAINER_NAME);
+      customContainer && (null === (_a = table.reactCustomLayout) || void 0 === _a || _a.removeCustomCell(range.start.col, range.start.row), customContainer.removeAllChild(), cellGroup.removeChild(customContainer)), table.scenegraph.updateCellContent(range.end.col, range.end.row);
+    }
+    function refreshCornerCustomMergeContentForResize(range, table) {
+      const cellGroup = table.scenegraph.getCell(range.end.col, range.end.row),
+        customContainer = cellGroup.getChildByName(CUSTOM_CONTAINER_NAME) || cellGroup.getChildByName(CUSTOM_MERGE_CONTAINER_NAME);
+      customContainer && cellGroup.removeChild(customContainer), table.scenegraph.updateCellContent(range.end.col, range.end.row);
+    }
+
     const PROMISE_CELL_UPDATE_TOKEN_KEY = "__vtable_promise_cell_update_token__";
     function nextPromiseCellUpdateToken(cellGroup) {
       var _a;
@@ -54357,11 +54456,17 @@
     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 ((null == range ? void 0 : range.isCustom) && !table.isCornerHeader(col, row)) ;else {
+      if (!shouldRenderCornerCustomMergeContent(col, row, range, table)) return {
+        customElementsGroup: customElementsGroup,
+        renderDefault: !1
+      };
+      if (customResult) customElementsGroup = createCornerCustomMergeContainer(customResult.elementsGroup, cellWidth, cellHeight, range, table), renderDefault = customResult.renderDefault;else if ((null == range ? void 0 : range.isCustom) && !table.isCornerHeader(col, row)) ;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);
-          customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;
+          const customCol = range && isCornerCustomMergeRange(range, table) ? range.start.col : col,
+            customRow = range && isCornerCustomMergeRange(range, table) ? range.start.row : row,
+            customResult = dealWithCustom(customLayout, customRender, customCol, customRow, cellWidth, cellHeight, !1, table.isAutoRowHeight(row), padding, range, table);
+          customElementsGroup = createCornerCustomMergeContainer(customResult.elementsGroup, cellWidth, cellHeight, range, table), renderDefault = customResult.renderDefault;
         }
       }
       return {
@@ -54390,7 +54495,7 @@
             customLayout: customLayout,
             customRender: customRender
           } = customMerge;
-          range = customMergeRange, isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row, value = customMergeText, customStyle = customMergeStyle, (customLayout || customRender) && (customResult = dealWithCustom(customLayout, customRender, customMergeRange.start.col, customMergeRange.start.row, table.getColsWidth(customMergeRange.start.col, customMergeRange.end.col), table.getRowsHeight(customMergeRange.start.row, customMergeRange.end.row), !1, table.isAutoRowHeight(row), [0, 0, 0, 0], range, table)), isCustomMerge = !0;
+          range = customMergeRange, isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row, value = customMergeText, customStyle = customMergeStyle, (customLayout || customRender) && shouldRenderCornerCustomMergeContent(col, row, customMergeRange, table) && (customResult = dealWithCustom(customLayout, customRender, customMergeRange.start.col, customMergeRange.start.row, table.getColsWidth(customMergeRange.start.col, customMergeRange.end.col), table.getRowsHeight(customMergeRange.start.row, customMergeRange.end.row), !1, table.isAutoRowHeight(row), [0, 0, 0, 0], range, table)), isCustomMerge = !0;
         }
       }
       let colForDefine = col,
@@ -54636,17 +54741,17 @@
             customRender: customMergeRender
           } = customMerge;
           if (customMergeLayout || customMergeRender) {
-            const customElementsGroup = dealWithCustom(customMergeLayout, customMergeRender, customMergeRange.start.col, customMergeRange.start.row, table.getColsWidth(customMergeRange.start.col, customMergeRange.end.col), table.getRowsHeight(customMergeRange.start.row, customMergeRange.end.row), !1, table.isAutoRowHeight(row), [0, 0, 0, 0], customMergeRange, table).elementsGroup;
-            cellGroup.childrenCount > 0 && customElementsGroup ? cellGroup.insertBefore(customElementsGroup, cellGroup.firstChild) : customElementsGroup && cellGroup.appendChild(customElementsGroup);
             const rangeHeight = table.getRowHeight(row),
               rangeWidth = table.getColWidth(col),
-              {
-                width: contentWidth
-              } = cellGroup.attribute,
-              {
-                height: contentHeight
-              } = cellGroup.attribute;
-            return cellGroup.contentWidth = contentWidth, cellGroup.contentHeight = contentHeight, resizeCellGroup(cellGroup, rangeWidth, rangeHeight, customMergeRange, table), customMergeRange;
+              contentWidth = table.getColsWidth(customMergeRange.start.col, customMergeRange.end.col),
+              contentHeight = table.getRowsHeight(customMergeRange.start.row, customMergeRange.end.row);
+            if (cellGroup.contentWidth = contentWidth, cellGroup.contentHeight = contentHeight, !shouldRenderCornerCustomMergeContent(col, row, customMergeRange, table)) {
+              const customContainer = cellGroup.getChildByName(CUSTOM_CONTAINER_NAME);
+              return customContainer && cellGroup.removeChild(customContainer), cellGroup.setAttribute("clip", !0), resizeCellGroup(cellGroup, rangeWidth, rangeHeight, customMergeRange, table), customMergeRange;
+            }
+            const customResult = dealWithCustom(customMergeLayout, customMergeRender, customMergeRange.start.col, customMergeRange.start.row, table.getColsWidth(customMergeRange.start.col, customMergeRange.end.col), table.getRowsHeight(customMergeRange.start.row, customMergeRange.end.row), !1, table.isAutoRowHeight(row), [0, 0, 0, 0], customMergeRange, table),
+              customElementsGroup = createCornerCustomMergeContainer(customResult.elementsGroup, contentWidth, contentHeight, customMergeRange, table);
+            return cellGroup.childrenCount > 0 && customElementsGroup ? cellGroup.insertBefore(customElementsGroup, cellGroup.firstChild) : customElementsGroup && cellGroup.appendChild(customElementsGroup), resizeCellGroup(cellGroup, rangeWidth, rangeHeight, customMergeRange, table), isCornerCustomMergeRange(customMergeRange, table) && cellGroup.setAttribute("clip", !1), customMergeRange;
           }
         }
       }
@@ -54815,7 +54920,12 @@
             update ? newHeights[row] = Math.round(height) : table._setRowHeight(row, height);
           }
         } else {
-          fillRowsHeight(computeRowHeight(table.columnHeaderLevelCount, 0, table.colCount - 1, table), table.columnHeaderLevelCount, table.rowCount - 1 - table.bottomFrozenRowCount, table, update ? newHeights : void 0);
+          const fillStartRow = table.columnHeaderLevelCount,
+            fillEndRow = table.rowCount - 1 - table.bottomFrozenRowCount,
+            rowForCompute = getFirstUnresizedRow(table, fillStartRow, fillEndRow);
+          if (rowForCompute >= 0) {
+            fillRowsHeight(computeRowHeight(rowForCompute, 0, table.colCount - 1, table), fillStartRow, fillEndRow, table, update ? newHeights : void 0);
+          }
           for (let row = table.rowCount - table.bottomFrozenRowCount; row <= rowEnd; row++) {
             const height = computeRowHeight(row, 0, table.colCount - 1, table);
             update ? newHeights[row] = Math.round(height) : table._setRowHeight(row, height);
@@ -54879,7 +54989,7 @@
       table.isPivotTable() && (layoutMap.disableUseGetBodyCache(), layoutMap.disableUseHeaderPathCache());
     }
     function computeRowHeight(row, startCol, endCol, table) {
-      return computeRowHeightInternal(row, startCol, endCol, table, !0);
+      return table.internalProps._heightResizedRowMap.has(row) ? table.getRowHeight(row) : computeRowHeightInternal(row, startCol, endCol, table, !0);
     }
     function computeRowHeightInternal(row, startCol, endCol, table, enableCustomCompute) {
       if (!(table.isAutoRowHeight(row) || "adaptive" === table.heightMode && !1 !== table.options.autoHeightInAdaptiveMode) && "auto" !== table.getDefaultRowHeight(row)) return table.getDefaultRowHeight(row);
@@ -54980,10 +55090,14 @@
     }
     function fillRowsHeight(height, startRow, endRow, table, newHeights) {
       if (!table.internalProps.useOneRowHeightFillAll) {
-        for (let row = startRow; row <= endRow; row++) newHeights ? newHeights[row] = height : table._setRowHeight(row, height);
+        for (let row = startRow; row <= endRow; row++) table.internalProps._heightResizedRowMap.has(row) || (newHeights ? newHeights[row] = height : table._setRowHeight(row, height));
         table.internalProps.useOneRowHeightFillAll = !0;
       }
     }
+    function getFirstUnresizedRow(table, startRow, endRow) {
+      for (let row = startRow; row <= endRow; row++) if (!table.internalProps._heightResizedRowMap.has(row)) return row;
+      return -1;
+    }
     function computeCustomRenderHeight(col, row, table) {
       var _a, _b, _c, _d, _e, _f, _g;
       const customRender = table.getCustomRender(col, row);
@@ -55132,14 +55246,15 @@
       };
     }
 
-    function updateRowHeight(scene, row, detaY, skipTableHeightMap) {
-      !skipTableHeightMap && detaY && scene.table._setRowHeight(row, scene.table.getRowHeight(row) + detaY, !0);
+    function updateRowHeight(scene, row, detaY, skipTableHeightMap, pendingCornerCustomMergeRanges) {
+      const shouldFlushCornerCustomMergeRanges = !pendingCornerCustomMergeRanges;
+      null != pendingCornerCustomMergeRanges || (pendingCornerCustomMergeRanges = new Map()), !skipTableHeightMap && detaY && scene.table._setRowHeight(row, scene.table.getRowHeight(row) + detaY, !0);
       for (let col = 0; col < scene.table.colCount; col++) {
         const cell = scene.getCell(col, row);
         if ("empty" === cell.role) continue;
         const mergeInfo = getCellMergeInfo(scene.table, col, row);
         if (mergeInfo && mergeInfo.start.col !== col) continue;
-        updateCellHeightForRow(scene, cell, col, row, cell.attribute.height + detaY, detaY, scene.table.isHeader(col, row)), scene.updateCellContentWhileResize(col, row);
+        updateCellHeightForRow(scene, cell, col, row, cell.attribute.height + detaY, detaY, scene.table.isHeader(col, row), pendingCornerCustomMergeRanges), scene.updateCellContentWhileResize(col, row);
       }
       let rowStart = 0,
         rowEnd = 0;
@@ -55148,11 +55263,12 @@
         const cellGroup = scene.highPerformanceGetCell(colIndex, rowIndex);
         "cell" === cellGroup.role && cellGroup.setAttribute("y", cellGroup.attribute.y + detaY);
       }
+      shouldFlushCornerCustomMergeRanges && flushCornerCustomMergeContentUpdates(pendingCornerCustomMergeRanges, scene.table);
     }
-    function updateCellHeightForRow(scene, cell, col, row, height, detaY, isHeader) {
-      cell && updateCellHeight(scene, cell, col, row, height, detaY);
+    function updateCellHeightForRow(scene, cell, col, row, height, detaY, isHeader, pendingCornerCustomMergeRanges) {
+      cell && updateCellHeight(scene, cell, col, row, height, detaY, isHeader, pendingCornerCustomMergeRanges);
     }
-    function updateCellHeight(scene, cell, col, row, distHeight, detaY, isHeader) {
+    function updateCellHeight(scene, cell, col, row, distHeight, detaY, isHeader, pendingCornerCustomMergeRanges) {
       var _a, _b, _c;
       if (cell.attribute.height === distHeight && !cell.needUpdateHeight) return;
       cell.needUpdateHeight = !1, cell.setAttribute("height", distHeight);
@@ -55169,7 +55285,7 @@
         (null == columnDefine ? void 0 : columnDefine.mergeCell) && (range = scene.table.getCellRange(col, row));
         const newBarCell = Factory.getFunction("createProgressBarCell")(columnDefine, style, cell.attribute.width, value, dataValue, col, row, padding, scene.table, range),
           oldBarCell = cell.getChildByName("progress-bar");
-        cell.insertBefore(newBarCell, oldBarCell), cell.removeChild(oldBarCell), oldBarCell.removeAllChild(), oldBarCell.release(), updateMergeCellContentHeight(cell, distHeight, detaY, scene.table.isAutoRowHeight(row), !0, scene.table);
+        cell.insertBefore(newBarCell, oldBarCell), cell.removeChild(oldBarCell), oldBarCell.removeAllChild(), oldBarCell.release(), updateMergeCellContentHeight(cell, distHeight, detaY, scene.table.isAutoRowHeight(row), !0, scene.table, !0, pendingCornerCustomMergeRanges);
       } else if ("sparkline" === type) {
         cell.removeAllChild();
         const headerStyle = scene.table._getCellStyle(col, row),
@@ -55179,6 +55295,13 @@
         let renderDefault = !0;
         const customContainer = cell.getChildByName(CUSTOM_CONTAINER_NAME) || cell.getChildByName(CUSTOM_MERGE_CONTAINER_NAME);
         if (customContainer) {
+          if (scene.table.reactCustomLayout) {
+            const mergeRange = isMergeCellGroup(cell) ? scene.table.getCellRange(cell.mergeStartCol, cell.mergeStartRow) : void 0,
+              shouldUseMergeStart = mergeRange && isCornerCustomMergeRange(mergeRange, scene.table),
+              removeCol = shouldUseMergeStart ? mergeRange.start.col : col,
+              removeRow = shouldUseMergeStart ? mergeRange.start.row : row;
+            scene.table.reactCustomLayout.removeCustomCell(removeCol, removeRow);
+          }
           let customElementsGroup;
           cell.removeChild(customContainer);
           const customMergeRange = getCustomCellMergeCustom(col, row, cell, scene.table);
@@ -55186,7 +55309,7 @@
             if (mergeRow === row) continue;
             const mergedCell = scene.getCell(col, mergeRow),
               customContainer = mergedCell.getChildByName(CUSTOM_CONTAINER_NAME) || mergedCell.getChildByName(CUSTOM_MERGE_CONTAINER_NAME);
-            customContainer.removeAllChild(), mergedCell.removeChild(customContainer), getCustomCellMergeCustom(col, mergeRow, mergedCell, scene.table);
+            customContainer && (customContainer.removeAllChild(), mergedCell.removeChild(customContainer)), getCustomCellMergeCustom(col, mergeRow, mergedCell, scene.table);
           } else {
             let customRender, customLayout;
             const cellLocation = scene.table.getCellLocation(col, row),
@@ -55201,31 +55324,31 @@
               customRender = (null == define ? void 0 : define.customRender) || scene.table.customRender, customLayout = null == define ? void 0 : define.customLayout;
             }
             if ((customRender || customLayout) && isMergeCellGroup(cell)) for (let mergeCol = cell.mergeStartCol; mergeCol <= cell.mergeEndCol; mergeCol++) for (let mergeRow = cell.mergeStartRow; mergeRow <= cell.mergeEndRow; mergeRow++) mergeRow !== row && scene.updateCellContent(mergeCol, mergeRow);
-            if (customLayout || customRender) {
-              const style = scene.table._getCellStyle(col, row),
-                padding = getQuadProps(getProp("padding", style, col, row, scene.table));
-              let width = cell.attribute.width,
-                height = cell.attribute.height;
-              isMergeCellGroup(cell) && (width = scene.table.getColsWidth(cell.mergeStartCol, cell.mergeEndCol), height = scene.table.getRowsHeight(cell.mergeStartRow, cell.mergeEndRow));
-              const customResult = dealWithCustom(customLayout, customRender, col, row, width, height, !1, scene.table.isAutoRowHeight(row), padding, isMergeCellGroup(cell) ? {
-                start: {
-                  col: cell.mergeStartCol,
-                  row: cell.mergeStartRow
-                },
-                end: {
-                  col: cell.mergeEndCol,
-                  row: cell.mergeEndRow
-                }
-              } : void 0, scene.table);
-              customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;
+            const mergeRange = isMergeCellGroup(cell) ? scene.table.getCellRange(cell.mergeStartCol, cell.mergeStartRow) : void 0;
+            if (shouldRenderCornerCustomMergeContent(col, row, mergeRange, scene.table)) {
+              if (customLayout || customRender) {
+                const style = scene.table._getCellStyle(col, row),
+                  padding = getQuadProps(getProp("padding", style, col, row, scene.table));
+                let width = cell.attribute.width,
+                  height = cell.attribute.height;
+                isMergeCellGroup(cell) && (width = scene.table.getColsWidth(cell.mergeStartCol, cell.mergeEndCol), height = scene.table.getRowsHeight(cell.mergeStartRow, cell.mergeEndRow));
+                let customCol = col,
+                  customRow = row;
+                mergeRange && isCornerCustomMergeRange(mergeRange, scene.table) && (customCol = mergeRange.start.col, customRow = mergeRange.start.row);
+                const customResult = dealWithCustom(customLayout, customRender, customCol, customRow, width, height, !1, scene.table.isAutoRowHeight(row), padding, mergeRange, scene.table);
+                customElementsGroup = createCornerCustomMergeContainer(customResult.elementsGroup, width, height, mergeRange, scene.table), renderDefault = customResult.renderDefault;
+              }
+            } else renderDefault = !1;
+            if (cell.childrenCount > 0 && customElementsGroup ? cell.insertBefore(customElementsGroup, cell.firstChild) : customElementsGroup && cell.appendChild(customElementsGroup), isMergeCellGroup(cell)) {
+              const mergeRange = scene.table.getCellRange(cell.mergeStartCol, cell.mergeStartRow);
+              isCornerCustomMergeRange(mergeRange, scene.table) && cell.setAttribute("clip", !shouldRenderCornerCustomMergeContent(col, row, mergeRange, scene.table));
             }
-            cell.childrenCount > 0 && customElementsGroup ? cell.insertBefore(customElementsGroup, cell.firstChild) : customElementsGroup && cell.appendChild(customElementsGroup);
           }
         }
-        updateMergeCellContentHeight(cell, distHeight, detaY, scene.table.isAutoRowHeight(row), renderDefault, scene.table);
+        updateMergeCellContentHeight(cell, distHeight, detaY, scene.table.isAutoRowHeight(row), renderDefault, scene.table, !customContainer, pendingCornerCustomMergeRanges);
       }
     }
-    function updateMergeCellContentHeight(cellGroup, distHeight, detaY, autoRowHeight, renderDefault, table) {
+    function updateMergeCellContentHeight(cellGroup, distHeight, detaY, autoRowHeight, renderDefault, table, refreshCornerCustomMergeContent = !0, pendingCornerCustomMergeRanges) {
       if (isMergeCellGroup(cellGroup)) {
         distHeight = 0;
         for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) distHeight += table.getRowHeight(row);
@@ -55265,6 +55388,8 @@
           }, table);
           widthChange && (singleCellGroup.needUpdateWidth = !0);
         }
+        const mergeRange = table.getCellRange(cellGroup.mergeStartCol, cellGroup.mergeStartRow);
+        refreshCornerCustomMergeContent && isCornerCustomMergeRange(mergeRange, table) && queueCornerCustomMergeContentUpdate(mergeRange, table, pendingCornerCustomMergeRanges);
       } else {
         const style = table._getCellStyle(cellGroup.col, cellGroup.row),
           padding = getQuadProps(getProp("padding", style, cellGroup.col, cellGroup.row, table));
@@ -55272,19 +55397,20 @@
       }
     }
 
-    function updateColWidth(scene, col, detaX, skipTableWidthMap) {
-      skipTableWidthMap || scene.table._setColWidth(col, scene.table.getColWidth(col) + detaX, !0);
+    function updateColWidth(scene, col, detaX, skipTableWidthMap, pendingCornerCustomMergeRanges) {
+      const shouldFlushCornerCustomMergeRanges = !pendingCornerCustomMergeRanges;
+      null != pendingCornerCustomMergeRanges || (pendingCornerCustomMergeRanges = new Map()), skipTableWidthMap || scene.table._setColWidth(col, scene.table.getColWidth(col) + detaX, !0);
       const colOrCornerHeaderColumn = scene.getColGroup(col, !0),
         rightTopColumn = scene.getColGroupInRightTopCorner(col);
-      colOrCornerHeaderColumn && !rightTopColumn && updateColunmWidth(colOrCornerHeaderColumn, detaX, "col-corner", scene), rightTopColumn && updateColunmWidth(rightTopColumn, detaX, "right-top", scene);
+      colOrCornerHeaderColumn && !rightTopColumn && updateColunmWidth(colOrCornerHeaderColumn, detaX, "col-corner", scene, pendingCornerCustomMergeRanges), rightTopColumn && updateColunmWidth(rightTopColumn, detaX, "right-top", scene, pendingCornerCustomMergeRanges);
       const rowHeaderOrBodyColumn = scene.getColGroup(col);
-      rowHeaderOrBodyColumn && updateColunmWidth(rowHeaderOrBodyColumn, detaX, "row-body", scene);
+      rowHeaderOrBodyColumn && updateColunmWidth(rowHeaderOrBodyColumn, detaX, "row-body", scene, pendingCornerCustomMergeRanges);
       const leftBottomColumn = scene.getColGroupInLeftBottomCorner(col);
-      leftBottomColumn && updateColunmWidth(leftBottomColumn, detaX, "left-bottom", scene);
+      leftBottomColumn && updateColunmWidth(leftBottomColumn, detaX, "left-bottom", scene, pendingCornerCustomMergeRanges);
       const bottomColumn = scene.getColGroupInBottom(col);
-      bottomColumn && updateColunmWidth(bottomColumn, detaX, "bottom", scene);
+      bottomColumn && updateColunmWidth(bottomColumn, detaX, "bottom", scene, pendingCornerCustomMergeRanges);
       const rightBottomColumn = scene.getColGroupInRightBottomCorner(col);
-      rightBottomColumn && updateColunmWidth(rightBottomColumn, detaX, "right-bottom", scene), col < scene.frozenColCount ? (scene.cornerHeaderGroup.forEachChildrenSkipChild((column, index) => {
+      rightBottomColumn && updateColunmWidth(rightBottomColumn, detaX, "right-bottom", scene, pendingCornerCustomMergeRanges), col < scene.frozenColCount ? (scene.cornerHeaderGroup.forEachChildrenSkipChild((column, index) => {
         column.col > col && column.setAttribute("x", column.attribute.x + detaX);
       }), scene.rowHeaderGroup.forEachChildrenSkipChild((column, index) => {
         column.col > col && column.setAttribute("x", column.attribute.x + detaX);
@@ -55298,14 +55424,14 @@
         column.col > col && column.setAttribute("x", column.attribute.x + detaX);
       }), rightBottomColumn && scene.rightBottomCornerGroup.forEachChildrenSkipChild((column, index) => {
         column.col > col && column.setAttribute("x", column.attribute.x + detaX);
-      });
+      }), shouldFlushCornerCustomMergeRanges && flushCornerCustomMergeContentUpdates(pendingCornerCustomMergeRanges, scene.table);
     }
-    function updateColunmWidth(columnGroup, detaX, mode, scene) {
+    function updateColunmWidth(columnGroup, detaX, mode, scene, pendingCornerCustomMergeRanges) {
       var _a, _b, _c, _d, _e, _f, _g;
       let needRerangeRow = !1;
       const oldColumnWidth = null !== (_a = null == columnGroup ? void 0 : columnGroup.attribute.width) && void 0 !== _a ? _a : 0;
       if (null == columnGroup || columnGroup.setAttribute("width", oldColumnWidth + detaX), null == columnGroup || columnGroup.forEachChildren((cell, index) => {
-        if (updateCellWidth(scene, cell, cell.col, cell.row, oldColumnWidth, oldColumnWidth + detaX, detaX, "row-body" !== mode || cell.col < scene.table.rowHeaderLevelCount, scene.table.internalProps.autoWrapText)) {
+        if (updateCellWidth(scene, cell, cell.col, cell.row, oldColumnWidth, oldColumnWidth + detaX, detaX, "row-body" !== mode || cell.col < scene.table.rowHeaderLevelCount, scene.table.internalProps.autoWrapText, pendingCornerCustomMergeRanges)) {
           const mergeInfo = getCellMergeInfo(scene.table, cell.col, cell.row);
           if (mergeInfo && mergeInfo.end.row - mergeInfo.start.row) for (let row = mergeInfo.start.row; row <= mergeInfo.end.row; row++) resetRowHeight(scene, row);else resetRowHeight(scene, cell.row);
           needRerangeRow = !0;
@@ -55347,7 +55473,7 @@
         }
       }
     }
-    function updateCellWidth(scene, cell, col, row, oldWidth, distWidth, detaX, isHeader, autoWrapText) {
+    function updateCellWidth(scene, cell, col, row, oldWidth, distWidth, detaX, isHeader, autoWrapText, pendingCornerCustomMergeRanges) {
       var _a, _b, _c, _d, _e;
       if (cell.attribute.width === distWidth && !cell.needUpdateWidth) return !1;
       cell.needUpdateWidth = !1, cell.setAttribute("width", distWidth);
@@ -55369,7 +55495,7 @@
         const newBarCell = Factory.getFunction("createProgressBarCell")(columnDefine, style, cellGroup.attribute.width, value, dataValue, col, row, padding, scene.table, range),
           oldBarCell = cellGroup.getChildByName("progress-bar");
         cellGroup.insertBefore(newBarCell, oldBarCell), cellGroup.removeChild(oldBarCell), oldBarCell.removeAllChild(), oldBarCell.release();
-        const cellChange = updateMergeCellContentWidth(cellGroup, distWidth, detaX, autoRowHeight, !0, scene.table);
+        const cellChange = updateMergeCellContentWidth(cellGroup, distWidth, detaX, autoRowHeight, !0, scene.table, !0, pendingCornerCustomMergeRanges);
         isHeightChange = isHeightChange || cellChange;
       } else if ("sparkline" === type) {
         cellGroup.removeAllChild();
@@ -55388,6 +55514,13 @@
         let renderDefault = !0;
         const customContainer = cell.getChildByName(CUSTOM_CONTAINER_NAME) || cell.getChildByName(CUSTOM_MERGE_CONTAINER_NAME);
         if (customContainer) {
+          if (scene.table.reactCustomLayout) {
+            const mergeRange = isMergeCellGroup(cellGroup) ? scene.table.getCellRange(cellGroup.mergeStartCol, cellGroup.mergeStartRow) : void 0,
+              shouldUseMergeStart = mergeRange && isCornerCustomMergeRange(mergeRange, scene.table),
+              removeCol = shouldUseMergeStart ? mergeRange.start.col : col,
+              removeRow = shouldUseMergeStart ? mergeRange.start.row : row;
+            scene.table.reactCustomLayout.removeCustomCell(removeCol, removeRow);
+          }
           let customElementsGroup;
           cell.removeChild(customContainer);
           const customMergeRange = getCustomCellMergeCustom(col, row, cell, scene.table);
@@ -55395,7 +55528,7 @@
             if (mergeCol === col) continue;
             const mergedCell = scene.getCell(mergeCol, row),
               customContainer = mergedCell.getChildByName(CUSTOM_CONTAINER_NAME) || mergedCell.getChildByName(CUSTOM_MERGE_CONTAINER_NAME);
-            customContainer.removeAllChild(), mergedCell.removeChild(customContainer), getCustomCellMergeCustom(mergeCol, row, mergedCell, scene.table);
+            customContainer && (customContainer.removeAllChild(), mergedCell.removeChild(customContainer)), getCustomCellMergeCustom(mergeCol, row, mergedCell, scene.table);
           } else {
             let customRender, customLayout;
             const cellType = scene.table.getCellLocation(col, row),
@@ -55410,28 +55543,28 @@
               customRender = (null == define ? void 0 : define.customRender) || scene.table.customRender, customLayout = null == define ? void 0 : define.customLayout;
             }
             if ((customRender || customLayout) && isMergeCellGroup(cellGroup)) for (let mergeCol = cellGroup.mergeStartCol; mergeCol <= cellGroup.mergeEndCol; mergeCol++) if (mergeCol !== col) for (let mergeRow = cellGroup.mergeStartRow; mergeRow <= cellGroup.mergeEndRow; mergeRow++) scene.updateCellContent(mergeCol, mergeRow);
-            if (customLayout || customRender) {
-              const style = scene.table._getCellStyle(col, row),
-                padding = getQuadProps(getProp("padding", style, col, row, scene.table));
-              let width = cellGroup.attribute.width,
-                height = cellGroup.attribute.height;
-              isMergeCellGroup(cellGroup) && (width = scene.table.getColsWidth(cellGroup.mergeStartCol, cellGroup.mergeEndCol), height = scene.table.getRowsHeight(cellGroup.mergeStartRow, cellGroup.mergeEndRow));
-              const customResult = dealWithCustom(customLayout, customRender, col, row, width, height, !1, scene.table.isAutoRowHeight(row), padding, isMergeCellGroup(cellGroup) ? {
-                start: {
-                  col: cellGroup.mergeStartCol,
-                  row: cellGroup.mergeStartRow
-                },
-                end: {
-                  col: cellGroup.mergeEndCol,
-                  row: cellGroup.mergeEndRow
-                }
-              } : void 0, scene.table);
-              customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault, isHeightChange = !0;
+            const mergeRange = isMergeCellGroup(cellGroup) ? scene.table.getCellRange(cellGroup.mergeStartCol, cellGroup.mergeStartRow) : void 0;
+            if (shouldRenderCornerCustomMergeContent(col, row, mergeRange, scene.table)) {
+              if (customLayout || customRender) {
+                const style = scene.table._getCellStyle(col, row),
+                  padding = getQuadProps(getProp("padding", style, col, row, scene.table));
+                let width = cellGroup.attribute.width,
+                  height = cellGroup.attribute.height;
+                isMergeCellGroup(cellGroup) && (width = scene.table.getColsWidth(cellGroup.mergeStartCol, cellGroup.mergeEndCol), height = scene.table.getRowsHeight(cellGroup.mergeStartRow, cellGroup.mergeEndRow));
+                let customCol = col,
+                  customRow = row;
+                mergeRange && isCornerCustomMergeRange(mergeRange, scene.table) && (customCol = mergeRange.start.col, customRow = mergeRange.start.row);
+                const customResult = dealWithCustom(customLayout, customRender, customCol, customRow, width, height, !1, scene.table.isAutoRowHeight(row), padding, mergeRange, scene.table);
+                customElementsGroup = createCornerCustomMergeContainer(customResult.elementsGroup, width, height, mergeRange, scene.table), renderDefault = customResult.renderDefault, isHeightChange = !0;
+              }
+            } else renderDefault = !1;
+            if (cell.childrenCount > 0 && customElementsGroup ? cell.insertBefore(customElementsGroup, cell.firstChild) : customElementsGroup && cell.appendChild(customElementsGroup), isMergeCellGroup(cellGroup)) {
+              const mergeRange = scene.table.getCellRange(cellGroup.mergeStartCol, cellGroup.mergeStartRow);
+              isCornerCustomMergeRange(mergeRange, scene.table) && cell.setAttribute("clip", !shouldRenderCornerCustomMergeContent(col, row, mergeRange, scene.table));
             }
-            cell.childrenCount > 0 && customElementsGroup ? cell.insertBefore(customElementsGroup, cell.firstChild) : customElementsGroup && cell.appendChild(customElementsGroup);
           }
         }
-        const cellChange = updateMergeCellContentWidth(cellGroup, distWidth, detaX, autoRowHeight, renderDefault, scene.table);
+        const cellChange = updateMergeCellContentWidth(cellGroup, distWidth, detaX, autoRowHeight, renderDefault, scene.table, !customContainer, pendingCornerCustomMergeRanges);
         isHeightChange = isHeightChange || cellChange;
       }
       if (!autoWrapText) {
@@ -55439,7 +55572,7 @@
       }
       return !(!autoRowHeight || !autoWrapText) && isHeightChange;
     }
-    function updateMergeCellContentWidth(cellGroup, distWidth, detaX, autoRowHeight, renderDefault, table) {
+    function updateMergeCellContentWidth(cellGroup, distWidth, detaX, autoRowHeight, renderDefault, table, refreshCornerCustomMergeContent = !0, pendingCornerCustomMergeRanges) {
       if (isMergeCellGroup(cellGroup)) {
         distWidth = 0;
         let isHeightChange = !1;
@@ -55493,7 +55626,8 @@
           }, table);
           heightChange && (singleCellGroup.needUpdateHeight = !0), isHeightChange = isHeightChange || changed;
         }
-        return isHeightChange;
+        const mergeRange = table.getCellRange(cellGroup.mergeStartCol, cellGroup.mergeStartRow);
+        return refreshCornerCustomMergeContent && isCornerCustomMergeRange(mergeRange, table) && queueCornerCustomMergeContentUpdate(mergeRange, table, pendingCornerCustomMergeRanges), isHeightChange;
       }
       const style = table._getCellStyle(cellGroup.col, cellGroup.row),
         padding = getQuadProps(getProp("padding", style, cellGroup.col, cellGroup.row, table)),
@@ -57048,8 +57182,12 @@
       const maxWidthColumnMap = new Map(),
         minWidthColumnMap = new Map();
       for (let col = startCol; col < endColPlus1; col++) {
-        const width = update && null !== (_a = newWidths[col]) && void 0 !== _a ? _a : table.getColWidth(col),
-          maxWidth = table.getMaxColWidth(col),
+        const width = update && null !== (_a = newWidths[col]) && void 0 !== _a ? _a : table.getColWidth(col);
+        if ("adaptive" === table.widthMode && table.internalProps._widthResizedColMap.has(col)) {
+          totalDrawWidth -= width;
+          continue;
+        }
+        const maxWidth = table.getMaxColWidth(col),
           minWidth = table.getMinColWidth(col);
         if (actualWidth += width, adaptiveColumns.push(col), maxWidth === width ? maxWidthColumnMap.set(col, width) : minWidth === width && minWidthColumnMap.set(col, width), null === (_b = table.options.customConfig) || void 0 === _b ? void 0 : _b.shrinkSparklineFirst) {
           "sparkline" === table.getBodyColumnType(col, 0) && (sparklineColumns.push({
@@ -57337,7 +57475,7 @@
       let targetRow = distRow;
       for (; targetRow < bodyBottomRow && table.getRowsHeight(table.frozenRowCount, targetRow) < visibleBodyHeight;) {
         const nextRow = targetRow + 1;
-        computeRowsHeight(table, nextRow, nextRow, !1), targetRow = nextRow;
+        table.internalProps._heightResizedRowMap.has(nextRow) || computeRowsHeight(table, nextRow, nextRow, !1), targetRow = nextRow;
       }
       return targetRow;
     }
@@ -57357,7 +57495,20 @@
       let distCol, distRow, distColForCompute, distRowForCompute;
       proxy.setParamsForRow(), proxy.setParamsForColumn(), "adaptive" === table.widthMode || table.options.autoWrapText && ("adaptive" === table.heightMode || table.isAutoRowHeight(table.columnHeaderLevelCount)) ? (distColForCompute = table.colCount - 1, distCol = Math.min(proxy.firstScreenColLimit - 1, table.colCount - 1)) : distCol = Math.min(proxy.firstScreenColLimit - 1, table.colCount - 1), "adaptive" === table.heightMode ? (distRowForCompute = table.rowCount - 1, distRow = Math.min(proxy.firstScreenRowLimit - 1, table.rowCount - 1)) : distRow = Math.min(proxy.firstScreenRowLimit - 1, table.rowCount - 1);
       let bodyDistRow = Math.min(proxy.bodyBottomRow, distRow - table.bottomFrozenRowCount);
-      0 === table.internalProps._widthResizedColMap.size && computeColsWidth(table, 0, null != distColForCompute ? distColForCompute : distCol), 0 === table.internalProps._heightResizedRowMap.size && (computeRowsHeight(table, 0, "auto" === table.options.canvasHeight || (null === (_a = table.options.customConfig) || void 0 === _a ? void 0 : _a.forceComputeAllRowHeight) ? table.rowCount - 1 : null != distRowForCompute ? distRowForCompute : distRow), "autoHeight" === table.heightMode && (bodyDistRow = fillVisibleBodyRows$1(proxy, bodyDistRow), syncVisibleBodyRows(proxy, bodyDistRow))), distCol < table.colCount - table.rightFrozenColCount && table.colCount - table.rightFrozenColCount <= table.colCount - 1 && computeColsWidth(table, table.colCount - table.rightFrozenColCount, table.colCount - 1), distRow < table.rowCount - table.bottomFrozenRowCount && table.rowCount - table.bottomFrozenRowCount <= table.rowCount - 1 && computeRowsHeight(table, table.rowCount - table.bottomFrozenRowCount, table.rowCount - 1), table.scenegraph.colHeaderGroup.setAttribute("x", table.getFrozenColsWidth()), table.scenegraph.rowHeaderGroup.setAttribute("y", table.getFrozenRowsHeight()), table.scenegraph.bottomFrozenGroup.setAttribute("x", table.getFrozenColsWidth()), table.scenegraph.rightFrozenGroup.setAttribute("y", table.getFrozenRowsHeight()), table.scenegraph.bodyGroup.setAttributes({
+      const colEndForCompute = null != distColForCompute ? distColForCompute : distCol;
+      let hasUnresizedColumns = !1;
+      for (let col = 0; col <= colEndForCompute; col++) if (!table.internalProps._widthResizedColMap.has(col)) {
+        hasUnresizedColumns = !0;
+        break;
+      }
+      hasUnresizedColumns && computeColsWidth(table, 0, colEndForCompute);
+      const rowEndForCompute = "auto" === table.options.canvasHeight || (null === (_a = table.options.customConfig) || void 0 === _a ? void 0 : _a.forceComputeAllRowHeight) ? table.rowCount - 1 : null != distRowForCompute ? distRowForCompute : distRow;
+      let hasUnresizedRows = !1;
+      for (let row = 0; row <= rowEndForCompute; row++) if (!table.internalProps._heightResizedRowMap.has(row)) {
+        hasUnresizedRows = !0;
+        break;
+      }
+      hasUnresizedRows && computeRowsHeight(table, 0, rowEndForCompute), "autoHeight" === table.heightMode && (bodyDistRow = fillVisibleBodyRows$1(proxy, bodyDistRow), syncVisibleBodyRows(proxy, bodyDistRow)), distCol < table.colCount - table.rightFrozenColCount && table.colCount - table.rightFrozenColCount <= table.colCount - 1 && computeColsWidth(table, table.colCount - table.rightFrozenColCount, table.colCount - 1), distRow < table.rowCount - table.bottomFrozenRowCount && table.rowCount - table.bottomFrozenRowCount <= table.rowCount - 1 && computeRowsHeight(table, table.rowCount - table.bottomFrozenRowCount, table.rowCount - 1), table.scenegraph.colHeaderGroup.setAttribute("x", table.getFrozenColsWidth()), table.scenegraph.rowHeaderGroup.setAttribute("y", table.getFrozenRowsHeight()), table.scenegraph.bottomFrozenGroup.setAttribute("x", table.getFrozenColsWidth()), table.scenegraph.rightFrozenGroup.setAttribute("y", table.getFrozenRowsHeight()), table.scenegraph.bodyGroup.setAttributes({
         x: table.getFrozenColsWidth(),
         y: table.getFrozenRowsHeight()
       }), createColGroup(cornerHeaderGroup, xOrigin, yOrigin, 0, table.frozenColCount - 1, 0, table.frozenRowCount - 1, table.isListTable() ? "columnHeader" : "cornerHeader", table), distCol - table.rightFrozenColCount >= table.frozenColCount && createColGroup(colHeaderGroup, xOrigin, yOrigin, table.frozenColCount, distCol - table.rightFrozenColCount, 0, table.frozenRowCount - 1, "columnHeader", table), table.frozenColCount > 0 && (table.leftRowSeriesNumberCount > 0 && createColGroup(rowHeaderGroup, xOrigin, yOrigin, 0, table.leftRowSeriesNumberCount - 1, table.frozenRowCount, bodyDistRow, "rowHeader", table), table.frozenColCount > table.leftRowSeriesNumberCount && createColGroup(rowHeaderGroup, xOrigin, yOrigin, table.leftRowSeriesNumberCount, Math.min(table.frozenColCount - 1, table.rowHeaderLevelCount + table.leftRowSeriesNumberCount - 1), table.frozenRowCount, bodyDistRow, "rowHeader", table), table.frozenColCount > table.rowHeaderLevelCount + table.leftRowSeriesNumberCount && createColGroup(rowHeaderGroup, xOrigin, yOrigin, table.rowHeaderLevelCount + table.leftRowSeriesNumberCount, table.frozenColCount - 1, table.frozenRowCount, bodyDistRow, "body", table)), table.bottomFrozenRowCount > 0 && (table.frozenColCount > 0 && (table.leftRowSeriesNumberCount > 0 && createColGroup(leftBottomCornerGroup, xOrigin, yOrigin, 0, table.leftRowSeriesNumberCount - 1, table.rowCount - 1 - table.bottomFrozenRowCount + 1, table.rowCount - 1, "rowHeader", table), table.rowHeaderLevelCount > 0 && createColGroup(leftBottomCornerGroup, xOrigin, yOrigin, table.leftRowSeriesNumberCount, table.leftRowSeriesNumberCount + table.rowHeaderLevelCount - 1, table.rowCount - 1 - table.bottomFrozenRowCount + 1, table.rowCount - 1, "rowHeader", table), table.frozenColCount > table.rowHeaderLevelCount + table.leftRowSeriesNumberCount && createColGroup(leftBottomCornerGroup, xOrigin, yOrigin, table.rowHeaderLevelCount + table.leftRowSeriesNumberCount, table.frozenColCount - 1, table.rowCount - 1 - table.bottomFrozenRowCount + 1, table.rowCount - 1, "body", table)), distCol - table.rightFrozenColCount >= table.frozenColCount && createColGroup(bottomFrozenGroup, xOrigin, yOrigin, table.frozenColCount, distCol - table.rightFrozenColCount, table.rowCount - 1 - table.bottomFrozenRowCount + 1, table.rowCount - 1, table.isPivotChart() ? "rowHeader" : "body", table)), table.rightFrozenColCount > 0 && (createColGroup(rightTopCornerGroup, xOrigin, yOrigin, table.colCount - 1 - table.rightFrozenColCount + 1, table.colCount - 1, 0, table.frozenRowCount - 1, "columnHeader", table), createColGroup(rightFrozenGroup, xOrigin, yOrigin, table.colCount - 1 - table.rightFrozenColCount + 1, table.colCount - 1, table.frozenRowCount, bodyDistRow, table.isPivotChart() ? "rowHeader" : "body", table)), table.bottomFrozenRowCount > 0 && table.rightFrozenColCount > 0 && createColGroup(rightBottomCornerGroup, xOrigin, yOrigin, table.colCount - 1 - table.rightFrozenColCount + 1, table.colCount - 1, table.rowCount - 1 - table.bottomFrozenRowCount + 1, table.rowCount - 1, "body", table), distCol - table.rightFrozenColCount >= table.frozenColCount && createColGroup(bodyGroup, xOrigin, yOrigin, table.frozenColCount, distCol - table.rightFrozenColCount, table.frozenRowCount, bodyDistRow, "body", table), bodyGroup.firstChild || colHeaderGroup.firstChild || cornerHeaderGroup.firstChild || rowHeaderGroup.firstChild ? (proxy.currentRow = null !== (_e = null !== (_c = null === (_b = bodyGroup.firstChild) || void 0 === _b ? void 0 : _b.rowNumber) && void 0 !== _c ? _c : null === (_d = rowHeaderGroup.firstChild) || void 0 === _d ? void 0 : _d.rowNumber) && void 0 !== _e ? _e : proxy.totalRow, proxy.rowEnd = proxy.currentRow, proxy.rowUpdatePos = proxy.rowEnd + 1, proxy.referenceRow = proxy.rowStart + Math.floor((proxy.rowEnd - proxy.rowStart) / 2), proxy.currentCol = null !== (_o = null !== (_l = null !== (_j = null !== (_g = null === (_f = bodyGroup.lastChild) || void 0 === _f ? void 0 : _f.col) && void 0 !== _g ? _g : null === (_h = colHeaderGroup.lastChild) || void 0 === _h ? void 0 : _h.col) && void 0 !== _j ? _j : null === (_k = rowHeaderGroup.lastChild) || void 0 === _k ? void 0 : _k.col) && void 0 !== _l ? _l : null === (_m = cornerHeaderGroup.lastChild) || void 0 === _m ? void 0 : _m.col) && void 0 !== _o ? _o : proxy.totalCol, proxy.colEnd = proxy.currentCol, proxy.colUpdatePos = proxy.colEnd + 1, proxy.referenceCol = proxy.colStart + Math.floor((proxy.colEnd - proxy.colStart) / 2), proxy.progress()) : (proxy.currentRow = proxy.totalRow, proxy.rowEnd = proxy.currentRow, proxy.rowUpdatePos = proxy.rowEnd + 1, proxy.referenceRow = proxy.rowStart + Math.floor((proxy.rowEnd - proxy.rowStart) / 2), proxy.currentCol = proxy.totalCol, proxy.colEnd = proxy.currentCol, proxy.colUpdatePos = proxy.colEnd + 1, proxy.referenceCol = proxy.colStart + Math.floor((proxy.colEnd - proxy.colStart) / 2));
@@ -60314,6 +60465,7 @@
       }
       releaseStage() {
         var _a, _b, _c;
+        this.clear = !0, this._needUpdateContainer = !1;
         const releaseAppRef = this.releaseVRenderAppRef;
         this.releaseVRenderAppRef = void 0;
         try {
@@ -60505,8 +60657,8 @@
           updateCellSelectBorder(this, cellRange), moveSelectingRangeComponentsToSelectedRangeComponents(this);
         });
       }
-      updateColWidth(col, detaX, skipUpdateContainer, skipTableWidthMap) {
-        updateColWidth(this, col, Math.round(detaX), skipTableWidthMap), skipUpdateContainer || this.updateContainer({
+      updateColWidth(col, detaX, skipUpdateContainer, skipTableWidthMap, pendingCornerCustomMergeRanges) {
+        updateColWidth(this, col, Math.round(detaX), skipTableWidthMap, pendingCornerCustomMergeRanges), skipUpdateContainer || this.updateContainer({
           async: !0
         });
       }
@@ -60679,8 +60831,8 @@
           height: this.tableGroup.attribute.height
         })));
       }
-      updateRowHeight(row, detaY, skipTableHeightMap) {
-        detaY = Math.round(detaY), updateRowHeight(this, row, detaY, skipTableHeightMap), this.updateContainerHeight(row, detaY);
+      updateRowHeight(row, detaY, skipTableHeightMap, pendingCornerCustomMergeRanges) {
+        detaY = Math.round(detaY), updateRowHeight(this, row, detaY, skipTableHeightMap, pendingCornerCustomMergeRanges), this.updateContainerHeight(row, detaY);
       }
       updateRowsHeight(rows, detaYs, skipTableHeightMap) {
         for (let i = 0; i < rows.length; i++) {
@@ -60889,7 +61041,7 @@
         var _a;
         updateConfig.async ? this._needUpdateContainer || (this._needUpdateContainer = !0, setTimeout(() => {
           var _a;
-          this.updateContainerSync(null !== (_a = updateConfig.needUpdateCellY) && void 0 !== _a && _a);
+          this._needUpdateContainer && !this.clear ? this.updateContainerSync(null !== (_a = updateConfig.needUpdateCellY) && void 0 !== _a && _a) : this._needUpdateContainer = !1;
         }, 0)) : (this._needUpdateContainer = !0, this.updateContainerSync(null !== (_a = updateConfig.needUpdateCellY) && void 0 !== _a && _a));
       }
       updateContainerSync(needUpdateCellY = !1) {
@@ -62031,17 +62183,20 @@
       }), state.table.internalProps.title && state.table.internalProps.title.resize(), state.table.internalProps.emptyTip && state.table.internalProps.emptyTip.resize(), state.columnResize.col < state.table.frozenColCount && !state.table.isPivotTable() && !state.table.transpose ? state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1, state.columnResize.isRightFrozen) : state.table.options.frozenColCount && state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1), (state.columnResize.col >= state.table.colCount - state.table.rightFrozenColCount && !state.table.isPivotTable() && !state.table.transpose || state.table.options.rightFrozenColCount) && state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount), state.table.scenegraph.updateNextFrame();
     }
     function updateResizeColForColumn(detaX, state) {
-      "adaptive" === state.table.widthMode && state.columnResize.col < state.table.colCount - 1 ? (state.table.scenegraph.updateColWidth(state.columnResize.col, detaX), state.table.scenegraph.updateColWidth(state.columnResize.col + 1, -detaX), state.table.internalProps._widthResizedColMap.add(state.columnResize.col), state.table.internalProps._widthResizedColMap.add(state.columnResize.col + 1)) : (state.table.scenegraph.updateColWidth(state.columnResize.col, detaX), state.table.internalProps._widthResizedColMap.add(state.columnResize.col));
+      const pendingCornerCustomMergeRanges = new Map();
+      "adaptive" === state.table.widthMode && state.columnResize.col < state.table.colCount - 1 ? (state.table.scenegraph.updateColWidth(state.columnResize.col, detaX, void 0, void 0, pendingCornerCustomMergeRanges), state.table.scenegraph.updateColWidth(state.columnResize.col + 1, -detaX, void 0, void 0, pendingCornerCustomMergeRanges), state.table.internalProps._widthResizedColMap.add(state.columnResize.col), state.table.internalProps._widthResizedColMap.add(state.columnResize.col + 1)) : (state.table.scenegraph.updateColWidth(state.columnResize.col, detaX, void 0, void 0, pendingCornerCustomMergeRanges), state.table.internalProps._widthResizedColMap.add(state.columnResize.col)), flushCornerCustomMergeContentUpdates(pendingCornerCustomMergeRanges, state.table);
     }
     function updateResizeColForAll$1(detaX, state) {
-      const layout = state.table.internalProps.layoutMap;
+      const layout = state.table.internalProps.layoutMap,
+        pendingCornerCustomMergeRanges = new Map();
       for (let col = state.table.frozenColCount; col < state.table.colCount - state.table.rightFrozenColCount; col++) {
         if (!(state.table.internalProps.transpose || state.table.isPivotTable() && !layout.indicatorsAsCol)) {
           const cellDefine = layout.getBody(col, state.table.columnHeaderLevelCount);
           if (null == cellDefine ? void 0 : cellDefine.disableColumnResize) continue;
         }
-        state.table.scenegraph.updateColWidth(col, detaX), state.table.internalProps._widthResizedColMap.add(col);
+        state.table.scenegraph.updateColWidth(col, detaX, void 0, void 0, pendingCornerCustomMergeRanges), state.table.internalProps._widthResizedColMap.add(col);
       }
+      flushCornerCustomMergeContentUpdates(pendingCornerCustomMergeRanges, state.table);
     }
     function updateResizeColForIndicator$1(detaX, state) {
       const layout = state.table.internalProps.layoutMap;
@@ -62051,14 +62206,16 @@
           headerPath = headerPaths.colHeaderPaths[headerPaths.colHeaderPaths.length - 1];
         resizeDimensionKey = headerPath.dimensionKey, resizeDimensionValue = headerPath.value;
       }
+      const pendingCornerCustomMergeRanges = new Map();
       for (let col = state.table.rowHeaderLevelCount; col < state.table.colCount - state.table.rightFrozenColCount; col++) {
         const indicatorKey = layout.getIndicatorKey(col, state.table.columnHeaderLevelCount);
-        if (layout.indicatorsAsCol && indicatorKey === resizeIndicatorKey) state.table.scenegraph.updateColWidth(col, detaX), state.table.internalProps._widthResizedColMap.add(col);else if (!layout.indicatorsAsCol) {
+        if (layout.indicatorsAsCol && indicatorKey === resizeIndicatorKey) state.table.scenegraph.updateColWidth(col, detaX, void 0, void 0, pendingCornerCustomMergeRanges), state.table.internalProps._widthResizedColMap.add(col);else if (!layout.indicatorsAsCol) {
           const headerPaths = layout.getCellHeaderPaths(col, state.table.columnHeaderLevelCount - 1),
             headerPath = null == headerPaths ? void 0 : headerPaths.colHeaderPaths[headerPaths.colHeaderPaths.length - 1];
-          headerPath && resizeDimensionKey === headerPath.dimensionKey && resizeDimensionValue === headerPath.value && (state.table.scenegraph.updateColWidth(col, detaX), state.table.internalProps._widthResizedColMap.add(col));
+          headerPath && resizeDimensionKey === headerPath.dimensionKey && resizeDimensionValue === headerPath.value && (state.table.scenegraph.updateColWidth(col, detaX, void 0, void 0, pendingCornerCustomMergeRanges), state.table.internalProps._widthResizedColMap.add(col));
         }
       }
+      flushCornerCustomMergeContentUpdates(pendingCornerCustomMergeRanges, state.table);
     }
     function updateResizeColForIndicatorGroup$1(detaX, state) {
       const layout = state.table.internalProps.layoutMap,
@@ -62067,15 +62224,17 @@
         startCol = node.startInTotal + state.table.frozenColCount,
         endCol = node.startInTotal + state.table.frozenColCount + node.size - 1,
         totalColWidth = state.table.getColsWidth(startCol, endCol),
-        moveX = detaX;
+        moveX = detaX,
+        pendingCornerCustomMergeRanges = new Map();
       for (let col = startCol; col <= endCol; col++) {
         if (!(state.table.internalProps.transpose || state.table.isPivotTable() && !layout.indicatorsAsCol)) {
           const cellDefine = layout.getBody(col, state.table.columnHeaderLevelCount);
           if (null == cellDefine ? void 0 : cellDefine.disableColumnResize) continue;
         }
         let deltaWidth = state.table.getColWidth(col) / totalColWidth * moveX;
-        deltaWidth > 0 && deltaWidth < .5 ? deltaWidth = .5 : deltaWidth < 0 && deltaWidth >= -.5 && (deltaWidth = -.5), state.table.scenegraph.updateColWidth(col, deltaWidth), state.table.internalProps._widthResizedColMap.add(col);
+        deltaWidth > 0 && deltaWidth < .5 ? deltaWidth = .5 : deltaWidth < 0 && deltaWidth >= -.5 && (deltaWidth = -.5), state.table.scenegraph.updateColWidth(col, deltaWidth, void 0, void 0, pendingCornerCustomMergeRanges), state.table.internalProps._widthResizedColMap.add(col);
       }
+      flushCornerCustomMergeContentUpdates(pendingCornerCustomMergeRanges, state.table);
     }
 
     function setRadioState(col, row, field, type, indexInCell, state) {
@@ -62540,10 +62699,13 @@
       }), state.table.internalProps.title && state.table.internalProps.title.resize(), state.table.internalProps.emptyTip && state.table.internalProps.emptyTip.resize(), state.table.scenegraph.updateNextFrame();
     }
     function updateResizeColForRow(detaY, state) {
-      "adaptive" === state.table.heightMode && state.rowResize.row < state.table.rowCount - 1 ? (state.table.scenegraph.updateRowHeight(state.rowResize.row, detaY), state.table.scenegraph.updateRowHeight(state.rowResize.row + 1, -detaY), state.table.internalProps._heightResizedRowMap.add(state.rowResize.row), state.table.internalProps._heightResizedRowMap.add(state.rowResize.row + 1)) : (state.table.scenegraph.updateRowHeight(state.rowResize.row, detaY), state.table.internalProps._heightResizedRowMap.add(state.rowResize.row));
+      const pendingCornerCustomMergeRanges = new Map();
+      "adaptive" === state.table.heightMode && state.rowResize.row < state.table.rowCount - 1 ? (state.table.scenegraph.updateRowHeight(state.rowResize.row, detaY, void 0, pendingCornerCustomMergeRanges), state.table.scenegraph.updateRowHeight(state.rowResize.row + 1, -detaY, void 0, pendingCornerCustomMergeRanges), state.table.internalProps._heightResizedRowMap.add(state.rowResize.row), state.table.internalProps._heightResizedRowMap.add(state.rowResize.row + 1)) : (state.table.scenegraph.updateRowHeight(state.rowResize.row, detaY, void 0, pendingCornerCustomMergeRanges), state.table.internalProps._heightResizedRowMap.add(state.rowResize.row)), flushCornerCustomMergeContentUpdates(pendingCornerCustomMergeRanges, state.table);
     }
     function updateResizeColForAll(detaY, state) {
-      for (let row = state.table.frozenRowCount; row < state.table.rowCount - state.table.bottomFrozenRowCount; row++) state.table.scenegraph.updateRowHeight(row, detaY), state.table.internalProps._heightResizedRowMap.add(row);
+      const pendingCornerCustomMergeRanges = new Map();
+      for (let row = state.table.frozenRowCount; row < state.table.rowCount - state.table.bottomFrozenRowCount; row++) state.table.scenegraph.updateRowHeight(row, detaY, void 0, pendingCornerCustomMergeRanges), state.table.internalProps._heightResizedRowMap.add(row);
+      flushCornerCustomMergeContentUpdates(pendingCornerCustomMergeRanges, state.table);
     }
     function updateResizeColForIndicator(detaY, state) {
       var _a, _b;
@@ -62554,16 +62716,18 @@
           headerPath = null === (_a = headerPaths.rowHeaderPaths) || void 0 === _a ? void 0 : _a[headerPaths.rowHeaderPaths.length - 1];
         resizeDimensionKey = null == headerPath ? void 0 : headerPath.dimensionKey, resizeDimensionValue = null == headerPath ? void 0 : headerPath.value;
       } else resizeIndicatorKey = layout.getIndicatorKey(state.table.rowHeaderLevelCount, state.rowResize.row);
+      const pendingCornerCustomMergeRanges = new Map();
       for (let row = state.table.columnHeaderLevelCount; row < state.table.rowCount - state.table.bottomFrozenRowCount; row++) {
         const indicatorKey = layout.getIndicatorKey(state.table.rowHeaderLevelCount, row);
         if (layout.indicatorsAsCol || indicatorKey !== resizeIndicatorKey) {
           if (layout.indicatorsAsCol) {
             const headerPaths = layout.getCellHeaderPaths(state.table.rowHeaderLevelCount - 1, row),
               headerPath = null === (_b = null == headerPaths ? void 0 : headerPaths.rowHeaderPaths) || void 0 === _b ? void 0 : _b[headerPaths.rowHeaderPaths.length - 1];
-            headerPath && resizeDimensionKey === headerPath.dimensionKey && resizeDimensionValue === headerPath.value && (state.table.scenegraph.updateRowHeight(row, detaY), state.table.internalProps._heightResizedRowMap.add(row));
+            headerPath && resizeDimensionKey === headerPath.dimensionKey && resizeDimensionValue === headerPath.value && (state.table.scenegraph.updateRowHeight(row, detaY, void 0, pendingCornerCustomMergeRanges), state.table.internalProps._heightResizedRowMap.add(row));
           }
-        } else state.table.scenegraph.updateRowHeight(row, detaY), state.table.internalProps._heightResizedRowMap.add(row);
+        } else state.table.scenegraph.updateRowHeight(row, detaY, void 0, pendingCornerCustomMergeRanges), state.table.internalProps._heightResizedRowMap.add(row);
       }
+      flushCornerCustomMergeContentUpdates(pendingCornerCustomMergeRanges, state.table);
     }
     function updateResizeColForIndicatorGroup(detaY, state) {
       const layout = state.table.internalProps.layoutMap,
@@ -62572,11 +62736,13 @@
         startRow = node.startInTotal + state.table.frozenRowCount,
         endRow = node.startInTotal + state.table.frozenRowCount + node.size - 1,
         totalRowHeight = state.table.getRowsHeight(startRow, endRow),
-        moveY = detaY;
+        moveY = detaY,
+        pendingCornerCustomMergeRanges = new Map();
       for (let row = startRow; row <= endRow; row++) {
         let deltaHeight = state.table.getRowHeight(row) / totalRowHeight * moveY;
-        deltaHeight > 0 && deltaHeight < .5 ? deltaHeight = .5 : deltaHeight < 0 && deltaHeight >= -.5 && (deltaHeight = -.51), state.table.scenegraph.updateRowHeight(row, deltaHeight), state.table.internalProps._heightResizedRowMap.add(row);
+        deltaHeight > 0 && deltaHeight < .5 ? deltaHeight = .5 : deltaHeight < 0 && deltaHeight >= -.5 && (deltaHeight = -.51), state.table.scenegraph.updateRowHeight(row, deltaHeight, void 0, pendingCornerCustomMergeRanges), state.table.internalProps._heightResizedRowMap.add(row);
       }
+      flushCornerCustomMergeContentUpdates(pendingCornerCustomMergeRanges, state.table);
     }
 
     function updateCustomSelectBorder(scene, selectRange, style) {
@@ -63678,6 +63844,7 @@
             clickToPreview: clickToPreview
           } = columnDefine;
           if (!1 === clickToPreview) return;
+          if (!cellValue) return;
           const previewManager = getMediaPreviewManager(table),
             overlay = document.createElement("div");
           overlay.style.width = "100%", overlay.style.height = "100%", overlay.style.position = "fixed", overlay.style.top = "0", overlay.style.left = "0", overlay.style.backgroundColor = "rgba(30, 30, 30, 0.4)", overlay.style.display = "flex", overlay.style.justifyContent = "center", overlay.style.alignItems = "center", overlay.style.overflow = "hidden", overlay.style.zIndex = "9999";
@@ -63694,6 +63861,7 @@
             clickToPreview: clickToPreview
           } = columnDefine;
           if (!1 === clickToPreview) return;
+          if (!cellValue) return;
           const previewManager = getMediaPreviewManager(table),
             overlay = document.createElement("div");
           overlay.style.width = "100%", overlay.style.height = "100%", overlay.style.position = "fixed", overlay.style.top = "0", overlay.style.left = "0", overlay.style.backgroundColor = "rgba(30, 30, 30, 0.4)", overlay.style.display = "flex", overlay.style.justifyContent = "center", overlay.style.alignItems = "center", overlay.style.overflow = "hidden", overlay.style.zIndex = "9999";
@@ -63709,6 +63877,7 @@
             clickToPreview: clickToPreview
           } = columnDefine;
           if (!1 === clickToPreview) return;
+          if (!cellValue) return;
           const previewManager = getMediaPreviewManager(table),
             overlay = document.createElement("div");
           overlay.style.width = "100%", overlay.style.height = "100%", overlay.style.position = "fixed", overlay.style.top = "0", overlay.style.left = "0", overlay.style.backgroundColor = "rgba(30, 30, 30, 0.4)", overlay.style.display = "flex", overlay.style.justifyContent = "center", overlay.style.alignItems = "center", overlay.style.overflow = "hidden", overlay.style.zIndex = "9999";
@@ -65322,7 +65491,7 @@
     };
     let EventManager$1 = class EventManager {
       constructor(table) {
-        this.isDown = !1, this.isDraging = !1, this.globalEventListeners = [], this._enableTableScroll = !0, this.cutWaitPaste = !1, this.clipboardCheckTimer = null, this.cutOperationTime = 0, this.lastClipboardContent = "", this.cutCellRange = null, this.cutRanges = null, this.copySourceRange = null, this.table = table, this.handleTextStickBindId = [], this.inertiaScroll = new InertiaScroll(table.stateManager), "node" === Env$1.mode || table.options.disableInteraction || (this.bindOuterEvent(), setTimeout(() => {
+        this.isDown = !1, this.isDraging = !1, this.globalEventListeners = [], this._enableTableScroll = !0, this.cutWaitPaste = !1, this.clipboardCheckTimer = null, this.cutOperationId = 0, this.clipboardOperationId = 0, this.pasteOperationId = 0, this.pasteWriteInProgress = !1, this.pasteWritePromise = Promise.resolve(), this.clipboardWritePromise = Promise.resolve(), this.lastCopiedClipboardData = null, this.internalFormulaHtmlMarkerId = 0, this.fieldKeyIds = new WeakMap(), this.fieldKeyId = 0, this.activeCutState = null, this.lastClipboardContent = "", this.cutCellRange = null, this.cutRanges = null, this.copySourceRange = null, this.table = table, this.handleTextStickBindId = [], this.inertiaScroll = new InertiaScroll(table.stateManager), "node" === Env$1.mode || table.options.disableInteraction || (this.bindOuterEvent(), setTimeout(() => {
           this.bindSelfEvent();
         }, 0));
       }
@@ -65543,7 +65712,7 @@
       }
       release() {
         var _a;
-        null === (_a = this.gesture) || void 0 === _a || _a.release(), this.globalEventListeners.forEach(item => {
+        this.clipboardOperationId++, this.pasteOperationId++, this.resetCutState(), null === (_a = this.gesture) || void 0 === _a || _a.release(), this.globalEventListeners.forEach(item => {
           "document" === item.env ? document.removeEventListener(item.name, item.callback) : "body" === item.env ? document.body.removeEventListener(item.name, item.callback) : "window" === item.env ? window.removeEventListener(item.name, item.callback) : "vglobal" === item.env && vglobal.removeEventListener(item.name, item.callback);
         }), this.globalEventListeners = [];
       }
@@ -65556,289 +65725,807 @@
       handleCopy(e, isCut = !1) {
         var _a, _b, _c, _d, _e, _f;
         return __awaiter$1(this, void 0, void 0, function* () {
-          const table = this.table;
-          !isCut && (this.cutWaitPaste = !1), this.copySourceRange = null;
-          const sourceRanges = table.stateManager.select.ranges;
-          if (sourceRanges && 1 === sourceRanges.length) {
-            const sourceRange = sourceRanges[0];
-            this.copySourceRange = {
-              startCol: Math.min(sourceRange.start.col, sourceRange.end.col),
-              startRow: Math.min(sourceRange.start.row, sourceRange.end.row)
-            };
-          } else if (!(null == sourceRanges ? void 0 : sourceRanges.length)) return void (this.copySourceRange = null);
+          const table = this.table,
+            operationId = ++this.clipboardOperationId;
+          this.pasteOperationId++, isCut || this.resetCutState();
+          const copySnapshot = this.getCopySnapshot(isCut);
+          if (this.copySourceRange = null, this.lastCopiedClipboardData = null, !copySnapshot) return this.copySourceRange = null, null;
           const data = this.table.getCopyValue(null === (_b = null === (_a = table.options.keyboardOptions) || void 0 === _a ? void 0 : _a.getCopyCellValue) || void 0 === _b ? void 0 : _b.value);
-          if (isValid$1(data)) {
+          if (!isValid$1(data)) return null;
+          {
             e.preventDefault();
+            let copySucceeded = !1,
+              copiedClipboardData = null;
+            const canUseAsyncClipboard = window.isSecureContext && !!(null === (_c = navigator.clipboard) || void 0 === _c ? void 0 : _c.writeText),
+              canWriteRichClipboard = window.isSecureContext && !!(null === (_d = navigator.clipboard) || void 0 === _d ? void 0 : _d.write) && !!window.ClipboardItem,
+              hasEventClipboard = !!e.clipboardData,
+              dataHTML = !canUseAsyncClipboard || canWriteRichClipboard || hasEventClipboard ? this.getCopyDataHTML(data) : null,
+              formulaClipboardData = this.getCopyFormulaPlainData(data, isCut);
+            if (null === formulaClipboardData) return null;
+            const plainClipboardData = data,
+              internalFormulaText = formulaClipboardData !== plainClipboardData ? formulaClipboardData : void 0,
+              internalFormulaHtmlMarker = internalFormulaText ? this.createInternalFormulaHtmlMarker() : void 0,
+              clipboardHTML = dataHTML && internalFormulaHtmlMarker ? this.attachInternalFormulaHtmlMarker(dataHTML, internalFormulaHtmlMarker) : dataHTML,
+              eventClipboardWriteData = hasEventClipboard ? this.setCopyDataToEventClipboard(plainClipboardData, clipboardHTML, e, internalFormulaText, internalFormulaHtmlMarker) : null;
+            if (eventClipboardWriteData) return copiedClipboardData = eventClipboardWriteData, this.lastCopiedClipboardData = copiedClipboardData, isCut && (this.lastClipboardContent = this.getClipboardSignature(copiedClipboardData), copySnapshot.clipboardData = copiedClipboardData, copySnapshot.clipboardSignature = this.lastClipboardContent), this.copySourceRange = copySnapshot.copySourceRange, this.afterCopyData(data, isCut, copySnapshot, !isCut), isCut && (null === (_e = table.keyboardOptions) || void 0 === _e ? void 0 : _e.showCopyCellBorder) && window.setTimeout(() => {
+              this.isClipboardOperationCurrent(operationId) && (setActiveCellRangeState(table, copySnapshot.ranges), table.clearSelected());
+            }, 0), copySnapshot;
             const element = table.getElement();
-            element && element !== document.activeElement && (element.focus(), yield new Promise(resolve => setTimeout(resolve, 10)));
+            if (element && element !== document.activeElement && (element.focus(), yield new Promise(resolve => setTimeout(resolve, 10)), !this.isClipboardOperationCurrent(operationId))) return null;
             try {
               if (navigator.clipboard && navigator.clipboard.writeText) {
                 let hasPermission = !0;
                 if (navigator.permissions && navigator.permissions.query) try {
-                  hasPermission = "granted" === (yield navigator.permissions.query({
+                  if (hasPermission = "granted" === (yield navigator.permissions.query({
                     name: "clipboard-write"
-                  })).state;
+                  })).state, !this.isClipboardOperationCurrent(operationId)) return null;
                 } catch (permissionError) {
                   hasPermission = !0;
                 }
                 if (hasPermission) try {
-                  if (window.ClipboardItem) {
-                    let htmlValues = data;
-                    1 === table.stateManager.select.ranges.length && (null === (_d = null === (_c = table.options.keyboardOptions) || void 0 === _c ? void 0 : _c.getCopyCellValue) || void 0 === _d ? void 0 : _d.html) && (htmlValues = this.table.getCopyValue(null === (_e = table.options.keyboardOptions) || void 0 === _e ? void 0 : _e.getCopyCellValue.html));
-                    const dataHTML = setDataToHTML(htmlValues);
-                    yield navigator.clipboard.write([new ClipboardItem({
-                      "text/html": new Blob([dataHTML], {
+                  if (!this.isClipboardOperationCurrent(operationId)) return null;
+                  copiedClipboardData = yield this.queueClipboardWrite(() => __awaiter$1(this, void 0, void 0, function* () {
+                    return this.isClipboardOperationCurrent(operationId) ? canWriteRichClipboard && clipboardHTML ? (yield navigator.clipboard.write([new ClipboardItem({
+                      "text/html": new Blob([clipboardHTML], {
                         type: "text/html"
                       }),
-                      "text/plain": new Blob([data], {
+                      "text/plain": new Blob([plainClipboardData], {
                         type: "text/plain"
                       })
-                    })]);
-                  } else yield navigator.clipboard.writeText(data);
+                    })]), {
+                      html: clipboardHTML,
+                      text: plainClipboardData,
+                      hasHtml: !0,
+                      hasText: !0,
+                      internalFormulaText: internalFormulaText,
+                      internalFormulaHtmlMarker: internalFormulaHtmlMarker
+                    }) : (yield navigator.clipboard.writeText(plainClipboardData), {
+                      html: "",
+                      text: plainClipboardData,
+                      hasText: !0,
+                      internalFormulaText: internalFormulaText
+                    }) : null;
+                  })), copiedClipboardData && (copySucceeded = !0);
                 } catch (clipboardError) {
-                  this.fallbackCopyToClipboard(data, e);
-                } else this.fallbackCopyToClipboard(data, e);
-              } else this.fallbackCopyToClipboard(data, e);
-              table.fireListeners(TABLE_EVENT_TYPE.COPY_DATA, {
-                cellRange: table.stateManager.select.ranges,
-                copyData: data,
-                isCut: isCut
+                  if (!this.isClipboardOperationCurrent(operationId)) return null;
+                  if (copySucceeded = this.fallbackCopyToClipboard(plainClipboardData), !this.isClipboardOperationCurrent(operationId)) return null;
+                  copySucceeded && (copiedClipboardData = {
+                    html: "",
+                    text: plainClipboardData,
+                    hasText: !0,
+                    internalFormulaText: internalFormulaText
+                  });
+                } else copySucceeded = this.fallbackCopyToClipboard(plainClipboardData), copySucceeded && (copiedClipboardData = {
+                  html: "",
+                  text: plainClipboardData,
+                  hasText: !0,
+                  internalFormulaText: internalFormulaText
+                });
+              } else copySucceeded = this.fallbackCopyToClipboard(plainClipboardData), copySucceeded && (copiedClipboardData = {
+                html: "",
+                text: plainClipboardData,
+                hasText: !0,
+                internalFormulaText: internalFormulaText
               });
+              if (!copySucceeded) return null;
+              if (!this.isClipboardOperationCurrent(operationId)) return null;
+              this.lastCopiedClipboardData = copiedClipboardData, isCut && (this.lastClipboardContent = this.getClipboardSignature(copiedClipboardData), copySnapshot.clipboardData = copiedClipboardData, copySnapshot.clipboardSignature = this.lastClipboardContent), this.copySourceRange = copySnapshot.copySourceRange, this.afterCopyData(data, isCut, copySnapshot, !1);
             } catch (error) {
-              this.fallbackCopyToClipboard(data, e);
+              if (!this.isClipboardOperationCurrent(operationId)) return null;
+              if (!this.fallbackCopyToClipboard(plainClipboardData)) return null;
+              if (!this.isClipboardOperationCurrent(operationId)) return null;
+              this.lastCopiedClipboardData = {
+                html: "",
+                text: plainClipboardData,
+                hasText: !0,
+                internalFormulaText: internalFormulaText
+              }, isCut && (this.lastClipboardContent = this.getClipboardSignature(this.lastCopiedClipboardData), copySnapshot.clipboardData = this.lastCopiedClipboardData, copySnapshot.clipboardSignature = this.lastClipboardContent), this.copySourceRange = copySnapshot.copySourceRange, this.afterCopyData(data, isCut, copySnapshot, !1);
+            }
+          }
+          return (null === (_f = table.keyboardOptions) || void 0 === _f ? void 0 : _f.showCopyCellBorder) && (setActiveCellRangeState(table, copySnapshot.ranges), table.clearSelected()), copySnapshot;
+        });
+      }
+      afterCopyData(data, isCut, copySnapshot, updateCopyCellBorder = !0) {
+        var _a;
+        const table = this.table;
+        try {
+          table.fireListeners(TABLE_EVENT_TYPE.COPY_DATA, {
+            cellRange: this.cloneRanges(copySnapshot.ranges),
+            copyData: data,
+            isCut: isCut
+          });
+        } catch (error) {}
+        updateCopyCellBorder && (null === (_a = table.keyboardOptions) || void 0 === _a ? void 0 : _a.showCopyCellBorder) && (setActiveCellRangeState(table, copySnapshot.ranges), table.clearSelected());
+      }
+      getCopySnapshot(includeCellInfos) {
+        const ranges = this.table.stateManager.select.ranges;
+        if (!(null == ranges ? void 0 : ranges.length)) return null;
+        const clonedRanges = ranges.map(range => ({
+            start: {
+              col: range.start.col,
+              row: range.start.row
+            },
+            end: {
+              col: range.end.col,
+              row: range.end.row
             }
+          })),
+          sourceRange = 1 === ranges.length ? ranges[0] : null,
+          sourceCellMatrix = this.getSourceCellMatrix(clonedRanges),
+          sourceCells = this.getSourceCells(sourceCellMatrix),
+          sourceSize = this.getSourceSize(clonedRanges, sourceCellMatrix);
+        return {
+          ranges: clonedRanges,
+          copySourceRange: sourceRange ? {
+            startCol: Math.min(sourceRange.start.col, sourceRange.end.col),
+            startRow: Math.min(sourceRange.start.row, sourceRange.end.row)
+          } : null,
+          cellInfos: includeCellInfos ? this.table.getSelectedCellInfos() : null,
+          sourceCells: sourceCells,
+          sourceCellMatrix: sourceCellMatrix,
+          sourceColCount: sourceSize.colCount,
+          sourceRowCount: sourceSize.rowCount,
+          clipboardData: null,
+          clipboardSignature: ""
+        };
+      }
+      cloneRanges(ranges) {
+        return ranges.map(range => ({
+          start: {
+            col: range.start.col,
+            row: range.start.row
+          },
+          end: {
+            col: range.end.col,
+            row: range.end.row
+          }
+        }));
+      }
+      getSourceCellMatrix(ranges) {
+        const table = this.table,
+          createSourceCell = (col, row) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            const recordShowIndex = null === (_a = table.getRecordShowIndexByCell) || void 0 === _a ? void 0 : _a.call(table, col, row);
+            return {
+              col: col,
+              row: row,
+              recordIndex: recordShowIndex >= 0 ? null === (_c = null === (_b = table.dataSource) || void 0 === _b ? void 0 : _b.getIndexKey) || void 0 === _c ? void 0 : _c.call(_b, recordShowIndex) : void 0,
+              field: null === (_g = null === (_f = null === (_e = null === (_d = table.internalProps) || void 0 === _d ? void 0 : _d.layoutMap) || void 0 === _e ? void 0 : _e.getBody) || void 0 === _f ? void 0 : _f.call(_e, col, row)) || void 0 === _g ? void 0 : _g.field,
+              value: null === (_h = table.getCellOriginValue) || void 0 === _h ? void 0 : _h.call(table, col, row)
+            };
+          };
+        if (1 === ranges.length) {
+          const range = ranges[0],
+            startCol = Math.min(range.start.col, range.end.col),
+            endCol = Math.max(range.start.col, range.end.col),
+            startRow = Math.min(range.start.row, range.end.row),
+            endRow = Math.max(range.start.row, range.end.row),
+            sourceCellMatrix = [];
+          for (let row = startRow; row <= endRow; row++) {
+            const rowCells = [];
+            for (let col = startCol; col <= endCol; col++) rowCells.push(createSourceCell(col, row));
+            sourceCellMatrix.push(rowCells);
+          }
+          return sourceCellMatrix;
+        }
+        let minCol = Math.min(ranges[0].start.col, ranges[0].end.col),
+          maxCol = Math.max(ranges[0].start.col, ranges[0].end.col),
+          minRow = Math.min(ranges[0].start.row, ranges[0].end.row),
+          maxRow = Math.max(ranges[0].start.row, ranges[0].end.row);
+        ranges.forEach(range => {
+          minCol = Math.min(minCol, range.start.col, range.end.col), maxCol = Math.max(maxCol, range.start.col, range.end.col), minRow = Math.min(minRow, range.start.row, range.end.row), maxRow = Math.max(maxRow, range.start.row, range.end.row);
+        });
+        const isExistDataInRow = row => ranges.some(range => {
+            const startRow = Math.min(range.start.row, range.end.row),
+              endRow = Math.max(range.start.row, range.end.row);
+            return startRow <= row && endRow >= row;
+          }),
+          isExistDataInCol = col => ranges.some(range => {
+            const startCol = Math.min(range.start.col, range.end.col),
+              endCol = Math.max(range.start.col, range.end.col);
+            return startCol <= col && endCol >= col;
+          }),
+          getRangeExistDataInCell = (col, row) => ranges.some(range => {
+            const startRow = Math.min(range.start.row, range.end.row),
+              endRow = Math.max(range.start.row, range.end.row),
+              startCol = Math.min(range.start.col, range.end.col),
+              endCol = Math.max(range.start.col, range.end.col);
+            return startCol <= col && endCol >= col && startRow <= row && endRow >= row;
+          }),
+          sourceCellMatrix = [];
+        for (let row = minRow; row <= maxRow; row++) {
+          if (!isExistDataInRow(row)) continue;
+          const rowCells = [];
+          for (let col = minCol; col <= maxCol; col++) isExistDataInCol(col) && rowCells.push(getRangeExistDataInCell(col, row) ? createSourceCell(col, row) : null);
+          sourceCellMatrix.push(rowCells);
+        }
+        return sourceCellMatrix;
+      }
+      getSourceCells(sourceCellMatrix) {
+        const sourceCells = [];
+        for (let row = 0; row < sourceCellMatrix.length; row++) for (let col = 0; col < sourceCellMatrix[row].length; col++) {
+          const sourceCell = sourceCellMatrix[row][col];
+          sourceCell && sourceCells.push(sourceCell);
+        }
+        return sourceCells;
+      }
+      getSourceSize(ranges, sourceCellMatrix) {
+        var _a, _b;
+        if (sourceCellMatrix.length) return {
+          colCount: null !== (_b = null === (_a = sourceCellMatrix[0]) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0,
+          rowCount: sourceCellMatrix.length
+        };
+        if (1 === ranges.length) {
+          const range = ranges[0];
+          return {
+            colCount: Math.abs(range.end.col - range.start.col) + 1,
+            rowCount: Math.abs(range.end.row - range.start.row) + 1
+          };
+        }
+        return {
+          colCount: 0,
+          rowCount: 0
+        };
+      }
+      getClipboardSignature(data) {
+        return data ? JSON.stringify({
+          html: data.hasHtml ? data.html : null,
+          text: data.hasText ? data.text : null
+        }) : "";
+      }
+      isClipboardOperationCurrent(operationId) {
+        return operationId === this.clipboardOperationId && !this.table.isReleased;
+      }
+      isPasteOperationCurrent(operationId) {
+        return (void 0 === operationId || operationId === this.pasteOperationId) && !this.table.isReleased;
+      }
+      queueClipboardWrite(write) {
+        return __awaiter$1(this, void 0, void 0, function* () {
+          const previousWrite = this.clipboardWritePromise;
+          let settleCurrentWrite = () => {};
+          this.clipboardWritePromise = previousWrite.catch(() => {}).then(() => new Promise(resolve => {
+            settleCurrentWrite = resolve;
+          })), yield previousWrite.catch(() => {});
+          try {
+            return yield write();
+          } finally {
+            settleCurrentWrite();
           }
-          (null === (_f = table.keyboardOptions) || void 0 === _f ? void 0 : _f.showCopyCellBorder) && (setActiveCellRangeState(table), table.clearSelected());
         });
       }
-      fallbackCopyToClipboard(data, e) {
+      isClipboardDataChanged(clipboardData, cutState) {
+        if (!clipboardData || clipboardData.readFailed) return null;
+        const sourceData = cutState.clipboardData;
+        if (!sourceData) return this.getClipboardSignature(clipboardData) !== cutState.clipboardSignature;
+        if (sourceData.hasHtml && !clipboardData.hasHtml) return null;
+        if (sourceData.hasText && !clipboardData.hasText) return null;
+        let hasComparableType = !1;
+        return !(!clipboardData.hasHtml || !sourceData.hasHtml || (hasComparableType = !0, clipboardData.html === sourceData.html)) || !(!clipboardData.hasText || !sourceData.hasText || (hasComparableType = !0, clipboardData.text === sourceData.text)) || !hasComparableType && null;
+      }
+      isClipboardDataSameAsLastCopy(clipboardData) {
+        const sourceData = this.lastCopiedClipboardData;
+        return !(!clipboardData || clipboardData.readFailed || !sourceData) && this.isClipboardDataSameBySignature(clipboardData, sourceData);
+      }
+      isClipboardDataSameBySignature(clipboardData, sourceData) {
+        return !(sourceData.hasHtml !== clipboardData.hasHtml || sourceData.hasText !== clipboardData.hasText || sourceData.hasHtml && sourceData.html !== clipboardData.html || sourceData.hasText && sourceData.text !== clipboardData.text);
+      }
+      getCopyFormulaPlainData(data, isCut) {
+        var _a, _b;
+        const table = this.table;
+        if (1 !== table.stateManager.select.ranges.length || !(null === (_b = null === (_a = table.options.keyboardOptions) || void 0 === _a ? void 0 : _a.getCopyCellValue) || void 0 === _b ? void 0 : _b.html)) return data;
+        try {
+          return this.table.getCopyValue(table.options.keyboardOptions.getCopyCellValue.html);
+        } catch (error) {
+          return isCut ? null : data;
+        }
+      }
+      getCopyDataHTML(data) {
+        var _a, _b, _c;
+        const table = this.table;
+        let htmlValues = data;
+        try {
+          return 1 === table.stateManager.select.ranges.length && (null === (_b = null === (_a = table.options.keyboardOptions) || void 0 === _a ? void 0 : _a.getCopyCellValue) || void 0 === _b ? void 0 : _b.html) && (htmlValues = this.table.getCopyValue(null === (_c = table.options.keyboardOptions) || void 0 === _c ? void 0 : _c.getCopyCellValue.html)), setDataToHTML(htmlValues);
+        } catch (error) {
+          try {
+            return setDataToHTML(data);
+          } catch (fallbackError) {
+            return null;
+          }
+        }
+      }
+      createInternalFormulaHtmlMarker() {
+        return `vtable-formula-${Date.now()}-${++this.internalFormulaHtmlMarkerId}`;
+      }
+      attachInternalFormulaHtmlMarker(html, marker) {
+        return `${html}\x3c!--${marker}--\x3e`;
+      }
+      setCopyDataToEventClipboard(data, dataHTML, e, internalFormulaText, internalFormulaHtmlMarker) {
+        const clipboardData = e.clipboardData;
+        if (!clipboardData) return null;
+        try {
+          clipboardData.setData("text/plain", data);
+          const copiedClipboardData = {
+            html: "",
+            text: data,
+            hasText: !0,
+            internalFormulaText: internalFormulaText
+          };
+          if (dataHTML) try {
+            clipboardData.setData("text/html", dataHTML), copiedClipboardData.html = dataHTML, copiedClipboardData.hasHtml = !0, copiedClipboardData.internalFormulaHtmlMarker = internalFormulaHtmlMarker;
+          } catch (error) {}
+          return copiedClipboardData;
+        } catch (error) {
+          return null;
+        }
+      }
+      fallbackCopyToClipboard(data) {
         try {
-          if (e.clipboardData) return void e.clipboardData.setData("text/plain", data);
           document.activeElement && document.activeElement !== document.body && document.activeElement.blur();
           const textArea = document.createElement("textarea");
           textArea.value = data, textArea.style.position = "fixed", textArea.style.left = "-999999px", textArea.style.top = "-999999px", textArea.style.opacity = "0", textArea.setAttribute("readonly", ""), textArea.setAttribute("aria-hidden", "true"), document.body.appendChild(textArea), textArea.focus(), textArea.select(), textArea.setSelectionRange(0, data.length);
           try {
-            document.execCommand("copy");
+            const successful = document.execCommand("copy");
+            return successful;
           } catch (execError) {} finally {
             document.body.removeChild(textArea);
           }
         } catch (error) {}
+        return !1;
       }
       handleCut(e) {
-        var _a;
         return __awaiter$1(this, void 0, void 0, function* () {
-          this.handleCopy(e, !0), this.cutWaitPaste = !0, this.cutCellRange = this.table.getSelectedCellInfos(), this.cutRanges = null === (_a = this.table.stateManager.select.ranges) || void 0 === _a ? void 0 : _a.map(r => ({
-            start: {
-              col: r.start.col,
-              row: r.start.row
-            },
-            end: {
-              col: r.end.col,
-              row: r.end.row
-            }
-          })), this.clipboardCheckTimer && clearTimeout(this.clipboardCheckTimer), this.clipboardCheckTimer = window.setTimeout(() => {
-            this.cutWaitPaste && (this.cutWaitPaste = !1, this.cutCellRange = null, this.cutRanges = null, this.clipboardCheckTimer = null);
-          }, 3e4), this.saveClipboardContent();
+          const copySnapshot = yield this.handleCopy(e, !0);
+          if (!copySnapshot) return;
+          const cutState = {
+            id: ++this.cutOperationId,
+            ranges: this.cloneRanges(copySnapshot.ranges),
+            cellInfos: copySnapshot.cellInfos,
+            sourceCells: copySnapshot.sourceCells,
+            sourceCellMatrix: copySnapshot.sourceCellMatrix,
+            sourceColCount: copySnapshot.sourceColCount,
+            sourceRowCount: copySnapshot.sourceRowCount,
+            clipboardData: copySnapshot.clipboardData,
+            clipboardSignature: copySnapshot.clipboardSignature,
+            copySourceRange: copySnapshot.copySourceRange,
+            isSingleRange: 1 === copySnapshot.ranges.length
+          };
+          this.cutWaitPaste = !0, this.activeCutState = cutState, this.cutCellRange = cutState.cellInfos, this.cutRanges = cutState.ranges, this.clipboardCheckTimer && clearTimeout(this.clipboardCheckTimer), this.clipboardCheckTimer = window.setTimeout(() => {
+            this.cutWaitPaste && this.resetCutState();
+          }, 3e4), this.lastClipboardContent = cutState.clipboardSignature;
         });
       }
       handlePaste(e) {
-        this.cutWaitPaste ? this.checkClipboardChanged().then(changed => {
-          this.executePaste(e), changed || this.clearCutArea(this.table), this.cutWaitPaste && (this.cutWaitPaste = !1, this.cutCellRange = null, this.cutRanges = null, this.clipboardCheckTimer && (clearTimeout(this.clipboardCheckTimer), this.clipboardCheckTimer = null));
-        }).catch(() => {
-          this.executePaste(e), this.cutWaitPaste && (this.cutWaitPaste = !1, this.cutCellRange = null, this.clipboardCheckTimer && (clearTimeout(this.clipboardCheckTimer), this.clipboardCheckTimer = null));
-        }) : this.executePaste(e);
+        const pasteOperationId = ++this.pasteOperationId,
+          pasteRange = this.getPasteRange();
+        if (!pasteRange) return;
+        const eventClipboardData = this.getEventClipboardData(e),
+          pasteCopySourceRange = this.copySourceRange;
+        if (!this.cutWaitPaste) return void this.readClipboardDataForPaste(eventClipboardData).then(clipboardData => {
+          if (!this.isPasteOperationCurrent(pasteOperationId)) return;
+          const copySourceRange = this.isClipboardDataSameAsLastCopy(clipboardData) ? pasteCopySourceRange : null;
+          this.executePaste(clipboardData, {
+            pasteRange: pasteRange,
+            copySourceRange: copySourceRange,
+            pasteOperationId: pasteOperationId
+          });
+        }).catch(error => {});
+        const cutState = this.activeCutState;
+        cutState ? this.readClipboardDataForPaste(eventClipboardData).then(clipboardData => __awaiter$1(this, void 0, void 0, function* () {
+          var _a, _b, _c, _d, _e;
+          if (!this.isPasteOperationCurrent(pasteOperationId) || (null === (_a = this.activeCutState) || void 0 === _a ? void 0 : _a.id) !== cutState.id) return;
+          const changed = this.isClipboardDataChanged(clipboardData, cutState);
+          if (null === changed) return void (yield this.executePaste(clipboardData, {
+            pasteRange: pasteRange,
+            copySourceRange: this.isClipboardDataSameAsLastCopy(clipboardData) ? pasteCopySourceRange : null,
+            pasteOperationId: pasteOperationId
+          }));
+          const pasteResult = yield this.executePaste(clipboardData, {
+            pasteRange: pasteRange,
+            copySourceRange: changed ? null : cutState.copySourceRange,
+            cutState: changed ? null : cutState,
+            pasteOperationId: pasteOperationId
+          });
+          if (this.isPasteOperationCurrent(pasteOperationId) && (null === (_b = this.activeCutState) || void 0 === _b ? void 0 : _b.id) === cutState.id) if (changed || !pasteResult.pasted || (null === (_c = this.activeCutState) || void 0 === _c ? void 0 : _c.id) !== cutState.id) changed && (null === (_e = this.activeCutState) || void 0 === _e ? void 0 : _e.id) === cutState.id && this.resetCutState();else if (pasteResult.migratedSourceCells.length === cutState.sourceCells.length) {
+            if (!(yield this.clearCutArea(pasteResult.migratedSourceCells, pasteResult.changedCells))) return void this.resetCutState();
+            (null === (_d = this.activeCutState) || void 0 === _d ? void 0 : _d.id) === cutState.id && this.resetCutState();
+          }
+        })).catch(() => __awaiter$1(this, void 0, void 0, function* () {
+          this.isPasteOperationCurrent(pasteOperationId) && (yield this.executePaste(eventClipboardData, {
+            pasteRange: pasteRange,
+            copySourceRange: this.isClipboardDataSameAsLastCopy(eventClipboardData) ? pasteCopySourceRange : null,
+            pasteOperationId: pasteOperationId
+          }));
+        })) : this.executePaste(eventClipboardData, {
+          pasteRange: pasteRange,
+          copySourceRange: this.isClipboardDataSameAsLastCopy(eventClipboardData) ? pasteCopySourceRange : null,
+          pasteOperationId: pasteOperationId
+        });
       }
-      executePaste(e) {
-        var _a, _b, _c;
+      executePaste(clipboardData, pasteContext) {
+        var _a, _b, _c, _d;
         return __awaiter$1(this, void 0, void 0, function* () {
-          const table = this.table;
-          if (!(null === (_a = table.editorManager) || void 0 === _a ? void 0 : _a.editingEditor)) {
-            if (table.changeCellValues && (null === (_b = table.stateManager.select.ranges) || void 0 === _b ? void 0 : _b.length) > 0) try {
-              if (navigator.clipboard && navigator.clipboard.read) try {
-                const clipboardItems = yield navigator.clipboard.read();
-                let handled = !1;
-                for (const item of clipboardItems) {
-                  if (item.types.includes("text/html")) {
-                    yield this.pasteHtmlToTable(item), handled = !0;
-                    break;
-                  }
-                  if (item.types.includes("text/plain")) {
-                    yield this.pasteTextToTable(item), handled = !0;
-                    break;
-                  }
-                }
-                handled || (yield this.fallbackPasteFromClipboard(e));
-              } catch (clipboardError) {
-                yield this.fallbackPasteFromClipboard(e);
-              } else yield this.fallbackPasteFromClipboard(e);
+          const table = this.table,
+            emptyResult = this.getEmptyPasteResult(),
+            pasteClipboardData = this.getPasteClipboardData(clipboardData, pasteContext);
+          if (!this.isPasteOperationCurrent(pasteContext.pasteOperationId) || (null === (_a = table.editorManager) || void 0 === _a ? void 0 : _a.editingEditor)) return emptyResult;
+          if (this.pasteWriteInProgress && (yield this.pasteWritePromise.catch(() => {}), !this.isPasteOperationCurrent(pasteContext.pasteOperationId) || (null === (_b = table.editorManager) || void 0 === _b ? void 0 : _b.editingEditor))) return emptyResult;
+          let pasteResult = emptyResult,
+            settlePasteWrite = () => {};
+          this.pasteWritePromise = new Promise(resolve => {
+            settlePasteWrite = resolve;
+          }), this.pasteWriteInProgress = !0;
+          try {
+            if (table.changeCellValues) try {
+              if (null == pasteClipboardData ? void 0 : pasteClipboardData.html) try {
+                const htmlResult = yield this.processPastedHTML(pasteClipboardData.html, pasteContext);
+                if (htmlResult.pasted) return pasteResult = htmlResult, pasteResult;
+              } catch (error) {
+                if (/<table\b/i.test(pasteClipboardData.html)) return emptyResult;
+              }
+              if ((null == pasteClipboardData ? void 0 : pasteClipboardData.hasText) || (null == pasteClipboardData ? void 0 : pasteClipboardData.text)) return pasteResult = yield this.processPastedText(null !== (_c = pasteClipboardData.internalFormulaText) && void 0 !== _c ? _c : pasteClipboardData.text, pasteContext), pasteResult;
             } catch (error) {
-              yield this.fallbackPasteFromClipboard(e);
+              pasteContext.cutState && this.resetCutState();
             }
-            (null === (_c = table.keyboardOptions) || void 0 === _c ? void 0 : _c.showCopyCellBorder) && clearActiveCellRangeState(table);
+            return pasteResult;
+          } finally {
+            this.pasteWriteInProgress = !1, settlePasteWrite(), !pasteContext.cutState && (null === (_d = table.keyboardOptions) || void 0 === _d ? void 0 : _d.showCopyCellBorder) && clearActiveCellRangeState(table);
           }
         });
       }
-      fallbackPasteFromClipboard(e) {
+      getPasteClipboardData(clipboardData, pasteContext) {
+        var _a, _b;
+        if (!clipboardData || !pasteContext.copySourceRange) return clipboardData;
+        const sourceData = null !== (_b = null === (_a = pasteContext.cutState) || void 0 === _a ? void 0 : _a.clipboardData) && void 0 !== _b ? _b : this.lastCopiedClipboardData;
+        return (null == sourceData ? void 0 : sourceData.internalFormulaText) && sourceData.internalFormulaHtmlMarker && sourceData.hasHtml && clipboardData.hasHtml && this.isClipboardDataSameBySignature(clipboardData, sourceData) && clipboardData.html.includes(sourceData.internalFormulaHtmlMarker) ? Object.assign(Object.assign({}, clipboardData), {
+          internalFormulaText: sourceData.internalFormulaText
+        }) : clipboardData;
+      }
+      getPasteRange() {
+        const ranges = this.table.stateManager.select.ranges;
+        if (!(null == ranges ? void 0 : ranges.length)) return null;
+        const range = ranges[ranges.length - 1];
+        return {
+          col: Math.min(range.start.col, range.end.col),
+          row: Math.min(range.start.row, range.end.row),
+          maxCol: Math.max(range.start.col, range.end.col),
+          maxRow: Math.max(range.start.row, range.end.row)
+        };
+      }
+      getEventClipboardData(e) {
+        var _a;
+        const clipboardData = e.clipboardData || window.clipboardData;
+        if (!clipboardData) return null;
+        try {
+          const types = Array.from(null !== (_a = clipboardData.types) && void 0 !== _a ? _a : []),
+            html = clipboardData.getData("text/html") || "",
+            text = clipboardData.getData("text/plain") || clipboardData.getData("text") || clipboardData.getData("Text") || "",
+            hasHtml = types.includes("text/html") || !!html;
+          return {
+            html: html,
+            text: text,
+            hasHtml: hasHtml,
+            hasText: types.includes("text/plain") || types.includes("text") || types.includes("Text") || !!text
+          };
+        } catch (error) {
+          return {
+            html: "",
+            text: "",
+            readFailed: !0
+          };
+        }
+      }
+      readClipboardDataForPaste(eventClipboardData) {
+        var _a, _b;
         return __awaiter$1(this, void 0, void 0, function* () {
-          const table = this.table,
-            ranges = table.stateManager.select.ranges,
-            col = Math.min(ranges[0].start.col, ranges[0].end.col),
-            row = Math.min(ranges[0].start.row, ranges[0].end.row);
-          try {
-            const element = table.getElement();
-            element && element !== document.activeElement && (element.focus(), yield new Promise(resolve => setTimeout(resolve, 10)));
-            const clipboardData = e.clipboardData || window.clipboardData || window.Clipboard;
-            if (clipboardData) {
-              const pastedData = clipboardData.getData("text") || clipboardData.getData("Text");
-              if (pastedData) return void (yield this.processPastedText(pastedData, col, row));
-            }
+          if ((null == eventClipboardData ? void 0 : eventClipboardData.readFailed) || (null == eventClipboardData ? void 0 : eventClipboardData.hasHtml) || (null == eventClipboardData ? void 0 : eventClipboardData.hasText)) return eventClipboardData;
+          if (null === (_a = navigator.clipboard) || void 0 === _a ? void 0 : _a.read) try {
+            const clipboardItems = yield navigator.clipboard.read(),
+              clipboardData = {
+                html: "",
+                text: ""
+              };
+            for (const item of clipboardItems) {
+              if (!clipboardData.html && item.types.includes("text/html")) try {
+                clipboardData.html = yield (yield item.getType("text/html")).text(), clipboardData.hasHtml = !0;
+              } catch (error) {}
+              if (!clipboardData.text && item.types.includes("text/plain")) try {
+                clipboardData.text = yield (yield item.getType("text/plain")).text(), clipboardData.hasText = !0;
+              } catch (error) {}
+            }
+            if (clipboardData.hasHtml || clipboardData.hasText) return clipboardData;
+          } catch (error) {}
+          if (null === (_b = navigator.clipboard) || void 0 === _b ? void 0 : _b.readText) try {
+            return {
+              html: "",
+              text: yield navigator.clipboard.readText(),
+              hasText: !0
+            };
           } catch (error) {}
+          return null != eventClipboardData ? eventClipboardData : {
+            html: "",
+            text: "",
+            readFailed: !0
+          };
         });
       }
-      processPastedText(pastedData, col, row) {
+      decodeHTMLCellValue(cellHTML) {
         var _a;
+        const template = document.createElement("template");
+        return template.innerHTML = cellHTML.replace(/<br\b[^>]*>(?:\r\n|\r|\n)?/gim, "\n").replace(/&nbsp;/gi, " "), null !== (_a = template.content.textContent) && void 0 !== _a ? _a : "";
+      }
+      processPastedHTML(pastedData, pasteContext) {
+        var _a, _b, _c;
         return __awaiter$1(this, void 0, void 0, function* () {
-          const table = this.table,
-            rows = pastedData.split("\n"),
+          const cellRegex = /<t[dh][^>]*>([\s\S]*?)<\/t[dh]>/gi,
+            table = this.table,
+            pasteRange = pasteContext.pasteRange,
+            {
+              col: col,
+              row: row,
+              maxCol: maxCol,
+              maxRow: maxRow
+            } = pasteRange;
+          let pasteValuesColCount = 0,
+            pasteValuesRowCount = 0,
             values = [];
+          if (!pastedData || !/<table\b/i.test(pastedData)) return this.getEmptyPasteResult();
+          const matches = Array.from(pastedData.matchAll(/<tr[^>]*>([\s\S]*?)<\/tr>/gi));
+          for (const match of matches) {
+            const rowContent = match[1],
+              cellMatches = Array.from(rowContent.matchAll(cellRegex));
+            if (!cellMatches.length) continue;
+            const rowValues = cellMatches.map(cellMatch => this.decodeHTMLCellValue(cellMatch[1]));
+            values.push(rowValues), pasteValuesColCount = Math.max(pasteValuesColCount, null !== (_a = null == rowValues ? void 0 : rowValues.length) && void 0 !== _a ? _a : 0);
+          }
+          if (pasteValuesRowCount = null !== (_b = values.length) && void 0 !== _b ? _b : 0, !pasteValuesRowCount || !pasteValuesColCount) return this.getEmptyPasteResult();
           let processedValues;
-          rows.forEach(function (rowCells) {
-            const cells = rowCells.split("\t"),
-              rowValues = [];
-            values.push(rowValues), cells.forEach(function (cell, cellIndex) {
-              cellIndex === cells.length - 1 && (cell = cell.trim()), rowValues.push(cell);
-            });
-          }), (null === (_a = table.options.keyboardOptions) || void 0 === _a ? void 0 : _a.processFormulaBeforePaste) && this.copySourceRange && (processedValues = table.options.keyboardOptions.processFormulaBeforePaste(values, this.copySourceRange.startCol, this.copySourceRange.startRow, col, row));
-          const changedCellResults = yield table.changeCellValues(col, row, processedValues || values, !0);
-          table.hasListeners(TABLE_EVENT_TYPE.PASTED_DATA) && table.fireListeners(TABLE_EVENT_TYPE.PASTED_DATA, {
+          values = this.handlePasteValues(values, pasteValuesRowCount, pasteValuesColCount, maxRow - row + 1, maxCol - col + 1), (null === (_c = table.options.keyboardOptions) || void 0 === _c ? void 0 : _c.processFormulaBeforePaste) && pasteContext.copySourceRange && (processedValues = table.options.keyboardOptions.processFormulaBeforePaste(values, pasteContext.copySourceRange.startCol, pasteContext.copySourceRange.startRow, col, row));
+          const valuesToPaste = processedValues || values,
+            targetCells = this.getPasteTargetCells(pasteRange, valuesToPaste);
+          if (!this.isPasteOperationCurrent(pasteContext.pasteOperationId)) return this.getEmptyPasteResult();
+          if (pasteContext.cutState) {
+            const validatedCellResults = yield this.validatePasteTargetCells(pasteRange, valuesToPaste);
+            if (!this.isPasteOperationCurrent(pasteContext.pasteOperationId)) return this.getEmptyPasteResult();
+            if (!this.isFullPasteAllowed(valuesToPaste, validatedCellResults)) return this.getEmptyPasteResult(validatedCellResults);
+          }
+          const rawChangedCellResults = yield table.changeCellValues(col, row, valuesToPaste, !pasteContext.cutState, !0, void 0, () => !this.isPasteOperationCurrent(pasteContext.pasteOperationId));
+          if (!this.isPasteOperationCurrent(pasteContext.pasteOperationId)) return this.getEmptyPasteResult();
+          const changedCellResults = this.normalizeChangedCellResults(rawChangedCellResults, pasteRange, valuesToPaste),
+            changedCells = this.getChangedCells(targetCells, changedCellResults),
+            migratedSourceCells = this.getMigratedSourceCells(pasteContext.cutState, changedCellResults);
+          return changedCells.length ? (this.firePastedDataEvent(col, row, valuesToPaste, changedCellResults), {
+            pasted: !0,
+            changedCellResults: changedCellResults,
+            changedCells: changedCells,
+            migratedSourceCells: migratedSourceCells
+          }) : this.getEmptyPasteResult(changedCellResults);
+        });
+      }
+      processPastedText(pastedData, pasteContext) {
+        var _a;
+        return __awaiter$1(this, void 0, void 0, function* () {
+          const table = this.table,
+            pasteRange = pasteContext.pasteRange,
+            {
+              col: col,
+              row: row,
+              maxCol: maxCol,
+              maxRow: maxRow
+            } = pasteRange;
+          let values = this.parsePlainTextPastedData(pastedData);
+          const pasteValuesRowCount = values.length,
+            pasteValuesColCount = Math.max(...values.map(rowValues => rowValues.length));
+          if (!pasteValuesRowCount || !pasteValuesColCount) return this.getEmptyPasteResult();
+          let processedValues;
+          values = this.handlePasteValues(values, pasteValuesRowCount, pasteValuesColCount, maxRow - row + 1, maxCol - col + 1), (null === (_a = table.options.keyboardOptions) || void 0 === _a ? void 0 : _a.processFormulaBeforePaste) && pasteContext.copySourceRange && (processedValues = table.options.keyboardOptions.processFormulaBeforePaste(values, pasteContext.copySourceRange.startCol, pasteContext.copySourceRange.startRow, col, row));
+          const valuesToPaste = processedValues || values,
+            targetCells = this.getPasteTargetCells(pasteRange, valuesToPaste);
+          if (!this.isPasteOperationCurrent(pasteContext.pasteOperationId)) return this.getEmptyPasteResult();
+          if (pasteContext.cutState) {
+            const validatedCellResults = yield this.validatePasteTargetCells(pasteRange, valuesToPaste);
+            if (!this.isPasteOperationCurrent(pasteContext.pasteOperationId)) return this.getEmptyPasteResult();
+            if (!this.isFullPasteAllowed(valuesToPaste, validatedCellResults)) return this.getEmptyPasteResult(validatedCellResults);
+          }
+          const rawChangedCellResults = yield table.changeCellValues(col, row, valuesToPaste, !pasteContext.cutState, !0, void 0, () => !this.isPasteOperationCurrent(pasteContext.pasteOperationId));
+          if (!this.isPasteOperationCurrent(pasteContext.pasteOperationId)) return this.getEmptyPasteResult();
+          const changedCellResults = this.normalizeChangedCellResults(rawChangedCellResults, pasteRange, valuesToPaste),
+            changedCells = this.getChangedCells(targetCells, changedCellResults),
+            migratedSourceCells = this.getMigratedSourceCells(pasteContext.cutState, changedCellResults);
+          return changedCells.length ? (this.firePastedDataEvent(col, row, valuesToPaste, changedCellResults), {
+            pasted: !0,
+            changedCellResults: changedCellResults,
+            changedCells: changedCells,
+            migratedSourceCells: migratedSourceCells
+          }) : this.getEmptyPasteResult(changedCellResults);
+        });
+      }
+      firePastedDataEvent(col, row, pasteData, changedCellResults) {
+        const table = this.table;
+        if (table.hasListeners(TABLE_EVENT_TYPE.PASTED_DATA)) try {
+          table.fireListeners(TABLE_EVENT_TYPE.PASTED_DATA, {
             col: col,
             row: row,
-            pasteData: processedValues || values,
+            pasteData: pasteData,
             changedCellResults: changedCellResults
           });
-        });
-      }
-      clearCutArea(table) {
-        try {
-          const ranges = this.cutRanges;
-          if (!ranges || 0 === ranges.length) return;
-          table.changeCellValuesByRanges(ranges, "");
         } catch (error) {}
       }
-      checkClipboardChanged() {
-        return __awaiter$1(this, void 0, void 0, function* () {
-          if (!navigator.clipboard || !navigator.clipboard.readText) return !1;
-          try {
-            return (yield navigator.clipboard.readText()) !== this.lastClipboardContent;
-          } catch (err) {
-            return !1;
-          }
-        });
+      getEmptyPasteResult(changedCellResults = []) {
+        return {
+          pasted: !1,
+          changedCellResults: changedCellResults,
+          changedCells: [],
+          migratedSourceCells: []
+        };
       }
-      saveClipboardContent() {
-        navigator.clipboard && navigator.clipboard.readText && setTimeout(() => {
-          navigator.clipboard.readText().then(text => {
-            this.lastClipboardContent = text;
-          }).catch(err => {});
-        }, 50);
-      }
-      pasteHtmlToTable(item) {
-        const regex = /<tr[^>]*>([\s\S]*?)<\/tr>/g,
-          cellRegex = /<td[^>]*>([\s\S]*?)<\/td>/g,
-          table = this.table,
-          ranges = table.stateManager.select.ranges,
-          selectRangeLength = ranges.length,
-          col = Math.min(ranges[selectRangeLength - 1].start.col, ranges[selectRangeLength - 1].end.col),
-          row = Math.min(ranges[selectRangeLength - 1].start.row, ranges[selectRangeLength - 1].end.row),
-          maxCol = Math.max(ranges[selectRangeLength - 1].start.col, ranges[selectRangeLength - 1].end.col),
-          maxRow = Math.max(ranges[selectRangeLength - 1].start.row, ranges[selectRangeLength - 1].end.row);
-        let pasteValuesColCount = 0,
-          pasteValuesRowCount = 0,
-          values = [];
-        item.getType("text/html").then(blob => {
-          blob.text().then(pastedData => __awaiter$1(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            if (pastedData && /(<table)|(<TABLE)/g.test(pastedData)) {
-              const matches = Array.from(pastedData.matchAll(regex));
-              for (const match of matches) {
-                const rowContent = match[1],
-                  rowValues = Array.from(rowContent.matchAll(cellRegex)).map(cellMatch => cellMatch[1].replace(/(<(?!br)([^>]+)>)/gi, "").replace(/<br(\s*|\/)>[\r\n]?/gim, "\n").replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&#9;/gi, "\t").replace(/&nbsp;/g, " "));
-                values.push(rowValues), pasteValuesColCount = Math.max(pasteValuesColCount, null !== (_a = null == rowValues ? void 0 : rowValues.length) && void 0 !== _a ? _a : 0);
-              }
-              let processedValues;
-              pasteValuesRowCount = null !== (_b = values.length) && void 0 !== _b ? _b : 0, values = this.handlePasteValues(values, pasteValuesRowCount, pasteValuesColCount, maxRow - row + 1, maxCol - col + 1), (null === (_c = table.options.keyboardOptions) || void 0 === _c ? void 0 : _c.processFormulaBeforePaste) && this.copySourceRange && (processedValues = table.options.keyboardOptions.processFormulaBeforePaste(values, this.copySourceRange.startCol, this.copySourceRange.startRow, col, row));
-              const changedCellResults = yield table.changeCellValues(col, row, processedValues || values, !0);
-              table.hasListeners(TABLE_EVENT_TYPE.PASTED_DATA) && table.fireListeners(TABLE_EVENT_TYPE.PASTED_DATA, {
-                col: col,
-                row: row,
-                pasteData: processedValues || values,
-                changedCellResults: changedCellResults
-              });
-            } else navigator.clipboard.read().then(clipboardItems => {
-              for (const item of clipboardItems) item.types.includes("text/plain") && item.getType("text/plain").then(blob => {
-                blob.text().then(data => this._pasteValue(data));
-              });
-            });
-          }));
-        });
+      getPasteTargetCells(pasteRange, values) {
+        const targetCells = [];
+        for (let rowIndex = 0; rowIndex < values.length; rowIndex++) {
+          targetCells[rowIndex] = [];
+          for (let colIndex = 0; colIndex < values[rowIndex].length; colIndex++) targetCells[rowIndex][colIndex] = this.getCellIdentity(pasteRange.col + colIndex, pasteRange.row + rowIndex);
+        }
+        return targetCells;
       }
-      _pasteValue(pastedData) {
-        var _a, _b;
+      getChangedCells(targetCells, changedCellResults) {
+        var _a, _b, _c;
+        const changedCells = [];
+        for (let rowIndex = 0; rowIndex < changedCellResults.length; rowIndex++) for (let colIndex = 0; colIndex < (null !== (_b = null === (_a = changedCellResults[rowIndex]) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0); colIndex++) changedCellResults[rowIndex][colIndex] && (null === (_c = targetCells[rowIndex]) || void 0 === _c ? void 0 : _c[colIndex]) && changedCells.push(targetCells[rowIndex][colIndex]);
+        return changedCells;
+      }
+      normalizeChangedCellResults(changedCellResults, pasteRange, values) {
+        if (Array.isArray(changedCellResults)) return changedCellResults;
+        const table = this.table;
+        return values.map((rowValues, rowIndex) => rowValues.map((_value, colIndex) => {
+          const targetCol = pasteRange.col + colIndex,
+            targetRow = pasteRange.row + rowIndex;
+          return targetCol < table.colCount && targetRow < table.rowCount && (!table.isHasEditorDefine || table.isHasEditorDefine(targetCol, targetRow));
+        }));
+      }
+      validatePasteTargetCells(pasteRange, values) {
+        var _a, _b, _c, _d;
         return __awaiter$1(this, void 0, void 0, function* () {
           const table = this.table,
-            ranges = table.stateManager.select.ranges,
-            selectRangeLength = ranges.length,
-            col = Math.min(ranges[selectRangeLength - 1].start.col, ranges[selectRangeLength - 1].end.col),
-            row = Math.min(ranges[selectRangeLength - 1].start.row, ranges[selectRangeLength - 1].end.row),
-            maxCol = Math.max(ranges[selectRangeLength - 1].start.col, ranges[selectRangeLength - 1].end.col),
-            maxRow = Math.max(ranges[selectRangeLength - 1].start.row, ranges[selectRangeLength - 1].end.row);
-          let pasteValuesColCount = 0,
-            pasteValuesRowCount = 0,
-            values = [];
-          let processedValues;
-          pastedData.split("\n").forEach(function (rowCells, rowIndex) {
-            var _a;
-            const cells = rowCells.split("\t"),
-              rowValues = [];
-            values.push(rowValues), cells.forEach(function (cell, cellIndex) {
-              cellIndex === cells.length - 1 && (cell = cell.trim()), rowValues.push(cell);
-            }), pasteValuesColCount = Math.max(pasteValuesColCount, null !== (_a = null == rowValues ? void 0 : rowValues.length) && void 0 !== _a ? _a : 0);
-          }), pasteValuesRowCount = null !== (_a = values.length) && void 0 !== _a ? _a : 0, values = this.handlePasteValues(values, pasteValuesRowCount, pasteValuesColCount, maxRow - row + 1, maxCol - col + 1), (null === (_b = table.options.keyboardOptions) || void 0 === _b ? void 0 : _b.processFormulaBeforePaste) && this.copySourceRange && (processedValues = table.options.keyboardOptions.processFormulaBeforePaste(values, this.copySourceRange.startCol, this.copySourceRange.startRow, col, row));
-          const changedCellResults = yield table.changeCellValues(col, row, processedValues || values, !0);
-          table.hasListeners(TABLE_EVENT_TYPE.PASTED_DATA) && table.fireListeners(TABLE_EVENT_TYPE.PASTED_DATA, {
-            col: col,
-            row: row,
-            pasteData: processedValues || values,
-            changedCellResults: changedCellResults
-          });
+            changedCellResults = [];
+          for (let rowIndex = 0; rowIndex < values.length; rowIndex++) {
+            changedCellResults[rowIndex] = [];
+            for (let colIndex = 0; colIndex < values[rowIndex].length; colIndex++) {
+              const targetCol = pasteRange.col + colIndex,
+                targetRow = pasteRange.row + rowIndex,
+                tableAny = table;
+              let canChange = targetCol < tableAny.colCount && targetRow < tableAny.rowCount && (!tableAny.isHasEditorDefine || tableAny.isHasEditorDefine(targetCol, targetRow));
+              if (canChange) {
+                const editor = null === (_a = tableAny.getEditor) || void 0 === _a ? void 0 : _a.call(tableAny, targetCol, targetRow),
+                  oldValue = null === (_b = table.getCellOriginValue) || void 0 === _b ? void 0 : _b.call(table, targetCol, targetRow),
+                  validateResult = null === (_d = null === (_c = null == editor ? void 0 : editor.validateValue) || void 0 === _c ? void 0 : _c.call(editor, values[rowIndex][colIndex], oldValue, {
+                    col: targetCol,
+                    row: targetRow
+                  }, table)) || void 0 === _d || _d,
+                  resolvedValidateResult = validateResult && "function" == typeof validateResult.then ? yield validateResult : validateResult;
+                canChange = !0 === resolvedValidateResult || "validate-exit" === resolvedValidateResult || "validate-not-exit" === resolvedValidateResult;
+              }
+              changedCellResults[rowIndex][colIndex] = canChange;
+            }
+          }
+          return changedCellResults;
         });
       }
-      pasteTextToTable(item) {
+      isFullPasteAllowed(values, changedCellResults) {
+        return values.every((rowValues, rowIndex) => rowValues.every((_value, colIndex) => {
+          var _a;
+          return !0 === (null === (_a = changedCellResults[rowIndex]) || void 0 === _a ? void 0 : _a[colIndex]);
+        }));
+      }
+      getMigratedSourceCells(cutState, changedCellResults) {
+        var _a, _b, _c, _d, _e;
+        if (!(null == cutState ? void 0 : cutState.sourceCells.length) || !cutState.sourceColCount || !cutState.sourceRowCount) return [];
+        const migratedSourceCells = [],
+          migratedKeys = new Set();
+        if (!cutState.isSingleRange) {
+          for (let rowIndex = 0; rowIndex < changedCellResults.length; rowIndex++) for (let colIndex = 0; colIndex < (null !== (_b = null === (_a = changedCellResults[rowIndex]) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0); colIndex++) {
+            if (!changedCellResults[rowIndex][colIndex]) continue;
+            const sourceRow = rowIndex % cutState.sourceRowCount,
+              sourceCol = colIndex % cutState.sourceColCount,
+              sourceCell = null === (_c = cutState.sourceCellMatrix[sourceRow]) || void 0 === _c ? void 0 : _c[sourceCol];
+            if (!sourceCell) continue;
+            const sourceKey = this.getCellKey(sourceCell);
+            migratedKeys.has(sourceKey) || (migratedKeys.add(sourceKey), migratedSourceCells.push(sourceCell));
+          }
+          return migratedSourceCells.length === cutState.sourceCells.length ? migratedSourceCells : [];
+        }
+        for (let rowIndex = 0; rowIndex < changedCellResults.length; rowIndex++) for (let colIndex = 0; colIndex < (null !== (_e = null === (_d = changedCellResults[rowIndex]) || void 0 === _d ? void 0 : _d.length) && void 0 !== _e ? _e : 0); colIndex++) {
+          if (!changedCellResults[rowIndex][colIndex]) continue;
+          const sourceRow = rowIndex % cutState.sourceRowCount,
+            sourceCol = colIndex % cutState.sourceColCount,
+            sourceIndex = sourceRow * cutState.sourceColCount + sourceCol,
+            sourceCell = cutState.sourceCells[sourceIndex];
+          if (!sourceCell) continue;
+          const sourceKey = this.getCellKey(sourceCell);
+          migratedKeys.has(sourceKey) || (migratedKeys.add(sourceKey), migratedSourceCells.push(sourceCell));
+        }
+        return migratedSourceCells;
+      }
+      getCellIdentity(col, row) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        const table = this.table,
+          recordShowIndex = null === (_a = table.getRecordShowIndexByCell) || void 0 === _a ? void 0 : _a.call(table, col, row);
+        return {
+          col: col,
+          row: row,
+          recordIndex: recordShowIndex >= 0 ? null === (_c = null === (_b = table.dataSource) || void 0 === _b ? void 0 : _b.getIndexKey) || void 0 === _c ? void 0 : _c.call(_b, recordShowIndex) : void 0,
+          field: null === (_g = null === (_f = null === (_e = null === (_d = table.internalProps) || void 0 === _d ? void 0 : _d.layoutMap) || void 0 === _e ? void 0 : _e.getBody) || void 0 === _f ? void 0 : _f.call(_e, col, row)) || void 0 === _g ? void 0 : _g.field
+        };
+      }
+      clearCutArea(migratedSourceCells, changedTargetCells) {
+        var _a, _b;
         return __awaiter$1(this, void 0, void 0, function* () {
-          const table = this.table,
-            ranges = table.stateManager.select.ranges,
-            selectRangeLength = ranges.length,
-            col = Math.min(ranges[selectRangeLength - 1].start.col, ranges[selectRangeLength - 1].end.col),
-            row = Math.min(ranges[selectRangeLength - 1].start.row, ranges[selectRangeLength - 1].end.row),
-            maxCol = Math.max(ranges[selectRangeLength - 1].start.col, ranges[selectRangeLength - 1].end.col),
-            maxRow = Math.max(ranges[selectRangeLength - 1].start.row, ranges[selectRangeLength - 1].end.row);
           try {
-            const blob = yield item.getType("text/plain"),
-              pastedData = yield blob.text(),
-              values = this.parsePastedData(pastedData),
-              pasteValuesRowCount = values.length,
-              pasteValuesColCount = Math.max(...values.map(row => row.length), 0),
-              processedValues = this.handlePasteValues(values, pasteValuesRowCount, pasteValuesColCount, maxRow - row + 1, maxCol - col + 1),
-              changedCellResults = yield table.changeCellValues(col, row, processedValues, !0);
-            table.hasListeners(TABLE_EVENT_TYPE.PASTED_DATA) && table.fireListeners(TABLE_EVENT_TYPE.PASTED_DATA, {
-              col: col,
-              row: row,
-              pasteData: processedValues,
-              changedCellResults: changedCellResults
+            const table = this.table,
+              changedTargetKeys = new Set();
+            changedTargetCells.forEach(cell => {
+              changedTargetKeys.add(this.getCellKey(cell)), changedTargetKeys.add(this.getCoordKey(cell));
             });
-          } catch (error) {}
+            const clearedKeys = new Set(),
+              sourceChanges = [],
+              coordChanges = [];
+            for (let i = 0; i < migratedSourceCells.length; i++) {
+              const sourceCell = migratedSourceCells[i],
+                sourceKey = this.getCellKey(sourceCell);
+              if (clearedKeys.has(sourceKey) || changedTargetKeys.has(sourceKey) || changedTargetKeys.has(this.getCoordKey(sourceCell))) continue;
+              const currentAddress = this.getCurrentCellAddress(sourceCell);
+              currentAddress && this.isSourceCellUnchanged(sourceCell, currentAddress) && (void 0 !== sourceCell.recordIndex && void 0 !== sourceCell.field && table.changeCellValuesByRecords ? sourceChanges.push({
+                recordIndex: sourceCell.recordIndex,
+                field: sourceCell.field,
+                value: ""
+              }) : coordChanges.push(currentAddress), clearedKeys.add(sourceKey));
+            }
+            sourceChanges.length && table.changeCellValuesByRecords(sourceChanges, {
+              triggerEvent: !0,
+              autoRefresh: !1
+            });
+            for (let i = 0; i < coordChanges.length; i++) yield table.changeCellValues(coordChanges[i].col, coordChanges[i].row, [[""]], !1);
+            return sourceChanges.length && (null === (_b = (_a = table).refreshAfterSourceChange) || void 0 === _b || _b.call(_a)), !0;
+          } catch (error) {
+            return !1;
+          }
         });
       }
+      isSourceCellUnchanged(sourceCell, currentAddress) {
+        var _a;
+        const table = this.table;
+        return Object.is(null === (_a = table.getCellOriginValue) || void 0 === _a ? void 0 : _a.call(table, currentAddress.col, currentAddress.row), sourceCell.value);
+      }
+      getCurrentCellAddress(sourceCell) {
+        const table = this.table;
+        if (void 0 !== sourceCell.recordIndex && void 0 !== sourceCell.field && table.getCellAddrByFieldRecord) {
+          const address = table.getCellAddrByFieldRecord(sourceCell.field, sourceCell.recordIndex);
+          return address && address.col >= 0 && address.row >= 0 ? address : null;
+        }
+        return {
+          col: sourceCell.col,
+          row: sourceCell.row
+        };
+      }
+      getCellKey(cell) {
+        return void 0 !== cell.recordIndex && void 0 !== cell.field ? `record:${this.getStableKeyPart(cell.recordIndex)}:${this.getStableKeyPart(cell.field)}` : this.getCoordKey(cell);
+      }
+      getCoordKey(cell) {
+        return `coord:${cell.col}:${cell.row}`;
+      }
+      getStableKeyPart(value) {
+        if (null === value) return "null";
+        const valueType = typeof value;
+        if ("string" === valueType || "number" === valueType || "boolean" === valueType) return `${valueType}:${JSON.stringify(value)}`;
+        if (Array.isArray(value)) return `array:[${value.map(item => this.getStableKeyPart(item)).join(",")}]`;
+        if ("object" === valueType || "function" === valueType) {
+          let id = this.fieldKeyIds.get(value);
+          return void 0 === id && (id = ++this.fieldKeyId, this.fieldKeyIds.set(value, id)), `${valueType}:#${id}`;
+        }
+        return `${valueType}:${String(value)}`;
+      }
+      resetCutState() {
+        var _a;
+        this.cutWaitPaste = !1, this.activeCutState = null, this.cutCellRange = null, this.cutRanges = null, (null === (_a = this.table.keyboardOptions) || void 0 === _a ? void 0 : _a.showCopyCellBorder) && clearActiveCellRangeState(this.table), this.clipboardCheckTimer && (clearTimeout(this.clipboardCheckTimer), this.clipboardCheckTimer = null);
+      }
       parsePastedData(pastedData) {
         const rows = pastedData.replace(/\r(?!\n)/g, "\r\n").split("\r\n"),
           values = [];
@@ -65847,6 +66534,10 @@
           values.push(rowValues);
         }), values;
       }
+      parsePlainTextPastedData(pastedData) {
+        const rows = pastedData.replace(/\r\n|\r/g, "\n").split("\n");
+        return rows.length > 1 && "" === rows[rows.length - 1] && rows.pop(), rows.map(rowCells => rowCells.split("\t"));
+      }
       processCellValue(cell) {
         cell.includes("\n") && (cell = cell.replace(/^"(.*)"$/, "$1").replace(/["]*/g, match => new Array(Math.floor(match.length / 2)).fill('"').join("")));
         const numValue = Number(cell);
@@ -68046,7 +68737,7 @@
       }
       constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
-        if (super(), this.showFrozenIcon = !0, this._scrollToRowCorrectTimer = null, this._tableBorderWidth_left = 0, this._tableBorderWidth_right = 0, this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, this.version = "1.26.7", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "undefined" != typeof window) {
+        if (super(), this.showFrozenIcon = !0, this._scrollToRowCorrectTimer = null, this._tableBorderWidth_left = 0, this._tableBorderWidth_right = 0, this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, this.version = "1.26.8", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "undefined" != typeof window) {
           const g = window;
           g[this.id] = this;
           const registry = g.__vtable__ || (g.__vtable__ = {
@@ -69051,7 +69742,7 @@
             defaultRowHeight = 40,
             defaultHeaderRowHeight: defaultHeaderRowHeight,
             defaultColWidth = 80,
-            defaultHeaderColWidth = 80,
+            defaultHeaderColWidth: defaultHeaderColWidth,
             keyboardOptions: keyboardOptions,
             eventOptions: eventOptions,
             rowSeriesNumber: rowSeriesNumber,
@@ -72045,6 +72736,23 @@
         if (null == r ? void 0 : r.start) for (let col = r.start.col; col <= r.end.col; col++) for (let row = r.start.row; row <= r.end.row; row++) table.scenegraph.updateCellContent(col, row);
       }
     }
+    function isSameRecordIndex(sourceRecordIndex, currentRecordIndex) {
+      return Array.isArray(sourceRecordIndex) || Array.isArray(currentRecordIndex) ? Array.isArray(sourceRecordIndex) && Array.isArray(currentRecordIndex) && sourceRecordIndex.length === currentRecordIndex.length && sourceRecordIndex.every((value, index) => value === currentRecordIndex[index]) : sourceRecordIndex === currentRecordIndex;
+    }
+    function isTargetCellSnapshotCurrent(table, snapshot) {
+      if (table.isHeader(snapshot.col, snapshot.row) !== snapshot.isHeader) return !1;
+      if (snapshot.isHeader) return !0;
+      const recordShowIndex = table.getRecordShowIndexByCell(snapshot.col, snapshot.row),
+        recordIndex = recordShowIndex >= 0 ? table.dataSource.getIndexKey(recordShowIndex) : void 0,
+        {
+          field: field
+        } = table.internalProps.layoutMap.getBody(snapshot.col, snapshot.row);
+      return isSameRecordIndex(snapshot.recordIndex, recordIndex) && snapshot.field === field;
+    }
+    function areTargetCellSnapshotsCurrent(table, snapshots) {
+      for (let i = 0; i < snapshots.length; i++) for (let j = 0; j < snapshots[i].length; j++) if (!isTargetCellSnapshotCurrent(table, snapshots[i][j])) return !1;
+      return !0;
+    }
     function listTableChangeCellValue(col, row, value, workOnEditableCell, triggerEvent, table, noTriggerChangeCellValuesEvent) {
       var _a, _b;
       if (workOnEditableCell && table.isHasEditorDefine(col, row) || !1 === workOnEditableCell) {
@@ -72099,29 +72807,70 @@
         table.scenegraph.updateNextFrame();
       }
     }
-    function listTableChangeCellValues(startCol, startRow, values, workOnEditableCell, triggerEvent, table, noTriggerChangeCellValuesEvent) {
-      var _a, _b;
+    function listTableChangeCellValues(startCol, startRow, values, workOnEditableCell, triggerEvent, table, noTriggerChangeCellValuesEvent, shouldCancel) {
+      var _a, _b, _c, _d, _e;
       return __awaiter(this, void 0, void 0, function* () {
         const changedCellResults = [];
         let pasteColEnd = startCol,
           pasteRowEnd = startRow;
         const beforeChangeValues = [],
-          oldValues = [];
+          oldValues = [],
+          targetSnapshots = [];
         let cellUpdateType;
         for (let i = 0; i < values.length && !(startRow + i > table.rowCount - 1); i++) {
           const rowValues = values[i],
             rawRowValues = [],
-            oldRowValues = [];
-          beforeChangeValues.push(rawRowValues), oldValues.push(oldRowValues);
+            oldRowValues = [],
+            rowTargetSnapshots = [];
+          beforeChangeValues.push(rawRowValues), oldValues.push(oldRowValues), targetSnapshots.push(rowTargetSnapshots);
           for (let j = 0; j < rowValues.length && !(startCol + j > table.colCount - 1); j++) {
+            const col = startCol + j,
+              row = startRow + i;
             cellUpdateType = getCellUpdateType(startCol + j, startRow + i, table, cellUpdateType);
-            const beforeChangeValue = table.getCellRawValue(startCol + j, startRow + i);
+            const beforeChangeValue = table.getCellRawValue(col, row);
             rawRowValues.push(beforeChangeValue);
-            const oldValue = table.getCellOriginValue(startCol + j, startRow + i);
+            const oldValue = table.getCellOriginValue(col, row);
             oldRowValues.push(oldValue);
+            const isHeader = table.isHeader(col, row),
+              recordShowIndex = table.getRecordShowIndexByCell(col, row),
+              recordIndex = recordShowIndex >= 0 ? table.dataSource.getIndexKey(recordShowIndex) : void 0,
+              {
+                field: field
+              } = table.internalProps.layoutMap.getBody(col, row);
+            rowTargetSnapshots.push({
+              col: col,
+              row: row,
+              isHeader: isHeader,
+              recordIndex: recordIndex,
+              field: field
+            });
           }
         }
-        const resultChangeValues = [];
+        const resultChangeValues = [],
+          preValidatedCellResults = shouldCancel && workOnEditableCell ? [] : null;
+        if (preValidatedCellResults) for (let i = 0; i < values.length; i++) {
+          if (null == shouldCancel ? void 0 : shouldCancel()) return changedCellResults;
+          if (startRow + i > table.rowCount - 1) break;
+          preValidatedCellResults[i] = [];
+          const rowValues = values[i];
+          for (let j = 0; j < rowValues.length && !(startCol + j > table.colCount - 1); j++) {
+            let isCanChange = !1;
+            if (table.isHasEditorDefine(startCol + j, startRow + i)) {
+              const editor = table.getEditor(startCol + j, startRow + i),
+                oldValue = oldValues[i][j],
+                value = rowValues[j],
+                maybePromiseOrValue = null === (_b = null === (_a = null == editor ? void 0 : editor.validateValue) || void 0 === _a ? void 0 : _a.call(editor, value, oldValue, {
+                  col: startCol + j,
+                  row: startRow + i
+                }, table)) || void 0 === _b || _b,
+                validateResult = isPromise(maybePromiseOrValue) ? yield maybePromiseOrValue : maybePromiseOrValue;
+              if (null == shouldCancel ? void 0 : shouldCancel()) return changedCellResults;
+              isCanChange = !0 === validateResult || "validate-exit" === validateResult || "validate-not-exit" === validateResult;
+            }
+            preValidatedCellResults[i][j] = isCanChange;
+          }
+        }
+        if ((null == shouldCancel ? void 0 : shouldCancel()) || !areTargetCellSnapshotsCurrent(table, targetSnapshots)) return changedCellResults;
         for (let i = 0; i < values.length && !(startRow + i > table.rowCount - 1); i++) {
           changedCellResults[i] = [], pasteRowEnd = startRow + i;
           const rowValues = values[i];
@@ -72129,16 +72878,17 @@
           for (let j = 0; j < rowValues.length && !(startCol + j > table.colCount - 1); j++) {
             thisRowPasteColEnd = startCol + j;
             let isCanChange = !1;
-            if (!1 === workOnEditableCell) isCanChange = !0;else if (table.isHasEditorDefine(startCol + j, startRow + i)) {
+            if (preValidatedCellResults) isCanChange = !0 === (null === (_c = preValidatedCellResults[i]) || void 0 === _c ? void 0 : _c[j]);else if (!1 === workOnEditableCell) isCanChange = !0;else if (table.isHasEditorDefine(startCol + j, startRow + i)) {
               const editor = table.getEditor(startCol + j, startRow + i),
                 oldValue = oldValues[i][j],
                 value = rowValues[j],
-                maybePromiseOrValue = null === (_b = null === (_a = null == editor ? void 0 : editor.validateValue) || void 0 === _a ? void 0 : _a.call(editor, value, oldValue, {
+                maybePromiseOrValue = null === (_e = null === (_d = null == editor ? void 0 : editor.validateValue) || void 0 === _d ? void 0 : _d.call(editor, value, oldValue, {
                   col: startCol + j,
                   row: startRow + i
-                }, table)) || void 0 === _b || _b;
+                }, table)) || void 0 === _e || _e;
               if (isPromise(maybePromiseOrValue)) {
                 const validateResult = yield maybePromiseOrValue;
+                if (null == shouldCancel ? void 0 : shouldCancel()) return changedCellResults;
                 isCanChange = !0 === validateResult || "validate-exit" === validateResult || "validate-not-exit" === validateResult;
               } else isCanChange = !0 === maybePromiseOrValue || "validate-exit" === maybePromiseOrValue || "validate-not-exit" === maybePromiseOrValue;
             }
@@ -72152,7 +72902,10 @@
                 } = table.internalProps.layoutMap.getBody(startCol + j, startRow + i),
                 beforeChangeValue = beforeChangeValues[i][j],
                 oldValue = oldValues[i][j];
-              table.isHeader(startCol + j, startRow + i) ? table.internalProps.layoutMap.updateColumnTitle(startCol + j, startRow + i, value) : table.dataSource.changeFieldValue(value, recordShowIndex, field, startCol + j, startRow + i, table);
+              if (table.isHeader(startCol + j, startRow + i)) table.internalProps.layoutMap.updateColumnTitle(startCol + j, startRow + i, value);else {
+                const changeResult = table.dataSource.changeFieldValue(value, recordShowIndex, field, startCol + j, startRow + i, table);
+                isPromise(changeResult) && (yield changeResult);
+              }
               const changedValue = table.getCellOriginValue(startCol + j, startRow + i);
               if (oldValue !== changedValue && triggerEvent) {
                 const changeValue = {
@@ -72849,6 +73602,9 @@
         }), clearLayoutColumnState(null !== (_a = column.children) && void 0 !== _a ? _a : column.columns);
       });
     }
+    function isSameField(left, right) {
+      return left === right || Array.isArray(left) && Array.isArray(right) && arrayEqual(left, right);
+    }
     class ListTable extends BaseTable {
       constructor(container, options) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -73151,7 +73907,7 @@
         return this.transpose ? this.dataSource.getTableIndex(recordIndex) + this.rowHeaderLevelCount : this.dataSource.getTableIndex(recordIndex) + this.columnHeaderLevelCount;
       }
       getTableIndexByField(field) {
-        const colObj = this.internalProps.layoutMap.columnObjects.find(col => col.field === field);
+        const colObj = this.internalProps.layoutMap.columnObjects.find(col => isSameField(col.field, field));
         if (!colObj) return -1;
         const layoutRange = this.internalProps.layoutMap.getBodyLayoutRangeById(colObj.id);
         return this.transpose ? layoutRange.start.row : layoutRange.start.col;
@@ -73294,7 +74050,7 @@
         const {
             layoutMap: layoutMap
           } = this.internalProps,
-          colObj = layoutMap.columnObjects.find(col => col.field === field);
+          colObj = layoutMap.columnObjects.find(col => isSameField(col.field, field));
         if (colObj) {
           const layoutRange = layoutMap.getBodyLayoutRangeById(colObj.id);
           let startRow;
@@ -73409,7 +74165,7 @@
       _getSortFuncFromHeaderOption(columns, field, fieldKey) {
         if (columns || (columns = this.internalProps.columns), field && columns && columns.length > 0) for (let i = 0; i < columns.length; i++) {
           const header = columns[i];
-          if ((fieldKey && fieldKey === header.fieldKey || !fieldKey && header.field === field) && header.sort && "function" == typeof header.sort) return header.sort;
+          if ((fieldKey && fieldKey === header.fieldKey || !fieldKey && isSameField(header.field, field)) && header.sort && "function" == typeof header.sort) return header.sort;
           if (header.columns) {
             const sort = this._getSortFuncFromHeaderOption(header.columns, field, fieldKey);
             if (sort) return sort;
@@ -73421,7 +74177,7 @@
         const normalizedSortState = (Array.isArray(sortState) ? sortState : sortState ? [sortState] : []).filter(Boolean);
         if (normalizedSortState.length ? this.internalProps.sortState = sortState : this.internalProps.sortState = null, executeSort) if (normalizedSortState.length) this.internalProps.layoutMap.headerObjects.some(item => !1 !== item.define.sort) && (this.dataSource.sort(normalizedSortState.map(item => {
           const sortFunc = this._getSortFuncFromHeaderOption(this.internalProps.columns, item.field);
-          this.internalProps.layoutMap.headerObjects.find(col => col && col.field === item.field);
+          this.internalProps.layoutMap.headerObjects.find(col => col && isSameField(col.field, item.field));
           return {
             field: item.field,
             order: item.order,
@@ -73519,7 +74275,7 @@
             const sortState = Array.isArray(this.sortState) ? this.sortState : [this.sortState];
             sortState.some(item => item.order && item.field && "normal" !== item.order) && this.internalProps.layoutMap.headerObjectsIncludeHided.some(item => !1 !== item.define.sort) && this.dataSource.sort(sortState.map(item => {
               const sortFunc = this._getSortFuncFromHeaderOption(void 0, item.field);
-              this.internalProps.layoutMap.headerObjectsIncludeHided.find(col => col && col.field === item.field);
+              this.internalProps.layoutMap.headerObjectsIncludeHided.find(col => col && isSameField(col.field, item.field));
               return {
                 field: item.field,
                 order: item.order || "asc",
@@ -73605,8 +74361,8 @@
       changeCellValue(col, row, value, workOnEditableCell = !1, triggerEvent = !0, noTriggerChangeCellValuesEvent) {
         return listTableChangeCellValue(col, row, value, workOnEditableCell, triggerEvent, this, noTriggerChangeCellValuesEvent);
       }
-      changeCellValues(startCol, startRow, values, workOnEditableCell = !1, triggerEvent = !0, noTriggerChangeCellValuesEvent) {
-        return listTableChangeCellValues(startCol, startRow, values, workOnEditableCell, triggerEvent, this, noTriggerChangeCellValuesEvent);
+      changeCellValues(startCol, startRow, values, workOnEditableCell = !1, triggerEvent = !0, noTriggerChangeCellValuesEvent, shouldCancel) {
+        return listTableChangeCellValues(startCol, startRow, values, workOnEditableCell, triggerEvent, this, noTriggerChangeCellValuesEvent, shouldCancel);
       }
       changeCellValuesByRanges(ranges, value, workOnEditableCell = !1, triggerEvent = !0, noTriggerChangeCellValuesEvent) {
         return listTableChangeCellValuesByRanges(ranges, value, workOnEditableCell, triggerEvent, this, noTriggerChangeCellValuesEvent);
@@ -73641,8 +74397,8 @@
           autoRefresh = null === (_b = null == options ? void 0 : options.autoRefresh) || void 0 === _b || _b,
           records = null === (_c = this.dataSource.dataSourceObj) || void 0 === _c ? void 0 : _c.records;
         let record, oldValue;
-        if (!Array.isArray(records) || "string" != typeof field && "number" != typeof field || (record = Array.isArray(recordIndex) ? getValueFromDeepArray(records, recordIndex) : records[recordIndex], oldValue = null == record ? void 0 : record[field]), this.dataSource.changeFieldValueByRecordIndex(value, recordIndex, field, this), !triggerEvent) return;
-        const changedValue = !record || "string" != typeof field && "number" != typeof field ? value : null == record ? void 0 : record[field];
+        if (Array.isArray(records) && ("string" == typeof field || "number" == typeof field || Array.isArray(field)) && (record = Array.isArray(recordIndex) ? getValueFromDeepArray(records, recordIndex) : records[recordIndex], oldValue = getRecordFieldValue(record, field)), this.dataSource.changeFieldValueByRecordIndex(value, recordIndex, field, this), Array.isArray(records) && (record = Array.isArray(recordIndex) ? getValueFromDeepArray(records, recordIndex) : records[recordIndex]), !triggerEvent) return;
+        const changedValue = record && ("string" == typeof field || "number" == typeof field || Array.isArray(field)) ? getRecordFieldValue(record, field) : value;
         if (oldValue !== changedValue) {
           const cellAddr = this.getCellAddrByFieldRecord(field, recordIndex),
             changeValue = {
@@ -73681,8 +74437,8 @@
             } = changeValues[i],
             records = null === (_c = this.dataSource.dataSourceObj) || void 0 === _c ? void 0 : _c.records;
           let record, oldValue;
-          if (!Array.isArray(records) || "string" != typeof field && "number" != typeof field || (record = Array.isArray(recordIndex) ? getValueFromDeepArray(records, recordIndex) : records[recordIndex], oldValue = null == record ? void 0 : record[field]), this.dataSource.changeFieldValueByRecordIndex(value, recordIndex, field, this), triggerEvent) {
-            const changedValue = !record || "string" != typeof field && "number" != typeof field ? value : null == record ? void 0 : record[field];
+          if (Array.isArray(records) && ("string" == typeof field || "number" == typeof field || Array.isArray(field)) && (record = Array.isArray(recordIndex) ? getValueFromDeepArray(records, recordIndex) : records[recordIndex], oldValue = getRecordFieldValue(record, field)), this.dataSource.changeFieldValueByRecordIndex(value, recordIndex, field, this), Array.isArray(records) && (record = Array.isArray(recordIndex) ? getValueFromDeepArray(records, recordIndex) : records[recordIndex]), triggerEvent) {
+            const changedValue = record && ("string" == typeof field || "number" == typeof field || Array.isArray(field)) ? getRecordFieldValue(record, field) : value;
             if (oldValue !== changedValue) {
               const changeValue = {
                 col: null !== (_e = null === (_d = this.getCellAddrByFieldRecord(field, recordIndex)) || void 0 === _d ? void 0 : _d.col) && void 0 !== _e ? _e : -1,
@@ -77383,8 +78139,9 @@
     }
 
     function createCellGroup(table, value, columnGroup, xOrigin, yOrigin, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, customElementsGroup, renderDefault, cellTheme, range, isAsync) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9;
-      const headerStyle = table._getCellStyle(col, row),
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11;
+      const isCornerCustomMergeContentCell = isCornerCustomMergeRange(range, table) && col === range.end.col && row === range.end.row,
+        headerStyle = table._getCellStyle(col, row),
         functionalPadding = getFunctionalProp("padding", headerStyle, col, row, table);
       isValid$1(functionalPadding) && (padding = functionalPadding), (null === (_a = null == cellTheme ? void 0 : cellTheme.text) || void 0 === _a ? void 0 : _a.textAlign) && (textAlign = null === (_b = null == cellTheme ? void 0 : cellTheme.text) || void 0 === _b ? void 0 : _b.textAlign), (null === (_c = null == cellTheme ? void 0 : cellTheme.text) || void 0 === _c ? void 0 : _c.textBaseline) && (textBaseline = null === (_d = null == cellTheme ? void 0 : cellTheme.text) || void 0 === _d ? void 0 : _d.textBaseline);
       const autoRowHeight = table.isAutoRowHeight(row),
@@ -77406,7 +78163,7 @@
         cursor: null !== (_q = null === (_p = null == cellTheme ? void 0 : cellTheme.group) || void 0 === _p ? void 0 : _p.cursor) && void 0 !== _q ? _q : void 0,
         lineDash: null !== (_s = null === (_r = null == cellTheme ? void 0 : cellTheme.group) || void 0 === _r ? void 0 : _r.lineDash) && void 0 !== _s ? _s : void 0,
         lineCap: "butt",
-        clip: !0,
+        clip: !isCornerCustomMergeContentCell,
         cornerRadius: cellTheme.group.cornerRadius
       })), cellGroup && "cell" === cellGroup.role || (cellGroup = new Group$1({
         x: xOrigin,
@@ -77421,9 +78178,12 @@
         cursor: null !== (_2 = null === (_1 = null == cellTheme ? void 0 : cellTheme.group) || void 0 === _1 ? void 0 : _1.cursor) && void 0 !== _2 ? _2 : void 0,
         lineDash: null !== (_4 = null === (_3 = null == cellTheme ? void 0 : cellTheme.group) || void 0 === _3 ? void 0 : _3.lineDash) && void 0 !== _4 ? _4 : void 0,
         lineCap: "butt",
-        clip: !0,
+        clip: !isCornerCustomMergeContentCell,
         cornerRadius: cellTheme.group.cornerRadius
-      }), cellGroup.role = "cell", cellGroup.col = col, cellGroup.row = row, cellGroup = null !== (_5 = null == columnGroup ? void 0 : columnGroup.addCellGroup(cellGroup)) && void 0 !== _5 ? _5 : cellGroup), customElementsGroup && cellGroup.appendChild(customElementsGroup), renderDefault) {
+      }), cellGroup.role = "cell", cellGroup.col = col, cellGroup.row = row, cellGroup = null !== (_5 = null == columnGroup ? void 0 : columnGroup.addCellGroup(cellGroup)) && void 0 !== _5 ? _5 : cellGroup), customElementsGroup && cellGroup.appendChild(customElementsGroup), isCornerCustomMergeContentCell && cellGroup.setAttributes({
+        width: Math.max(cellGroup.attribute.width, null !== (_6 = null == customElementsGroup ? void 0 : customElementsGroup.attribute.width) && void 0 !== _6 ? _6 : 0),
+        height: Math.max(cellGroup.attribute.height, null !== (_7 = null == customElementsGroup ? void 0 : customElementsGroup.attribute.height) && void 0 !== _7 ? _7 : 0)
+      }), renderDefault) {
         const textStr = value;
         let icons;
         if (mayHaveIcon) {
@@ -77431,11 +78191,11 @@
             iconRow = row;
           range && (iconCol = range.start.col, iconRow = range.start.row), icons = table.getCellIcons(iconCol, iconRow);
         }
-        createCellContent(cellGroup, icons, textStr, padding, autoColWidth, autoRowHeight, autoWrapText, "number" == typeof lineClamp ? lineClamp : void 0, cellGroup.attribute.width, cellGroup.attribute.height, textAlign, textBaseline, table, cellTheme, range), (null === (_6 = null == cellTheme ? void 0 : cellTheme._vtable) || void 0 === _6 ? void 0 : _6.marked) && createMark(null === (_7 = null == cellTheme ? void 0 : cellTheme._vtable) || void 0 === _7 ? void 0 : _7.marked, cellGroup);
+        createCellContent(cellGroup, icons, textStr, padding, autoColWidth, autoRowHeight, autoWrapText, "number" == typeof lineClamp ? lineClamp : void 0, cellGroup.attribute.width, cellGroup.attribute.height, textAlign, textBaseline, table, cellTheme, range), (null === (_8 = null == cellTheme ? void 0 : cellTheme._vtable) || void 0 === _8 ? void 0 : _8.marked) && createMark(null === (_9 = null == cellTheme ? void 0 : cellTheme._vtable) || void 0 === _9 ? void 0 : _9.marked, cellGroup);
       }
       return customElementsGroup && cellGroup.setAttributes({
-        width: Math.max(cellGroup.attribute.width, null !== (_8 = customElementsGroup.attribute.width) && void 0 !== _8 ? _8 : 0),
-        height: Math.max(cellGroup.attribute.height, null !== (_9 = customElementsGroup.attribute.height) && void 0 !== _9 ? _9 : 0)
+        width: Math.max(cellGroup.attribute.width, null !== (_10 = customElementsGroup.attribute.width) && void 0 !== _10 ? _10 : 0),
+        height: Math.max(cellGroup.attribute.height, null !== (_11 = customElementsGroup.attribute.height) && void 0 !== _11 ? _11 : 0)
       }), cellGroup;
     }
 
@@ -79542,30 +80302,36 @@
         }
         else if (Array.isArray(markLine)) {
             return markLine.map((item, index) => {
+                const style = item.style;
                 return {
                     ...item,
                     date: item.date,
                     scrollToMarkLine: item.scrollToMarkLine,
                     position: item.position ?? 'left',
-                    style: {
-                        lineColor: item.style?.lineColor || 'red',
-                        lineWidth: item.style?.lineWidth || 1,
-                        lineDash: item.style?.lineDash
-                    }
+                    style: typeof style === 'function'
+                        ? style
+                        : {
+                            lineColor: style?.lineColor || 'red',
+                            lineWidth: style?.lineWidth ?? 1,
+                            lineDash: style?.lineDash
+                        }
                 };
             });
         }
+        const style = markLine.style;
         return [
             {
                 ...markLine,
                 date: markLine.date,
                 scrollToMarkLine: markLine.scrollToMarkLine ?? true,
                 position: markLine.position ?? 'left',
-                style: {
-                    lineColor: markLine.style?.lineColor || 'red',
-                    lineWidth: markLine.style?.lineWidth || 1,
-                    lineDash: markLine.style?.lineDash
-                }
+                style: typeof style === 'function'
+                    ? style
+                    : {
+                        lineColor: style?.lineColor || 'red',
+                        lineWidth: style?.lineWidth ?? 1,
+                        lineDash: style?.lineDash
+                    }
             }
         ];
     }
@@ -81714,6 +82480,15 @@
         }
     }
 
+    function resolveMarkLineStyle(line, args) {
+        const style = typeof line.style === 'function' ? line.style(args) : line.style;
+        const lineWidth = typeof style?.lineWidth === 'function' ? style.lineWidth(args) : style?.lineWidth;
+        return {
+            lineColor: style?.lineColor || 'red',
+            lineWidth: lineWidth ?? 1,
+            lineDash: style?.lineDash
+        };
+    }
     class MarkLine {
         _scene;
         group;
@@ -81759,7 +82534,6 @@
             const minDate = this._scene._gantt.parsedOptions.minDate;
             minDate &&
                 markLine.forEach(line => {
-                    const style = line.style;
                     const contentStyle = line.contentStyle || {};
                     const date = this._scene._gantt.parsedOptions.timeScaleIncludeHour
                         ? createDateAtMidnight(line.date)
@@ -81782,6 +82556,15 @@
                     else if (line.position === 'middle') {
                         dateX = cellStartX + cellWidth / 2;
                     }
+                    const style = resolveMarkLineStyle(line, {
+                        date,
+                        dateIndex: cellIndex,
+                        dateX,
+                        cellStartX,
+                        cellWidth,
+                        timelineColWidth: this._scene._gantt.parsedOptions.timelineColWidth,
+                        millisecondsPerPixel: this._scene._gantt.getCurrentMillisecondsPerPixel()
+                    });
                     const markLineGroup = new Group$2({
                         pickable: false,
                         x: dateX - this.markLineContainerWidth / 2,
@@ -88429,7 +89212,7 @@
         PluginManager: PluginManager
     });
 
-    const version = "1.26.7";
+    const version = "1.26.8";
 
     exports.Gantt = Gantt;
     exports.TABLE_EVENT_TYPE = TABLE_EVENT_TYPE;