@visactor/vtable-gantt 1.23.3 → 1.24.0

package/dist/vtable-gantt.js

@@ -34894,500 +34894,6 @@
       registed || (registed = !0, preLoadAllModule(), isBrowserEnv() ? loadBrowserEnv(container) : isNodeEnv() && loadNodeEnv(container), registerArc(), registerCircle(), registerGroup(), registerImage(), registerLine(), registerRect(), registerRichtext(), registerShadowRoot(), registerSymbol(), registerText(), registerFlexLayoutPlugin(), loadPoptip(), registerFlexLayoutPlugin());
     }
 
-    function throttle$1(func, delay) {
-        let timer = null;
-        return function (...args) {
-            if (!timer) {
-                func.apply(this, args);
-                timer = setTimeout(() => {
-                    timer = null;
-                }, delay);
-            }
-        };
-    }
-    function getTodayNearDay(dayOffset, format) {
-        const today = new Date();
-        const todayTime = today.getTime();
-        const oneDayTime = 24 * 60 * 60 * 1000;
-        const targetTime = todayTime + dayOffset * oneDayTime;
-        const date = new Date(targetTime);
-        if (format) {
-            const year = date.getFullYear().toString();
-            const month = (date.getMonth() + 1).toString().padStart(2, '0');
-            const day = date.getDate().toString().padStart(2, '0');
-            format = format.replace('yyyy', year);
-            format = format.replace('mm', month);
-            format = format.replace('dd', day);
-            return format;
-        }
-        return date;
-    }
-    function formatDate(date, format) {
-        const year = date.getFullYear().toString();
-        const month = (date.getMonth() + 1).toString().padStart(2, '0');
-        const day = date.getDate().toString().padStart(2, '0');
-        format = format.replace('yyyy', year);
-        format = format.replace('mm', month);
-        format = format.replace('dd', day);
-        if (format.length > 10) {
-            const hour = date.getHours().toString().padStart(2, '0');
-            const minute = date.getMinutes().toString().padStart(2, '0');
-            const second = date.getSeconds().toString().padStart(2, '0');
-            format = format.replace('hh', hour);
-            format = format.replace('mm', minute);
-            format = format.replace('ss', second);
-        }
-        return format;
-    }
-    function validateDate(dateParts, format) {
-        const yearIndex = format.indexOf('yyyy');
-        const monthIndex = format.indexOf('mm');
-        const dayIndex = format.indexOf('dd');
-        const dateYearIndex = yearIndex < monthIndex ? (yearIndex < dayIndex ? 0 : 1) : monthIndex < dayIndex ? 1 : 2;
-        const dateMonthIndex = monthIndex < yearIndex ? (monthIndex < dayIndex ? 0 : 1) : monthIndex < dayIndex ? 1 : 2;
-        const dateDayIndex = dayIndex < yearIndex ? (dayIndex < monthIndex ? 0 : 1) : dayIndex < monthIndex ? 1 : 2;
-        const year = parseInt(dateParts[dateYearIndex], 10);
-        const month = parseInt(dateParts[dateMonthIndex], 10) - 1;
-        const day = parseInt(dateParts[dateDayIndex], 10);
-        if (isNaN(year) || year < 1) {
-            return false;
-        }
-        if (isNaN(month) || month < 0 || month > 11) {
-            return false;
-        }
-        const daysInMonth = [31, isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-        if (isNaN(day) || day < 1 || day > daysInMonth[month]) {
-            return false;
-        }
-        return true;
-    }
-    function validateTime(dateParts, format) {
-        if (format.includes('hh') || format.includes('mm') || format.includes('ss')) {
-            const timeIndex = format.indexOf('hh') > -1 ? format.indexOf('hh') : format.indexOf('HH');
-            const hour = parseInt(dateParts[timeIndex], 10);
-            const minute = parseInt(dateParts[timeIndex + 1], 10);
-            const second = dateParts.length > timeIndex + 2 ? parseInt(dateParts[timeIndex + 2], 10) : 0;
-            if (isNaN(hour) || hour < 0 || hour > 23) {
-                return false;
-            }
-            if (isNaN(minute) || minute < 0 || minute > 59) {
-                return false;
-            }
-            if (isNaN(second) || second < 0 || second > 59) {
-                return false;
-            }
-        }
-        return true;
-    }
-    function isLeapYear(year) {
-        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
-    }
-    function parseDateFormat(dateString) {
-        const formats = [
-            'yyyy-mm-dd',
-            'dd-mm-yyyy',
-            'mm/dd/yyyy',
-            'yyyy/mm/dd',
-            'dd/mm/yyyy',
-            'yyyy.mm.dd',
-            'mm.dd.yyyy',
-            'dd.mm.yyyy'
-        ];
-        const timeFormat = ['hh:mm:ss', 'hh:mm'];
-        dateString = dateString.trim();
-        const dates = dateString.split(' ');
-        const date = dates[0];
-        const time = dates[1];
-        let dateFormatMatched;
-        let timeFormatMatched;
-        if (date) {
-            for (let i = 0; i < formats.length; i++) {
-                const format = formats[i];
-                const dateParts = date.split(getSeparator(format));
-                const isValid = validateDate(dateParts, format);
-                if (dateParts.length === 3 && isValid) {
-                    dateFormatMatched = format;
-                    break;
-                }
-            }
-        }
-        if (dateFormatMatched) {
-            if (time) {
-                for (let i = 0; i < timeFormat.length; i++) {
-                    const format = timeFormat[i];
-                    const timeParts = time.split(getSeparator(format));
-                    const formatParts = format.split(getSeparator(format));
-                    const isValid = validateTime(timeParts, format);
-                    if (isValid && timeParts.length === formatParts.length) {
-                        timeFormatMatched = format;
-                        break;
-                    }
-                }
-            }
-        }
-        if (date && time && dateFormatMatched && timeFormatMatched) {
-            return dateFormatMatched + ' ' + timeFormatMatched;
-        }
-        if (date && !time) {
-            return dateFormatMatched;
-        }
-        return 'yyyy-mm-dd hh:mm:ss';
-    }
-    function getSeparator(format) {
-        const separators = format.match(/[^\w]/g);
-        if (separators) {
-            const escapedSeparators = separators.map(s => '\\' + s).join('|');
-            return new RegExp(escapedSeparators, 'g');
-        }
-        return /[^\w]/;
-    }
-    function parseStringTemplate(template, data) {
-        const result = template.replace(/\{([^}]+)\}/g, (match, key) => {
-            const keys = key.split('.');
-            let value = data;
-            for (const k of keys) {
-                if (value.hasOwnProperty(k)) {
-                    value = value[k];
-                }
-                else {
-                    value = match;
-                    break;
-                }
-            }
-            return value;
-        });
-        return result;
-    }
-    function toBoxArray$2(obj) {
-        if (!Array.isArray(obj)) {
-            return [obj, obj, obj, obj];
-        }
-        if (obj.length === 3) {
-            return [obj[0], obj[1], obj[2], obj[1]];
-        }
-        if (obj.length === 2) {
-            return [obj[0], obj[1], obj[0], obj[1]];
-        }
-        if (obj.length === 1) {
-            return [obj[0], obj[0], obj[0], obj[0]];
-        }
-        return [obj[0], obj[1], obj[2], obj[3]];
-    }
-    function getWeekNumber(currentDate) {
-        const startOfYear = new Date(currentDate.getFullYear(), 0, 1);
-        const weekNumber = Math.ceil(((currentDate.getTime() + 1 - startOfYear.getTime()) / 86400000 + 1) / 7);
-        return weekNumber;
-    }
-    function getWeekday(dateString, format = 'long') {
-        const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
-        const date = new Date(dateString);
-        if (format === 'short') {
-            return days[date.getDay()].substr(0, 3);
-        }
-        else if (format === 'long') {
-            return days[date.getDay()];
-        }
-        return 'Invalid format specified. Please use "short" or "long".';
-    }
-    function isPropertyWritable(obj, prop) {
-        const descriptor = Object.getOwnPropertyDescriptor(obj, prop);
-        if (!descriptor) {
-            return false;
-        }
-        return !!descriptor.set || descriptor.writable === true;
-    }
-    function createDateAtMidnight(dateStr, forceMidnight = false) {
-        let date;
-        if (dateStr) {
-            date = new Date(dateStr);
-            if (typeof dateStr === 'string') {
-                if (dateStr.length > 10) {
-                    if (forceMidnight) {
-                        date.setHours(0, 0, 0, 0);
-                    }
-                    return date;
-                }
-                date.setHours(0, 0, 0, 0);
-            }
-        }
-        else {
-            date = new Date();
-        }
-        if (forceMidnight) {
-            date.setHours(0, 0, 0, 0);
-        }
-        return date;
-    }
-    function createDateAtLastMinute(dateStr, forceSetMinute = false) {
-        let date;
-        if (dateStr) {
-            date = new Date(dateStr);
-            if (typeof dateStr === 'string') {
-                if (dateStr.length > 10) {
-                    if (forceSetMinute) {
-                        date.setMinutes(59, 59, 999);
-                    }
-                    return date;
-                }
-                date.setMinutes(59, 59, 999);
-            }
-        }
-        else {
-            date = new Date();
-        }
-        if (forceSetMinute) {
-            date.setMinutes(59, 59, 999);
-        }
-        return date;
-    }
-    function createDateAtLastSecond(dateStr, forceSetSecond = false) {
-        let date;
-        if (dateStr) {
-            date = new Date(dateStr);
-            if (typeof dateStr === 'string') {
-                if (dateStr.length > 10) {
-                    if (forceSetSecond) {
-                        date.setSeconds(59, 999);
-                    }
-                    return date;
-                }
-                date.setSeconds(59, 999);
-            }
-        }
-        else {
-            date = new Date();
-        }
-        if (forceSetSecond) {
-            date.setSeconds(59, 999);
-        }
-        return date;
-    }
-    function createDateAtLastMillisecond(dateStr, forceSetMillisecond = false) {
-        let date;
-        if (dateStr) {
-            date = new Date(dateStr);
-            if (typeof dateStr === 'string') {
-                if (dateStr.length > 10) {
-                    if (forceSetMillisecond) {
-                        date.setMilliseconds(999);
-                    }
-                    return date;
-                }
-                date.setMilliseconds(999);
-            }
-        }
-        else {
-            date = new Date();
-        }
-        if (forceSetMillisecond) {
-            date.setMilliseconds(999);
-        }
-        return date;
-    }
-    function createDateAtLastHour(dateStr, forceLastHour = false) {
-        let date;
-        if (dateStr) {
-            date = new Date(dateStr);
-            if (typeof dateStr === 'string') {
-                if (dateStr.length > 10) {
-                    if (forceLastHour) {
-                        date.setHours(23, 59, 59, 999);
-                    }
-                    return date;
-                }
-                date.setHours(23, 59, 59, 999);
-            }
-        }
-        else {
-            date = new Date();
-        }
-        if (forceLastHour) {
-            date.setHours(23, 59, 59, 999);
-        }
-        return date;
-    }
-    function getEndDateByTimeUnit(startDate, date, timeScale, step) {
-        let endDate = new Date(date);
-        switch (timeScale) {
-            case 'second':
-                endDate.setMilliseconds(999);
-                break;
-            case 'minute':
-                endDate.setSeconds(59, 999);
-                break;
-            case 'hour':
-                endDate.setMinutes(59, 59, 999);
-                break;
-            case 'day':
-                endDate.setHours(23, 59, 59, 999);
-                break;
-            case 'week':
-                const day = endDate.getDay();
-                const diffToEndOfWeek = 6 - day;
-                endDate.setDate(endDate.getDate() + diffToEndOfWeek);
-                endDate.setHours(23, 59, 59, 999);
-                break;
-            case 'month':
-                const lastDayOfMonth = new Date(endDate.getFullYear(), endDate.getMonth() + 1, 0).getDate();
-                endDate.setDate(lastDayOfMonth);
-                endDate.setHours(23, 59, 59, 999);
-                break;
-            case 'quarter':
-                const currentMonth = endDate.getMonth();
-                const endMonthOfQuarter = currentMonth - (currentMonth % 3) + 2;
-                const lastDayOfQuarter = new Date(endDate.getFullYear(), endMonthOfQuarter + 1, 0).getDate();
-                endDate.setMonth(endMonthOfQuarter, lastDayOfQuarter);
-                endDate.setHours(23, 59, 59, 999);
-                break;
-            case 'year':
-                endDate.setMonth(11, 31);
-                endDate.setHours(23, 59, 59, 999);
-                break;
-            default:
-                throw new Error('Invalid time scale');
-        }
-        const count = computeCountToTimeScale(endDate, startDate, timeScale, step, 1);
-        const targetCount = Math.ceil(count);
-        if (targetCount > count) {
-            const dif = (targetCount - count) * step;
-            const msInSecond = 1000;
-            const msInMinute = msInSecond * 60;
-            const msInHour = msInMinute * 60;
-            const msInDay = msInHour * 24;
-            const msInWeek = msInDay * 7;
-            new Date(endDate.getTime() + 1);
-            switch (timeScale) {
-                case 'second':
-                    endDate.setTime(endDate.getTime() + dif * msInSecond);
-                    break;
-                case 'minute':
-                    endDate.setTime(endDate.getTime() + dif * msInMinute);
-                    break;
-                case 'hour':
-                    endDate.setTime(endDate.getTime() + dif * msInHour);
-                    break;
-                case 'day':
-                    endDate.setTime(endDate.getTime() + dif * msInDay);
-                    break;
-                case 'week':
-                    endDate.setTime(endDate.getTime() + dif * msInWeek);
-                    break;
-                case 'month':
-                    endDate = new Date(endDate.getFullYear(), endDate.getMonth() + 1 + Math.round(dif), 0);
-                    endDate.setHours(23, 59, 59, 999);
-                    break;
-                case 'quarter':
-                    const currentMonth = endDate.getMonth();
-                    const endMonthOfQuarter = currentMonth - (currentMonth % 3) + 2;
-                    endDate = new Date(endDate.getFullYear(), endMonthOfQuarter + Math.round(dif * 3) + 1, 0);
-                    endDate.setHours(23, 59, 59, 999);
-                    break;
-                case 'year':
-                    endDate.setFullYear(endDate.getFullYear() + Math.floor(dif));
-                    endDate.setHours(23, 59, 59, 999);
-                    break;
-                default:
-                    throw new Error('Invalid time scale');
-            }
-        }
-        return endDate;
-    }
-    function getStartDateByTimeUnit(date, timeScale, startOfWeekSetting = 'monday') {
-        const startDate = new Date(date);
-        switch (timeScale) {
-            case 'second':
-                startDate.setMilliseconds(0);
-                break;
-            case 'minute':
-                startDate.setSeconds(0, 0);
-                break;
-            case 'hour':
-                startDate.setMinutes(0, 0, 0);
-                break;
-            case 'day':
-                startDate.setHours(0, 0, 0, 0);
-                break;
-            case 'week':
-                const day = startDate.getDay();
-                let diffToStartOfWeek = day;
-                if (startOfWeekSetting === 'monday') {
-                    diffToStartOfWeek = day === 0 ? -6 : 1 - day;
-                }
-                else {
-                    diffToStartOfWeek = -day;
-                }
-                startDate.setDate(startDate.getDate() + diffToStartOfWeek);
-                startDate.setHours(0, 0, 0, 0);
-                break;
-            case 'month':
-                startDate.setDate(1);
-                startDate.setHours(0, 0, 0, 0);
-                break;
-            case 'quarter':
-                const currentMonth = startDate.getMonth();
-                const startMonthOfQuarter = currentMonth - (currentMonth % 3);
-                startDate.setMonth(startMonthOfQuarter, 1);
-                startDate.setHours(0, 0, 0, 0);
-                break;
-            case 'year':
-                startDate.setMonth(0, 1);
-                startDate.setHours(0, 0, 0, 0);
-                break;
-            default:
-                throw new Error('Invalid time scale');
-        }
-        return startDate;
-    }
-    function computeCountToTimeScale(date, startDate, timeScale, step, diffMS = 0) {
-        const msInSecond = 1000;
-        const msInMinute = msInSecond * 60;
-        const msInHour = msInMinute * 60;
-        const msInDay = msInHour * 24;
-        const msInWeek = msInDay * 7;
-        let difference;
-        const adjusted_date = new Date(date.getTime() + diffMS);
-        switch (timeScale) {
-            case 'second':
-                difference = (adjusted_date.getTime() - startDate.getTime()) / msInSecond;
-                break;
-            case 'minute':
-                difference = (adjusted_date.getTime() - startDate.getTime()) / msInMinute;
-                break;
-            case 'hour':
-                difference = (adjusted_date.getTime() - startDate.getTime()) / msInHour;
-                break;
-            case 'day':
-                difference = (adjusted_date.getTime() - startDate.getTime()) / msInDay;
-                break;
-            case 'week':
-                difference = (adjusted_date.getTime() - startDate.getTime()) / msInWeek;
-                break;
-            case 'month':
-                const startDaysInMonth = new Date(startDate.getFullYear(), startDate.getMonth() + 1, 0).getDate();
-                const adjustedDaysInMonth = new Date(adjusted_date.getFullYear(), adjusted_date.getMonth() + 1, 0).getDate();
-                difference =
-                    (adjusted_date.getFullYear() - startDate.getFullYear()) * 12 +
-                        (adjusted_date.getMonth() - startDate.getMonth());
-                difference += adjusted_date.getDate() / adjustedDaysInMonth - startDate.getDate() / startDaysInMonth;
-                break;
-            case 'quarter':
-                difference =
-                    (adjusted_date.getFullYear() - startDate.getFullYear()) * 4 +
-                        (adjusted_date.getMonth() - startDate.getMonth()) / 3;
-                difference +=
-                    (adjusted_date.getDate() - startDate.getDate()) /
-                        (3 * new Date(adjusted_date.getFullYear(), adjusted_date.getMonth() + 1, 0).getDate());
-                break;
-            case 'year':
-                difference = adjusted_date.getFullYear() - startDate.getFullYear();
-                difference += (adjusted_date.getMonth() - startDate.getMonth()) / 12;
-                break;
-            default:
-                throw new Error('Invalid time scale');
-        }
-        return difference / step;
-    }
-
     class Grid {
         gridStyle;
         scrollLeft;
@@ -35468,9 +34974,7 @@
                 this.verticalLineGroup.name = 'grid-vertical';
                 this.group.appendChild(this.verticalLineGroup);
                 const dependenceOnTimeScale = this._scene._gantt.parsedOptions.reverseSortedTimelineScales.find(scale => scale.unit === verticalLineDependenceOnTimeScale) ?? this._scene._gantt.parsedOptions.reverseSortedTimelineScales[0];
-                const { unit: minUnit, step } = this._scene._gantt.parsedOptions.reverseSortedTimelineScales[0];
                 const { timelineDates } = dependenceOnTimeScale;
-                const timelineColWidth = this._scene._gantt.parsedOptions.timelineColWidth;
                 if (typeof gridStyle.verticalLine === 'function') {
                     for (let i = 0; i < timelineDates?.length - 1; i++) {
                         const { endDate } = timelineDates[i];
@@ -35480,8 +34984,8 @@
                             date: timelineDates[i].endDate,
                             ganttInstance: this._scene._gantt
                         });
-                        const x = Math.ceil(computeCountToTimeScale(endDate, this._scene._gantt.parsedOptions.minDate, minUnit, step, 1) *
-                            timelineColWidth) + (verticalLine_style.lineWidth & 1 ? 0.5 : 0);
+                        const x = Math.ceil(this._scene._gantt.getXByTime(endDate.getTime() + 1)) +
+                            (verticalLine_style.lineWidth & 1 ? 0.5 : 0);
                         const line = createLine({
                             pickable: false,
                             stroke: verticalLine_style.lineColor,
@@ -35499,8 +35003,8 @@
                     const verticalLine_style = gridStyle.verticalLine;
                     for (let i = 0; i < timelineDates?.length - 1; i++) {
                         const { endDate } = timelineDates[i];
-                        const x = Math.ceil(computeCountToTimeScale(endDate, this._scene._gantt.parsedOptions.minDate, minUnit, step, 1) *
-                            timelineColWidth) + (verticalLine_style.lineWidth & 1 ? 0.5 : 0);
+                        const x = Math.ceil(this._scene._gantt.getXByTime(endDate.getTime() + 1)) +
+                            (verticalLine_style.lineWidth & 1 ? 0.5 : 0);
                         const line = createLine({
                             pickable: false,
                             stroke: verticalLine_style.lineColor,
@@ -35584,7 +35088,6 @@
                 this.verticalBackgroundRectsGroup.name = 'grid-vertical-background';
                 this.group.appendChild(this.verticalBackgroundRectsGroup);
                 const { timelineDates, unit, step } = this._scene._gantt.parsedOptions.reverseSortedTimelineScales[0];
-                const timelineColWidth = this._scene._gantt.parsedOptions.timelineColWidth;
                 if (verticalBackgroundColor || weekendBackgroundColor) {
                     for (let i = 0; i <= timelineDates?.length - 1; i++) {
                         let backgroundColor;
@@ -35606,13 +35109,14 @@
                             backgroundColor = verticalBackgroundColor[i % verticalBackgroundColor.length];
                         }
                         if (backgroundColor) {
-                            const x = Math.ceil(timelineColWidth * i);
+                            const x = i >= 1 ? Math.ceil(this._scene._gantt.getDateColsWidth(0, i - 1)) : 0;
+                            const width = this._scene._gantt.getDateColWidth(i);
                             const rect = createRect({
                                 pickable: false,
                                 fill: backgroundColor,
                                 x,
                                 y: 0,
-                                width: timelineColWidth,
+                                width,
                                 height: this.allGridHeight
                             });
                             this.verticalBackgroundRectsGroup.appendChild(rect);
@@ -35826,165 +35330,659 @@
             this.vScrollBar.render();
             this.vScrollBar.hideAll();
         }
-        refresh() {
+        refresh() {
+        }
+        hideVerticalScrollBar() {
+            const visable = this._gantt.parsedOptions.scrollStyle.visible;
+            if (visable !== 'focus' && visable !== 'scrolling') {
+                return;
+            }
+            this.vScrollBar.setAttribute('visible', false);
+            this.vScrollBar.hideAll();
+            this._gantt.scenegraph.updateNextFrame();
+        }
+        showVerticalScrollBar(autoHide) {
+            const visable = this._gantt.parsedOptions.scrollStyle.visible;
+            if (visable !== 'focus' && visable !== 'scrolling') {
+                return;
+            }
+            this.vScrollBar.setAttribute('visible', true);
+            this.vScrollBar.showAll();
+            this._gantt.scenegraph.updateNextFrame();
+            if (autoHide) {
+                clearTimeout(this._clearVerticalScrollBar);
+                this._clearVerticalScrollBar = setTimeout(() => {
+                    this.hideVerticalScrollBar();
+                }, 1000);
+            }
+        }
+        hideHorizontalScrollBar() {
+            const visable = this._gantt.parsedOptions.scrollStyle.visible;
+            if (visable !== 'focus' && visable !== 'scrolling') {
+                return;
+            }
+            this.hScrollBar.setAttribute('visible', false);
+            this.hScrollBar.hideAll();
+            this._gantt.scenegraph.updateNextFrame();
+        }
+        showHorizontalScrollBar(autoHide) {
+            const visable = this._gantt.parsedOptions.scrollStyle.visible;
+            if (visable !== 'focus' && visable !== 'scrolling') {
+                return;
+            }
+            this.hScrollBar.setAttribute('visible', true);
+            this.hScrollBar.showAll();
+            this._gantt.scenegraph.updateNextFrame();
+            if (autoHide) {
+                clearTimeout(this._clearHorizontalScrollBar);
+                this._clearHorizontalScrollBar = setTimeout(() => {
+                    this.hideHorizontalScrollBar();
+                }, 1000);
+            }
+        }
+        updateVerticalScrollBarPos(topRatio) {
+            const range = this.vScrollBar.attribute.range;
+            const size = range[1] - range[0];
+            const range0 = topRatio * (1 - size);
+            this.vScrollBar.setAttribute('range', [range0, range0 + size]);
+            const bounds = this.vScrollBar.AABBBounds && this.vScrollBar.globalAABBBounds;
+            this.vScrollBar._viewPosition = {
+                x: bounds.x1,
+                y: bounds.y1
+            };
+        }
+        updateHorizontalScrollBarPos(leftRatio) {
+            const range = this.hScrollBar.attribute.range;
+            const size = range[1] - range[0];
+            const range0 = leftRatio * (1 - size);
+            this.hScrollBar.setAttribute('range', [range0, range0 + size]);
+            const bounds = this.hScrollBar.AABBBounds && this.hScrollBar.globalAABBBounds;
+            this.hScrollBar._viewPosition = {
+                x: bounds.x1,
+                y: bounds.y1
+            };
+        }
+        updateScrollBar() {
+            const oldHorizontalBarPos = this._gantt.stateManager.scroll.horizontalBarPos;
+            const oldVerticalBarPos = this._gantt.stateManager.scroll.verticalBarPos;
+            const scrollStyle = this._gantt.parsedOptions.scrollStyle;
+            const width = scrollStyle?.width;
+            const visible = scrollStyle?.visible;
+            const tableWidth = Math.ceil(this._gantt.scenegraph.ganttGroup.attribute.width);
+            const tableHeight = Math.ceil(this._gantt.scenegraph.ganttGroup.attribute.height);
+            const totalHeight = this._gantt.getAllRowsHeight();
+            const totalWidth = this._gantt.getAllDateColsWidth();
+            const frozenRowsHeight = this._gantt.getAllHeaderRowsHeight();
+            if (totalWidth > tableWidth) {
+                const y = Math.min(tableHeight, totalHeight);
+                const rangeEnd = Math.max(0.05, tableWidth / totalWidth);
+                const hoverOn = scrollStyle.hoverOn;
+                let attrY = 0;
+                if (scrollStyle.barToSide) {
+                    attrY =
+                        this._gantt.tableNoFrameHeight -
+                            (hoverOn ? width : -this._gantt.scenegraph.ganttGroup.attribute.y) +
+                            this._gantt.tableY;
+                }
+                else {
+                    attrY = y - (hoverOn ? width : -this._gantt.scenegraph.ganttGroup.attribute.y) + this._gantt.tableY;
+                }
+                this.hScrollBar.setAttributes({
+                    x: this._gantt.scenegraph.ganttGroup.attribute.x,
+                    y: attrY,
+                    width: tableWidth,
+                    range: [0, rangeEnd],
+                    visible: visible === 'always'
+                });
+                const bounds = this.hScrollBar.AABBBounds && this.hScrollBar.globalAABBBounds;
+                this.hScrollBar._viewPosition = {
+                    x: bounds.x1,
+                    y: bounds.y1
+                };
+                if (visible === 'always') {
+                    this.hScrollBar.showAll();
+                }
+            }
+            else {
+                this.hScrollBar.setAttributes({
+                    x: -this._gantt.tableNoFrameWidth * 2,
+                    y: -this._gantt.tableNoFrameHeight * 2,
+                    width: 0,
+                    visible: false
+                });
+            }
+            if (totalHeight > tableHeight) {
+                const x = Math.min(tableWidth, totalWidth) + this._gantt.scenegraph.ganttGroup.attribute.x;
+                const rangeEnd = Math.max(0.05, (tableHeight - frozenRowsHeight) / (totalHeight - frozenRowsHeight));
+                let attrX = 0;
+                const hoverOn = this._gantt.parsedOptions.scrollStyle.hoverOn;
+                if (this._gantt.parsedOptions.scrollStyle.barToSide) {
+                    attrX = this._gantt.tableNoFrameWidth - (hoverOn ? width : -this._gantt.scenegraph.ganttGroup.attribute.x);
+                }
+                else {
+                    attrX = x - (hoverOn ? width : -this._gantt.scenegraph.ganttGroup.attribute.x);
+                }
+                this.vScrollBar.setAttributes({
+                    x: attrX,
+                    y: frozenRowsHeight + (!hoverOn ? this._gantt.scenegraph.ganttGroup.attribute.y : 0) + this._gantt.tableY,
+                    height: tableHeight - frozenRowsHeight,
+                    range: [0, rangeEnd],
+                    visible: visible === 'always'
+                });
+                const bounds = this.vScrollBar.AABBBounds && this.vScrollBar.globalAABBBounds;
+                this.vScrollBar._viewPosition = {
+                    x: bounds.x1,
+                    y: bounds.y1
+                };
+                if (visible === 'always') {
+                    this.vScrollBar.showAll();
+                }
+            }
+            else {
+                this.vScrollBar.setAttributes({
+                    x: -this._gantt.tableNoFrameWidth * 2,
+                    y: -this._gantt.tableNoFrameHeight * 2,
+                    height: 0,
+                    visible: false
+                });
+            }
+            this._gantt.stateManager.setScrollLeft(oldHorizontalBarPos);
+            this._gantt.stateManager.setScrollTop(oldVerticalBarPos);
+        }
+    }
+
+    function throttle$1(func, delay) {
+        let timer = null;
+        return function (...args) {
+            if (!timer) {
+                func.apply(this, args);
+                timer = setTimeout(() => {
+                    timer = null;
+                }, delay);
+            }
+        };
+    }
+    function getTodayNearDay(dayOffset, format) {
+        const today = new Date();
+        const todayTime = today.getTime();
+        const oneDayTime = 24 * 60 * 60 * 1000;
+        const targetTime = todayTime + dayOffset * oneDayTime;
+        const date = new Date(targetTime);
+        if (format) {
+            const year = date.getFullYear().toString();
+            const month = (date.getMonth() + 1).toString().padStart(2, '0');
+            const day = date.getDate().toString().padStart(2, '0');
+            format = format.replace('yyyy', year);
+            format = format.replace('mm', month);
+            format = format.replace('dd', day);
+            return format;
+        }
+        return date;
+    }
+    function formatDate(date, format) {
+        const year = date.getFullYear().toString();
+        const month = (date.getMonth() + 1).toString().padStart(2, '0');
+        const day = date.getDate().toString().padStart(2, '0');
+        format = format.replace('yyyy', year);
+        format = format.replace('mm', month);
+        format = format.replace('dd', day);
+        if (format.length > 10) {
+            const hour = date.getHours().toString().padStart(2, '0');
+            const minute = date.getMinutes().toString().padStart(2, '0');
+            const second = date.getSeconds().toString().padStart(2, '0');
+            format = format.replace('hh', hour);
+            format = format.replace('mm', minute);
+            format = format.replace('ss', second);
+        }
+        return format;
+    }
+    function validateDate(dateParts, format) {
+        const yearIndex = format.indexOf('yyyy');
+        const monthIndex = format.indexOf('mm');
+        const dayIndex = format.indexOf('dd');
+        const dateYearIndex = yearIndex < monthIndex ? (yearIndex < dayIndex ? 0 : 1) : monthIndex < dayIndex ? 1 : 2;
+        const dateMonthIndex = monthIndex < yearIndex ? (monthIndex < dayIndex ? 0 : 1) : monthIndex < dayIndex ? 1 : 2;
+        const dateDayIndex = dayIndex < yearIndex ? (dayIndex < monthIndex ? 0 : 1) : dayIndex < monthIndex ? 1 : 2;
+        const year = parseInt(dateParts[dateYearIndex], 10);
+        const month = parseInt(dateParts[dateMonthIndex], 10) - 1;
+        const day = parseInt(dateParts[dateDayIndex], 10);
+        if (isNaN(year) || year < 1) {
+            return false;
+        }
+        if (isNaN(month) || month < 0 || month > 11) {
+            return false;
+        }
+        const daysInMonth = [31, isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+        if (isNaN(day) || day < 1 || day > daysInMonth[month]) {
+            return false;
+        }
+        return true;
+    }
+    function validateTime(dateParts, format) {
+        if (format.includes('hh') || format.includes('mm') || format.includes('ss')) {
+            const timeIndex = format.indexOf('hh') > -1 ? format.indexOf('hh') : format.indexOf('HH');
+            const hour = parseInt(dateParts[timeIndex], 10);
+            const minute = parseInt(dateParts[timeIndex + 1], 10);
+            const second = dateParts.length > timeIndex + 2 ? parseInt(dateParts[timeIndex + 2], 10) : 0;
+            if (isNaN(hour) || hour < 0 || hour > 23) {
+                return false;
+            }
+            if (isNaN(minute) || minute < 0 || minute > 59) {
+                return false;
+            }
+            if (isNaN(second) || second < 0 || second > 59) {
+                return false;
+            }
+        }
+        return true;
+    }
+    function isLeapYear(year) {
+        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+    }
+    function parseDateFormat(dateString) {
+        const formats = [
+            'yyyy-mm-dd',
+            'dd-mm-yyyy',
+            'mm/dd/yyyy',
+            'yyyy/mm/dd',
+            'dd/mm/yyyy',
+            'yyyy.mm.dd',
+            'mm.dd.yyyy',
+            'dd.mm.yyyy'
+        ];
+        const timeFormat = ['hh:mm:ss', 'hh:mm'];
+        dateString = dateString.trim();
+        const dates = dateString.split(' ');
+        const date = dates[0];
+        const time = dates[1];
+        let dateFormatMatched;
+        let timeFormatMatched;
+        if (date) {
+            for (let i = 0; i < formats.length; i++) {
+                const format = formats[i];
+                const dateParts = date.split(getSeparator(format));
+                const isValid = validateDate(dateParts, format);
+                if (dateParts.length === 3 && isValid) {
+                    dateFormatMatched = format;
+                    break;
+                }
+            }
+        }
+        if (dateFormatMatched) {
+            if (time) {
+                for (let i = 0; i < timeFormat.length; i++) {
+                    const format = timeFormat[i];
+                    const timeParts = time.split(getSeparator(format));
+                    const formatParts = format.split(getSeparator(format));
+                    const isValid = validateTime(timeParts, format);
+                    if (isValid && timeParts.length === formatParts.length) {
+                        timeFormatMatched = format;
+                        break;
+                    }
+                }
+            }
+        }
+        if (date && time && dateFormatMatched && timeFormatMatched) {
+            return dateFormatMatched + ' ' + timeFormatMatched;
+        }
+        if (date && !time) {
+            return dateFormatMatched;
+        }
+        return 'yyyy-mm-dd hh:mm:ss';
+    }
+    function getSeparator(format) {
+        const separators = format.match(/[^\w]/g);
+        if (separators) {
+            const escapedSeparators = separators.map(s => '\\' + s).join('|');
+            return new RegExp(escapedSeparators, 'g');
+        }
+        return /[^\w]/;
+    }
+    function parseStringTemplate(template, data) {
+        const result = template.replace(/\{([^}]+)\}/g, (match, key) => {
+            const keys = key.split('.');
+            let value = data;
+            for (const k of keys) {
+                if (value.hasOwnProperty(k)) {
+                    value = value[k];
+                }
+                else {
+                    value = match;
+                    break;
+                }
+            }
+            return value;
+        });
+        return result;
+    }
+    function toBoxArray$2(obj) {
+        if (!Array.isArray(obj)) {
+            return [obj, obj, obj, obj];
+        }
+        if (obj.length === 3) {
+            return [obj[0], obj[1], obj[2], obj[1]];
+        }
+        if (obj.length === 2) {
+            return [obj[0], obj[1], obj[0], obj[1]];
+        }
+        if (obj.length === 1) {
+            return [obj[0], obj[0], obj[0], obj[0]];
+        }
+        return [obj[0], obj[1], obj[2], obj[3]];
+    }
+    function getWeekNumber(currentDate) {
+        const startOfYear = new Date(currentDate.getFullYear(), 0, 1);
+        const weekNumber = Math.ceil(((currentDate.getTime() + 1 - startOfYear.getTime()) / 86400000 + 1) / 7);
+        return weekNumber;
+    }
+    function getWeekday(dateString, format = 'long') {
+        const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+        const date = new Date(dateString);
+        if (format === 'short') {
+            return days[date.getDay()].substr(0, 3);
+        }
+        else if (format === 'long') {
+            return days[date.getDay()];
+        }
+        return 'Invalid format specified. Please use "short" or "long".';
+    }
+    function isPropertyWritable(obj, prop) {
+        const descriptor = Object.getOwnPropertyDescriptor(obj, prop);
+        if (!descriptor) {
+            return false;
+        }
+        return !!descriptor.set || descriptor.writable === true;
+    }
+    function createDateAtMidnight(dateStr, forceMidnight = false) {
+        let date;
+        if (dateStr) {
+            date = new Date(dateStr);
+            if (typeof dateStr === 'string') {
+                if (dateStr.length > 10) {
+                    if (forceMidnight) {
+                        date.setHours(0, 0, 0, 0);
+                    }
+                    return date;
+                }
+                date.setHours(0, 0, 0, 0);
+            }
+        }
+        else {
+            date = new Date();
+        }
+        if (forceMidnight) {
+            date.setHours(0, 0, 0, 0);
+        }
+        return date;
+    }
+    function createDateAtLastMinute(dateStr, forceSetMinute = false) {
+        let date;
+        if (dateStr) {
+            date = new Date(dateStr);
+            if (typeof dateStr === 'string') {
+                if (dateStr.length > 10) {
+                    if (forceSetMinute) {
+                        date.setMinutes(59, 59, 999);
+                    }
+                    return date;
+                }
+                date.setMinutes(59, 59, 999);
+            }
+        }
+        else {
+            date = new Date();
+        }
+        if (forceSetMinute) {
+            date.setMinutes(59, 59, 999);
         }
-        hideVerticalScrollBar() {
-            const visable = this._gantt.parsedOptions.scrollStyle.visible;
-            if (visable !== 'focus' && visable !== 'scrolling') {
-                return;
+        return date;
+    }
+    function createDateAtLastSecond(dateStr, forceSetSecond = false) {
+        let date;
+        if (dateStr) {
+            date = new Date(dateStr);
+            if (typeof dateStr === 'string') {
+                if (dateStr.length > 10) {
+                    if (forceSetSecond) {
+                        date.setSeconds(59, 999);
+                    }
+                    return date;
+                }
+                date.setSeconds(59, 999);
             }
-            this.vScrollBar.setAttribute('visible', false);
-            this.vScrollBar.hideAll();
-            this._gantt.scenegraph.updateNextFrame();
         }
-        showVerticalScrollBar(autoHide) {
-            const visable = this._gantt.parsedOptions.scrollStyle.visible;
-            if (visable !== 'focus' && visable !== 'scrolling') {
-                return;
-            }
-            this.vScrollBar.setAttribute('visible', true);
-            this.vScrollBar.showAll();
-            this._gantt.scenegraph.updateNextFrame();
-            if (autoHide) {
-                clearTimeout(this._clearVerticalScrollBar);
-                this._clearVerticalScrollBar = setTimeout(() => {
-                    this.hideVerticalScrollBar();
-                }, 1000);
-            }
+        else {
+            date = new Date();
         }
-        hideHorizontalScrollBar() {
-            const visable = this._gantt.parsedOptions.scrollStyle.visible;
-            if (visable !== 'focus' && visable !== 'scrolling') {
-                return;
-            }
-            this.hScrollBar.setAttribute('visible', false);
-            this.hScrollBar.hideAll();
-            this._gantt.scenegraph.updateNextFrame();
+        if (forceSetSecond) {
+            date.setSeconds(59, 999);
         }
-        showHorizontalScrollBar(autoHide) {
-            const visable = this._gantt.parsedOptions.scrollStyle.visible;
-            if (visable !== 'focus' && visable !== 'scrolling') {
-                return;
-            }
-            this.hScrollBar.setAttribute('visible', true);
-            this.hScrollBar.showAll();
-            this._gantt.scenegraph.updateNextFrame();
-            if (autoHide) {
-                clearTimeout(this._clearHorizontalScrollBar);
-                this._clearHorizontalScrollBar = setTimeout(() => {
-                    this.hideHorizontalScrollBar();
-                }, 1000);
+        return date;
+    }
+    function createDateAtLastMillisecond(dateStr, forceSetMillisecond = false) {
+        let date;
+        if (dateStr) {
+            date = new Date(dateStr);
+            if (typeof dateStr === 'string') {
+                if (dateStr.length > 10) {
+                    if (forceSetMillisecond) {
+                        date.setMilliseconds(999);
+                    }
+                    return date;
+                }
+                date.setMilliseconds(999);
             }
         }
-        updateVerticalScrollBarPos(topRatio) {
-            const range = this.vScrollBar.attribute.range;
-            const size = range[1] - range[0];
-            const range0 = topRatio * (1 - size);
-            this.vScrollBar.setAttribute('range', [range0, range0 + size]);
-            const bounds = this.vScrollBar.AABBBounds && this.vScrollBar.globalAABBBounds;
-            this.vScrollBar._viewPosition = {
-                x: bounds.x1,
-                y: bounds.y1
-            };
+        else {
+            date = new Date();
         }
-        updateHorizontalScrollBarPos(leftRatio) {
-            const range = this.hScrollBar.attribute.range;
-            const size = range[1] - range[0];
-            const range0 = leftRatio * (1 - size);
-            this.hScrollBar.setAttribute('range', [range0, range0 + size]);
-            const bounds = this.hScrollBar.AABBBounds && this.hScrollBar.globalAABBBounds;
-            this.hScrollBar._viewPosition = {
-                x: bounds.x1,
-                y: bounds.y1
-            };
+        if (forceSetMillisecond) {
+            date.setMilliseconds(999);
         }
-        updateScrollBar() {
-            const oldHorizontalBarPos = this._gantt.stateManager.scroll.horizontalBarPos;
-            const oldVerticalBarPos = this._gantt.stateManager.scroll.verticalBarPos;
-            const scrollStyle = this._gantt.parsedOptions.scrollStyle;
-            const width = scrollStyle?.width;
-            const visible = scrollStyle?.visible;
-            const tableWidth = Math.ceil(this._gantt.scenegraph.ganttGroup.attribute.width);
-            const tableHeight = Math.ceil(this._gantt.scenegraph.ganttGroup.attribute.height);
-            const totalHeight = this._gantt.getAllRowsHeight();
-            const totalWidth = this._gantt.getAllDateColsWidth();
-            const frozenRowsHeight = this._gantt.getAllHeaderRowsHeight();
-            if (totalWidth > tableWidth) {
-                const y = Math.min(tableHeight, totalHeight);
-                const rangeEnd = Math.max(0.05, tableWidth / totalWidth);
-                const hoverOn = scrollStyle.hoverOn;
-                let attrY = 0;
-                if (scrollStyle.barToSide) {
-                    attrY =
-                        this._gantt.tableNoFrameHeight -
-                            (hoverOn ? width : -this._gantt.scenegraph.ganttGroup.attribute.y) +
-                            this._gantt.tableY;
-                }
-                else {
-                    attrY = y - (hoverOn ? width : -this._gantt.scenegraph.ganttGroup.attribute.y) + this._gantt.tableY;
-                }
-                this.hScrollBar.setAttributes({
-                    x: this._gantt.scenegraph.ganttGroup.attribute.x,
-                    y: attrY,
-                    width: tableWidth,
-                    range: [0, rangeEnd],
-                    visible: visible === 'always'
-                });
-                const bounds = this.hScrollBar.AABBBounds && this.hScrollBar.globalAABBBounds;
-                this.hScrollBar._viewPosition = {
-                    x: bounds.x1,
-                    y: bounds.y1
-                };
-                if (visible === 'always') {
-                    this.hScrollBar.showAll();
+        return date;
+    }
+    function createDateAtLastHour(dateStr, forceLastHour = false) {
+        let date;
+        if (dateStr) {
+            date = new Date(dateStr);
+            if (typeof dateStr === 'string') {
+                if (dateStr.length > 10) {
+                    if (forceLastHour) {
+                        date.setHours(23, 59, 59, 999);
+                    }
+                    return date;
                 }
+                date.setHours(23, 59, 59, 999);
             }
-            else {
-                this.hScrollBar.setAttributes({
-                    x: -this._gantt.tableNoFrameWidth * 2,
-                    y: -this._gantt.tableNoFrameHeight * 2,
-                    width: 0,
-                    visible: false
-                });
+        }
+        else {
+            date = new Date();
+        }
+        if (forceLastHour) {
+            date.setHours(23, 59, 59, 999);
+        }
+        return date;
+    }
+    function getEndDateByTimeUnit(startDate, date, timeScale, step) {
+        let endDate = new Date(date);
+        switch (timeScale) {
+            case 'second':
+                endDate.setMilliseconds(999);
+                break;
+            case 'minute':
+                endDate.setSeconds(59, 999);
+                break;
+            case 'hour':
+                endDate.setMinutes(59, 59, 999);
+                break;
+            case 'day':
+                endDate.setHours(23, 59, 59, 999);
+                break;
+            case 'week':
+                const day = endDate.getDay();
+                const diffToEndOfWeek = 6 - day;
+                endDate.setDate(endDate.getDate() + diffToEndOfWeek);
+                endDate.setHours(23, 59, 59, 999);
+                break;
+            case 'month':
+                const lastDayOfMonth = new Date(endDate.getFullYear(), endDate.getMonth() + 1, 0).getDate();
+                endDate.setDate(lastDayOfMonth);
+                endDate.setHours(23, 59, 59, 999);
+                break;
+            case 'quarter':
+                const currentMonth = endDate.getMonth();
+                const endMonthOfQuarter = currentMonth - (currentMonth % 3) + 2;
+                const lastDayOfQuarter = new Date(endDate.getFullYear(), endMonthOfQuarter + 1, 0).getDate();
+                endDate.setMonth(endMonthOfQuarter, lastDayOfQuarter);
+                endDate.setHours(23, 59, 59, 999);
+                break;
+            case 'year':
+                endDate.setMonth(11, 31);
+                endDate.setHours(23, 59, 59, 999);
+                break;
+            default:
+                throw new Error('Invalid time scale');
+        }
+        const count = computeCountToTimeScale(endDate, startDate, timeScale, step, 1);
+        const targetCount = Math.ceil(count);
+        if (targetCount > count) {
+            const dif = (targetCount - count) * step;
+            const msInSecond = 1000;
+            const msInMinute = msInSecond * 60;
+            const msInHour = msInMinute * 60;
+            const msInDay = msInHour * 24;
+            const msInWeek = msInDay * 7;
+            new Date(endDate.getTime() + 1);
+            switch (timeScale) {
+                case 'second':
+                    endDate.setTime(endDate.getTime() + dif * msInSecond);
+                    break;
+                case 'minute':
+                    endDate.setTime(endDate.getTime() + dif * msInMinute);
+                    break;
+                case 'hour':
+                    endDate.setTime(endDate.getTime() + dif * msInHour);
+                    break;
+                case 'day':
+                    endDate.setTime(endDate.getTime() + dif * msInDay);
+                    break;
+                case 'week':
+                    endDate.setTime(endDate.getTime() + dif * msInWeek);
+                    break;
+                case 'month':
+                    endDate = new Date(endDate.getFullYear(), endDate.getMonth() + 1 + Math.round(dif), 0);
+                    endDate.setHours(23, 59, 59, 999);
+                    break;
+                case 'quarter':
+                    const currentMonth = endDate.getMonth();
+                    const endMonthOfQuarter = currentMonth - (currentMonth % 3) + 2;
+                    endDate = new Date(endDate.getFullYear(), endMonthOfQuarter + Math.round(dif * 3) + 1, 0);
+                    endDate.setHours(23, 59, 59, 999);
+                    break;
+                case 'year':
+                    endDate.setFullYear(endDate.getFullYear() + Math.floor(dif));
+                    endDate.setHours(23, 59, 59, 999);
+                    break;
+                default:
+                    throw new Error('Invalid time scale');
             }
-            if (totalHeight > tableHeight) {
-                const x = Math.min(tableWidth, totalWidth) + this._gantt.scenegraph.ganttGroup.attribute.x;
-                const rangeEnd = Math.max(0.05, (tableHeight - frozenRowsHeight) / (totalHeight - frozenRowsHeight));
-                let attrX = 0;
-                const hoverOn = this._gantt.parsedOptions.scrollStyle.hoverOn;
-                if (this._gantt.parsedOptions.scrollStyle.barToSide) {
-                    attrX = this._gantt.tableNoFrameWidth - (hoverOn ? width : -this._gantt.scenegraph.ganttGroup.attribute.x);
+        }
+        return endDate;
+    }
+    function getStartDateByTimeUnit(date, timeScale, startOfWeekSetting = 'monday') {
+        const startDate = new Date(date);
+        switch (timeScale) {
+            case 'second':
+                startDate.setMilliseconds(0);
+                break;
+            case 'minute':
+                startDate.setSeconds(0, 0);
+                break;
+            case 'hour':
+                startDate.setMinutes(0, 0, 0);
+                break;
+            case 'day':
+                startDate.setHours(0, 0, 0, 0);
+                break;
+            case 'week':
+                const day = startDate.getDay();
+                let diffToStartOfWeek = day;
+                if (startOfWeekSetting === 'monday') {
+                    diffToStartOfWeek = day === 0 ? -6 : 1 - day;
                 }
                 else {
-                    attrX = x - (hoverOn ? width : -this._gantt.scenegraph.ganttGroup.attribute.x);
-                }
-                this.vScrollBar.setAttributes({
-                    x: attrX,
-                    y: frozenRowsHeight + (!hoverOn ? this._gantt.scenegraph.ganttGroup.attribute.y : 0) + this._gantt.tableY,
-                    height: tableHeight - frozenRowsHeight,
-                    range: [0, rangeEnd],
-                    visible: visible === 'always'
-                });
-                const bounds = this.vScrollBar.AABBBounds && this.vScrollBar.globalAABBBounds;
-                this.vScrollBar._viewPosition = {
-                    x: bounds.x1,
-                    y: bounds.y1
-                };
-                if (visible === 'always') {
-                    this.vScrollBar.showAll();
+                    diffToStartOfWeek = -day;
                 }
-            }
-            else {
-                this.vScrollBar.setAttributes({
-                    x: -this._gantt.tableNoFrameWidth * 2,
-                    y: -this._gantt.tableNoFrameHeight * 2,
-                    height: 0,
-                    visible: false
-                });
-            }
-            this._gantt.stateManager.setScrollLeft(oldHorizontalBarPos);
-            this._gantt.stateManager.setScrollTop(oldVerticalBarPos);
+                startDate.setDate(startDate.getDate() + diffToStartOfWeek);
+                startDate.setHours(0, 0, 0, 0);
+                break;
+            case 'month':
+                startDate.setDate(1);
+                startDate.setHours(0, 0, 0, 0);
+                break;
+            case 'quarter':
+                const currentMonth = startDate.getMonth();
+                const startMonthOfQuarter = currentMonth - (currentMonth % 3);
+                startDate.setMonth(startMonthOfQuarter, 1);
+                startDate.setHours(0, 0, 0, 0);
+                break;
+            case 'year':
+                startDate.setMonth(0, 1);
+                startDate.setHours(0, 0, 0, 0);
+                break;
+            default:
+                throw new Error('Invalid time scale');
+        }
+        return startDate;
+    }
+    function computeCountToTimeScale(date, startDate, timeScale, step, diffMS = 0) {
+        const msInSecond = 1000;
+        const msInMinute = msInSecond * 60;
+        const msInHour = msInMinute * 60;
+        const msInDay = msInHour * 24;
+        const msInWeek = msInDay * 7;
+        let difference;
+        const adjusted_date = new Date(date.getTime() + diffMS);
+        switch (timeScale) {
+            case 'second':
+                difference = (adjusted_date.getTime() - startDate.getTime()) / msInSecond;
+                break;
+            case 'minute':
+                difference = (adjusted_date.getTime() - startDate.getTime()) / msInMinute;
+                break;
+            case 'hour':
+                difference = (adjusted_date.getTime() - startDate.getTime()) / msInHour;
+                break;
+            case 'day':
+                difference = (adjusted_date.getTime() - startDate.getTime()) / msInDay;
+                break;
+            case 'week':
+                difference = (adjusted_date.getTime() - startDate.getTime()) / msInWeek;
+                break;
+            case 'month':
+                const startDaysInMonth = new Date(startDate.getFullYear(), startDate.getMonth() + 1, 0).getDate();
+                const adjustedDaysInMonth = new Date(adjusted_date.getFullYear(), adjusted_date.getMonth() + 1, 0).getDate();
+                difference =
+                    (adjusted_date.getFullYear() - startDate.getFullYear()) * 12 +
+                        (adjusted_date.getMonth() - startDate.getMonth());
+                difference += adjusted_date.getDate() / adjustedDaysInMonth - startDate.getDate() / startDaysInMonth;
+                break;
+            case 'quarter':
+                difference =
+                    (adjusted_date.getFullYear() - startDate.getFullYear()) * 4 +
+                        (adjusted_date.getMonth() - startDate.getMonth()) / 3;
+                difference +=
+                    (adjusted_date.getDate() - startDate.getDate()) /
+                        (3 * new Date(adjusted_date.getFullYear(), adjusted_date.getMonth() + 1, 0).getDate());
+                break;
+            case 'year':
+                difference = adjusted_date.getFullYear() - startDate.getFullYear();
+                difference += (adjusted_date.getMonth() - startDate.getMonth()) / 12;
+                break;
+            default:
+                throw new Error('Invalid time scale');
         }
+        return difference / step;
     }
 
     function handleWhell$1(event, state, gantt, isWheelEvent = true) {
@@ -36179,10 +36177,7 @@
     const isNode$1 = typeof window === 'undefined' || typeof window.window === 'undefined';
     const DayTimes = 1000 * 60 * 60 * 24;
     function getDateIndexByX(x, gantt) {
-        const totalX = x + gantt.stateManager.scroll.horizontalBarPos;
-        const firstDateColWidth = gantt.getDateColWidth(0);
-        const dateIndex = Math.floor((totalX - firstDateColWidth) / gantt.parsedOptions.timelineColWidth) + 1;
-        return dateIndex;
+        return gantt.getDateIndexByX(x);
     }
     function generateMarkLine(markLine) {
         if (!markLine) {
@@ -37097,7 +37092,6 @@
             this.group = dateHeader;
             dateHeader.name = 'date-header-container';
             scene.ganttGroup.addChild(this.group);
-            const { unit: minUnit, step } = scene._gantt.parsedOptions.reverseSortedTimelineScales[0];
             let y = 0;
             for (let i = 0; i < scene._gantt.timeLineHeaderLevel; i++) {
                 const { timelineDates, customLayout, visible } = scene._gantt.parsedOptions.sortedTimelineScales[i];
@@ -37116,10 +37110,8 @@
                 dateHeader.addChild(rowHeader);
                 for (let j = 0; j < timelineDates?.length; j++) {
                     const { days, endDate, startDate, title, dateIndex, unit } = timelineDates[j];
-                    const x = Math.ceil(computeCountToTimeScale(startDate, scene._gantt.parsedOptions.minDate, minUnit, step) *
-                        scene._gantt.parsedOptions.timelineColWidth);
-                    const right_x = Math.ceil(computeCountToTimeScale(endDate, scene._gantt.parsedOptions.minDate, minUnit, step, 1) *
-                        scene._gantt.parsedOptions.timelineColWidth);
+                    const x = Math.ceil(scene._gantt.getXByTime(startDate.getTime()));
+                    const right_x = Math.ceil(scene._gantt.getXByTime(endDate.getTime() + 1));
                     const width = right_x - x;
                     const date = new Group$2({
                         x,
@@ -38774,6 +38766,8 @@
       RESIZE_COLUMN_END: "resize_column_end",
       RESIZE_ROW: "resize_row",
       RESIZE_ROW_END: "resize_row_end",
+      MERGE_CELLS: "merge_cells",
+      UNMERGE_CELLS: "unmerge_cells",
       CHANGE_HEADER_POSITION_START: "change_header_position_start",
       CHANGE_HEADER_POSITION: "change_header_position",
       CHANGING_HEADER_POSITION: "changing_header_position",
@@ -41267,7 +41261,7 @@
       }
       clearFilteredChildren(record) {
         var _a, _b;
-        record.filteredChildren = void 0;
+        record.filteredChildren = void 0, delete record.filteredChildren;
         for (let i = 0; i < (null !== (_b = null === (_a = record.children) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0); i++) this.clearFilteredChildren(record.children[i]);
       }
       filterRecord(record) {
@@ -41370,8 +41364,9 @@
       fieldPromiseCallBack(_index, _field, _value) {}
       recordPromiseCallBack(_index, _record) {}
       canChangeOrder(sourceIndex, targetIndex) {
-        var _a;
+        var _a, _b;
         if (null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.canChangeOrder) return this.dataSourceObj.canChangeOrder(sourceIndex, targetIndex);
+        if (null === (_b = this.lastSortStates) || void 0 === _b ? void 0 : _b.some(state => "asc" === state.order || "desc" === state.order)) return !1;
         if (this.hasHierarchyStateExpand) {
           let sourceIndexs = this.currentPagerIndexedData[sourceIndex],
             targetIndexs = this.currentPagerIndexedData[targetIndex];
@@ -45374,7 +45369,7 @@
     function updateCell$1(col, row, table, addNew, isShadow, forceFastUpdate) {
       var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
       const oldCellGroup = table.scenegraph.highPerformanceGetCell(col, row, !0);
-      if ("cell" !== oldCellGroup.role && !addNew) return;
+      if ("cell" !== oldCellGroup.role && "shadow-cell" !== oldCellGroup.role && !addNew) return;
       const cellLocation = table.getCellLocation(col, row);
       let isMerge,
         range,
@@ -52824,7 +52819,7 @@
       }), scene.tableGroup.role = "table";
       const colHeaderGroup = createContainerGroup(0, 0, !scene.table.internalProps.enableTreeStickCell);
       colHeaderGroup.role = "col-header", scene.colHeaderGroup = colHeaderGroup;
-      const cornerHeaderGroup = createContainerGroup(0, 0, !scene.table.options.enableTreeStickCell);
+      const cornerHeaderGroup = createContainerGroup(0, 0, !scene.table.internalProps.enableTreeStickCell);
       cornerHeaderGroup.role = "corner-header", scene.cornerHeaderGroup = cornerHeaderGroup;
       const rowHeaderGroup = createContainerGroup(0, 0, !0);
       rowHeaderGroup.role = "row-header", scene.rowHeaderGroup = rowHeaderGroup;
@@ -55622,13 +55617,13 @@
       setSortState(sortState) {
         const state = this;
         const sort = (sortState = !sortState || Array.isArray(sortState) ? sortState : [sortState]) && sortState.reduce((prev, item) => {
-          var _a, _b, _c;
+          var _a, _b, _c, _d, _e;
           const column = null === (_a = function (columns) {
             const result = [];
             return function flatten(cols, parentStartIndex = 0) {
               cols.forEach(col => {
                 var _a;
-                const startIndex = col.startInTotal ? null !== (_a = col.startInTotal + state.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _a ? _a : 0 : parentStartIndex;
+                const startIndex = col.startInTotal ? col.startInTotal + (null !== (_a = state.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _a ? _a : 0) : parentStartIndex;
                 col.columns ? flatten(col.columns, startIndex) : result.push(Object.assign(Object.assign({}, col), {
                   startIndex: startIndex
                 }));
@@ -55638,12 +55633,12 @@
           return this.table.internalProps.transpose ? prev.push({
             field: item.field,
             order: item.order,
-            row: null !== (_b = (null == column ? void 0 : column.startInTotal) + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _b ? _b : 0,
+            row: (null !== (_b = null == column ? void 0 : column.startInTotal) && void 0 !== _b ? _b : 0) + (null !== (_c = this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _c ? _c : 0),
             col: null == column ? void 0 : column.level
           }) : prev.push({
             field: item.field,
             order: item.order,
-            col: null !== (_c = (null == column ? void 0 : column.startInTotal) + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _c ? _c : 0,
+            col: (null !== (_d = null == column ? void 0 : column.startInTotal) && void 0 !== _d ? _d : 0) + (null !== (_e = this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _e ? _e : 0),
             row: null == column ? void 0 : column.level
           }), prev;
         }, []);
@@ -56155,13 +56150,16 @@
         this.select.selectInline = selectInline;
       }
       updateSortState(sortState) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        sortState = Array.isArray(sortState) ? sortState : [sortState];
+        var _a, _b, _c, _d, _e, _f, _g;
+        const isSame = (sortState = Array.isArray(sortState) ? sortState : [sortState]).length === this.sort.length && sortState.every((item, index) => {
+          var _a, _b;
+          return (null == item ? void 0 : item.field) === (null === (_a = this.sort[index]) || void 0 === _a ? void 0 : _a.field) && (null == item ? void 0 : item.order) === (null === (_b = this.sort[index]) || void 0 === _b ? void 0 : _b.order);
+        });
+        if (isSame) return;
         for (let index = 0; index < sortState.length; index++) {
-          if (sortState[index].field === (null === (_a = this.sort[index]) || void 0 === _a ? void 0 : _a.field) && sortState[sortState.length - 1].order === (null === (_b = this.sort[index]) || void 0 === _b ? void 0 : _b.order)) return;
-          const oldSortCol = this.table.internalProps.multipleSort ? null : (null === (_c = this.sort[index]) || void 0 === _c ? void 0 : _c.col) || null,
-            oldSortRow = this.table.internalProps.multipleSort ? null : (null === (_d = this.sort[index]) || void 0 === _d ? void 0 : _d.row) || null;
-          "asc" === (null === (_e = this.sort[index]) || void 0 === _e ? void 0 : _e.order) || null === (_f = this.sort[index]) || void 0 === _f || _f.order;
+          const oldSortCol = this.table.internalProps.multipleSort ? null : (null === (_a = this.sort[index]) || void 0 === _a ? void 0 : _a.col) || null,
+            oldSortRow = this.table.internalProps.multipleSort ? null : (null === (_b = this.sort[index]) || void 0 === _b ? void 0 : _b.row) || null;
+          "asc" === (null === (_c = this.sort[index]) || void 0 === _c ? void 0 : _c.order) || null === (_d = this.sort[index]) || void 0 === _d || _d.order;
           this.setSortState(sortState.slice(0, index + 1));
           const cellAddress = this.table.internalProps.layoutMap.getHeaderCellAddressByField(sortState[index].field);
           this.sort[index].col = cellAddress.col, this.sort[index].row = cellAddress.row;
@@ -56174,7 +56172,7 @@
             order: this.sort[index].order,
             oldSortCol: oldSortCol,
             oldSortRow: oldSortRow,
-            oldIconMark: null === (_g = this.sort[index]) || void 0 === _g ? void 0 : _g.icon
+            oldIconMark: null === (_e = this.sort[index]) || void 0 === _e ? void 0 : _e.icon
           });
         }
         const normalHeaders = [];
@@ -56188,7 +56186,7 @@
             row: null,
             iconMark: null,
             order: null,
-            oldSortCol: null !== (_h = column.startInTotal + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _h ? _h : 0,
+            oldSortCol: (null !== (_f = column.startInTotal) && void 0 !== _f ? _f : 0) + (null !== (_g = this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount) && void 0 !== _g ? _g : 0),
             oldSortRow: column.level,
             oldIconMark: null
           });
@@ -60441,7 +60439,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._tableBorderWidth_left = 0, this._tableBorderWidth_right = 0, this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, this.version = "1.23.3", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, container = container.container ? container.container : null), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
+        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.24.0", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, container = container.container ? container.container : null), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
         this.pluginManager = new PluginManager$1(this, options), this.fireListeners(TABLE_EVENT_TYPE.BEFORE_INIT, {
           options: options,
           container: container
@@ -61379,12 +61377,15 @@
       dispose() {
         this.release();
       }
+      clearCorrectTimer() {
+        this._scrollToRowCorrectTimer && (clearTimeout(this._scrollToRowCorrectTimer), this._scrollToRowCorrectTimer = null);
+      }
       release() {
         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;
         null === (_c = null === (_b = null === (_a = this.scenegraph) || void 0 === _a ? void 0 : _a.component) || void 0 === _b ? void 0 : _b.vScrollBar) || void 0 === _c || _c.release(), null === (_f = null === (_e = null === (_d = this.scenegraph) || void 0 === _d ? void 0 : _d.component) || void 0 === _e ? void 0 : _e.hScrollBar) || void 0 === _f || _f.release(), this.animationManager.clear(), this.animationManager.ticker.release(), null === (_j = null === (_h = null === (_g = this.scenegraph) || void 0 === _g ? void 0 : _g.stage) || void 0 === _h ? void 0 : _h.ticker) || void 0 === _j || _j.release();
         const internalProps = this.internalProps;
         if (this.isReleased) return;
-        null === (_l = null === (_k = internalProps.tooltipHandler) || void 0 === _k ? void 0 : _k.release) || void 0 === _l || _l.call(_k), null === (_o = null === (_m = internalProps.menuHandler) || void 0 === _m ? void 0 : _m.release) || void 0 === _o || _o.call(_m), null === (_p = super.release) || void 0 === _p || _p.call(this), this.pluginManager.release(), null === (_r = null === (_q = internalProps.handler) || void 0 === _q ? void 0 : _q.release) || void 0 === _r || _r.call(_q), this.eventManager.release(), null === (_t = null === (_s = internalProps.focusControl) || void 0 === _s ? void 0 : _s.release) || void 0 === _t || _t.call(_s), null === (_u = internalProps.legends) || void 0 === _u || _u.forEach(legend => {
+        this.clearCorrectTimer(), null === (_l = null === (_k = internalProps.tooltipHandler) || void 0 === _k ? void 0 : _k.release) || void 0 === _l || _l.call(_k), null === (_o = null === (_m = internalProps.menuHandler) || void 0 === _m ? void 0 : _m.release) || void 0 === _o || _o.call(_m), null === (_p = super.release) || void 0 === _p || _p.call(this), this.pluginManager.release(), null === (_r = null === (_q = internalProps.handler) || void 0 === _q ? void 0 : _q.release) || void 0 === _r || _r.call(_q), this.eventManager.release(), null === (_t = null === (_s = internalProps.focusControl) || void 0 === _s ? void 0 : _s.release) || void 0 === _t || _t.call(_s), null === (_u = internalProps.legends) || void 0 === _u || _u.forEach(legend => {
           null == legend || legend.release();
         }), null === (_v = internalProps.title) || void 0 === _v || _v.release(), internalProps.title = null, null === (_w = internalProps.emptyTip) || void 0 === _w || _w.release(), internalProps.emptyTip = null, internalProps.layoutMap.release(), internalProps.releaseList && (internalProps.releaseList.forEach(releaseObj => {
           var _a;
@@ -61689,6 +61690,30 @@
           lastSelectRange = currentSelectRanges[currentSelectRanges.length - 1];
         lastSelectRange && (lastSelectRange.end.row = rowIndex), this.stateManager.updateSelectPos(this.colCount - 1, rowIndex, !1, isCtrl, !1, makeSelectCellVisible, !0), this.stateManager.select.selecting = !1;
       }
+      changeHeaderPosition(args) {
+        var _a, _b, _c, _d, _e;
+        if (!("canMoveHeaderPosition" in this.internalProps.layoutMap) || !0 === (null === (_a = this.options.customConfig) || void 0 === _a ? void 0 : _a.notUpdateInColumnRowMove)) return !1;
+        const prevMoving = this.stateManager.columnMove.movingColumnOrRow;
+        this.stateManager.columnMove.movingColumnOrRow = args.movingColumnOrRow;
+        try {
+          if (!1 === (null === (_c = (_b = this.internalProps.layoutMap).canMoveHeaderPosition) || void 0 === _c ? void 0 : _c.call(_b, args.source, args.target))) return !1;
+          const oldSourceMergeInfo = this.getCellRange(args.source.col, args.source.row),
+            oldTargetMergeInfo = this.getCellRange(args.target.col, args.target.row),
+            moveContext = this._moveHeaderPosition(args.source, args.target);
+          if (!moveContext || moveContext.targetIndex === moveContext.sourceIndex) return !1;
+          this.internalProps.useOneRowHeightFillAll = !1, this.internalProps.layoutMap.clearCellRangeMap();
+          const sourceMergeInfo = this.getCellRange(args.source.col, args.source.row),
+            targetMergeInfo = this.getCellRange(args.target.col, args.target.row),
+            colMin = Math.min(sourceMergeInfo.start.col, targetMergeInfo.start.col, oldSourceMergeInfo.start.col, oldTargetMergeInfo.start.col),
+            colMax = Math.max(sourceMergeInfo.end.col, targetMergeInfo.end.col, oldSourceMergeInfo.end.col, oldTargetMergeInfo.end.col),
+            rowMin = Math.min(sourceMergeInfo.start.row, targetMergeInfo.start.row, oldSourceMergeInfo.start.row, oldTargetMergeInfo.start.row);
+          let rowMax = Math.max(sourceMergeInfo.end.row, targetMergeInfo.end.row, oldSourceMergeInfo.end.row, oldTargetMergeInfo.end.row);
+          if ("row" === moveContext.moveType && "tree" === this.internalProps.layoutMap.rowHierarchyType && (rowMax = moveContext.targetIndex > moveContext.sourceIndex ? rowMax + moveContext.targetSize - 1 : rowMax + moveContext.sourceSize - 1), this.transpose || !this.isSeriesNumberInBody(args.source.col, args.source.row) && "row" !== args.movingColumnOrRow || (this.changeRecordOrder(moveContext.sourceIndex, moveContext.targetIndex), this.stateManager.changeCheckboxAndRadioOrder(moveContext.sourceIndex, moveContext.targetIndex)), "column" === moveContext.moveType) for (let col = colMin; col <= colMax; col++) this._clearColRangeWidthsMap(col);else for (let row = rowMin; row <= rowMax; row++) this._clearRowRangeHeightsMap(row);
+          return this.clearCellStyleCache(), this.isSeriesNumberInBody(args.source.col, args.source.row) || "row" === args.movingColumnOrRow ? this.scenegraph.updateHeaderPosition(this.scenegraph.proxy.colStart, this.scenegraph.proxy.colEnd, this.scenegraph.proxy.rowStart, this.scenegraph.proxy.rowEnd, moveContext.moveType) : "column" === moveContext.moveType ? this.scenegraph.updateHeaderPosition(colMin, colMax, 0, -1, moveContext.moveType) : this.scenegraph.updateHeaderPosition(0, -1, rowMin, rowMax, moveContext.moveType), "adjustFrozenCount" === this.internalProps.frozenColDragHeaderMode && this.isListTable() && (this.isLeftFrozenColumn(args.target.col) && !this.isLeftFrozenColumn(args.source.col) ? this.frozenColCount += sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1 : this.isLeftFrozenColumn(args.source.col) && !this.isLeftFrozenColumn(args.target.col) && (this.frozenColCount -= sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1), this.isRightFrozenColumn(args.target.col) && !this.isRightFrozenColumn(args.source.col) ? this.rightFrozenColCount += sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1 : this.isRightFrozenColumn(args.source.col) && !this.isRightFrozenColumn(args.target.col) && (this.rightFrozenColCount -= sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1)), null === (_e = (_d = this.scenegraph).updateNextFrame) || void 0 === _e || _e.call(_d), !0;
+        } finally {
+          this.stateManager.columnMove.movingColumnOrRow = prevMoving;
+        }
+      }
       get recordsCount() {
         var _a;
         return null === (_a = this.records) || void 0 === _a ? void 0 : _a.length;
@@ -61834,7 +61859,7 @@
       getCustomMerge(col, row) {
         if (this.internalProps.customMergeCell) {
           const customMerge = this.internalProps.customMergeCell(col, row, this);
-          if (customMerge && customMerge.range && (isValid$1(customMerge.text) || customMerge.customLayout || this.customRender)) {
+          if (customMerge && customMerge.range) {
             if (customMerge.style) {
               const styleClass = this.internalProps.bodyHelper.getStyleClass("text"),
                 style = customMerge.style,
@@ -62545,12 +62570,34 @@
         this.eventManager.enableScroll();
       }
       getGroupTitleLevel(col, row) {}
+      getTargetScrollTop(row) {
+        const drawRange = this.getDrawRange(),
+          frozenHeight = this.getFrozenRowsHeight();
+        return Math.max(0, Math.min(this.getRowsHeight(0, row - 1) - frozenHeight, this.getAllRowsHeight() - drawRange.height));
+      }
+      _scheduleScrollToRowCorrect(row, delay = 0) {
+        this._scrollToRowCorrectTimer = setTimeout(() => {
+          this.clearCorrectTimer();
+          const targetScrollTop = this.getTargetScrollTop(row);
+          if (targetScrollTop !== this.scrollTop) {
+            this.scrollTop = targetScrollTop;
+            const correctedTargetScrollTop = this.getTargetScrollTop(row);
+            correctedTargetScrollTop !== this.scrollTop && (this.scrollTop = correctedTargetScrollTop);
+          }
+        }, delay);
+      }
       scrollToRow(row, animationOption) {
-        animationOption ? this.animationManager.scrollTo({
-          row: row
-        }, animationOption) : this.scrollToCell({
-          row: row
-        });
+        var _a;
+        const targetRow = Math.min(Math.max(Math.floor(row), 0), this.rowCount - 1);
+        if (this.clearCorrectTimer(), !animationOption) return this.scrollToCell({
+          row: targetRow
+        }), void this._scheduleScrollToRowCorrect(targetRow);
+        const duration = isBoolean$2(animationOption) ? 3e3 : null !== (_a = null == animationOption ? void 0 : animationOption.duration) && void 0 !== _a ? _a : 3e3;
+        this.animationManager.scrollTo({
+          row: targetRow
+        }, animationOption), this._scrollToRowCorrectTimer = setTimeout(() => {
+          this.scrollToRow(targetRow, !1);
+        }, duration);
       }
       scrollToCol(col, animationOption) {
         animationOption ? this.animationManager.scrollTo({
@@ -62569,8 +62616,8 @@
         }
         if (isValid$1(cellAddr.row) && cellAddr.row >= this.frozenRowCount) {
           const frozenHeight = this.getFrozenRowsHeight(),
-            top = this.getRowsHeight(0, cellAddr.row - 1);
-          this.scrollTop = Math.min(top - frozenHeight, this.getAllRowsHeight() - drawRange.height);
+            top = this.rowHeightsMap.getSumInRange(0, cellAddr.row - 1);
+          this.scrollTop = Math.min(top - frozenHeight, this.rowHeightsMap.getSumInRange(0, this.rowCount - 1) - drawRange.height);
         }
         this.render();
       }
@@ -63218,9 +63265,24 @@
       return layout._cellRangeMap.set(`$${col}$${row}`, cellRange), cellRange;
     }
     function getTreeTitleMerge(col, row, cellRange, layout) {
+      var _a;
       if ("tree" !== layout.rowHierarchyType) return;
-      const cellRecord = layout._table.getCellRawRecord(col, row);
-      layout._table.internalProps.groupTitleCheckbox && layout._table.internalProps.rowSeriesNumber ? (null == cellRecord ? void 0 : cellRecord.vtableMerge) && col >= layout.leftRowSeriesNumberColumnCount && (cellRange.start.col = layout.rowHeaderLevelCount + layout.leftRowSeriesNumberColumnCount, cellRange.end.col = layout.colCount - 1, cellRange.start.row = cellRange.end.row = row) : (null == cellRecord ? void 0 : cellRecord.vtableMerge) && (cellRange.start.col = layout.rowHeaderLevelCount, cellRange.end.col = layout.colCount - 1, cellRange.start.row = cellRange.end.row = row);
+      const table = layout._table,
+        internalProps = table.internalProps || {},
+        isGroupMode = !!internalProps.groupBy,
+        cellRecord = table.getCellRawRecord(col, row);
+      if (!(null == cellRecord ? void 0 : cellRecord.vtableMerge)) return;
+      const treeTitleStartCol = internalProps.groupTitleCheckbox && internalProps.rowSeriesNumber ? layout.rowHeaderLevelCount + layout.leftRowSeriesNumberColumnCount : layout.rowHeaderLevelCount;
+      if (!(col < treeTitleStartCol) && (cellRange.start.col = treeTitleStartCol, cellRange.end.col = layout.colCount - 1, cellRange.start.row = cellRange.end.row = row, isGroupMode && 1 === (null === (_a = layout.columnObjects) || void 0 === _a ? void 0 : _a.length))) {
+        const onlyColumn = layout.columnObjects[0],
+          field = null == onlyColumn ? void 0 : onlyColumn.field;
+        if (null != field) {
+          let text = cellRecord.vtableMergeName;
+          const groupTitleFieldFormat = internalProps.groupTitleFieldFormat;
+          "function" == typeof groupTitleFieldFormat && (text = groupTitleFieldFormat(cellRecord, col, row, table));
+          null == cellRecord[field] && null != text && (cellRecord[field] = text);
+        }
+      }
     }
     function getCellRangeTranspose(col, row, layout) {
       var _a, _b, _c, _d;
@@ -64137,7 +64199,7 @@
         this.listenersId.push(doubleClickEventId, clickEventId, selectedChangedEventId);
       }
       startEditCell(col, row, value, editElement) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         if (this.editingEditor) return;
         const editor = this.table.getEditor(col, row);
         if (editor) {
@@ -64153,7 +64215,8 @@
             col: col,
             row: row
           }), this.table._makeVisibleCell(col, row), this.editingEditor = editor;
-          const dataValue = isValid$1(value) ? value : this.table.getCellOriginValue(col, row),
+          const customMergeText = null === (_j = this.table.getCustomMerge(col, row)) || void 0 === _j ? void 0 : _j.text,
+            dataValue = isValid$1(value) ? value : isValid$1(customMergeText) ? customMergeText : this.table.getCellOriginValue(col, row),
             rect = this.table.getCellRangeRelativeRect(this.table.getCellRange(col, row)),
             referencePosition = {
               rect: {
@@ -64163,9 +64226,9 @@
                 height: rect.height
               }
             };
-          col === this.table.colCount - 1 ? referencePosition.rect.width = rect.width - 1 : referencePosition.rect.width = rect.width + 1, row === this.table.rowCount - 1 ? referencePosition.rect.height = rect.height - 1 : referencePosition.rect.height = rect.height + 1, editor.beginEditing, null === (_j = editor.beginEditing) || void 0 === _j || _j.call(editor, this.table.getElement(), referencePosition, dataValue), editor.bindSuccessCallback, null === (_k = editor.bindSuccessCallback) || void 0 === _k || _k.call(editor, () => {
+          col === this.table.colCount - 1 ? referencePosition.rect.width = rect.width - 1 : referencePosition.rect.width = rect.width + 1, row === this.table.rowCount - 1 ? referencePosition.rect.height = rect.height - 1 : referencePosition.rect.height = rect.height + 1, editor.beginEditing, null === (_k = editor.beginEditing) || void 0 === _k || _k.call(editor, this.table.getElement(), referencePosition, dataValue), editor.bindSuccessCallback, null === (_l = editor.bindSuccessCallback) || void 0 === _l || _l.call(editor, () => {
             this.completeEdit();
-          }), null === (_l = editor.onStart) || void 0 === _l || _l.call(editor, {
+          }), null === (_m = editor.onStart) || void 0 === _m || _m.call(editor, {
             value: dataValue,
             endEdit: () => {
               this.completeEdit();
@@ -64179,7 +64242,7 @@
         }
       }
       completeEdit(e) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!this.editingEditor) return !0;
         if (this.isValidatingValue) return !1;
         this.cacheLastSelectedCellEditor = {};
@@ -64193,9 +64256,10 @@
         if (this.editingEditor.getValue, this.editingEditor.validateValue) {
           this.isValidatingValue = !0;
           const newValue = this.editingEditor.getValue(),
-            oldValue = this.table.getCellOriginValue(this.editCell.col, this.editCell.row),
+            customMergeText = null === (_a = this.table.getCustomMerge(this.editCell.col, this.editCell.row)) || void 0 === _a ? void 0 : _a.text,
+            oldValue = isValid$1(customMergeText) ? customMergeText : this.table.getCellOriginValue(this.editCell.col, this.editCell.row),
             target = null == e ? void 0 : e.target,
-            maybePromiseOrValue = null === (_b = (_a = this.editingEditor).validateValue) || void 0 === _b ? void 0 : _b.call(_a, newValue, oldValue, this.editCell, this.table, !!this.table.getElement().contains(target));
+            maybePromiseOrValue = null === (_c = (_b = this.editingEditor).validateValue) || void 0 === _c ? void 0 : _c.call(_b, newValue, oldValue, this.editCell, this.table, !!this.table.getElement().contains(target));
           return isPromise(maybePromiseOrValue) ? (this.isValidatingValue = !0, new Promise((resolve, reject) => {
             maybePromiseOrValue.then(result => {
               dealWithValidateValue(result, this, oldValue, resolve);
@@ -64209,14 +64273,17 @@
       doExit() {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const changedValue = null === (_b = (_a = this.editingEditor).getValue) || void 0 === _b ? void 0 : _b.call(_a),
-          range = this.table.getCellRange(this.editCell.col, this.editCell.row),
-          changedValues = [];
-        for (let row = range.start.row; row <= range.end.row; row++) {
-          const rowChangedValues = [];
-          for (let col = range.start.col; col <= range.end.col; col++) rowChangedValues.push(changedValue);
-          changedValues.push(rowChangedValues);
+          range = this.table.getCellRange(this.editCell.col, this.editCell.row);
+        if (null === (_d = (_c = this.editingEditor).beforeEnd) || void 0 === _d || _d.call(_c), range.isCustom) this.table.changeCellValue(range.start.col, range.start.row, changedValue);else {
+          const changedValues = [];
+          for (let row = range.start.row; row <= range.end.row; row++) {
+            const rowChangedValues = [];
+            for (let col = range.start.col; col <= range.end.col; col++) rowChangedValues.push(changedValue);
+            changedValues.push(rowChangedValues);
+          }
+          this.table.changeCellValues(range.start.col, range.start.row, changedValues);
         }
-        null === (_d = (_c = this.editingEditor).beforeEnd) || void 0 === _d || _d.call(_c), this.table.changeCellValues(range.start.col, range.start.row, changedValues), this.editingEditor.exit, null === (_f = (_e = this.editingEditor).exit) || void 0 === _f || _f.call(_e), null === (_h = (_g = this.editingEditor).onEnd) || void 0 === _h || _h.call(_g), this.editingEditor = null, this.isValidatingValue = !1, this.beginTriggerEditCellMode = null;
+        this.editingEditor.exit, null === (_f = (_e = this.editingEditor).exit) || void 0 === _f || _f.call(_e), null === (_h = (_g = this.editingEditor).onEnd) || void 0 === _h || _h.call(_g), this.editingEditor = null, this.isValidatingValue = !1, this.beginTriggerEditCellMode = null;
       }
       cancelEdit() {
         var _a, _b, _c, _d;
@@ -64276,7 +64343,18 @@
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
     };
+    function refreshCustomMergeCellGroups(table) {
+      var _a;
+      if (!Array.isArray(table.options.customMergeCell)) return;
+      table.internalProps.customMergeCell = getCustomMergeCellFunc(table.options.customMergeCell);
+      const merges = table.options.customMergeCell;
+      for (let i = 0; i < merges.length; i++) {
+        const r = null === (_a = merges[i]) || void 0 === _a ? void 0 : _a.range;
+        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 listTableChangeCellValue(col, row, value, workOnEditableCell, triggerEvent, table, noTriggerChangeCellValuesEvent) {
+      var _a, _b;
       if (workOnEditableCell && table.isHasEditorDefine(col, row) || !1 === workOnEditableCell) {
         const recordShowIndex = table.getRecordShowIndexByCell(col, row),
           recordIndex = recordShowIndex >= 0 ? table.dataSource.getIndexKey(recordShowIndex) : void 0,
@@ -64286,8 +64364,12 @@
           beforeChangeValue = table.getCellRawValue(col, row),
           oldValue = table.getCellOriginValue(col, row);
         table.isHeader(col, row) ? table.internalProps.layoutMap.updateColumnTitle(col, row, value) : table.dataSource.changeFieldValue(value, recordShowIndex, field, col, row, table);
-        const range = table.getCellRange(col, row),
-          aggregators = table.internalProps.layoutMap.getAggregatorsByCell(col, row);
+        const range = table.getCellRange(col, row);
+        if (range.isCustom && range.start.col === col && range.start.row === row && Array.isArray(table.options.customMergeCell) && "function" == typeof table.getCellValue) {
+          const customMerge = null === (_b = null === (_a = table.internalProps) || void 0 === _a ? void 0 : _a.customMergeCell) || void 0 === _b ? void 0 : _b.call(_a, col, row, table);
+          customMerge && (customMerge.text = value);
+        }
+        const aggregators = table.internalProps.layoutMap.getAggregatorsByCell(col, row);
         if (aggregators) {
           if (Array.isArray(aggregators)) for (let i = 0; i < (null == aggregators ? void 0 : aggregators.length); i++) aggregators[i].recalculate();else aggregators.recalculate();
           const aggregatorCells = table.internalProps.layoutMap.getAggregatorCellAddress(range.start.col, range.start.row, range.end.col, range.end.row);
@@ -64510,7 +64592,13 @@
           (void 0 === recordIndex || recordIndex > table.dataSource.sourceLength) && (recordIndex = table.dataSource.sourceLength);
           const headerCount = table.transpose ? table.rowHeaderLevelCount : table.columnHeaderLevelCount,
             syncToOriginalRecords = !!(null === (_f = table.options) || void 0 === _f ? void 0 : _f.syncRecordOperationsToSourceRecords);
-          if (table.dataSource.addRecord(record, recordIndex, syncToOriginalRecords), adjustCheckBoxStateMapWithAddRecordIndex(table, recordIndex, 1), syncToOriginalRecords) return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), table.scenegraph.createSceneGraph(), !0;
+          if (table.dataSource.addRecord(record, recordIndex, syncToOriginalRecords), adjustCheckBoxStateMapWithAddRecordIndex(table, recordIndex, 1), syncToOriginalRecords) {
+            if (!table.transpose) {
+              const insertRowIndex = recordIndex + headerCount + table.internalProps.layoutMap.hasAggregationOnTopCount;
+              table.rowHeightsMap.insert(insertRowIndex);
+            }
+            return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), table.scenegraph.createSceneGraph(!0), !0;
+          }
           const oldRowCount = table.rowCount;
           if (table.refreshRowColCount(), 0 === table.scenegraph.proxy.totalActualBodyRowCount) return table.scenegraph.clearCells(), table.scenegraph.createSceneGraph(), !0;
           const newRowCount = table.transpose ? table.colCount : table.rowCount;
@@ -64588,7 +64676,13 @@
           void 0 === recordIndex || recordIndex > table.dataSource.sourceLength ? recordIndex = table.dataSource.sourceLength : recordIndex < 0 && (recordIndex = 0);
           const headerCount = table.transpose ? table.rowHeaderLevelCount : table.columnHeaderLevelCount,
             syncToOriginalRecords = !!(null === (_f = table.options) || void 0 === _f ? void 0 : _f.syncRecordOperationsToSourceRecords);
-          if (table.dataSource.addRecords(records, recordIndex, syncToOriginalRecords), adjustCheckBoxStateMapWithAddRecordIndex(table, recordIndex, records.length), syncToOriginalRecords) return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), table.scenegraph.createSceneGraph(), !0;
+          if (table.dataSource.addRecords(records, recordIndex, syncToOriginalRecords), adjustCheckBoxStateMapWithAddRecordIndex(table, recordIndex, records.length), syncToOriginalRecords) {
+            if (!table.transpose) {
+              const insertRowIndex = recordIndex + headerCount + table.internalProps.layoutMap.hasAggregationOnTopCount;
+              for (let i = 0; i < records.length; i++) table.rowHeightsMap.insert(insertRowIndex);
+            }
+            return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), table.scenegraph.createSceneGraph(!0), !0;
+          }
           const oldRowCount = table.transpose ? table.colCount : table.rowCount;
           if (table.refreshRowColCount(), 0 === table.scenegraph.proxy.totalActualBodyRowCount) return table.scenegraph.clearCells(), table.scenegraph.createSceneGraph(), !0;
           const newRowCount = table.transpose ? table.colCount : table.rowCount;
@@ -64657,7 +64751,7 @@
       }
     }
     function listTableDeleteRecords(recordIndexs, table) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
       if ((null == recordIndexs ? void 0 : recordIndexs.length) > 0) if (table.internalProps.groupBy) null === (_b = (_a = table.dataSource).deleteRecordsForGroup) || void 0 === _b || _b.call(_a, recordIndexs), table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.sortState && sortRecords(table), table.scenegraph.clearCells(), table.scenegraph.createSceneGraph();else if ("tree" === table.dataSource.rowHierarchyType) {
         const deletedRecordIndexs = null === (_d = (_c = table.dataSource).deleteRecordsForTree) || void 0 === _d ? void 0 : _d.call(_c, recordIndexs);
         if (0 === deletedRecordIndexs.length) return;
@@ -64669,8 +64763,17 @@
         const syncToOriginalRecords = !!(null === (_f = table.options) || void 0 === _f ? void 0 : _f.syncRecordOperationsToSourceRecords),
           deletedRecordIndexs = table.dataSource.deleteRecords(recordIndexs, syncToOriginalRecords);
         if (0 === deletedRecordIndexs.length) return;
+        Array.isArray(table.options.customMergeCell) && (table.internalProps.customMergeCell = getCustomMergeCellFunc(table.options.customMergeCell));
         for (let index = 0; index < deletedRecordIndexs.length; index++) adjustCheckBoxStateMapWithDeleteRecordIndex(table, deletedRecordIndexs[index], 1);
-        if (syncToOriginalRecords) return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), void table.scenegraph.createSceneGraph();
+        if (syncToOriginalRecords) {
+          if (!table.transpose) {
+            const headerCount = table.transpose ? table.rowHeaderLevelCount : table.columnHeaderLevelCount,
+              topAggregationCount = table.internalProps.layoutMap.hasAggregationOnTopCount,
+              sorted = [...deletedRecordIndexs].sort((a, b) => b - a);
+            for (let i = 0; i < sorted.length; i++) table.rowHeightsMap.delete(sorted[i] + headerCount + topAggregationCount);
+          }
+          return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), void table.scenegraph.createSceneGraph(!0);
+        }
         const oldRowCount = table.transpose ? table.colCount : table.rowCount;
         table.refreshRowColCount();
         const newRowCount = table.transpose ? table.colCount : table.rowCount,
@@ -64708,7 +64811,7 @@
               col: 0,
               row: row
             });
-            null === (_g = table.reactCustomLayout) || void 0 === _g || _g.clearCache(), table.transpose ? table.scenegraph.updateCol(delRows, [], updateRows) : table.scenegraph.updateRow(delRows, [], updateRows), null === (_h = table.reactCustomLayout) || void 0 === _h || _h.updateAllCustomCell();
+            null === (_g = table.reactCustomLayout) || void 0 === _g || _g.clearCache(), table.transpose ? table.scenegraph.updateCol(delRows, [], updateRows) : table.scenegraph.updateRow(delRows, [], updateRows), null === (_h = table.reactCustomLayout) || void 0 === _h || _h.updateAllCustomCell(), refreshCustomMergeCellGroups(table);
           }
         } else {
           const delRows = [],
@@ -64726,6 +64829,42 @@
             });
           }
           const updateRows = [];
+          if (table.internalProps.customMergeCell) {
+            const proxy = table.scenegraph.proxy,
+              deletedIndexNums = (recordIndexsMinToMax[0], recordIndexsMinToMax.map(recordIndex => recordIndex + headerCount + topAggregationCount)),
+              minIndexNum = deletedIndexNums[0];
+            let updateMin = minIndexNum,
+              updateMax = minIndexNum;
+            if (Array.isArray(table.options.customMergeCell)) {
+              const merges = table.options.customMergeCell,
+                axis = table.transpose ? "col" : "row";
+              merges.forEach(m => {
+                const r = null == m ? void 0 : m.range;
+                if ((null == r ? void 0 : r.start) && (null == r ? void 0 : r.end)) for (let i = 0; i < deletedIndexNums.length; i++) {
+                  const deleteIndex = deletedIndexNums[i];
+                  if (r.end[axis] >= deleteIndex - 1) {
+                    updateMin = Math.min(updateMin, r.start[axis]), updateMax = Math.max(updateMax, r.end[axis]);
+                    break;
+                  }
+                }
+              });
+            }
+            if (table.transpose) {
+              const start = Math.max(updateMin, null !== (_j = null == proxy ? void 0 : proxy.colStart) && void 0 !== _j ? _j : updateMin),
+                end = Math.min(updateMax, null !== (_k = null == proxy ? void 0 : proxy.colEnd) && void 0 !== _k ? _k : updateMax);
+              for (let col = start; col <= end; col++) updateRows.push({
+                col: col,
+                row: 0
+              });
+            } else {
+              const start = Math.max(updateMin, null !== (_l = null == proxy ? void 0 : proxy.rowStart) && void 0 !== _l ? _l : updateMin),
+                end = Math.min(updateMax, null !== (_m = null == proxy ? void 0 : proxy.rowEnd) && void 0 !== _m ? _m : updateMax);
+              for (let row = start; row <= end; row++) updateRows.push({
+                col: 0,
+                row: row
+              });
+            }
+          }
           for (let row = headerCount; row < headerCount + topAggregationCount; row++) table.transpose ? updateRows.push({
             col: row,
             row: 0
@@ -64740,7 +64879,7 @@
             col: 0,
             row: row
           });
-          null === (_j = table.reactCustomLayout) || void 0 === _j || _j.clearCache(), table.transpose ? table.scenegraph.updateCol(delRows, [], updateRows) : table.scenegraph.updateRow(delRows, [], updateRows), null === (_k = table.reactCustomLayout) || void 0 === _k || _k.updateAllCustomCell();
+          null === (_o = table.reactCustomLayout) || void 0 === _o || _o.clearCache(), table.transpose ? table.scenegraph.updateCol(delRows, [], updateRows) : table.scenegraph.updateRow(delRows, [], updateRows), null === (_p = table.reactCustomLayout) || void 0 === _p || _p.updateAllCustomCell(), refreshCustomMergeCellGroups(table);
         }
       }
     }
@@ -64752,7 +64891,7 @@
         const syncToOriginalRecords = !!(null === (_f = table.options) || void 0 === _f ? void 0 : _f.syncRecordOperationsToSourceRecords),
           updateRecordIndexs = table.dataSource.updateRecords(records, recordIndexs, syncToOriginalRecords);
         if (0 === updateRecordIndexs.length) return;
-        if (syncToOriginalRecords) return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), void table.scenegraph.createSceneGraph();
+        if (syncToOriginalRecords) return table.refreshRowColCount(), table.internalProps.layoutMap.clearCellRangeMap(), table.scenegraph.clearCells(), void table.scenegraph.createSceneGraph(!0);
         const recordIndexsMinToMax = updateRecordIndexs.map(index => table.getBodyRowIndexByRecordIndex(index)).sort((a, b) => a - b);
         if (table.pagination) {
           const {
@@ -65075,10 +65214,33 @@
         this._hasAutoImageColumn = void 0, this.refreshHeader(), this.records && checkHasAggregationOnColumnDefine(this.internalProps.columns) && this.dataSource.processRecords(null !== (_b = null === (_a = this.dataSource.dataSourceObj) || void 0 === _a ? void 0 : _a.records) && void 0 !== _b ? _b : this.dataSource.dataSourceObj), this.internalProps.useOneRowHeightFillAll = !1, this.headerStyleCache = new Map(), this.bodyStyleCache = new Map(), this.bodyBottomStyleCache = new Map(), this._updateSize(), this.scenegraph.createSceneGraph(), this.stateManager.updateHoverPos(oldHoverState.col, oldHoverState.row), this.renderAsync(), this.eventManager.updateEventBinder();
       }
       addColumns(toAddColumns, colIndex, isMaintainArrayData = !0) {
-        var _a;
+        var _a, _b;
         const columns = this.options.columns;
+        if (Array.isArray(this.options.customMergeCell) && (null == toAddColumns ? void 0 : toAddColumns.length)) {
+          const axis = this.transpose ? "row" : "col";
+          let insertIndex = colIndex;
+          void 0 === insertIndex ? insertIndex = columns.length : insertIndex < 0 ? insertIndex = 0 : insertIndex > columns.length && (insertIndex = columns.length);
+          const toAddCount = toAddColumns.length,
+            merges = this.options.customMergeCell.map(m => Object.assign(Object.assign({}, m), {
+              range: {
+                start: Object.assign({}, m.range.start),
+                end: Object.assign({}, m.range.end)
+              }
+            }));
+          for (let i = 0; i < merges.length; i++) {
+            const r = null === (_a = merges[i]) || void 0 === _a ? void 0 : _a.range;
+            if (!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) continue;
+            const start = r.start[axis],
+              end = r.end[axis];
+            end < insertIndex || (start > insertIndex ? (r.start[axis] = start + toAddCount, r.end[axis] = end + toAddCount) : r.end[axis] = end + toAddCount);
+          }
+          this.options.customMergeCell = merges.filter(m => {
+            const r = null == m ? void 0 : m.range;
+            return !(!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) && !(r.end.row < r.start.row || r.end.col < r.start.col) && !(r.start.row === r.end.row && r.start.col === r.end.col);
+          }), this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+        }
         void 0 === colIndex ? (colIndex = columns.length, columns.push(...toAddColumns)) : columns.splice(colIndex, 0, ...toAddColumns);
-        for (let i = 0; i < toAddColumns.length; i++) this.colWidthsMap.addAndReorder(colIndex + i, null !== (_a = toAddColumns[i].width) && void 0 !== _a ? _a : this.internalProps.defaultColWidth);
+        for (let i = 0; i < toAddColumns.length; i++) this.colWidthsMap.addAndReorder(colIndex + i, null !== (_b = toAddColumns[i].width) && void 0 !== _b ? _b : this.internalProps.defaultColWidth);
         this.internalProps._colRangeWidthsMap.clear();
         const resizedColIndexs = Array.from(this.internalProps._widthResizedColMap.keys());
         for (let i = 0; i < resizedColIndexs.length; i++) resizedColIndexs[i] >= colIndex && (this.internalProps._widthResizedColMap.delete(resizedColIndexs[i]), this.internalProps._widthResizedColMap.add(resizedColIndexs[i] + toAddColumns.length));
@@ -65091,15 +65253,46 @@
         }
         this.updateColumns(columns, {
           clearRowHeightCache: !1
-        }), this.fireListeners(TABLE_EVENT_TYPE.ADD_COLUMN, {
+        }), Array.isArray(this.options.customMergeCell) && (this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell), this.options.customMergeCell.forEach(m => {
+          const r = null == m ? void 0 : m.range;
+          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++) this.scenegraph.updateCellContent(col, row);
+        }), this.scenegraph.updateNextFrame()), this.fireListeners(TABLE_EVENT_TYPE.ADD_COLUMN, {
           columnIndex: colIndex,
           columnCount: toAddColumns.length,
           columns: columns
         });
       }
       deleteColumns(deleteColIndexs, isMaintainArrayData = !0) {
+        var _a;
         const columns = this.options.columns;
         deleteColIndexs.sort((a, b) => b - a);
+        const deletedColumns = deleteColIndexs.map(idx => cloneDeepSpec(columns[idx], ["children"]));
+        let deletedRecordValues;
+        if (Array.isArray(this.options.customMergeCell) && (null == deleteColIndexs ? void 0 : deleteColIndexs.length)) {
+          const axis = this.transpose ? "row" : "col",
+            deleteIndexNums = deleteColIndexs.slice().sort((a, b) => a - b).map((idx, i) => idx - i),
+            merges = this.options.customMergeCell.map(m => Object.assign(Object.assign({}, m), {
+              range: {
+                start: Object.assign({}, m.range.start),
+                end: Object.assign({}, m.range.end)
+              }
+            }));
+          for (let i = 0; i < deleteIndexNums.length; i++) {
+            const deleteIndex = deleteIndexNums[i];
+            for (let j = 0; j < merges.length; j++) {
+              const r = null === (_a = merges[j]) || void 0 === _a ? void 0 : _a.range;
+              if (!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) continue;
+              const start = r.start[axis],
+                end = r.end[axis];
+              end < deleteIndex || (start > deleteIndex ? (r.start[axis] = start - 1, r.end[axis] = end - 1) : r.end[axis] = end - 1);
+            }
+          }
+          this.options.customMergeCell = merges.filter(m => {
+            const r = null == m ? void 0 : m.range;
+            return !(!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) && !(r.end.row < r.start.row || r.end.col < r.start.col) && !(r.start.row === r.end.row && r.start.col === r.end.col);
+          }), this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+        }
+        isMaintainArrayData && Array.isArray(this.records) && this.records.length && (deletedRecordValues = this.records.map(record => Array.isArray(record) ? deleteColIndexs.map(idx => record[idx]) : []), deletedRecordValues.every(v => 0 === v.length) && (deletedRecordValues = void 0));
         for (let i = 0; i < deleteColIndexs.length; i++) if (columns.splice(deleteColIndexs[i], 1), this.colWidthsMap.delAndReorder(deleteColIndexs[i]), this.internalProps._widthResizedColMap.delete(deleteColIndexs[i]), isMaintainArrayData) for (let j = 0; j < this.records.length; j++) {
           const record = this.records[j];
           Array.isArray(record) && record.splice(deleteColIndexs[i], 1);
@@ -65115,7 +65308,9 @@
           clearRowHeightCache: !1
         }), this.fireListeners(TABLE_EVENT_TYPE.DELETE_COLUMN, {
           deleteColIndexs: deleteColIndexs,
-          columns: columns
+          columns: columns,
+          deletedColumns: deletedColumns,
+          deletedRecordValues: deletedRecordValues
         });
       }
       get columns() {
@@ -65503,9 +65698,9 @@
         }
       }
       updateSortState(sortState, executeSort = !0) {
-        var _a;
-        if (sortState) this.internalProps.sortState = sortState;else if (this.internalProps.sortState) if (Array.isArray(this.internalProps.sortState)) for (let i = 0; i < this.internalProps.sortState.length; i++) (sortState = null === (_a = this.internalProps.sortState) || void 0 === _a ? void 0 : _a[i]) && (sortState.order = "normal");else this.internalProps.sortState.order = "normal", sortState = this.internalProps.sortState;
-        (sortState = Array.isArray(sortState) ? sortState : [sortState]).some(item => item.field) && executeSort && this.internalProps.layoutMap.headerObjects.some(item => !1 !== item.define.sort) && (this.dataSource.sort(sortState.map(item => {
+        var _a, _b, _c, _d, _e;
+        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);
           return {
@@ -65513,13 +65708,20 @@
             order: item.order,
             orderFn: null != sortFunc ? sortFunc : defaultOrderFn
           };
-        })), this.internalProps.layoutMap.clearCellRangeMap(), this.internalProps.useOneRowHeightFillAll = !1, this.scenegraph.sortCell()), sortState.length && this.stateManager.updateSortState(sortState);
+        })), this.internalProps.layoutMap.clearCellRangeMap(), this.internalProps.useOneRowHeightFillAll = !1, this.scenegraph.sortCell());else {
+          const ds = this.dataSource,
+            sourceLength = null !== (_c = null !== (_b = null !== (_a = null == ds ? void 0 : ds.sourceLength) && void 0 !== _a ? _a : null == ds ? void 0 : ds._sourceLength) && void 0 !== _b ? _b : null == ds ? void 0 : ds.length) && void 0 !== _c ? _c : 0;
+          (null === (_d = null == ds ? void 0 : ds.sortedIndexMap) || void 0 === _d ? void 0 : _d.clear) && ds.sortedIndexMap.clear(), void 0 !== ds.currentIndexedData && (ds.currentIndexedData = Array.from({
+            length: sourceLength
+          }, (_, i) => i)), ds.lastSortStates = [], null === (_e = ds.updatePagination) || void 0 === _e || _e.call(ds, ds.pagination), this.internalProps.layoutMap.clearCellRangeMap(), this.internalProps.useOneRowHeightFillAll = !1, this.scenegraph.sortCell();
+        }
+        this.stateManager.updateSortState(normalizedSortState);
       }
       updateFilterRules(filterRules, options = {
         clearRowHeightCache: !0
       }) {
         var _a, _b, _c;
-        this.scenegraph.clearCells(), null === (_b = (_a = this.dataSource).clearForceVisibleRecords) || void 0 === _b || _b.call(_a), this.sortState ? (this.dataSource.updateFilterRulesForSorted(filterRules), sortRecords(this)) : this.dataSource.updateFilterRules(filterRules, null == options ? void 0 : options.onFilterRecordsEnd), this.refreshRowColCount(), this.stateManager.initCheckedState(this.records), this.scenegraph.createSceneGraph(!(null == options ? void 0 : options.clearRowHeightCache)), null === (_c = this.internalProps.emptyTip) || void 0 === _c || _c.resetVisible(), this.resize();
+        this.scenegraph.clearCells(), !1 !== (null == options ? void 0 : options.clearForceVisibleRecords) && (null === (_b = (_a = this.dataSource).clearForceVisibleRecords) || void 0 === _b || _b.call(_a)), this.sortState ? (this.dataSource.updateFilterRulesForSorted(filterRules), sortRecords(this)) : this.dataSource.updateFilterRules(filterRules, null == options ? void 0 : options.onFilterRecordsEnd), this.refreshRowColCount(), this.stateManager.initCheckedState(this.records), this.scenegraph.createSceneGraph(!(null == options ? void 0 : options.clearRowHeightCache)), null === (_c = this.internalProps.emptyTip) || void 0 === _c || _c.resetVisible(), this.resize();
       }
       getFilteredRecords() {
         return this.dataSource.records;
@@ -65794,30 +65996,112 @@
         traverseColumns(this.internalProps.columns), this.refreshRowColCount(), this.internalProps.layoutMap.clearCellRangeMap(), this.internalProps.useOneRowHeightFillAll = !1, this.stateManager.initCheckedState(this.records), this.scenegraph.createSceneGraph(!clearRowHeightCache), null === (_k = this.internalProps.emptyTip) || void 0 === _k || _k.resetVisible(), this.resize();
       }
       addRecord(record, recordIndex, triggerEvent = !0) {
-        var _a;
+        var _a, _b;
+        if (Array.isArray(this.options.customMergeCell) && "number" == typeof recordIndex) {
+          const axis = this.transpose ? "col" : "row",
+            headerCount = this.transpose ? this.rowHeaderLevelCount : this.columnHeaderLevelCount,
+            topAggregationCount = this.internalProps.layoutMap.hasAggregationOnTopCount;
+          let insertIndex = recordIndex;
+          void 0 === insertIndex || insertIndex > this.dataSource.sourceLength ? insertIndex = this.dataSource.sourceLength : insertIndex < 0 && (insertIndex = 0);
+          const insertIndexNum = insertIndex + headerCount + topAggregationCount,
+            merges = this.options.customMergeCell.map(m => Object.assign(Object.assign({}, m), {
+              range: {
+                start: Object.assign({}, m.range.start),
+                end: Object.assign({}, m.range.end)
+              }
+            }));
+          for (let i = 0; i < merges.length; i++) {
+            const r = null === (_a = merges[i]) || void 0 === _a ? void 0 : _a.range;
+            if (!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) continue;
+            const start = r.start[axis],
+              end = r.end[axis];
+            end < insertIndexNum || (start > insertIndexNum ? (r.start[axis] = start + 1, r.end[axis] = end + 1) : r.end[axis] = end + 1);
+          }
+          this.options.customMergeCell = merges.filter(m => {
+            const r = null == m ? void 0 : m.range;
+            return !(!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) && !(r.end.row < r.start.row || r.end.col < r.start.col) && !(r.start.row === r.end.row && r.start.col === r.end.col);
+          }), this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+        }
         const success = listTableAddRecord(record, recordIndex, this);
-        adjustHeightResizedRowMapWithAddRecordIndex(this, recordIndex, [record]), null === (_a = this.internalProps.emptyTip) || void 0 === _a || _a.resetVisible(), triggerEvent && success && this.fireListeners(TABLE_EVENT_TYPE.ADD_RECORD, {
+        adjustHeightResizedRowMapWithAddRecordIndex(this, recordIndex, [record]), null === (_b = this.internalProps.emptyTip) || void 0 === _b || _b.resetVisible(), success && Array.isArray(this.options.customMergeCell) && (this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell), this.options.customMergeCell.forEach(m => {
+          const r = null == m ? void 0 : m.range;
+          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++) this.scenegraph.updateCellContent(col, row);
+        }), this.scenegraph.updateNextFrame()), triggerEvent && success && this.fireListeners(TABLE_EVENT_TYPE.ADD_RECORD, {
           records: [record],
           recordIndex: recordIndex,
           recordCount: 1
         });
       }
       addRecords(records, recordIndex, triggerEvent = !0) {
-        var _a;
+        var _a, _b;
+        if (Array.isArray(this.options.customMergeCell) && "number" == typeof recordIndex && (null == records ? void 0 : records.length)) {
+          const axis = this.transpose ? "col" : "row",
+            headerCount = this.transpose ? this.rowHeaderLevelCount : this.columnHeaderLevelCount,
+            topAggregationCount = this.internalProps.layoutMap.hasAggregationOnTopCount;
+          let insertIndex = recordIndex;
+          void 0 === insertIndex || insertIndex > this.dataSource.sourceLength ? insertIndex = this.dataSource.sourceLength : insertIndex < 0 && (insertIndex = 0);
+          const insertIndexNum = insertIndex + headerCount + topAggregationCount,
+            toAddCount = records.length,
+            merges = this.options.customMergeCell.map(m => Object.assign(Object.assign({}, m), {
+              range: {
+                start: Object.assign({}, m.range.start),
+                end: Object.assign({}, m.range.end)
+              }
+            }));
+          for (let i = 0; i < merges.length; i++) {
+            const r = null === (_a = merges[i]) || void 0 === _a ? void 0 : _a.range;
+            if (!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) continue;
+            const start = r.start[axis],
+              end = r.end[axis];
+            end < insertIndexNum || (start > insertIndexNum ? (r.start[axis] = start + toAddCount, r.end[axis] = end + toAddCount) : r.end[axis] = end + toAddCount);
+          }
+          this.options.customMergeCell = merges.filter(m => {
+            const r = null == m ? void 0 : m.range;
+            return !(!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) && !(r.end.row < r.start.row || r.end.col < r.start.col) && !(r.start.row === r.end.row && r.start.col === r.end.col);
+          }), this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
+        }
         const success = listTableAddRecords(records, recordIndex, this);
-        "number" == typeof recordIndex && adjustHeightResizedRowMapWithAddRecordIndex(this, recordIndex, records), null === (_a = this.internalProps.emptyTip) || void 0 === _a || _a.resetVisible(), triggerEvent && success && this.fireListeners(TABLE_EVENT_TYPE.ADD_RECORD, {
+        "number" == typeof recordIndex && adjustHeightResizedRowMapWithAddRecordIndex(this, recordIndex, records), null === (_b = this.internalProps.emptyTip) || void 0 === _b || _b.resetVisible(), success && Array.isArray(this.options.customMergeCell) && (this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell), this.options.customMergeCell.forEach(m => {
+          const r = null == m ? void 0 : m.range;
+          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++) this.scenegraph.updateCellContent(col, row);
+        }), this.scenegraph.updateNextFrame()), triggerEvent && success && this.fireListeners(TABLE_EVENT_TYPE.ADD_RECORD, {
           records: records,
           recordIndex: recordIndex,
           recordCount: records.length
         });
       }
       deleteRecords(recordIndexs, triggerEvent = !0) {
-        var _a;
-        const deletedRecords = [];
-        (null == recordIndexs ? void 0 : recordIndexs.length) > 0 && recordIndexs.forEach(index => {
+        var _a, _b;
+        const prevMergeRanges = Array.isArray(this.options.customMergeCell) ? this.options.customMergeCell.map(m => null == m ? void 0 : m.range).filter(Boolean).map(r => ({
+            start: Object.assign({}, r.start),
+            end: Object.assign({}, r.end)
+          })) : [],
+          deletedRecords = [];
+        if ((null == recordIndexs ? void 0 : recordIndexs.length) > 0 && recordIndexs.forEach(index => {
           let record = null;
           record = "number" == typeof index ? this.dataSource.get(index) : [], deletedRecords.push(record);
-        }), listTableDeleteRecords(recordIndexs, this), adjustHeightResizedRowMapWithDeleteRecordIndex(this, recordIndexs), null === (_a = this.internalProps.emptyTip) || void 0 === _a || _a.resetVisible();
+        }), Array.isArray(this.options.customMergeCell) && (null == recordIndexs ? void 0 : recordIndexs.length) && "number" == typeof recordIndexs[0]) {
+          const axis = this.transpose ? "col" : "row",
+            headerCount = this.transpose ? this.rowHeaderLevelCount : this.columnHeaderLevelCount,
+            topAggregationCount = this.internalProps.layoutMap.hasAggregationOnTopCount,
+            deleteIndexNums = recordIndexs.slice().sort((a, b) => a - b).map((index, i) => index + headerCount + topAggregationCount - i),
+            merges = this.options.customMergeCell;
+          for (let i = 0; i < deleteIndexNums.length; i++) {
+            const deleteIndex = deleteIndexNums[i];
+            for (let j = 0; j < merges.length; j++) {
+              const r = null === (_a = merges[j]) || void 0 === _a ? void 0 : _a.range;
+              if (!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) continue;
+              const start = r.start[axis],
+                end = r.end[axis];
+              end < deleteIndex || (start > deleteIndex ? (r.start[axis] = start - 1, r.end[axis] = end - 1) : r.end[axis] = end - 1);
+            }
+          }
+          this.options.customMergeCell = merges.filter(m => {
+            const r = null == m ? void 0 : m.range;
+            return !(!(null == r ? void 0 : r.start) || !(null == r ? void 0 : r.end)) && !(r.end.row < r.start.row || r.end.col < r.start.col) && !(r.start.row === r.end.row && r.start.col === r.end.col);
+          });
+        }
+        listTableDeleteRecords(recordIndexs, this), adjustHeightResizedRowMapWithDeleteRecordIndex(this, recordIndexs), null === (_b = this.internalProps.emptyTip) || void 0 === _b || _b.resetVisible();
         const rowIndexs = [];
         for (let i = 0; i < recordIndexs.length; i++) rowIndexs.push(this.getBodyRowIndexByRecordIndex(recordIndexs[i]) + this.columnHeaderLevelCount);
         triggerEvent && this.fireListeners(TABLE_EVENT_TYPE.DELETE_RECORD, {
@@ -65825,7 +66109,16 @@
           records: deletedRecords,
           rowIndexs: rowIndexs,
           deletedCount: (Array.isArray(recordIndexs[0]), recordIndexs.length)
-        });
+        }), Array.isArray(this.options.customMergeCell) && (this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell), this.options.customMergeCell.forEach(m => {
+          const r = null == m ? void 0 : m.range;
+          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++) this.scenegraph.updateCellContent(col, row);
+        }), this.scenegraph.updateNextFrame(), setTimeout(() => {
+          if (!this.internalProps || !this.options || !this.scenegraph) return;
+          Array.isArray(this.options.customMergeCell) && (this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell));
+          [...prevMergeRanges, ...(Array.isArray(this.options.customMergeCell) ? this.options.customMergeCell.map(m => null == m ? void 0 : m.range) : [])].filter(Boolean).forEach(r => {
+            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++) this.scenegraph.updateCellContent(col, row);
+          }), this.scenegraph.updateNextFrame();
+        }, 0));
       }
       updateRecords(records, recordIndexs, triggerEvent = !0) {
         listTableUpdateRecords(records, recordIndexs, this), triggerEvent && this.fireListeners(TABLE_EVENT_TYPE.UPDATE_RECORD, {
@@ -65929,7 +66222,12 @@
           }
         }), this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
         for (let i = startCol; i <= endCol; i++) for (let j = startRow; j <= endRow; j++) this.scenegraph.updateCellContent(i, j);
-        this.scenegraph.updateNextFrame();
+        this.scenegraph.updateNextFrame(), this.fireListeners(TABLE_EVENT_TYPE.MERGE_CELLS, {
+          startCol: startCol,
+          startRow: startRow,
+          endCol: endCol,
+          endRow: endRow
+        });
       }
       unmergeCells(startCol, startRow, endCol, endRow) {
         this.options.customMergeCell ? "function" == typeof this.options.customMergeCell && (this.options.customMergeCell = []) : this.options.customMergeCell = [], this.options.customMergeCell = this.options.customMergeCell.filter(item => {
@@ -65940,7 +66238,12 @@
           return !(start.col === startCol && start.row === startRow && end.col === endCol && end.row === endRow);
         }), this.internalProps.customMergeCell = getCustomMergeCellFunc(this.options.customMergeCell);
         for (let i = startCol; i <= endCol; i++) for (let j = startRow; j <= endRow; j++) this.scenegraph.updateCellContent(i, j);
-        this.scenegraph.updateNextFrame();
+        this.scenegraph.updateNextFrame(), this.fireListeners(TABLE_EVENT_TYPE.UNMERGE_CELLS, {
+          startCol: startCol,
+          startRow: startRow,
+          endCol: endCol,
+          endRow: endRow
+        });
       }
     }
 
@@ -70209,8 +70512,7 @@
                 (!isMilestone && (taskDays <= 0 || !startDate || !endDate || startDate.getTime() > endDate.getTime()))) {
                 return { barGroupBox: null, baselineBar: null };
             }
-            const { unit, step } = this._scene._gantt.parsedOptions.reverseSortedTimelineScales[0];
-            let taskBarSize = computeCountToTimeScale(endDate, startDate, unit, step, 1) * this._scene._gantt.parsedOptions.timelineColWidth;
+            let taskBarSize = this._scene._gantt.getXByTime(endDate.getTime() + 1) - this._scene._gantt.getXByTime(startDate.getTime());
             const taskBarStyle = this._scene._gantt.getTaskBarStyle(index, childIndex);
             const taskbarHeight = taskBarStyle.width;
             if (isValid$1(taskBarStyle.minSize)) {
@@ -70218,9 +70520,7 @@
             }
             const oneTaskHeigth = this._scene._gantt.parsedOptions.rowHeight;
             const milestoneTaskBarHeight = this._scene._gantt.parsedOptions.taskBarMilestoneStyle.width;
-            const x = computeCountToTimeScale(startDate, this._scene._gantt.parsedOptions.minDate, unit, step) *
-                this._scene._gantt.parsedOptions.timelineColWidth -
-                (isMilestone ? milestoneTaskBarHeight / 2 : 0);
+            const x = this._scene._gantt.getXByTime(startDate.getTime()) - (isMilestone ? milestoneTaskBarHeight / 2 : 0);
             let y = this._scene._gantt.getRowsHeightByIndex(0, index - 1) +
                 (this._scene._gantt.parsedOptions.tasksShowMode === TasksShowMode.Sub_Tasks_Separate
                     ? (childIndex ?? 0) * oneTaskHeigth
@@ -70235,10 +70535,9 @@
             let taskBarYOffset = 0;
             if (hasBaseline && !isMilestone) {
                 const baselineStyle = this._scene._gantt.getBaselineStyle(index, childIndex);
-                const baselineX = computeCountToTimeScale(baselineInfo.baselineStartDate, this._scene._gantt.parsedOptions.minDate, unit, step) *
-                    this._scene._gantt.parsedOptions.timelineColWidth;
-                const baselineWidth = computeCountToTimeScale(baselineInfo.baselineEndDate, baselineInfo.baselineStartDate, unit, step, 1) *
-                    this._scene._gantt.parsedOptions.timelineColWidth;
+                const baselineX = this._scene._gantt.getXByTime(baselineInfo.baselineStartDate.getTime());
+                const baselineWidth = this._scene._gantt.getXByTime(baselineInfo.baselineEndDate.getTime() + 1) -
+                    this._scene._gantt.getXByTime(baselineInfo.baselineStartDate.getTime());
                 let baselineY;
                 const taskBarPaddingTop = taskBarStyle.paddingTop ?? undefined;
                 const baselinePaddingTop = baselineStyle.paddingTop ?? undefined;
@@ -70849,22 +71148,24 @@
                     const date = this._scene._gantt.parsedOptions.timeScaleIncludeHour
                         ? createDateAtMidnight(line.date)
                         : createDateAtMidnight(line.date, true);
-                    const { unit, step } = this._scene._gantt.parsedOptions.reverseSortedTimelineScales[0];
-                    const unitCount = computeCountToTimeScale(date, minDate, unit, step);
-                    let positionOffset = 0;
-                    if (line.position === 'right') {
-                        positionOffset = 1;
+                    const dateTime = date.getTime();
+                    if (dateTime < this._scene._gantt.parsedOptions._minDateTime ||
+                        dateTime > this._scene._gantt.parsedOptions._maxDateTime) {
+                        return;
                     }
-                    else if (line.position === 'middle') {
-                        positionOffset = 0.5;
+                    const cellIndex = this._scene._gantt.getDateIndexByTime(dateTime);
+                    const cellStartX = cellIndex >= 1 ? this._scene._gantt.getDateColsWidth(0, cellIndex - 1) : 0;
+                    const cellWidth = this._scene._gantt.getDateColWidth(cellIndex);
+                    let dateX = cellStartX;
+                    if (line.position === 'date') {
+                        dateX = this._scene._gantt.getXByTime(dateTime);
+                    }
+                    else if (line.position === 'right') {
+                        dateX = cellStartX + cellWidth;
                     }
-                    else if (line.position === 'date') {
-                        const date = createDateAtMidnight(line.date);
-                        const unitCount = computeCountToTimeScale(date, minDate, unit, step);
-                        const cellIndex = Math.floor(unitCount);
-                        positionOffset = unitCount - cellIndex;
+                    else if (line.position === 'middle') {
+                        dateX = cellStartX + cellWidth / 2;
                     }
-                    const dateX = this._scene._gantt.parsedOptions.timelineColWidth * (Math.floor(unitCount) + positionOffset);
                     const markLineGroup = new Group$2({
                         pickable: false,
                         x: dateX - this.markLineContainerWidth / 2,
@@ -70886,7 +71187,7 @@
                     });
                     markLineGroup.appendChild(lineObj);
                     if (line.content) {
-                        const textMaxLineWidth = this._scene._gantt.parsedOptions.timelineColWidth;
+                        const textMaxLineWidth = Math.max(this._scene._gantt.getDateColWidth(cellIndex), 1);
                         const textContainerHeight = contentStyle.lineHeight || 18;
                         const textGroup = new Group$2({
                             x: this.markLineContainerWidth / 2,
@@ -71475,22 +71776,21 @@
         }
     }
     function generateLinkLinePoints(type, linkedFromTaskStartDate, linkedFromTaskEndDate, linkedFromTaskRecordRowIndex, linkedFromTaskTaskDays, linkedFromTaskIsMilestone, linkedToTaskStartDate, linkedToTaskEndDate, linkedToTaskRecordRowIndex, linkedToTaskTaskDays, linkedToTaskIsMilestone, gantt) {
-        const { unit, step } = gantt.parsedOptions.reverseSortedTimelineScales[0];
-        const { minDate, rowHeight, timelineColWidth } = gantt.parsedOptions;
+        const { rowHeight } = gantt.parsedOptions;
         const taskBarMilestoneHypotenuse = gantt.parsedOptions.taskBarMilestoneHypotenuse;
         const distanceToTaskBar = gantt.parsedOptions.dependencyLinkDistanceToTaskBar ?? 20;
         const arrowWidth = 10;
         const arrowHeight = 5;
         let linePoints = [];
         let arrowPoints = [];
+        const getStartX = (d) => gantt.getXByTime(d.getTime());
+        const getEndX = (d) => gantt.getXByTime(d.getTime() + 1);
         if (type === DependencyType.FinishToStart) {
-            let linkFromPointX = computeCountToTimeScale(linkedFromTaskEndDate, minDate, unit, step, 1) * timelineColWidth;
+            let linkFromPointX = getEndX(linkedFromTaskEndDate);
             if (linkedFromTaskIsMilestone) {
-                linkFromPointX =
-                    computeCountToTimeScale(linkedFromTaskStartDate, minDate, unit, step, 1) * timelineColWidth +
-                        taskBarMilestoneHypotenuse / 2;
+                linkFromPointX = getStartX(linkedFromTaskStartDate) + taskBarMilestoneHypotenuse / 2;
             }
-            let linkToPointX = computeCountToTimeScale(linkedToTaskStartDate, minDate, unit, step) * timelineColWidth;
+            let linkToPointX = getStartX(linkedToTaskStartDate);
             if (linkedToTaskIsMilestone) {
                 linkToPointX -= taskBarMilestoneHypotenuse / 2;
             }
@@ -71549,15 +71849,13 @@
             ];
         }
         else if (type === DependencyType.StartToFinish) {
-            let linkFromPointX = computeCountToTimeScale(linkedFromTaskStartDate, minDate, unit, step) * timelineColWidth;
+            let linkFromPointX = getStartX(linkedFromTaskStartDate);
             if (linkedFromTaskIsMilestone) {
                 linkFromPointX -= taskBarMilestoneHypotenuse / 2;
             }
-            let linkToPointX = computeCountToTimeScale(linkedToTaskEndDate, minDate, unit, step, 1) * timelineColWidth;
+            let linkToPointX = getEndX(linkedToTaskEndDate);
             if (linkedToTaskIsMilestone) {
-                linkToPointX =
-                    computeCountToTimeScale(linkedToTaskStartDate, minDate, unit, step, 1) * timelineColWidth +
-                        taskBarMilestoneHypotenuse / 2;
+                linkToPointX = getStartX(linkedToTaskStartDate) + taskBarMilestoneHypotenuse / 2;
             }
             linePoints = [
                 {
@@ -71614,11 +71912,11 @@
             ];
         }
         else if (type === DependencyType.StartToStart) {
-            let linkFromPointX = computeCountToTimeScale(linkedFromTaskStartDate, minDate, unit, step) * timelineColWidth;
+            let linkFromPointX = getStartX(linkedFromTaskStartDate);
             if (linkedFromTaskIsMilestone) {
                 linkFromPointX -= taskBarMilestoneHypotenuse / 2;
             }
-            let linkToPointX = computeCountToTimeScale(linkedToTaskStartDate, minDate, unit, step) * timelineColWidth;
+            let linkToPointX = getStartX(linkedToTaskStartDate);
             if (linkedToTaskIsMilestone) {
                 linkToPointX -= taskBarMilestoneHypotenuse / 2;
             }
@@ -71677,17 +71975,13 @@
             ];
         }
         else if (type === DependencyType.FinishToFinish) {
-            let linkFromPointX = computeCountToTimeScale(linkedFromTaskEndDate, minDate, unit, step, 1) * timelineColWidth;
+            let linkFromPointX = getEndX(linkedFromTaskEndDate);
             if (linkedFromTaskIsMilestone) {
-                linkFromPointX =
-                    computeCountToTimeScale(linkedFromTaskStartDate, minDate, unit, step, 1) * timelineColWidth +
-                        taskBarMilestoneHypotenuse / 2;
+                linkFromPointX = getStartX(linkedFromTaskStartDate) + taskBarMilestoneHypotenuse / 2;
             }
-            let linkToPointX = computeCountToTimeScale(linkedToTaskEndDate, minDate, unit, step, 1) * timelineColWidth;
+            let linkToPointX = getEndX(linkedToTaskEndDate);
             if (linkedToTaskIsMilestone) {
-                linkToPointX =
-                    computeCountToTimeScale(linkedToTaskStartDate, minDate, unit, step, 1) * timelineColWidth +
-                        taskBarMilestoneHypotenuse / 2;
+                linkToPointX = getStartX(linkedToTaskStartDate) + taskBarMilestoneHypotenuse / 2;
             }
             linePoints = [
                 {
@@ -71744,8 +72038,7 @@
         return { linePoints, arrowPoints };
     }
     function updateLinkLinePoints(type, linkedFromTaskStartDate, linkedFromTaskEndDate, linkedFromTaskRecordRowIndex, linkedFromTaskTaskDays, linkedFromTaskIsMilestone, linkedFromMovedTaskBarNode, fromNodeDiffY, linkedToTaskStartDate, linkedToTaskEndDate, linkedToTaskRecordRowIndex, linkedToTaskTaskDays, linkedToTaskIsMilestone, linkedToMovedTaskBarNode, toNodeDiffY, gantt) {
-        const { unit, step } = gantt.parsedOptions.reverseSortedTimelineScales[0];
-        const { minDate, rowHeight, timelineColWidth } = gantt.parsedOptions;
+        const { rowHeight } = gantt.parsedOptions;
         const taskBarMilestoneHypotenuse = gantt.parsedOptions.taskBarMilestoneHypotenuse;
         const milestoneTaskbarHeight = gantt.parsedOptions.taskBarMilestoneStyle.width;
         const distanceToTaskBar = gantt.parsedOptions.dependencyLinkDistanceToTaskBar ?? 20;
@@ -71753,21 +72046,22 @@
         const arrowHeight = 5;
         let linePoints = [];
         let arrowPoints = [];
+        const getStartX = (d) => gantt.getXByTime(d.getTime());
+        const getEndX = (d) => gantt.getXByTime(d.getTime() + 1);
         if (type === DependencyType.FinishToStart) {
             let linkFromPointX = linkedFromMovedTaskBarNode
                 ? linkedFromMovedTaskBarNode.attribute.x + linkedFromMovedTaskBarNode.attribute.width
-                : computeCountToTimeScale(linkedFromTaskEndDate, minDate, unit, step, 1) * timelineColWidth;
+                : getEndX(linkedFromTaskEndDate);
             if (linkedFromTaskIsMilestone) {
                 linkFromPointX = linkedFromMovedTaskBarNode
                     ? linkedFromMovedTaskBarNode.attribute.x +
                         linkedFromMovedTaskBarNode.attribute.width +
                         (taskBarMilestoneHypotenuse - milestoneTaskbarHeight) / 2
-                    : computeCountToTimeScale(linkedFromTaskStartDate, minDate, unit, step, 1) * timelineColWidth +
-                        taskBarMilestoneHypotenuse / 2;
+                    : getStartX(linkedFromTaskStartDate) + taskBarMilestoneHypotenuse / 2;
             }
             let linkToPointX = linkedToMovedTaskBarNode
                 ? linkedToMovedTaskBarNode.attribute.x
-                : computeCountToTimeScale(linkedToTaskStartDate, minDate, unit, step) * timelineColWidth;
+                : getStartX(linkedToTaskStartDate);
             if (linkedToTaskIsMilestone) {
                 linkToPointX -= (taskBarMilestoneHypotenuse - milestoneTaskbarHeight) / 2;
             }
@@ -71830,20 +72124,19 @@
         else if (type === DependencyType.StartToFinish) {
             let linkFromPointX = linkedFromMovedTaskBarNode
                 ? linkedFromMovedTaskBarNode.attribute.x
-                : computeCountToTimeScale(linkedFromTaskStartDate, minDate, unit, step) * timelineColWidth;
+                : getStartX(linkedFromTaskStartDate);
             if (linkedFromTaskIsMilestone) {
                 linkFromPointX -= (taskBarMilestoneHypotenuse - milestoneTaskbarHeight) / 2;
             }
             let linkToPointX = linkedToMovedTaskBarNode
                 ? linkedToMovedTaskBarNode.attribute.x + linkedToMovedTaskBarNode.attribute.width
-                : computeCountToTimeScale(linkedToTaskEndDate, minDate, unit, step, 1) * timelineColWidth;
+                : getEndX(linkedToTaskEndDate);
             if (linkedToTaskIsMilestone) {
                 linkToPointX = linkedToMovedTaskBarNode
                     ? linkedToMovedTaskBarNode.attribute.x +
                         linkedToMovedTaskBarNode.attribute.width +
                         (taskBarMilestoneHypotenuse - milestoneTaskbarHeight) / 2
-                    : computeCountToTimeScale(linkedToTaskStartDate, minDate, unit, step, 1) * timelineColWidth +
-                        taskBarMilestoneHypotenuse / 2;
+                    : getStartX(linkedToTaskStartDate) + taskBarMilestoneHypotenuse / 2;
             }
             linePoints = [
                 {
@@ -71904,13 +72197,13 @@
         else if (type === DependencyType.StartToStart) {
             let linkFromPointX = linkedFromMovedTaskBarNode
                 ? linkedFromMovedTaskBarNode.attribute.x
-                : computeCountToTimeScale(linkedFromTaskStartDate, minDate, unit, step) * timelineColWidth;
+                : getStartX(linkedFromTaskStartDate);
             if (linkedFromTaskIsMilestone) {
                 linkFromPointX -= (taskBarMilestoneHypotenuse - milestoneTaskbarHeight) / 2;
             }
             let linkToPointX = linkedToMovedTaskBarNode
                 ? linkedToMovedTaskBarNode.attribute.x
-                : computeCountToTimeScale(linkedToTaskStartDate, minDate, unit, step) * timelineColWidth;
+                : getStartX(linkedToTaskStartDate);
             if (linkedToTaskIsMilestone) {
                 linkToPointX -= (taskBarMilestoneHypotenuse - milestoneTaskbarHeight) / 2;
             }
@@ -71973,25 +72266,23 @@
         else if (type === DependencyType.FinishToFinish) {
             let linkFromPointX = linkedFromMovedTaskBarNode
                 ? linkedFromMovedTaskBarNode.attribute.x + linkedFromMovedTaskBarNode.attribute.width
-                : computeCountToTimeScale(linkedFromTaskEndDate, minDate, unit, step, 1) * timelineColWidth;
+                : getEndX(linkedFromTaskEndDate);
             if (linkedFromTaskIsMilestone) {
                 linkFromPointX = linkedFromMovedTaskBarNode
                     ? linkedFromMovedTaskBarNode.attribute.x +
                         linkedFromMovedTaskBarNode.attribute.width +
                         (taskBarMilestoneHypotenuse - milestoneTaskbarHeight) / 2
-                    : computeCountToTimeScale(linkedFromTaskStartDate, minDate, unit, step, 1) * timelineColWidth +
-                        taskBarMilestoneHypotenuse / 2;
+                    : getStartX(linkedFromTaskStartDate) + taskBarMilestoneHypotenuse / 2;
             }
             let linkToPointX = linkedToMovedTaskBarNode
                 ? linkedToMovedTaskBarNode.attribute.x + linkedToMovedTaskBarNode.attribute.width
-                : computeCountToTimeScale(linkedToTaskEndDate, minDate, unit, step, 1) * timelineColWidth;
+                : getEndX(linkedToTaskEndDate);
             if (linkedToTaskIsMilestone) {
                 linkToPointX = linkedToMovedTaskBarNode
                     ? linkedToMovedTaskBarNode.attribute.x +
                         linkedToMovedTaskBarNode.attribute.width +
                         (taskBarMilestoneHypotenuse - milestoneTaskbarHeight) / 2
-                    : computeCountToTimeScale(linkedToTaskStartDate, minDate, unit, step, 1) * timelineColWidth +
-                        taskBarMilestoneHypotenuse / 2;
+                    : getStartX(linkedToTaskStartDate) + taskBarMilestoneHypotenuse / 2;
             }
             linePoints = [
                 {
@@ -74311,7 +74602,7 @@
                     gantt._updateSize();
                     gantt.scenegraph.refreshAll();
                     target = this.moveTaskBar.target = gantt.scenegraph.taskBar.getTaskBarNodeByIndex(this.moveTaskBar.target.task_index, this.moveTaskBar.target.sub_task_index);
-                    gantt.scrollLeft = gantt.parsedOptions.timelineColWidth - 1;
+                    gantt.scrollLeft = Math.max(0, gantt.getDateColWidth(0) - 1);
                     gantt.eventManager.lastDragPointerXYOnWindow.x = e.x;
                     if (target.record?.type === 'milestone') {
                         moveTaskBar(target, gantt.scrollLeft - target.attribute.x, 0, this);
@@ -74321,7 +74612,9 @@
                     }
                 }
                 else {
-                    this.moveTaskBar.moveTaskBarXSpeed = -gantt.parsedOptions.timelineColWidth / 100;
+                    const colCount = gantt.parsedOptions.reverseSortedTimelineScales[0].timelineDates?.length ?? 0;
+                    const avgColWidth = gantt.getAllDateColsWidth() / Math.max(1, colCount);
+                    this.moveTaskBar.moveTaskBarXSpeed = -avgColWidth / 100;
                     this.moveTaskBar.moveTaskBarXInertia.startInertia(this.moveTaskBar.moveTaskBarXSpeed, 0, 1);
                     this.moveTaskBar.moveTaskBarXInertia.setScrollHandle((dx, dy) => {
                         this.moveTaskBar.deltaX += dx;
@@ -74359,7 +74652,9 @@
                     }
                 }
                 else {
-                    this.moveTaskBar.moveTaskBarXSpeed = gantt.parsedOptions.timelineColWidth / 100;
+                    const colCount = gantt.parsedOptions.reverseSortedTimelineScales[0].timelineDates?.length ?? 0;
+                    const avgColWidth = gantt.getAllDateColsWidth() / Math.max(1, colCount);
+                    this.moveTaskBar.moveTaskBarXSpeed = avgColWidth / 100;
                     this.moveTaskBar.moveTaskBarXInertia.startInertia(this.moveTaskBar.moveTaskBarXSpeed, 0, 1);
                     this.moveTaskBar.moveTaskBarXInertia.setScrollHandle((dx, dy) => {
                         this.moveTaskBar.deltaX += dx;
@@ -76158,6 +76453,10 @@
         parsedOptions = {};
         millisecondsPerPixel;
         zoomScaleManager;
+        _timelineColWidths = [];
+        _timelineColX = [];
+        _timelineColStartTimes = [];
+        _timelineColEndTimes = [];
         recalculateTimeScale() {
             if (this.zoomScaleManager) {
                 this.zoomScaleManager.recalculateTimeScale();
@@ -76572,6 +76871,151 @@
                     scale.timelineDates = generateTimeLineDate(new Date(this.parsedOptions.minDate), this.parsedOptions.maxDate, scale);
                 }
             }
+            this._rebuildTimelineColXMap();
+        }
+        _rebuildTimelineColXMap() {
+            const minScale = this.parsedOptions.reverseSortedTimelineScales?.[0];
+            const timelineDates = minScale?.timelineDates ?? [];
+            const baseWidth = this.parsedOptions.timelineColWidth ?? 0;
+            const hideWeekend = this.options?.timelineHeader?.hideWeekend === true;
+            const weekendColWidth = this.options?.timelineHeader?.weekendColWidth;
+            const enableWeekendWidth = minScale?.unit === 'day' && minScale?.step === 1 && (hideWeekend || weekendColWidth !== undefined);
+            this._timelineColWidths = new Array(timelineDates.length);
+            this._timelineColX = new Array(timelineDates.length + 1);
+            this._timelineColStartTimes = new Array(timelineDates.length);
+            this._timelineColEndTimes = new Array(timelineDates.length);
+            this._timelineColX[0] = 0;
+            let sumX = 0;
+            for (let i = 0; i < timelineDates.length; i++) {
+                const d = timelineDates[i];
+                const startTime = d.startDate?.getTime?.() ?? 0;
+                const endTime = d.endDate?.getTime?.() ?? startTime;
+                this._timelineColStartTimes[i] = startTime;
+                this._timelineColEndTimes[i] = endTime;
+                let w = baseWidth;
+                if (enableWeekendWidth) {
+                    const day = d.startDate.getDay();
+                    const isWeekend = day === 0 || day === 6;
+                    if (isWeekend) {
+                        if (hideWeekend) {
+                            w = 0;
+                        }
+                        else if (typeof weekendColWidth === 'number') {
+                            w = weekendColWidth;
+                        }
+                        else if (typeof weekendColWidth === 'function') {
+                            w = weekendColWidth(baseWidth);
+                        }
+                    }
+                }
+                w = Math.max(0, Number.isFinite(w) ? w : baseWidth);
+                this._timelineColWidths[i] = w;
+                sumX += w;
+                this._timelineColX[i + 1] = sumX;
+            }
+        }
+        getXByTime(time) {
+            const startTimes = this._timelineColStartTimes;
+            const endTimes = this._timelineColEndTimes;
+            const widths = this._timelineColWidths;
+            const xPrefix = this._timelineColX;
+            if (!startTimes?.length || !endTimes?.length || !widths?.length || !xPrefix?.length) {
+                return 0;
+            }
+            if (time <= startTimes[0]) {
+                return 0;
+            }
+            const lastIndex = endTimes.length - 1;
+            if (time > endTimes[lastIndex]) {
+                return xPrefix[lastIndex + 1] ?? 0;
+            }
+            let low = 0;
+            let high = lastIndex;
+            while (low <= high) {
+                const mid = (low + high) >> 1;
+                const st = startTimes[mid];
+                const et = endTimes[mid];
+                if (time < st) {
+                    high = mid - 1;
+                }
+                else if (time > et) {
+                    low = mid + 1;
+                }
+                else {
+                    const duration = Math.max(1, et - st + 1);
+                    const offset = (time - st) / duration;
+                    return (xPrefix[mid] ?? 0) + (widths[mid] ?? 0) * offset;
+                }
+            }
+            const idx = Math.max(0, Math.min(lastIndex, high));
+            const st = startTimes[idx];
+            const et = endTimes[idx];
+            const duration = Math.max(1, et - st + 1);
+            const offset = Math.max(0, Math.min(1, (time - st) / duration));
+            return (xPrefix[idx] ?? 0) + (widths[idx] ?? 0) * offset;
+        }
+        getDateIndexByTime(time) {
+            const startTimes = this._timelineColStartTimes;
+            const endTimes = this._timelineColEndTimes;
+            if (!startTimes?.length || !endTimes?.length) {
+                return 0;
+            }
+            if (time <= startTimes[0]) {
+                return 0;
+            }
+            const lastIndex = endTimes.length - 1;
+            if (time > endTimes[lastIndex]) {
+                return lastIndex;
+            }
+            let low = 0;
+            let high = lastIndex;
+            while (low <= high) {
+                const mid = (low + high) >> 1;
+                const st = startTimes[mid];
+                const et = endTimes[mid];
+                if (time < st) {
+                    high = mid - 1;
+                }
+                else if (time > et) {
+                    low = mid + 1;
+                }
+                else {
+                    return mid;
+                }
+            }
+            return Math.max(0, Math.min(lastIndex, high));
+        }
+        getDateIndexByX(x) {
+            const totalX = x + this.stateManager.scroll.horizontalBarPos;
+            const xPrefix = this._timelineColX;
+            if (!xPrefix?.length) {
+                return 0;
+            }
+            if (totalX <= 0) {
+                return 0;
+            }
+            const lastIndex = xPrefix.length - 2;
+            const totalWidth = xPrefix[lastIndex + 1] ?? 0;
+            if (totalX >= totalWidth) {
+                return Math.max(0, lastIndex);
+            }
+            let low = 0;
+            let high = lastIndex;
+            while (low <= high) {
+                const mid = (low + high) >> 1;
+                const left = xPrefix[mid] ?? 0;
+                const right = xPrefix[mid + 1] ?? left;
+                if (totalX < left) {
+                    high = mid - 1;
+                }
+                else if (totalX >= right) {
+                    low = mid + 1;
+                }
+                else {
+                    return mid;
+                }
+            }
+            return Math.max(0, Math.min(lastIndex, low));
         }
         getRowHeightByIndex(index) {
             if (this.taskListTableInstance) {
@@ -76600,6 +77044,10 @@
             }, 0);
         }
         getAllDateColsWidth() {
+            const xPrefix = this._timelineColX;
+            if (xPrefix?.length) {
+                return xPrefix[xPrefix.length - 1] ?? 0;
+            }
             return (this.parsedOptions.timelineColWidth *
                 (this.parsedOptions.reverseSortedTimelineScales[0].timelineDates?.length ?? 0));
         }
@@ -77001,10 +77449,7 @@
         }
         _scrollToMarkLine() {
             if (this.parsedOptions.scrollToMarkLineDate && this.parsedOptions.minDate) {
-                const minDate = this.parsedOptions.minDate;
-                const { unit, step } = this.parsedOptions.reverseSortedTimelineScales[0];
-                const count = computeCountToTimeScale(this.parsedOptions.scrollToMarkLineDate, minDate, unit, step);
-                const targetDayDistance = count * this.parsedOptions.timelineColWidth;
+                const targetDayDistance = this.getXByTime(this.parsedOptions.scrollToMarkLineDate.getTime());
                 const left = targetDayDistance - this.tableNoFrameWidth / 2;
                 this.stateManager.setScrollLeft(left);
             }
@@ -77013,10 +77458,7 @@
             if (!date || !this.parsedOptions.minDate) {
                 return;
             }
-            const minDate = this.parsedOptions.minDate;
-            const { unit, step } = this.parsedOptions.reverseSortedTimelineScales[0];
-            const count = computeCountToTimeScale(date, minDate, unit, step);
-            const targetDayDistance = count * this.parsedOptions.timelineColWidth;
+            const targetDayDistance = this.getXByTime(date.getTime());
             const left = targetDayDistance - this.tableNoFrameWidth / 2;
             this.stateManager.setScrollLeft(left);
         }
@@ -77068,9 +77510,22 @@
             };
         }
         getDateColWidth(dateIndex) {
+            const widths = this._timelineColWidths;
+            if (widths?.length && dateIndex >= 0 && dateIndex < widths.length) {
+                return widths[dateIndex] ?? 0;
+            }
             return this.parsedOptions.timelineColWidth;
         }
         getDateColsWidth(startDateIndex, endDateIndex) {
+            const xPrefix = this._timelineColX;
+            if (xPrefix?.length) {
+                const start = Math.max(0, Math.min(startDateIndex, xPrefix.length - 1));
+                const end = Math.max(0, Math.min(endDateIndex + 1, xPrefix.length - 1));
+                if (end <= start) {
+                    return 0;
+                }
+                return (xPrefix[end] ?? 0) - (xPrefix[start] ?? 0);
+            }
             return (endDateIndex - startDateIndex + 1) * this.parsedOptions.timelineColWidth;
         }
         getDateRangeByIndex(index) {
@@ -77192,7 +77647,7 @@
         PluginManager: PluginManager
     });
 
-    const version = "1.23.3";
+    const version = "1.24.0";
 
     exports.Gantt = Gantt;
     exports.TYPES = index$4;