@syncfusion/ej2-gantt 20.3.52 → 20.3.57

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

@@ -1685,7 +1685,7 @@ class TaskProcessor extends DateProcessor {
                     }
                 });
             }
-            else if (!tempData[child]) {
+            else if (!tempData[child] || (tempData[child] && tempData[child].length === 0)) {
                 unassignedTasks.push(tempData);
             }
             if (tempData[this.parent.taskFields.child] && tempData[this.parent.taskFields.child].length) {
@@ -6307,7 +6307,7 @@ class Timeline {
                 endDate.setHours(24, 0, 0, 0);
             }
         }
-        if ((this.isZooming || this.parent.isLoad || this.parent.isFromOnPropertyChange) && isNullOrUndefined(this.parent.projectEndDate)) {
+        if (isNullOrUndefined(this.parent.projectEndDate)) {
             this.updateTimelineAfterZooming(endDate, false);
         }
         return endDate;
@@ -7356,7 +7356,7 @@ class GanttTreeGrid {
             column.valueAccessor = column.valueAccessor ? column.valueAccessor : !isNullOrUndefined(column.edit) ? null :
                 this.durationValueAccessor.bind(this);
             column.editType = column.editType ? column.editType : 'stringedit';
-            column.type = 'string';
+            column.type = column.type ? column.type : 'string';
         }
         else if (taskSettings.progress === column.field) {
             this.composeProgressColumn(column);
@@ -9330,7 +9330,7 @@ class ChartRows extends DateProcessor {
             for (let index = 0; index < this.parent.currentViewData.length; index++) {
                 const oldIndex = oldKeys[this.parent.currentViewData[index][key]];
                 const modifiedRecIndex = this.parent.modifiedRecords.indexOf(this.parent.currentViewData[index]);
-                if (isNullOrUndefined(oldIndex) || modifiedRecIndex !== -1) {
+                if (isNullOrUndefined(oldIndex) || modifiedRecIndex !== -1 || this.parent.isFromRenderBaseline) {
                     const tRow = this.getGanttChartRow(index, this.parent.currentViewData[index]);
                     this.ganttChartTableBody.appendChild(tRow);
                     this.refreshedTr.push(this.ganttChartTableBody.querySelectorAll('tr')[index]);
@@ -10595,6 +10595,11 @@ class Dependency {
             return;
         }
         if (childGanttRecord.ganttProperties.predecessor) {
+            const taskBarModule = this.parent.editModule.taskbarEditModule;
+            let ganttProp;
+            if (taskBarModule) {
+                ganttProp = taskBarModule.taskBarEditRecord;
+            }
             const predecessorsCollection = childGanttRecord.ganttProperties.predecessor;
             let parentGanttRecord;
             let record = null;
@@ -10659,10 +10664,21 @@ class Dependency {
                     this.validatePredecessor(record, undefined, 'successor');
                 }
             }
-            if (record && record.hasChildRecords && record.ganttProperties.taskId !== this.isValidatedParentTaskID &&
-                this.parent.editModule['taskbarMoved']) {
-                this.parent.editModule['updateChildItems'](record);
-                this.isValidatedParentTaskID = record.ganttProperties.taskId;
+            if (record && record.ganttProperties.taskId !== this.isValidatedParentTaskID && ganttProp) {
+                if ((taskBarModule.taskBarEditAction !== 'ParentDrag' && taskBarModule.taskBarEditAction !== 'ChildDrag')) {
+                    if (!ganttProp.hasChildRecords && record.hasChildRecords) {
+                        this.parent.editModule['updateChildItems'](record);
+                        this.isValidatedParentTaskID = record.ganttProperties.taskId;
+                    }
+                }
+                else if ((record.hasChildRecords && taskBarModule.taskBarEditAction == 'ChildDrag') ||
+                    (!ganttProp.ganttProperties.predecessorsName && taskBarModule.taskBarEditAction == 'ParentDrag')) {
+                    this.parent.editModule['updateChildItems'](record);
+                    this.isValidatedParentTaskID = record.ganttProperties.taskId;
+                }
+                if (!ganttProp.hasChildRecords) {
+                    this.parent.dataOperation.updateParentItems(record, true);
+                }
             }
         }
     }
@@ -12653,6 +12669,10 @@ let Gantt = class Gantt extends Component {
          * @private
          */
         this.isFromOnPropertyChange = false;
+        /**
+         * @private
+         */
+        this.isFromRenderBaseline = false;
         /**
          * @private
          */
@@ -13576,8 +13596,10 @@ let Gantt = class Gantt extends Component {
                 case 'labelSettings':
                 case 'renderBaseline':
                 case 'baselineColor':
+                    this.isFromRenderBaseline = true;
                     this.chartRowsModule.initiateTemplates();
                     this.chartRowsModule.refreshGanttRows();
+                    this.isFromRenderBaseline = false;
                     break;
                 case 'resourceIDMapping':
                 case 'resourceNameMapping':
@@ -20707,17 +20729,19 @@ class DialogEdit {
         this.parent.setRecordValue('durationUnit', fromRecord.ganttProperties.durationUnit, toRecord.ganttProperties, true);
         this.parent.setRecordValue('work', fromRecord.ganttProperties.work, toRecord.ganttProperties, true);
         this.parent.setRecordValue('type', fromRecord.ganttProperties.taskType, toRecord.ganttProperties, true);
+        this.parent.setRecordValue('resourceNames', fromRecord.ganttProperties.resourceNames, toRecord.ganttProperties, true);
+        this.parent.setRecordValue('resourceInfo', fromRecord.ganttProperties.resourceInfo, toRecord.ganttProperties, true);
         if (!isNullOrUndefined(this.parent.taskFields.startDate)) {
-            this.parent.dataOperation.updateMappingData(this.rowData, this.parent.taskFields.startDate);
+            this.parent.dataOperation.updateMappingData(toRecord, this.parent.taskFields.startDate);
         }
         if (!isNullOrUndefined(this.parent.taskFields.endDate)) {
-            this.parent.dataOperation.updateMappingData(this.rowData, this.parent.taskFields.endDate);
+            this.parent.dataOperation.updateMappingData(toRecord, this.parent.taskFields.endDate);
         }
         if (!isNullOrUndefined(this.parent.taskFields.duration)) {
-            this.parent.dataOperation.updateMappingData(this.rowData, this.parent.taskFields.duration);
+            this.parent.dataOperation.updateMappingData(toRecord, this.parent.taskFields.duration);
             this.parent.setRecordValue('durationUnit', fromRecord.ganttProperties.durationUnit, this.rowData, true);
             if (this.rowData.ganttProperties.duration === 0) {
-                this.parent.setRecordValue('isMilestone', true, this.rowData.ganttProperties, true);
+                this.parent.setRecordValue('isMilestone', true, toRecord.ganttProperties, true);
             }
             else {
                 this.parent.setRecordValue('isMilestone', false, this.rowData.ganttProperties, true);
@@ -20732,6 +20756,9 @@ class DialogEdit {
         if (!isNullOrUndefined(this.parent.taskFields.type)) {
             this.parent.dataOperation.updateMappingData(this.rowData, "type");
         }
+        if (!isNullOrUndefined(this.parent.taskFields.resourceInfo)) {
+            this.parent.dataOperation.updateMappingData(this.rowData, "resourceInfo");
+        }
     }
     updatePredecessorTab(preElement) {
         const gridObj = preElement.ej2_instances[0];
@@ -20795,10 +20822,11 @@ class DialogEdit {
         }
         const idArray = [];
         if (this.isEdit) {
-            this.parent.setRecordValue('resourceInfo', selectedItems, this.rowData.ganttProperties, true);
-            this.parent.dataOperation.updateMappingData(this.rowData, 'resourceInfo');
-            this.parent.editModule.updateResourceRelatedFields(this.rowData, 'resource');
-            this.validateDuration(this.rowData);
+            this.parent.setRecordValue('resourceInfo', selectedItems, this.editedRecord.ganttProperties, true);
+            this.parent.dataOperation.updateMappingData(this.editedRecord, 'resourceInfo');
+            this.parent.editModule.updateResourceRelatedFields(this.editedRecord, 'resource');
+            this.validateDuration(this.editedRecord);
+            this.updateScheduleProperties(this.editedRecord, this.rowData);
         }
         else {
             for (let i = 0; i < selectedItems.length; i++) {
@@ -21754,6 +21782,7 @@ class Edit$2 {
     constructor(parent) {
         this.isFromDeleteMethod = false;
         this.targetedRecords = [];
+        this.isNewRecordAdded = false;
         /** @hidden */
         this.updateParentRecords = [];
         /** @hidden */
@@ -22553,7 +22582,7 @@ class Edit$2 {
         if (ganttRecord.parentItem) {
             this.parent.dataOperation.updateParentItems(ganttRecord, true);
             let parentData = this.parent.getRecordByID(ganttRecord.parentItem.taskId);
-            if (parentData.ganttProperties.predecessor) {
+            if (!parentData.ganttProperties.predecessorsName) {
                 this.parent.predecessorModule.validatePredecessor(parentData, [], '');
                 this.updateParentItemOnEditing();
             }
@@ -24200,6 +24229,7 @@ class Edit$2 {
                     parentItem.taskData[child] = [];
                     parentItem.taskData[child].push(record.taskData);
                 }
+                this.isNewRecordAdded = true;
             }
         }
     }
@@ -24314,9 +24344,10 @@ class Edit$2 {
                     dataSource.push(addedRecord[i].taskData);
                 }
                 else {
-                    if (isNullOrUndefined(addedRecord[i].parentItem)) {
+                    if (!this.isNewRecordAdded) {
                         this.addDataInRealDataSource(dataSource, addedRecord[i].taskData, rowPosition);
                     }
+                    this.isNewRecordAdded = false;
                 }
             }
             this.isBreakLoop = false;
@@ -25043,7 +25074,14 @@ class Edit$2 {
             if (this.dropPosition === 'topSegment' || this.dropPosition === 'bottomSegment') {
                 const rowPos = this.dropPosition === 'topSegment' ? 'Above' : 'Below';
                 this.parent.editModule.addRowSelectedItem = droppedRec;
-                this.parent.editModule.updateRealDataSource(draggedRec, rowPos);
+                let dragRecord = [];
+                if (!Array.isArray(draggedRec)) {
+                    dragRecord[0] = draggedRec;
+                }
+                else {
+                    dragRecord = draggedRec;
+                }
+                this.parent.editModule.updateRealDataSource(dragRecord, rowPos);
                 delete this.parent.editModule.addRowSelectedItem;
             }
         }