@syncfusion/ej2-gantt 20.1.48 → 20.1.50

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

@@ -8039,10 +8039,10 @@ class ChartRows extends DateProcessor {
                     'border-bottom-right-radius:' + this.getBorderRadius(data.ganttProperties) + 'px;">' +
                     '</div>');
             }
+            let tempDiv = createElement('div');
             if (this.taskLabelTemplateFunction && !isNullOrUndefined(progressDiv) && progressDiv.length > 0) {
                 const taskLabelTemplateNode = this.taskLabelTemplateFunction(extend({ index: i }, data), this.parent, 'TaskLabelTemplate', this.getTemplateID('TaskLabelTemplate'), false, undefined, progressDiv[0]);
                 if (taskLabelTemplateNode && taskLabelTemplateNode.length > 0) {
-                    const tempDiv = createElement('div');
                     tempDiv.appendChild(taskLabelTemplateNode[0]);
                     labelString = tempDiv.innerHTML;
                 }
@@ -8052,6 +8052,9 @@ class ChartRows extends DateProcessor {
                 labelString = labelString === 'isCustomTemplate' ? this.parent.labelSettings.taskLabel : labelString;
             }
             if (labelString !== 'null') {
+                if (this.getTaskLabel(this.parent.labelSettings.taskLabel) === 'isCustomTemplate') {
+                    labelString = '';
+                }
                 if (isNaN(parseInt(labelString))) {
                     taskLabel$$1 = '<span class="' + taskLabel + '" style="line-height:' +
                         (this.taskBarHeight - 1) + 'px; text-align: left;' +
@@ -8089,7 +8092,16 @@ class ChartRows extends DateProcessor {
                 (isNullOrUndefined(data.ganttProperties.segments) || (!isNullOrUndefined(data.ganttProperties.segments) &&
                     data.ganttProperties.segments.length === 0))) {
                 if (template !== '' && !isNullOrUndefined(progressDiv) && progressDiv.length > 0) {
-                    progressDiv[0].appendChild([].slice.call(this.createDivElement(template))[0]);
+                    let templateElement = this.createDivElement(template)[0];
+                    templateElement.appendChild(tempDiv);
+                    progressDiv[0].appendChild(templateElement);
+                    let childLabel = this.parent.labelSettings.taskLabel;
+                    if (progressDiv[0].querySelectorAll('.e-task-label')[0].textContent !== '' &&
+                        !this.isTemplate(childLabel))
+                        progressDiv[0].querySelectorAll('.e-task-label')[0].children[0].remove();
+                    if (progressDiv[0].querySelectorAll('.e-task-label')[0].textContent == '' &&
+                        childLabel && !childLabel['elementRef'])
+                        progressDiv[0].querySelectorAll('.e-task-label')[0].textContent = childLabel;
                 }
                 if (!isNullOrUndefined(taskbarInnerDiv) && taskbarInnerDiv.length > 0) {
                     taskbarInnerDiv[0].appendChild([].slice.call(progressDiv)[0]);
@@ -8663,10 +8675,10 @@ class ChartRows extends DateProcessor {
                 'width:' + data.ganttProperties.progressWidth + 'px;' +
                 'border-top-right-radius:' + this.getBorderRadius(data) + 'px;' +
                 'border-bottom-right-radius:' + this.getBorderRadius(data) + 'px;height:100%;"></div>');
+            let div = createElement('div');
             if (this.taskLabelTemplateFunction) {
                 const parentTaskLabelNode = this.taskLabelTemplateFunction(extend({ index: i }, data), this.parent, 'TaskLabelTemplate', this.getTemplateID('TaskLabelTemplate'), false, undefined, progressBarInnerDiv[0]);
                 if (parentTaskLabelNode && parentTaskLabelNode.length > 0) {
-                    const div = createElement('div');
                     div.appendChild(parentTaskLabelNode[0]);
                     labelString = div.innerHTML;
                 }
@@ -8676,23 +8688,35 @@ class ChartRows extends DateProcessor {
                 labelString = labelString === 'isCustomTemplate' ? this.parent.labelSettings.taskLabel : labelString;
             }
             if (labelString !== 'null') {
+                if (this.getTaskLabel(this.parent.labelSettings.taskLabel) === 'isCustomTemplate') {
+                    labelString = '';
+                }
                 if (isNaN(parseInt(labelString))) {
-                    labelDiv = this.createDivElement('<span class="' + taskLabel + '" style="line-height:' +
+                    labelDiv = '<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>');
+                        this.taskBarHeight + 'px;">' + labelString + '</span>';
                 }
                 else {
-                    labelDiv = this.createDivElement('<span class="' +
+                    labelDiv = '<span class="' +
                         taskLabel + '" style="line-height:' +
                         (this.taskBarHeight - 1) + 'px;' + (this.parent.viewType === 'ResourceView' ? 'display:inline-flex;' : '') +
                         (this.parent.viewType === 'ResourceView' ? 'width:' + (data.ganttProperties.width - 10) : '') + 'px; height:' +
                         (this.taskBarHeight - 1) + 'px;' + (this.parent.viewType === 'ResourceView' ? 'display: inline-flex;' : '') +
                         (this.parent.viewType === 'ResourceView' ? 'width:' + (data.ganttProperties.width - 10) : '') + 'px; height:' +
-                        this.taskBarHeight + 'px;">' + labelString + '</span>');
+                        this.taskBarHeight + 'px;">' + labelString + '</span>';
                 }
-                progressBarInnerDiv[0].appendChild([].slice.call(labelDiv)[0]);
+                let labelElement = this.createDivElement(labelDiv)[0];
+                labelElement.appendChild(div);
+                progressBarInnerDiv[0].appendChild(labelElement);
+                let parentLabel = this.parent.labelSettings.taskLabel;
+                if (progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent !== '' &&
+                    !this.isTemplate(parentLabel))
+                    progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].children[0].remove();
+                if (progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent == '' &&
+                    parentLabel && !parentLabel['elementRef'])
+                    progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent = parentLabel;
             }
             const milestoneTemplate = '<div class="' + parentMilestone + '" style="position:absolute;">' +
                 '<div class="' + parentMilestoneTop + '" style="border-right-width:' +
@@ -9519,6 +9543,18 @@ class ChartRows extends DateProcessor {
     }
     getResourceParent(record) {
         const chartRows = this.parent.ganttChartModule.getChartRows();
+        //Below code is for rendering taskbartemplate in resource view with multi taskbar
+        if (this.parent.initialChartRowElements) {
+            for (let j = 0; j <= this.parent.initialChartRowElements.length; j++) {
+                if (!isNullOrUndefined(chartRows[j])) {
+                    if (!isNullOrUndefined(chartRows[j].childNodes[0].childNodes[1].childNodes[2]) &&
+                        !isNullOrUndefined(this.parent.initialChartRowElements[j].childNodes[0].childNodes[1].childNodes[2])) {
+                        // eslint-disable-next-line
+                        chartRows[j].childNodes[0].childNodes[1].childNodes[2]['innerHTML'] = this.parent.initialChartRowElements[j].childNodes[0].childNodes[1].childNodes[2]['innerHTML'];
+                    }
+                }
+            }
+        }
         this.templateData = record;
         const parentTrNode = this.getTableTrNode();
         const leftLabelNode = this.leftLabelContainer();
@@ -12953,6 +12989,7 @@ let Gantt = class Gantt extends Component {
             this.getCurrentRecords(args);
         }
         this.notify('recordsUpdated', {});
+        this.initialChartRowElements = this.ganttChartModule.getChartRows();
         this.isLoad = false;
         this.trigger('dataBound', args);
     }
@@ -18292,6 +18329,13 @@ class DialogEdit {
         dialogModel.target = document.body;
         dialogModel.close = this.dialogClose.bind(this);
         dialogModel.closeOnEscape = true;
+        dialogModel.beforeClose = function (args) {
+            if (args.closedBy == "escape") {
+                if (args.event.name == "key-pressed" && args.event.target.nodeName == 'INPUT') {
+                    args.cancel = true;
+                }
+            }
+        };
         dialogModel.open = (args) => {
             const dialogElement = getValue('element', args);
             const generalTabElement = dialogElement.querySelector('#' + this.parent.element.id + 'GeneralTabContainer');
@@ -18576,6 +18620,8 @@ class DialogEdit {
         }
         else if (id === ganttObj.element.id + 'NotesTabContainer') {
             document.getElementById(id).ej2_instances[0].refresh();
+            let notesTabElement = document.querySelector('#' + this.parent.element.id + 'NotesTabContainer');
+            notesTabElement.style.overflow = 'scroll';
         }
         else if (id === ganttObj.element.id + 'SegmentsTabContainer') {
             if (isNullOrUndefined(this.beforeOpenArgs.rowData.ganttProperties.startDate)) {