@visactor/vtable-gantt 1.26.4 → 1.26.6

package/cjs/Gantt.d.ts

@@ -153,7 +153,7 @@ export declare class Gantt extends EventTarget {
     getRecordIndexByTaskShowIndex(showIndex: number): number | number[];
     getTaskShowIndexByRecordIndex(index: number | number[]): number;
     getRecordByIndex(taskShowIndex: number, sub_task_index?: number | number[]): any;
-    _refreshTaskBar(taskShowIndex: number, sub_task_index?: number): void;
+    _refreshTaskBar(taskShowIndex: number, sub_task_index?: number | number[]): void;
     _updateRecordToListTable(record: any, index: number | number[]): void;
     private _refreshSortedTaskBarsAfterRecordUpdate;
     getTaskInfoByTaskListIndex(taskShowIndex: number, sub_task_index?: number | number[]): {
@@ -169,12 +169,12 @@ export declare class Gantt extends EventTarget {
         baselineDays: number;
     };
     _updateStartDateToTaskRecord(startDate: Date, index: number, sub_task_index?: number | number[]): void;
-    _updateEndDateToTaskRecord(endDate: Date, index: number, sub_task_index?: number): void;
-    _updateStartEndDateToTaskRecord(startDate: Date, endDate: Date, index: number, sub_task_index?: number): void;
-    _updateProgressToTaskRecord(progress: number, index: number, sub_task_index?: number): void;
+    _updateEndDateToTaskRecord(endDate: Date, index: number, sub_task_index?: number | number[]): void;
+    _updateStartEndDateToTaskRecord(startDate: Date, endDate: Date, index: number, sub_task_index?: number | number[]): void;
+    _updateProgressToTaskRecord(progress: number, index: number, sub_task_index?: number | number[]): void;
     _dragOrderTaskRecord(source_index: number, source_sub_task_index: number, target_index: number, target_sub_task_index: number): void;
     updateTaskRecord(record: any, task_index: number | number[]): void;
-    updateTaskRecord(record: any, task_index: number, sub_task_index: number): void;
+    updateTaskRecord(record: any, task_index: number, sub_task_index: number | number[]): void;
     setPixelRatio(pixelRatio: number): void;
     updateTasksShowMode(tasksShowMode: TasksShowMode): void;
     _resize(): void;
@@ -198,7 +198,7 @@ export declare class Gantt extends EventTarget {
     set scrollTop(value: number);
     get scrollLeft(): number;
     set scrollLeft(value: number);
-    getTaskBarRelativeRect(index: number): {
+    getTaskBarRelativeRect(index: number, sub_task_index?: number | number[]): {
         left: number;
         top: number;
         width: number;

package/cjs/Gantt.js

@@ -19,6 +19,11 @@ function createRootElement(padding, className = "vtable-gantt") {
 
 exports.createRootElement = createRootElement;
 
+const DEFAULT_TIMELINE_SCALE = {
+    unit: "day",
+    step: 1
+};
+
 class Gantt extends EventTarget_1.EventTarget {
     recalculateTimeScale() {
         this.zoomScaleManager && this.zoomScaleManager.recalculateTimeScale();
@@ -221,20 +226,22 @@ class Gantt extends EventTarget_1.EventTarget {
         return this.element.parentElement;
     }
     _sortScales() {
-        const {timelineHeader: timelineHeader} = this.options;
-        if (timelineHeader) {
-            const timelineScales = timelineHeader.scales, sortOrder = [ "year", "quarter", "month", "week", "day", "hour", "minute", "second" ];
-            1 === timelineScales.length && ("hour" !== timelineScales[0].unit && "minute" !== timelineScales[0].unit && "second" !== timelineScales[0].unit || (this.parsedOptions.timeScaleIncludeHour = !0));
-            const orderedScales = timelineScales.slice().sort(((a, b) => {
-                "hour" !== a.unit && "minute" !== a.unit && "second" !== a.unit || (this.parsedOptions.timeScaleIncludeHour = !0);
-                const indexA = sortOrder.indexOf(a.unit), indexB = sortOrder.indexOf(b.unit);
-                return -1 === indexA ? 1 : -1 === indexB ? -1 : indexA - indexB;
-            })), reverseOrderedScales = timelineScales.slice().sort(((a, b) => {
-                const indexA = sortOrder.indexOf(a.unit), indexB = sortOrder.indexOf(b.unit);
-                return -1 === indexA ? 1 : -1 === indexB ? -1 : indexB - indexA;
-            }));
-            this.parsedOptions.sortedTimelineScales = orderedScales, this.parsedOptions.reverseSortedTimelineScales = reverseOrderedScales;
-        }
+        var _a, _b;
+        const {timelineHeader: timelineHeader} = this.options, zoomLevelScales = null === (_a = this.zoomScaleManager) || void 0 === _a ? void 0 : _a.config.levels[this.zoomScaleManager.getCurrentLevel()], defaultTimelineScale = Object.assign({}, DEFAULT_TIMELINE_SCALE);
+        let timelineScales;
+        timelineScales = (null === (_b = null == timelineHeader ? void 0 : timelineHeader.scales) || void 0 === _b ? void 0 : _b.length) > 0 ? timelineHeader.scales : (null == zoomLevelScales ? void 0 : zoomLevelScales.length) > 0 ? zoomLevelScales : [ defaultTimelineScale ], 
+        !timelineHeader || timelineHeader.scales && 0 !== timelineHeader.scales.length || (timelineHeader.scales = timelineScales.map((scale => Object.assign({}, scale))));
+        const sortOrder = [ "year", "quarter", "month", "week", "day", "hour", "minute", "second" ];
+        this.parsedOptions.timeScaleIncludeHour = !1, 1 === timelineScales.length && ("hour" !== timelineScales[0].unit && "minute" !== timelineScales[0].unit && "second" !== timelineScales[0].unit || (this.parsedOptions.timeScaleIncludeHour = !0));
+        const orderedScales = timelineScales.slice().sort(((a, b) => {
+            "hour" !== a.unit && "minute" !== a.unit && "second" !== a.unit || (this.parsedOptions.timeScaleIncludeHour = !0);
+            const indexA = sortOrder.indexOf(a.unit), indexB = sortOrder.indexOf(b.unit);
+            return -1 === indexA ? 1 : -1 === indexB ? -1 : indexA - indexB;
+        })), reverseOrderedScales = timelineScales.slice().sort(((a, b) => {
+            const indexA = sortOrder.indexOf(a.unit), indexB = sortOrder.indexOf(b.unit);
+            return -1 === indexA ? 1 : -1 === indexB ? -1 : indexB - indexA;
+        }));
+        this.parsedOptions.sortedTimelineScales = orderedScales, this.parsedOptions.reverseSortedTimelineScales = reverseOrderedScales;
     }
     _generateTimeLineDateMap() {
         if (this.parsedOptions.minDate && this.parsedOptions.maxDate) for (const scale of this.parsedOptions.reverseSortedTimelineScales) scale.timelineDates = (0, 
@@ -362,7 +369,7 @@ class Gantt extends EventTarget_1.EventTarget {
         return this.records[taskShowIndex];
     }
     _refreshTaskBar(taskShowIndex, sub_task_index) {
-        this.scenegraph.taskBar.updateTaskBarNode(taskShowIndex, sub_task_index), this.scenegraph.refreshRecordLinkNodes(taskShowIndex, void 0, this.scenegraph.taskBar.getTaskBarNodeByIndex(taskShowIndex, sub_task_index)), 
+        this.scenegraph.taskBar.updateTaskBarNode(taskShowIndex, sub_task_index), this.scenegraph.refreshRecordLinkNodes(taskShowIndex, sub_task_index, this.scenegraph.taskBar.getTaskBarNodeByIndex(taskShowIndex, sub_task_index)), 
         this.scenegraph.updateNextFrame();
     }
     _updateRecordToListTable(record, index) {
@@ -443,7 +450,8 @@ class Gantt extends EventTarget_1.EventTarget {
         var _a;
         const taskRecord = this.getRecordByIndex(index, sub_task_index), startDateField = this.parsedOptions.startDateField, dateFormat = null !== (_a = this.parsedOptions.dateFormat) && void 0 !== _a ? _a : (0, 
         util_1.parseDateFormat)(taskRecord[startDateField]), newStartDate = (0, util_1.formatDate)(startDate, dateFormat);
-        if (taskRecord[startDateField] = newStartDate, (0, vutils_1.isValid)(sub_task_index)) Array.isArray(sub_task_index) && this.stateManager.updateProjectTaskTimes(sub_task_index); else {
+        if (taskRecord[startDateField] = newStartDate, (0, vutils_1.isValid)(sub_task_index)) Array.isArray(sub_task_index) && (this._updateRecordToListTable(taskRecord, sub_task_index), 
+        this.stateManager.updateProjectTaskTimes(sub_task_index)); else {
             const recordIndex = this.getRecordIndexByTaskShowIndex(index);
             this._updateRecordToListTable(taskRecord, Array.isArray(recordIndex) ? recordIndex : index), 
             Array.isArray(recordIndex) && this.stateManager.updateProjectTaskTimes(recordIndex), 
@@ -454,7 +462,8 @@ class Gantt extends EventTarget_1.EventTarget {
         var _a;
         const taskRecord = this.getRecordByIndex(index, sub_task_index), endDateField = this.parsedOptions.endDateField, dateFormat = null !== (_a = this.parsedOptions.dateFormat) && void 0 !== _a ? _a : (0, 
         util_1.parseDateFormat)(taskRecord[endDateField]), newEndDate = (0, util_1.formatDate)(endDate, dateFormat);
-        if (taskRecord[endDateField] = newEndDate, (0, vutils_1.isValid)(sub_task_index)) Array.isArray(sub_task_index) && this.stateManager.updateProjectTaskTimes(sub_task_index); else {
+        if (taskRecord[endDateField] = newEndDate, (0, vutils_1.isValid)(sub_task_index)) Array.isArray(sub_task_index) && (this._updateRecordToListTable(taskRecord, sub_task_index), 
+        this.stateManager.updateProjectTaskTimes(sub_task_index)); else {
             const recordIndex = this.getRecordIndexByTaskShowIndex(index);
             this._updateRecordToListTable(taskRecord, Array.isArray(recordIndex) ? recordIndex : index), 
             Array.isArray(recordIndex) && this.stateManager.updateProjectTaskTimes(recordIndex), 
@@ -467,7 +476,8 @@ class Gantt extends EventTarget_1.EventTarget {
         util_1.parseDateFormat)(taskRecord[startDateField]), newStartDate = (0, util_1.formatDate)(startDate, dateFormat);
         taskRecord[startDateField] = newStartDate;
         const newEndDate = (0, util_1.formatDate)(endDate, dateFormat);
-        if (taskRecord[endDateField] = newEndDate, (0, vutils_1.isValid)(sub_task_index)) Array.isArray(sub_task_index) && this.stateManager.updateProjectTaskTimes(sub_task_index); else {
+        if (taskRecord[endDateField] = newEndDate, (0, vutils_1.isValid)(sub_task_index)) Array.isArray(sub_task_index) && (this._updateRecordToListTable(taskRecord, sub_task_index), 
+        this.stateManager.updateProjectTaskTimes(sub_task_index)); else {
             const recordIndex = this.getRecordIndexByTaskShowIndex(index);
             this._updateRecordToListTable(taskRecord, Array.isArray(recordIndex) ? recordIndex : index), 
             Array.isArray(recordIndex) && this.stateManager.updateProjectTaskTimes(recordIndex), 
@@ -477,7 +487,8 @@ class Gantt extends EventTarget_1.EventTarget {
     _updateProgressToTaskRecord(progress, index, sub_task_index) {
         const taskRecord = this.getRecordByIndex(index, sub_task_index), progressField = this.parsedOptions.progressField;
         if (progressField) {
-            taskRecord[progressField] = progress;
+            if (taskRecord[progressField] = progress, Array.isArray(sub_task_index)) return this._updateRecordToListTable(taskRecord, sub_task_index), 
+            void this._refreshTaskBar(index, sub_task_index);
             const recordIndex = this.getRecordIndexByTaskShowIndex(index);
             this._updateRecordToListTable(taskRecord, Array.isArray(recordIndex) ? recordIndex : index), 
             this._refreshSortedTaskBarsAfterRecordUpdate(recordIndex, index) || this._refreshTaskBar(index, sub_task_index);
@@ -489,7 +500,8 @@ class Gantt extends EventTarget_1.EventTarget {
     updateTaskRecord(record, task_index, sub_task_index) {
         if ((0, vutils_1.isValid)(sub_task_index)) {
             const index = "number" == typeof task_index ? task_index : task_index[0];
-            return this._updateRecordToListTable(record, [ index, sub_task_index ]), void this._refreshTaskBar(index, sub_task_index);
+            return this._updateRecordToListTable(record, Array.isArray(sub_task_index) ? sub_task_index : [ index, sub_task_index ]), 
+            void this._refreshTaskBar(index, sub_task_index);
         }
         if (Array.isArray(task_index)) {
             const index = task_index[0], sub_index = task_index[1];
@@ -632,8 +644,9 @@ class Gantt extends EventTarget_1.EventTarget {
     set scrollLeft(value) {
         this.stateManager.setScrollLeft(value);
     }
-    getTaskBarRelativeRect(index) {
-        const taskBarNode = this.scenegraph.taskBar.getTaskBarNodeByIndex(index);
+    getTaskBarRelativeRect(index, sub_task_index) {
+        const taskBarNode = this.scenegraph.taskBar.getTaskBarNodeByIndex(index, sub_task_index);
+        if (!taskBarNode) return null;
         return {
             left: taskBarNode.attribute.x + this.taskListTableInstance.tableNoFrameWidth + this.taskListTableInstance.tableX + this.tableX - this.scrollLeft,
             top: taskBarNode.attribute.y + this.tableY + this.headerHeight - this.scrollTop,