@visactor/vtable-gantt 1.23.3 → 1.24.0

package/es/Gantt.d.ts

@@ -119,6 +119,10 @@ export declare class Gantt extends EventTarget {
     };
     private millisecondsPerPixel;
     zoomScaleManager?: ZoomScaleManager;
+    private _timelineColWidths;
+    private _timelineColX;
+    private _timelineColStartTimes;
+    private _timelineColEndTimes;
     recalculateTimeScale(): void;
     zoomByFactor(factor: number, keepCenter?: boolean, centerX?: number): void;
     taskTableWidth: number;
@@ -135,6 +139,10 @@ export declare class Gantt extends EventTarget {
     getContainer(): HTMLElement;
     _sortScales(): void;
     _generateTimeLineDateMap(): void;
+    private _rebuildTimelineColXMap;
+    getXByTime(time: number): number;
+    getDateIndexByTime(time: number): number;
+    getDateIndexByX(x: number): number;
     getRowHeightByIndex(index: number): number;
     getRowsHeightByIndex(startIndex: number, endIndex: number): number;
     getAllRowsHeight(): number;

package/es/Gantt.js

@@ -14,7 +14,7 @@ import { computeRowsCountByRecordDate, computeRowsCountByRecordDateForCompact, c
 
 import { EventTarget } from "./event/EventTarget";
 
-import { computeCountToTimeScale, createDateAtLastHour, createDateAtLastMillisecond, createDateAtMidnight, formatDate, isPropertyWritable, parseDateFormat } from "./tools/util";
+import { createDateAtLastHour, createDateAtLastMillisecond, createDateAtMidnight, formatDate, isPropertyWritable, parseDateFormat } from "./tools/util";
 
 import { DataSource } from "./data/DataSource";
 
@@ -46,8 +46,9 @@ export class Gantt extends EventTarget {
     }
     constructor(container, options) {
         var _a, _b, _c, _d, _e, _f;
-        super(), this.parsedOptions = {}, this.container = container, this.options = options, 
-        this.taskTableWidth = "number" == typeof (null === (_a = null == options ? void 0 : options.taskListTable) || void 0 === _a ? void 0 : _a.tableWidth) ? null === (_b = null == options ? void 0 : options.taskListTable) || void 0 === _b ? void 0 : _b.tableWidth : -1, 
+        super(), this.parsedOptions = {}, this._timelineColWidths = [], this._timelineColX = [], 
+        this._timelineColStartTimes = [], this._timelineColEndTimes = [], this.container = container, 
+        this.options = options, this.taskTableWidth = "number" == typeof (null === (_a = null == options ? void 0 : options.taskListTable) || void 0 === _a ? void 0 : _a.tableWidth) ? null === (_b = null == options ? void 0 : options.taskListTable) || void 0 === _b ? void 0 : _b.tableWidth : -1, 
         this.taskTableColumns = null !== (_d = null === (_c = null == options ? void 0 : options.taskListTable) || void 0 === _c ? void 0 : _c.columns) && void 0 !== _d ? _d : [], 
         this.records = null !== (_e = null == options ? void 0 : options.records) && void 0 !== _e ? _e : [], 
         (null === (_f = options.timelineHeader) || void 0 === _f ? void 0 : _f.zoomScale) && !1 !== options.timelineHeader.zoomScale.enabled && (this.zoomScaleManager = new ZoomScaleManager(this, options.timelineHeader.zoomScale)), 
@@ -252,6 +253,80 @@ export class Gantt extends EventTarget {
     }
     _generateTimeLineDateMap() {
         if (this.parsedOptions.minDate && this.parsedOptions.maxDate) for (const scale of this.parsedOptions.reverseSortedTimelineScales) scale.timelineDates = generateTimeLineDate(new Date(this.parsedOptions.minDate), this.parsedOptions.maxDate, scale);
+        this._rebuildTimelineColXMap();
+    }
+    _rebuildTimelineColXMap() {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        const minScale = null === (_a = this.parsedOptions.reverseSortedTimelineScales) || void 0 === _a ? void 0 : _a[0], timelineDates = null !== (_b = null == minScale ? void 0 : minScale.timelineDates) && void 0 !== _b ? _b : [], baseWidth = null !== (_c = this.parsedOptions.timelineColWidth) && void 0 !== _c ? _c : 0, hideWeekend = !0 === (null === (_e = null === (_d = this.options) || void 0 === _d ? void 0 : _d.timelineHeader) || void 0 === _e ? void 0 : _e.hideWeekend), weekendColWidth = null === (_g = null === (_f = this.options) || void 0 === _f ? void 0 : _f.timelineHeader) || void 0 === _g ? void 0 : _g.weekendColWidth, enableWeekendWidth = "day" === (null == minScale ? void 0 : minScale.unit) && 1 === (null == minScale ? void 0 : minScale.step) && (hideWeekend || void 0 !== weekendColWidth);
+        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], startTime = null !== (_k = null === (_j = null === (_h = d.startDate) || void 0 === _h ? void 0 : _h.getTime) || void 0 === _j ? void 0 : _j.call(_h)) && void 0 !== _k ? _k : 0, endTime = null !== (_o = null === (_m = null === (_l = d.endDate) || void 0 === _l ? void 0 : _l.getTime) || void 0 === _m ? void 0 : _m.call(_l)) && void 0 !== _o ? _o : startTime;
+            this._timelineColStartTimes[i] = startTime, this._timelineColEndTimes[i] = endTime;
+            let w = baseWidth;
+            if (enableWeekendWidth) {
+                const day = d.startDate.getDay();
+                (0 === day || 6 === day) && (hideWeekend ? w = 0 : "number" == typeof weekendColWidth ? w = weekendColWidth : "function" == typeof weekendColWidth && (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) {
+        var _a, _b, _c, _d, _e;
+        const startTimes = this._timelineColStartTimes, endTimes = this._timelineColEndTimes, widths = this._timelineColWidths, xPrefix = this._timelineColX;
+        if (!((null == startTimes ? void 0 : startTimes.length) && (null == endTimes ? void 0 : endTimes.length) && (null == widths ? void 0 : widths.length) && (null == xPrefix ? void 0 : xPrefix.length))) return 0;
+        if (time <= startTimes[0]) return 0;
+        const lastIndex = endTimes.length - 1;
+        if (time > endTimes[lastIndex]) return null !== (_a = xPrefix[lastIndex + 1]) && void 0 !== _a ? _a : 0;
+        let low = 0, high = lastIndex;
+        for (;low <= high; ) {
+            const mid = low + high >> 1, st = startTimes[mid], et = endTimes[mid];
+            if (time < st) high = mid - 1; else {
+                if (!(time > et)) {
+                    const offset = (time - st) / Math.max(1, et - st + 1);
+                    return (null !== (_b = xPrefix[mid]) && void 0 !== _b ? _b : 0) + (null !== (_c = widths[mid]) && void 0 !== _c ? _c : 0) * offset;
+                }
+                low = mid + 1;
+            }
+        }
+        const idx = Math.max(0, Math.min(lastIndex, high)), st = startTimes[idx], et = endTimes[idx], duration = Math.max(1, et - st + 1), offset = Math.max(0, Math.min(1, (time - st) / duration));
+        return (null !== (_d = xPrefix[idx]) && void 0 !== _d ? _d : 0) + (null !== (_e = widths[idx]) && void 0 !== _e ? _e : 0) * offset;
+    }
+    getDateIndexByTime(time) {
+        const startTimes = this._timelineColStartTimes, endTimes = this._timelineColEndTimes;
+        if (!(null == startTimes ? void 0 : startTimes.length) || !(null == endTimes ? void 0 : endTimes.length)) return 0;
+        if (time <= startTimes[0]) return 0;
+        const lastIndex = endTimes.length - 1;
+        if (time > endTimes[lastIndex]) return lastIndex;
+        let low = 0, high = lastIndex;
+        for (;low <= high; ) {
+            const mid = low + high >> 1, st = startTimes[mid], et = endTimes[mid];
+            if (time < st) high = mid - 1; else {
+                if (!(time > et)) return mid;
+                low = mid + 1;
+            }
+        }
+        return Math.max(0, Math.min(lastIndex, high));
+    }
+    getDateIndexByX(x) {
+        var _a, _b, _c;
+        const totalX = x + this.stateManager.scroll.horizontalBarPos, xPrefix = this._timelineColX;
+        if (!(null == xPrefix ? void 0 : xPrefix.length)) return 0;
+        if (totalX <= 0) return 0;
+        const lastIndex = xPrefix.length - 2;
+        if (totalX >= (null !== (_a = xPrefix[lastIndex + 1]) && void 0 !== _a ? _a : 0)) return Math.max(0, lastIndex);
+        let low = 0, high = lastIndex;
+        for (;low <= high; ) {
+            const mid = low + high >> 1, left = null !== (_b = xPrefix[mid]) && void 0 !== _b ? _b : 0, right = null !== (_c = xPrefix[mid + 1]) && void 0 !== _c ? _c : left;
+            if (totalX < left) high = mid - 1; else {
+                if (!(totalX >= right)) return mid;
+                low = mid + 1;
+            }
+        }
+        return Math.max(0, Math.min(lastIndex, low));
     }
     getRowHeightByIndex(index) {
         return this.taskListTableInstance ? this.taskListTableInstance.getRowHeight(index + this.taskListTableInstance.columnHeaderLevelCount) : this.parsedOptions.rowHeight;
@@ -266,8 +341,9 @@ export class Gantt extends EventTarget {
         return this.parsedOptions.timeLineHeaderRowHeights.reduce(((acc, curr, index) => !1 === this.parsedOptions.sortedTimelineScales[index].visible ? acc : acc + curr), 0);
     }
     getAllDateColsWidth() {
-        var _a, _b;
-        return this.parsedOptions.timelineColWidth * (null !== (_b = null === (_a = this.parsedOptions.reverseSortedTimelineScales[0].timelineDates) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0);
+        var _a, _b, _c;
+        const xPrefix = this._timelineColX;
+        return (null == xPrefix ? void 0 : xPrefix.length) ? null !== (_a = xPrefix[xPrefix.length - 1]) && void 0 !== _a ? _a : 0 : this.parsedOptions.timelineColWidth * (null !== (_c = null === (_b = this.parsedOptions.reverseSortedTimelineScales[0].timelineDates) || void 0 === _b ? void 0 : _b.length) && void 0 !== _c ? _c : 0);
     }
     getAllTaskBarsHeight() {
         return this.taskListTableInstance ? this.taskListTableInstance.getRowsHeight(this.taskListTableInstance.columnHeaderLevelCount, this.taskListTableInstance.rowCount - 1) : this.itemCount * this.parsedOptions.rowHeight;
@@ -509,13 +585,13 @@ export class Gantt extends EventTarget {
     }
     _scrollToMarkLine() {
         if (this.parsedOptions.scrollToMarkLineDate && this.parsedOptions.minDate) {
-            const minDate = this.parsedOptions.minDate, {unit: unit, step: step} = this.parsedOptions.reverseSortedTimelineScales[0], left = computeCountToTimeScale(this.parsedOptions.scrollToMarkLineDate, minDate, unit, step) * this.parsedOptions.timelineColWidth - this.tableNoFrameWidth / 2;
+            const left = this.getXByTime(this.parsedOptions.scrollToMarkLineDate.getTime()) - this.tableNoFrameWidth / 2;
             this.stateManager.setScrollLeft(left);
         }
     }
     scrollToMarkLine(date) {
         if (!date || !this.parsedOptions.minDate) return;
-        const minDate = this.parsedOptions.minDate, {unit: unit, step: step} = this.parsedOptions.reverseSortedTimelineScales[0], left = computeCountToTimeScale(date, minDate, unit, step) * this.parsedOptions.timelineColWidth - this.tableNoFrameWidth / 2;
+        const left = this.getXByTime(date.getTime()) - this.tableNoFrameWidth / 2;
         this.stateManager.setScrollLeft(left);
     }
     addLink(link) {
@@ -554,9 +630,17 @@ export class Gantt extends EventTarget {
         };
     }
     getDateColWidth(dateIndex) {
-        return this.parsedOptions.timelineColWidth;
+        var _a;
+        const widths = this._timelineColWidths;
+        return (null == widths ? void 0 : widths.length) && dateIndex >= 0 && dateIndex < widths.length ? null !== (_a = widths[dateIndex]) && void 0 !== _a ? _a : 0 : this.parsedOptions.timelineColWidth;
     }
     getDateColsWidth(startDateIndex, endDateIndex) {
+        var _a, _b;
+        const xPrefix = this._timelineColX;
+        if (null == xPrefix ? void 0 : xPrefix.length) {
+            const start = Math.max(0, Math.min(startDateIndex, xPrefix.length - 1)), end = Math.max(0, Math.min(endDateIndex + 1, xPrefix.length - 1));
+            return end <= start ? 0 : (null !== (_a = xPrefix[end]) && void 0 !== _a ? _a : 0) - (null !== (_b = xPrefix[start]) && void 0 !== _b ? _b : 0);
+        }
         return (endDateIndex - startDateIndex + 1) * this.parsedOptions.timelineColWidth;
     }
     getDateRangeByIndex(index) {