@syncfusion/ej2-gantt 19.4.52 → 19.4.55

package/dist/es6/ej2-gantt.es2015.js

@@ -478,7 +478,8 @@ class DateProcessor {
     calculateDuration(ganttData) {
         const ganttProperties = ganttData.ganttProperties;
         let tDuration;
-        if (!isNullOrUndefined(ganttProperties.segments) && ganttProperties.segments.length > 0) {
+        if (!isNullOrUndefined(ganttProperties.segments) && ganttProperties.segments.length > 0 &&
+            !isNullOrUndefined(this.parent.editModule.taskbarEditModule)) {
             tDuration = this.parent.editModule.taskbarEditModule.sumOfDuration(ganttProperties.segments);
         }
         else {
@@ -6519,7 +6520,7 @@ class Timeline {
                 const validStartLeft = this.parent.dataOperation.getTaskLeft(validStartDate, false);
                 const validEndLeft = this.parent.dataOperation.getTaskLeft(validEndDate, false);
                 let isChanged;
-                if (!isNullOrUndefined(maxStartLeft) && (maxStartLeft <= this.bottomTierCellWidth || maxStartLeft <= validStartLeft)) {
+                if (!isNullOrUndefined(maxStartLeft) && (maxStartLeft < this.bottomTierCellWidth || maxStartLeft <= validStartLeft)) {
                     isChanged = 'prevTimeSpan';
                     minStartDate = minStartDate > this.timelineStartDate ? this.timelineStartDate : minStartDate;
                 }
@@ -7945,7 +7946,7 @@ class ChartRows extends DateProcessor {
         let childTaskbarNode = null;
         const data = this.templateData;
         if (this.childTaskbarTemplateFunction) {
-            childTaskbarNode = this.childTaskbarTemplateFunction(extend({ index: i }, data), this.parent, 'TaskbarTemplate', this.getTemplateID('TaskbarTemplate'), false, undefined, rootElement[0]);
+            childTaskbarNode = this.childTaskbarTemplateFunction(extend({ index: i }, data), this.parent, 'TaskbarTemplate', this.getTemplateID('TaskbarTemplate'), false, undefined, rootElement[0], this.parent.treeGrid['root']);
         }
         else {
             let labelString = '';
@@ -7980,11 +7981,20 @@ class ChartRows extends DateProcessor {
                 labelString = labelString === 'isCustomTemplate' ? this.parent.labelSettings.taskLabel : labelString;
             }
             if (labelString !== 'null') {
-                taskLabel$$1 = '<span class="' + taskLabel + '" style="line-height:' +
-                    (this.taskBarHeight - 1) + 'px; text-align: left;' +
-                    'display:' + 'inline-block;' +
-                    'width:' + (data.ganttProperties.width - 10) + 'px; height:' +
-                    this.taskBarHeight + 'px;">' + labelString + '</span>';
+                if (isNaN(parseInt(labelString))) {
+                    taskLabel$$1 = '<span class="' + taskLabel + '" style="line-height:' +
+                        (this.taskBarHeight - 1) + 'px; text-align: left;' +
+                        'display:' + 'inline-block;' +
+                        'width:' + (data.ganttProperties.width - 10) + 'px; height:' +
+                        this.taskBarHeight + 'px;">' + labelString + '</span>';
+                }
+                else {
+                    taskLabel$$1 = '<span class="' + taskLabel + '" style="line-height:' +
+                        (this.taskBarHeight - 1) + 'px; text-align:' + (this.parent.viewType === 'ResourceView' ? 'left;' : ';') +
+                        'display:' + (this.parent.viewType === 'ResourceView' ? 'inline-flex;' : ';') +
+                        'width:' + (this.parent.viewType === 'ResourceView' ? (data.ganttProperties.width - 10) : '') + 'px; height:' +
+                        this.taskBarHeight + 'px;">' + labelString + '</span>';
+                }
             }
             const template = !isNullOrUndefined(data.ganttProperties.segments) && data.ganttProperties.segments.length > 0 ?
                 this.splitTaskbar(data, labelString) : (data.ganttProperties.startDate && data.ganttProperties.endDate
@@ -8375,7 +8385,7 @@ class ChartRows extends DateProcessor {
         let milestoneNode = null;
         const data = this.templateData;
         if (this.milestoneTemplateFunction) {
-            milestoneNode = this.milestoneTemplateFunction(extend({ index: i }, data), this.parent, 'MilestoneTemplate', this.getTemplateID('MilestoneTemplate'), false, undefined, rootElement[0]);
+            milestoneNode = this.milestoneTemplateFunction(extend({ index: i }, data), this.parent, 'MilestoneTemplate', this.getTemplateID('MilestoneTemplate'), false, undefined, rootElement[0], this.parent.treeGrid['root']);
         }
         else {
             const template = '<div class="' + traceMilestone + '" style="position:absolute;">' +
@@ -8446,7 +8456,7 @@ class ChartRows extends DateProcessor {
         leftLabelNode[0].setAttribute('aria-label', this.generateTaskLabelAriaLabel('left'));
         let leftLabelTemplateNode = null;
         if (this.leftTaskLabelTemplateFunction) {
-            leftLabelTemplateNode = this.leftTaskLabelTemplateFunction(extend({ index: i }, this.templateData), this.parent, 'LeftLabelTemplate', this.getTemplateID('LeftLabelTemplate'), false, undefined, leftLabelNode[0]);
+            leftLabelTemplateNode = this.leftTaskLabelTemplateFunction(extend({ index: i }, this.templateData), this.parent, 'LeftLabelTemplate', this.getTemplateID('LeftLabelTemplate'), false, undefined, leftLabelNode[0], this.parent.treeGrid['root']);
         }
         else {
             const field = this.parent.labelSettings.leftLabel;
@@ -8457,6 +8467,9 @@ class ChartRows extends DateProcessor {
             }
         }
         if (leftLabelTemplateNode && leftLabelTemplateNode.length > 0) {
+            if (leftLabelTemplateNode[0]['data'] === 'null') {
+                leftLabelTemplateNode[0]['data'] = '';
+            }
             leftLabelNode[0].appendChild([].slice.call(leftLabelTemplateNode)[0]);
         }
         return leftLabelNode;
@@ -8486,7 +8499,7 @@ class ChartRows extends DateProcessor {
         rightLabelNode[0].setAttribute('aria-label', this.generateTaskLabelAriaLabel('right'));
         let rightLabelTemplateNode = null;
         if (this.rightTaskLabelTemplateFunction) {
-            rightLabelTemplateNode = this.rightTaskLabelTemplateFunction(extend({ index: i }, this.templateData), this.parent, 'RightLabelTemplate', this.getTemplateID('RightLabelTemplate'), false, undefined, rightLabelNode[0]);
+            rightLabelTemplateNode = this.rightTaskLabelTemplateFunction(extend({ index: i }, this.templateData), this.parent, 'RightLabelTemplate', this.getTemplateID('RightLabelTemplate'), false, undefined, rightLabelNode[0], this.parent.treeGrid['root']);
         }
         else {
             const field = this.parent.labelSettings.rightLabel;
@@ -8497,6 +8510,9 @@ class ChartRows extends DateProcessor {
             }
         }
         if (rightLabelTemplateNode && rightLabelTemplateNode.length > 0) {
+            if (rightLabelTemplateNode[0]['data'] === 'null') {
+                rightLabelTemplateNode[0]['data'] = '';
+            }
             rightLabelNode[0].appendChild([].slice.call(rightLabelTemplateNode)[0]);
         }
         return rightLabelNode;
@@ -8551,7 +8567,7 @@ class ChartRows extends DateProcessor {
         let parentTaskbarNode = null;
         const data = this.templateData;
         if (this.parentTaskbarTemplateFunction) {
-            parentTaskbarNode = this.parentTaskbarTemplateFunction(extend({ index: i }, data), this.parent, 'ParentTaskbarTemplate', this.getTemplateID('ParentTaskbarTemplate'), false, undefined, rootElement[0]);
+            parentTaskbarNode = this.parentTaskbarTemplateFunction(extend({ index: i }, data), this.parent, 'ParentTaskbarTemplate', this.getTemplateID('ParentTaskbarTemplate'), false, undefined, rootElement[0], this.parent.treeGrid['root']);
         }
         else {
             let labelString = '';
@@ -8583,11 +8599,20 @@ class ChartRows extends DateProcessor {
                 labelString = labelString === 'isCustomTemplate' ? this.parent.labelSettings.taskLabel : labelString;
             }
             if (labelString !== 'null') {
-                labelDiv = this.createDivElement('<span class="' +
-                    taskLabel + '" style="line-height:' +
-                    (this.taskBarHeight - 1) + 'px; display:' + (this.parent.viewType === 'ResourceView' ? 'inline-flex;' : '') + 'width:' +
-                    (this.parent.viewType === 'ResourceView' ? (data.ganttProperties.width - 10) : '') + 'px; height:' +
-                    this.taskBarHeight + 'px;">' + labelString + '</span>');
+                if (isNaN(parseInt(labelString))) {
+                    labelDiv = this.createDivElement('<span class="' + taskLabel + '" style="line-height:' +
+                        (this.taskBarHeight - 1) + 'px; text-align: left;' +
+                        'display:' + 'inline-block;' +
+                        'width:' + (data.ganttProperties.width - 10) + 'px; height:' +
+                        this.taskBarHeight + 'px;">' + labelString + '</span>');
+                }
+                else {
+                    labelDiv = this.createDivElement('<span class="' +
+                        taskLabel + '" style="line-height:' +
+                        (this.taskBarHeight - 1) + 'px; display:' + (this.parent.viewType === 'ResourceView' ? 'inline-flex;' : ';') + 'width:' +
+                        (this.parent.viewType === 'ResourceView' ? (data.ganttProperties.width - 10) : ';') + 'px; height:' +
+                        this.taskBarHeight + 'px;">' + labelString + '</span>');
+                }
                 progressBarInnerDiv[0].appendChild([].slice.call(labelDiv)[0]);
             }
             const milestoneTemplate = '<div class="' + parentMilestone + '" style="position:absolute;">' +
@@ -8656,10 +8681,19 @@ class ChartRows extends DateProcessor {
     }
     isTemplate(template) {
         let result = false;
+        for (let i = 0; i < this.parent.ganttColumns.length; i++) {
+            if (template === this.parent.ganttColumns[i].field) {
+                result = true;
+                break;
+            }
+        }
         if (typeof template !== 'string' || template.indexOf('#') === 0 || template.indexOf('<') > -1
-            || template.indexOf('$') > -1) {
+            || template.indexOf('$') > -1 || !result) {
             result = true;
         }
+        else {
+            result = false;
+        }
         return result;
     }
     /**
@@ -8674,7 +8708,7 @@ class ChartRows extends DateProcessor {
     leftLabelContainer() {
         const template = '<div class="' + ((this.leftTaskLabelTemplateFunction) ? leftLabelTempContainer :
             leftLabelContainer) + ' ' + '" tabindex="-1" style="height:' +
-            (this.parent.rowHeight - 1) + 'px;width:' + this.taskNameWidth(this.templateData) + '"></div>';
+            (this.parent.rowHeight - 2) + 'px;width:' + this.taskNameWidth(this.templateData) + '"></div>';
         return this.createDivElement(template);
     }
     taskbarContainer() {
@@ -8697,7 +8731,7 @@ class ChartRows extends DateProcessor {
     rightLabelContainer() {
         const template = '<div class="' + ((this.rightTaskLabelTemplateFunction) ? rightLabelTempContainer :
             rightLabelContainer) + '" ' + ' tabindex="-1" style="left:' + this.getRightLabelLeft(this.templateData) + 'px;height:'
-            + (this.parent.rowHeight - 1) + 'px;"></div>';
+            + (this.parent.rowHeight - 2) + 'px;"></div>';
         return this.createDivElement(template);
     }
     childTaskbarLeftResizer() {
@@ -15620,7 +15654,8 @@ class CellEdit {
         if (!ganttRecord.ganttProperties.isAutoSchedule) {
             this.parent.setRecordValue('autoWidth', this.parent.dataOperation.calculateWidth(ganttRecord, false), ganttRecord.ganttProperties, true);
         }
-        if (!isNullOrUndefined(args.data.ganttProperties.segments) && args.data.ganttProperties.segments.length > 0) {
+        if (!isNullOrUndefined(args.data.ganttProperties.segments) && args.data.ganttProperties.segments.length > 0 &&
+            !isNullOrUndefined(this.parent.editModule.taskbarEditModule)) {
             this.parent.editModule.taskbarEditModule.updateSegmentProgress(args.data.ganttProperties);
         }
         if (!args.data.hasChildRecords) {
@@ -24854,7 +24889,9 @@ class Selection$1 {
         }
         this.addRemoveClass(index);
         this.selectedRowIndexes = extend([], this.getSelectedRowIndexes(), [], true);
-        this.parent.setProperties({ selectedRowIndex: -1 }, true);
+        if (this.selectedRowIndexes.length == 0) {
+            this.parent.setProperties({ selectedRowIndex: -1 }, true);
+        }
         if (!isNullOrUndefined(this.parent.toolbarModule)) {
             this.parent.toolbarModule.refreshToolbarItems();
         }
@@ -27088,7 +27125,13 @@ class RowDD$1 {
                         }
                         else {
                             startIndex = droppedRecord.index;
-                            endIndex = draggedRecord.index;
+                            let rootChildRecord = draggedRecord;
+                            if (rootChildRecord.childRecords.length > 0) {
+                                do {
+                                    rootChildRecord = rootChildRecord.childRecords[rootChildRecord.childRecords.length - 1];
+                                } while (rootChildRecord.childRecords.length > 0);
+                            }
+                            endIndex = rootChildRecord.index;
                         }
                         for (let i = startIndex; i <= endIndex; i++) {
                             if (!isNullOrUndefined(data[i])) {