@syncfusion/ej2-gantt 20.4.51 → 20.4.53

package/src/gantt/base/tree-grid.js

@@ -59,7 +59,13 @@ var GanttTreeGrid = /** @class */ (function () {
         this.parent.treeGrid.allowKeyboard = this.parent.allowKeyboard;
         this.parent.treeGrid.enableImmutableMode = this.parent.enableImmutableMode;
         this.treeGridColumns = [];
+        if (!this.parent.isLocaleChanged && this.parent.isLoad) {
+            this.parent.previousGanttColumns = extend([], [], this.parent.columns, true);
+        }
         this.validateGanttColumns();
+        if (this.parent.isLocaleChanged) {
+            this.parent.isLocaleChanged = false;
+        }
         this.addEventListener();
     }
     GanttTreeGrid.prototype.addEventListener = function () {
@@ -481,6 +487,9 @@ var GanttTreeGrid = /** @class */ (function () {
      */
     GanttTreeGrid.prototype.createTreeGridColumn = function (column, isDefined) {
         var taskSettings = this.parent.taskFields;
+        var previousColumn = this.parent.previousGanttColumns.filter(function (prevcolumn) {
+            return column.field == prevcolumn.field;
+        })[0];
         column.disableHtmlEncode = !isNullOrUndefined(column.disableHtmlEncode) ? column.disableHtmlEncode : this.parent.disableHtmlEncode;
         if (taskSettings.id !== column.field) {
             column.clipMode = column.clipMode ? column.clipMode : 'EllipsisWithTooltip';
@@ -491,14 +500,24 @@ var GanttTreeGrid = /** @class */ (function () {
         }
         else if (taskSettings.name === column.field) {
             /** Name column */
-            column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('name');
+            if (this.parent.isLocaleChanged && previousColumn) {
+                column.headerText = previousColumn.headerText ? previousColumn.headerText : this.parent.localeObj.getConstant('name');
+            }
+            else {
+                column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('name');
+            }
             column.width = column.width ? column.width : 150;
             column.editType = column.editType ? column.editType : 'stringedit';
             column.type = column.type ? column.type : 'string';
         }
         else if (taskSettings.startDate === column.field) {
             /** Name column */
-            column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('startDate');
+            if (this.parent.isLocaleChanged && previousColumn) {
+                column.headerText = previousColumn.headerText ? previousColumn.headerText : this.parent.localeObj.getConstant('startDate');
+            }
+            else {
+                column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('startDate');
+            }
             column.editType = column.editType ? column.editType :
                 this.parent.getDateFormat().toLowerCase().indexOf('hh') !== -1 ? 'datetimepickeredit' : 'datepickeredit';
             column.format = column.format ? column.format : { type: 'date', format: this.parent.getDateFormat() };
@@ -506,7 +525,12 @@ var GanttTreeGrid = /** @class */ (function () {
             column.edit = { params: { renderDayCell: this.parent.renderWorkingDayCell.bind(this.parent) } };
         }
         else if (taskSettings.endDate === column.field) {
-            column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('endDate');
+            if (this.parent.isLocaleChanged && previousColumn) {
+                column.headerText = previousColumn.headerText ? previousColumn.headerText : this.parent.localeObj.getConstant('endDate');
+            }
+            else {
+                column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('endDate');
+            }
             column.format = column.format ? column.format : { type: 'date', format: this.parent.getDateFormat() };
             column.editType = column.editType ? column.editType :
                 this.parent.getDateFormat().toLowerCase().indexOf('hh') !== -1 ? 'datetimepickeredit' : 'datepickeredit';
@@ -515,7 +539,12 @@ var GanttTreeGrid = /** @class */ (function () {
         }
         else if (taskSettings.duration === column.field) {
             column.width = column.width ? column.width : 150;
-            column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('duration');
+            if (this.parent.isLocaleChanged && previousColumn) {
+                column.headerText = previousColumn.headerText ? previousColumn.headerText : this.parent.localeObj.getConstant('duration');
+            }
+            else {
+                column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('duration');
+            }
             column.valueAccessor = column.valueAccessor ? column.valueAccessor : !isNullOrUndefined(column.edit) ? null :
                 this.durationValueAccessor.bind(this);
             column.editType = column.editType ? column.editType : 'stringedit';
@@ -525,7 +554,12 @@ var GanttTreeGrid = /** @class */ (function () {
             this.composeProgressColumn(column);
         }
         else if (taskSettings.dependency === column.field) {
-            column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('dependency');
+            if (this.parent.isLocaleChanged && previousColumn) {
+                column.headerText = previousColumn.headerText ? previousColumn.headerText : this.parent.localeObj.getConstant('dependency');
+            }
+            else {
+                column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('dependency');
+            }
             column.width = column.width ? column.width : 150;
             column.editType = column.editType ? column.editType : 'stringedit';
             column.type = 'string';
@@ -535,7 +569,12 @@ var GanttTreeGrid = /** @class */ (function () {
             this.composeResourceColumn(column);
         }
         else if (taskSettings.notes === column.field) {
-            column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('notes');
+            if (this.parent.isLocaleChanged && previousColumn) {
+                column.headerText = previousColumn.headerText ? previousColumn.headerText : this.parent.localeObj.getConstant('notes');
+            }
+            else {
+                column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('notes');
+            }
             column.width = column.width ? column.width : 150;
             column.editType = column.editType ? column.editType : 'stringedit';
             if (!this.parent.showInlineNotes) {
@@ -550,26 +589,46 @@ var GanttTreeGrid = /** @class */ (function () {
             var colName = (taskSettings.baselineEndDate === column.field) ? 'baselineEndDate' :
                 'baselineStartDate';
             column.width = column.width ? column.width : 150;
-            column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant(colName);
+            if (this.parent.isLocaleChanged && previousColumn) {
+                column.headerText = previousColumn.headerText ? previousColumn.headerText : this.parent.localeObj.getConstant(colName);
+            }
+            else {
+                column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant(colName);
+            }
             column.format = column.format ? column.format : { type: 'date', format: this.parent.getDateFormat() };
             column.editType = column.editType ? column.editType :
                 this.parent.getDateFormat().toLowerCase().indexOf('hh') !== -1 ? 'datetimepickeredit' : 'datepickeredit';
         }
         else if (taskSettings.work === column.field) {
-            column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('work');
+            if (this.parent.isLocaleChanged && previousColumn) {
+                column.headerText = previousColumn.headerText ? previousColumn.headerText : this.parent.localeObj.getConstant('work');
+            }
+            else {
+                column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('work');
+            }
             column.width = column.width ? column.width : 150;
             column.valueAccessor = column.valueAccessor ? column.valueAccessor : this.workValueAccessor.bind(this);
             column.editType = column.editType ? column.editType : 'numericedit';
         }
         else if (taskSettings.type === column.field) {
-            column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('taskType');
+            if (this.parent.isLocaleChanged && previousColumn) {
+                column.headerText = previousColumn.headerText ? previousColumn.headerText : this.parent.localeObj.getConstant('taskType');
+            }
+            else {
+                column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('taskType');
+            }
             column.width = column.width ? column.width : 150;
             //column.type = 'string';
             column.editType = 'dropdownedit';
             column.valueAccessor = column.valueAccessor ? column.valueAccessor : this.taskTypeValueAccessor.bind(this);
         }
         else if (taskSettings.manual === column.field && this.parent.taskMode === 'Custom') {
-            column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('taskMode');
+            if (this.parent.isLocaleChanged && previousColumn) {
+                column.headerText = previousColumn.headerText ? previousColumn.headerText : this.parent.localeObj.getConstant('taskMode');
+            }
+            else {
+                column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('taskMode');
+            }
             column.width = column.width ? column.width : 120;
             column.editType = column.editType ? column.editType : 'dropdownedit';
             column.valueAccessor = column.valueAccessor ? column.valueAccessor : this.modeValueAccessor.bind(this);
@@ -593,7 +652,15 @@ var GanttTreeGrid = /** @class */ (function () {
      * @returns {void} .
      */
     GanttTreeGrid.prototype.composeResourceColumn = function (column) {
-        column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('resourceName');
+        var previousColumn = this.parent.previousGanttColumns.filter(function (prevcolumn) {
+            return column.field == prevcolumn.field;
+        })[0];
+        if (this.parent.isLocaleChanged && previousColumn) {
+            column.headerText = previousColumn.headerText ? previousColumn.headerText : this.parent.localeObj.getConstant('resourceName');
+        }
+        else {
+            column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('resourceName');
+        }
         column.width = column.width ? column.width : 150;
         column.type = 'string';
         column.valueAccessor = column.valueAccessor ? column.valueAccessor : this.resourceValueAccessor.bind(this);
@@ -628,7 +695,17 @@ var GanttTreeGrid = /** @class */ (function () {
         var lengthDataSource = this.parent.dataSource['length'];
         var taskIDName;
         column.isPrimaryKey = isProjectView ? true : false;
-        column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('id');
+        if (this.parent.isLocaleChanged) {
+            var previousColumn = this.parent.previousGanttColumns.filter(function (prevcolumn) {
+                return column.field == prevcolumn.field;
+            })[0];
+            if (previousColumn) {
+                column.headerText = previousColumn.headerText ? previousColumn.headerText : this.parent.localeObj.getConstant('id');
+            }
+        }
+        else {
+            column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('id');
+        }
         column.width = column.width ? column.width : 100;
         for (var i = 0; i < lengthDataSource; i++) {
             if (!isNullOrUndefined(this.parent.dataSource[i][this.parent.taskFields.id])) {
@@ -665,7 +742,15 @@ var GanttTreeGrid = /** @class */ (function () {
      * @returns {void} .
      */
     GanttTreeGrid.prototype.composeProgressColumn = function (column) {
-        column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('progress');
+        var previousColumn = this.parent.previousGanttColumns.filter(function (prevcolumn) {
+            return column.field == prevcolumn.field;
+        })[0];
+        if (this.parent.isLocaleChanged && previousColumn) {
+            column.headerText = previousColumn.headerText ? previousColumn.headerText : this.parent.localeObj.getConstant('progress');
+        }
+        else {
+            column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('progress');
+        }
         column.width = column.width ? column.width : 150;
         column.editType = column.editType ? column.editType : 'numericedit';
     };

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

@@ -1328,7 +1328,7 @@ var ChartRows = /** @class */ (function (_super) {
             for (var i = 0; i < this.parent.currentViewData.length; i++) {
                 var tempTemplateData = this.parent.currentViewData[i];
                 if (this.parent.viewType === 'ResourceView') {
-                    if (this.parent.editModule && this.parent.editModule.isResourceTaskDeleted) {
+                    if (this.parent.editModule && this.parent.editModule.isResourceTaskDeleted || this.parent.isFromOnPropertyChange) {
                         this.parent.initialChartRowElements = this.parent.ganttChartModule.getChartRows();
                         this.parent.editModule.isResourceTaskDeleted = false;
                     }
@@ -1840,7 +1840,10 @@ var ChartRows = /** @class */ (function (_super) {
                 addClass([cloneElement], 'collpse-parent-border');
                 var id = chartRows[i].querySelector('.' + cls.taskBarMainContainer).getAttribute('rowUniqueId');
                 var ganttData = this.parent.getRecordByID(id);
-                var zIndex = (ganttData.ganttProperties.eOverlapIndex).toString();
+                var zIndex = "";
+                if (ganttData && ganttData.ganttProperties.eOverlapIndex) {
+                    zIndex = (ganttData.ganttProperties.eOverlapIndex).toString();
+                }
                 var cloneChildElement = cloneElement.cloneNode(true);
                 cloneChildElement.style.zIndex = zIndex;
                 parentTrNode[0].childNodes[0].childNodes[0].childNodes[0].appendChild(cloneChildElement);

package/src/gantt/renderer/timeline.js

@@ -156,6 +156,9 @@ var Timeline = /** @class */ (function () {
      */
     Timeline.prototype.changeTimelineSettings = function (newTimeline) {
         var _this = this;
+        if (!this.isZoomIn) {
+            this.isSingleTier = newTimeline.topTier.unit === 'None' || newTimeline.bottomTier.unit === 'None' ? true : false;
+        }
         var skipProperty = this.isSingleTier ?
             this.customTimelineSettings.topTier.unit === 'None' ?
                 'topTier' : 'bottomTier' : null;
@@ -167,7 +170,9 @@ var Timeline = /** @class */ (function () {
             else {
                 var value = property === 'topTier' ? 'bottomTier' : 'topTier';
                 var assignValue = 'bottomTier';
-                _this.customTimelineSettings[value] = __assign({}, newTimeline[assignValue]);
+                if (newTimeline[assignValue].unit != "None") {
+                    _this.customTimelineSettings[value] = __assign({}, newTimeline[assignValue]);
+                }
             }
         });
         this.parent.isTimelineRoundOff = this.isZoomToFit ? false : isNullOrUndefined(this.parent.projectStartDate) ? true : false;
@@ -403,7 +408,9 @@ var Timeline = /** @class */ (function () {
             this.customTimelineSettings.bottomTier.count : this.customTimelineSettings.topTier.count;
         var unit = this.customTimelineSettings.bottomTier.unit !== 'None' ?
             this.customTimelineSettings.bottomTier.unit : this.customTimelineSettings.topTier.unit;
-        var zoomLevel = this.getCurrentZoomingLevel(unit, count);
+        var tier = this.customTimelineSettings.bottomTier.unit !== 'None' ?
+            "bottomTier" : "topTier";
+        var zoomLevel = this.getCurrentZoomingLevel(unit, count, tier);
         if (this.parent.toolbarModule) {
             if (zoomLevel === this.parent.zoomingLevels[this.parent.zoomingLevels.length - 1].level) {
                 this.parent.toolbarModule.enableItems([this.parent.controlId + '_zoomin'], false);
@@ -421,7 +428,7 @@ var Timeline = /** @class */ (function () {
      * @returns {number} .
      * @private
      */
-    Timeline.prototype.getCurrentZoomingLevel = function (unit, count) {
+    Timeline.prototype.getCurrentZoomingLevel = function (unit, count, tier) {
         var level;
         var currentZoomCollection;
         var checkSameCountLevels;
@@ -431,16 +438,31 @@ var Timeline = /** @class */ (function () {
             this.parent.zoomingLevels = this.parent.getZoomingLevels();
         }
         var sameUnitLevels = this.parent.zoomingLevels.filter(function (tempLevel) {
-            return tempLevel.bottomTier.unit === unit;
+            if (tier === "bottomTier") {
+                return tempLevel.bottomTier.unit === unit;
+            }
+            else {
+                return tempLevel.topTier.unit === unit;
+            }
         });
         if (sameUnitLevels.length === 0) {
             var closestUnit_1 = this.getClosestUnit(unit, '', false);
             sameUnitLevels = this.parent.zoomingLevels.filter(function (tempLevel) {
-                return tempLevel.bottomTier.unit === closestUnit_1;
+                if (tier === "bottomTier") {
+                    return tempLevel.bottomTier.unit === closestUnit_1;
+                }
+                else {
+                    return tempLevel.topTier.unit === closestUnit_1;
+                }
             });
         }
         var sortedUnitLevels = sameUnitLevels.sort(function (a, b) {
-            return (a.bottomTier.count < b.bottomTier.count) ? 1 : -1;
+            if (tier === "bottomTier") {
+                return (a.bottomTier.count < b.bottomTier.count) ? 1 : -1;
+            }
+            else {
+                return (a.topTier.count < b.topTier.count) ? 1 : -1;
+            }
         });
         for (var i = 0; i < sortedUnitLevels.length; i++) {
             firstValue = sortedUnitLevels[i];
@@ -451,10 +473,15 @@ var Timeline = /** @class */ (function () {
             else {
                 secondValue = sortedUnitLevels[i + 1];
             }
-            if (count >= firstValue.bottomTier.count) {
+            if (count >= firstValue[tier].count) {
                 currentZoomCollection = sortedUnitLevels[i];
                 checkSameCountLevels = sortedUnitLevels.filter(function (tempLevel) {
-                    return tempLevel.bottomTier.count === currentZoomCollection.bottomTier.count;
+                    if (tier === "bottomTier") {
+                        return tempLevel.bottomTier.count === currentZoomCollection.bottomTier.count;
+                    }
+                    else {
+                        return tempLevel.topTier.count === currentZoomCollection.topTier.count;
+                    }
                 });
                 if (checkSameCountLevels.length > 1) {
                     level = this.checkCollectionsWidth(checkSameCountLevels);
@@ -464,10 +491,15 @@ var Timeline = /** @class */ (function () {
                 }
                 break;
             }
-            else if (count < firstValue.bottomTier.count && count > secondValue.bottomTier.count) {
+            else if (count < firstValue[tier].count && count > secondValue[tier].count) {
                 currentZoomCollection = sortedUnitLevels[i + 1];
                 checkSameCountLevels = sortedUnitLevels.filter(function (tempLevel) {
-                    return tempLevel.bottomTier.count === currentZoomCollection.bottomTier.count;
+                    if (tier === "bottomTier") {
+                        return tempLevel.bottomTier.count === currentZoomCollection.bottomTier.count;
+                    }
+                    else {
+                        return tempLevel.topTier.count === currentZoomCollection.topTier.count;
+                    }
                 });
                 if (checkSameCountLevels.length > 1) {
                     level = this.checkCollectionsWidth(checkSameCountLevels);

package/GitLeaksReport.json

@@ -1 +0,0 @@
-[]