@syncfusion/ej2-gantt 21.2.6 → 21.2.9

package/src/gantt/renderer/chart-rows.js

@@ -11,7 +11,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { createElement, isNullOrUndefined, extend, compile, getValue, setValue, SanitizeHtmlHelper } from '@syncfusion/ej2-base';
+import { createElement, isNullOrUndefined, extend, compile, getValue, setValue, SanitizeHtmlHelper, append } from '@syncfusion/ej2-base';
 import { formatUnit, addClass } from '@syncfusion/ej2-base';
 import { isScheduledTask } from '../base/utils';
 import { DataManager, Query } from '@syncfusion/ej2-data';
@@ -173,7 +173,7 @@ var ChartRows = /** @class */ (function (_super) {
             if (this.taskLabelTemplateFunction && !isNullOrUndefined(progressDiv) && progressDiv.length > 0) {
                 var taskLabelTemplateNode = this.taskLabelTemplateFunction(extend({ index: i }, data), this.parent, 'TaskLabelTemplate', this.getTemplateID('TaskLabelTemplate'), false, undefined, progressDiv[0]);
                 if (taskLabelTemplateNode && taskLabelTemplateNode.length > 0) {
-                    tempDiv.appendChild(taskLabelTemplateNode[0]);
+                    append(taskLabelTemplateNode, tempDiv);
                     labelString = tempDiv.innerHTML;
                 }
             }
@@ -243,7 +243,7 @@ var ChartRows = /** @class */ (function (_super) {
                         !this.isTemplate(childLabel) &&
                         progressDiv[0].querySelectorAll('.e-task-label')[0].children[0])
                         progressDiv[0].querySelectorAll('.e-task-label')[0].children[0].remove();
-                    if (progressDiv[0].querySelectorAll('.e-task-label')[0].textContent == '' &&
+                    if (progressDiv[0].querySelectorAll('.e-task-label')[0].textContent === '' &&
                         childLabel && !childLabel['elementRef'] && tempDiv.innerHTML !== '')
                         progressDiv[0].querySelectorAll('.e-task-label')[0].textContent = childLabel;
                 }
@@ -728,7 +728,7 @@ var ChartRows = /** @class */ (function (_super) {
             if (leftLabelTemplateNode[0]['data'] === 'null') {
                 leftLabelTemplateNode[0]['data'] = '';
             }
-            leftLabelNode[0].appendChild([].slice.call(leftLabelTemplateNode)[0]);
+            append(leftLabelTemplateNode, leftLabelNode[0]);
         }
         if (this.parent.enableRtl) {
             leftLabelNode[0].style.paddingLeft = '25px';
@@ -783,7 +783,7 @@ var ChartRows = /** @class */ (function (_super) {
             if (rightLabelTemplateNode[0]['data'] === 'null') {
                 rightLabelTemplateNode[0]['data'] = '';
             }
-            rightLabelNode[0].appendChild([].slice.call(rightLabelTemplateNode)[0]);
+            append(rightLabelTemplateNode, rightLabelNode[0]);
         }
         if (this.parent.enableRtl) {
             rightLabelNode[0].style.marginLeft = '0px';
@@ -914,7 +914,7 @@ var ChartRows = /** @class */ (function (_super) {
                     !this.isTemplate(parentLabel) &&
                     progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].children[0])
                     progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].children[0].remove();
-                if (progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent == '' &&
+                if (progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent === '' &&
                     parentLabel && !parentLabel['elementRef'] && div.innerHTML !== '')
                     progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent = parentLabel;
             }
@@ -944,11 +944,19 @@ var ChartRows = /** @class */ (function (_super) {
      * @returns {NodeList} .
      * @private
      */
-    ChartRows.prototype.getTableTrNode = function () {
+    ChartRows.prototype.getTableTrNode = function (i) {
         var table = createElement('table');
         var className = (this.parent.gridLines === 'Horizontal' || this.parent.gridLines === 'Both') ?
             'e-chart-row-border' : '';
-        table.innerHTML = '<tr class="' + this.getRowClassName(this.templateData) + ' ' + cls.chartRow + '"' +
+        var rows = this.parent.treeGrid.grid.contentModule.getRows()[i];
+        var activecls;
+        if (rows && rows.isSelected) {
+            activecls = 'e-active';
+        }
+        else {
+            activecls = '';
+        }
+        table.innerHTML = '<tr class="' + this.getRowClassName(this.templateData) + ' ' + cls.chartRow + ' ' + (activecls) + '"' +
             'style="display:' + this.getExpandDisplayProp(this.templateData) + ';height:' +
             this.parent.rowHeight + 'px;">' +
             '<td class="' + cls.chartRowCell + ' ' + className
@@ -1386,7 +1394,7 @@ var ChartRows = /** @class */ (function (_super) {
         this.parent.renderTemplates();
         this.triggerQueryTaskbarInfo();
         this.parent.modifiedRecords = [];
-        if (this.parent.viewType == 'ResourceView' && this.parent.showOverAllocation) {
+        if (this.parent.viewType === 'ResourceView' && this.parent.showOverAllocation) {
             this.updateOverlapped();
         }
         if (collapsedResourceRecord.length) {
@@ -1410,7 +1418,7 @@ var ChartRows = /** @class */ (function (_super) {
     ChartRows.prototype.getGanttChartRow = function (i, tempTemplateData) {
         this.templateData = tempTemplateData;
         var taskBaselineTemplateNode = null;
-        var parentTrNode = this.getTableTrNode();
+        var parentTrNode = this.getTableTrNode(i);
         var leftLabelNode = this.getLeftLabelNode(i);
         var taskbarContainerNode = this.taskbarContainer();
         taskbarContainerNode[0].setAttribute('aria-label', this.generateAriaLabel(this.templateData));
@@ -1440,12 +1448,12 @@ var ChartRows = /** @class */ (function (_super) {
                 }
             }
             if ((this.templateData.ganttProperties.autoDuration !== 0) && !this.templateData.ganttProperties.isMilestone && parentTaskbarTemplateNode && parentTaskbarTemplateNode.length > 0) {
-                taskbarContainerNode[0].appendChild([].slice.call(parentTaskbarTemplateNode)[0]);
+                append(parentTaskbarTemplateNode, taskbarContainerNode[0]);
             }
             else if ((this.templateData.ganttProperties.duration === 0 && this.templateData.ganttProperties.isMilestone && this.templateData.ganttProperties.isAutoSchedule)) {
                 var milestoneTemplateNode = this.getMilestoneNode(i, taskbarContainerNode);
                 if (milestoneTemplateNode && milestoneTemplateNode.length > 0) {
-                    taskbarContainerNode[0].appendChild([].slice.call(milestoneTemplateNode)[0]);
+                    append(milestoneTemplateNode, taskbarContainerNode[0]);
                 }
             }
             if (this.parent.renderBaseline && this.templateData.ganttProperties.baselineStartDate &&
@@ -1499,7 +1507,7 @@ var ChartRows = /** @class */ (function (_super) {
                         }
                     }
                     else {
-                        taskbarContainerNode[0].appendChild([].slice.call(childTaskbarTemplateNode)[0]);
+                        append(childTaskbarTemplateNode, taskbarContainerNode[0]);
                     }
                 }
                 if (childTaskbarProgressResizeNode) {
@@ -1962,6 +1970,19 @@ var ChartRows = /** @class */ (function (_super) {
             }
         }
     };
+    ChartRows.prototype.updateResourceTaskbarElement = function (tRow, parentTr) {
+        var cloneElement = tRow.querySelector('.e-taskbar-main-container');
+        addClass([cloneElement], 'collpse-parent-border');
+        var id = tRow.querySelector('.' + cls.taskBarMainContainer).getAttribute('rowUniqueId');
+        var ganttData = this.parent.getRecordByID(id);
+        var zIndex = "";
+        if (ganttData && !isNullOrUndefined(ganttData.ganttProperties.eOverlapIndex)) {
+            zIndex = (ganttData.ganttProperties.eOverlapIndex).toString();
+        }
+        var cloneChildElement = cloneElement.cloneNode(true);
+        cloneChildElement.style.zIndex = zIndex;
+        parentTr[0].childNodes[0].childNodes[0].childNodes[0].appendChild(cloneChildElement);
+    };
     ChartRows.prototype.getResourceParent = function (record) {
         var chartRows = this.parent.ganttChartModule.getChartRows();
         //Below code is for rendering taskbartemplate in resource view with multi taskbar
@@ -1985,20 +2006,19 @@ var ChartRows = /** @class */ (function (_super) {
         parentTrNode[0].childNodes[0].childNodes[0].appendChild(collapseParent);
         var tasks = this.parent.dataOperation.setSortedChildTasks(record);
         this.parent.dataOperation.updateOverlappingIndex(tasks);
-        for (var i = 0; i < chartRows.length; i++) {
-            if (chartRows[i].classList.contains('gridrowtaskId'
-                + record.ganttProperties.rowUniqueID + 'level' + (record.level + 1))) {
-                var cloneElement = chartRows[i].querySelector('.e-taskbar-main-container');
-                addClass([cloneElement], 'collpse-parent-border');
-                var id = chartRows[i].querySelector('.' + cls.taskBarMainContainer).getAttribute('rowUniqueId');
-                var ganttData = this.parent.getRecordByID(id);
-                var zIndex = "";
-                if (ganttData && !isNullOrUndefined(ganttData.ganttProperties.eOverlapIndex)) {
-                    zIndex = (ganttData.ganttProperties.eOverlapIndex).toString();
+        var tRow;
+        if (this.parent.enableVirtualization) {
+            for (var i = 0; i < record.childRecords.length; i++) {
+                tRow = this.getGanttChartRow(record.childRecords[i].index, this.parent.flatData[record.childRecords[i].index]);
+                this.updateResourceTaskbarElement(tRow, parentTrNode);
+            }
+        }
+        else {
+            for (var i = 0; i < chartRows.length; i++) {
+                if (chartRows[i].classList.contains('gridrowtaskId'
+                    + record.ganttProperties.rowUniqueID + 'level' + (record.level + 1))) {
+                    this.updateResourceTaskbarElement(chartRows[i], parentTrNode);
                 }
-                var cloneChildElement = cloneElement.cloneNode(true);
-                cloneChildElement.style.zIndex = zIndex;
-                parentTrNode[0].childNodes[0].childNodes[0].childNodes[0].appendChild(cloneChildElement);
             }
         }
         parentTrNode[0].childNodes[0].childNodes[0].appendChild([].slice.call(leftLabelNode)[0]);

package/src/gantt/renderer/timeline.js

@@ -1410,9 +1410,11 @@ var Timeline = /** @class */ (function () {
                 var validStartLeft = this.parent.dataOperation.getTaskLeft(validStartDate, false);
                 var validEndLeft = this.parent.dataOperation.getTaskLeft(validEndDate, false);
                 var isChanged = void 0;
+                var taskbarModule = this.parent.editModule.taskbarEditModule;
                 if (!isNullOrUndefined(maxStartLeft) && ((minStartDate < this.timelineStartDate) ||
-                    (!isNullOrUndefined(this.parent.editModule.taskbarEditModule)) &&
-                        (!isNullOrUndefined(this.parent.editModule.taskbarEditModule.taskBarEditAction))) && (maxStartLeft < this.bottomTierCellWidth || maxStartLeft <= validStartLeft)) {
+                    (!isNullOrUndefined(taskbarModule)) && (!isNullOrUndefined(taskbarModule.taskBarEditAction)
+                        && taskbarModule.taskBarEditAction !== 'ProgressResizing' &&
+                        taskbarModule.taskBarEditAction !== 'RightResizing')) && (maxStartLeft < this.bottomTierCellWidth || maxStartLeft <= validStartLeft)) {
                     isChanged = 'prevTimeSpan';
                     minStartDate = minStartDate > this.timelineStartDate ? this.timelineStartDate : minStartDate;
                 }