@syncfusion/ej2-gantt 22.2.11 → 22.2.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +38 -22
- package/dist/ej2-gantt.min.js +2 -2
- package/dist/ej2-gantt.umd.min.js +2 -2
- package/dist/ej2-gantt.umd.min.js.map +1 -1
- package/dist/es6/ej2-gantt.es2015.js +161 -54
- package/dist/es6/ej2-gantt.es2015.js.map +1 -1
- package/dist/es6/ej2-gantt.es5.js +160 -53
- package/dist/es6/ej2-gantt.es5.js.map +1 -1
- package/dist/global/ej2-gantt.min.js +2 -2
- package/dist/global/ej2-gantt.min.js.map +1 -1
- package/dist/global/index.d.ts +1 -1
- package/package.json +11 -11
- package/src/gantt/actions/context-menu.js +4 -1
- package/src/gantt/actions/critical-path.js +2 -0
- package/src/gantt/actions/edit.d.ts +12 -1
- package/src/gantt/actions/edit.js +76 -2
- package/src/gantt/actions/filter.js +3 -0
- package/src/gantt/base/date-processor.js +2 -2
- package/src/gantt/base/gantt.js +10 -2
- package/src/gantt/base/task-processor.js +11 -11
- package/src/gantt/export/export-helper.js +2 -1
- package/src/gantt/export/pdf-base/treegrid-layouter.js +3 -0
- package/src/gantt/export/pdf-treegrid.js +3 -0
- package/src/gantt/renderer/edit-tooltip.js +10 -7
- package/src/gantt/renderer/timeline.js +3 -0
- package/src/gantt/renderer/tooltip.js +32 -28
- package/styles/gantt/material-dark.css +1 -1
- package/styles/material-dark.css +1 -1
package/dist/global/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* filename: index.d.ts
|
|
3
|
-
* version : 22.2.
|
|
3
|
+
* version : 22.2.12
|
|
4
4
|
* Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
|
|
5
5
|
* Use of this code is subject to the terms of our license.
|
|
6
6
|
* A copy of the current license can be obtained at any time by e-mailing
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"_from": "@syncfusion/ej2-gantt@*",
|
|
3
|
-
"_id": "@syncfusion/ej2-gantt@22.2.
|
|
3
|
+
"_id": "@syncfusion/ej2-gantt@22.2.11",
|
|
4
4
|
"_inBundle": false,
|
|
5
|
-
"_integrity": "sha512-
|
|
5
|
+
"_integrity": "sha512-4k77+lRaM2yuPPVon313iOaBCTitL9kD0en5Bq1hQUl76tMUiIGj6JO0mK26YIsWSWG8btrJpP5Bre49Cyldnw==",
|
|
6
6
|
"_location": "/@syncfusion/ej2-gantt",
|
|
7
7
|
"_phantomChildren": {},
|
|
8
8
|
"_requested": {
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"/@syncfusion/ej2-react-gantt",
|
|
24
24
|
"/@syncfusion/ej2-vue-gantt"
|
|
25
25
|
],
|
|
26
|
-
"_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-gantt/-/ej2-gantt-22.2.
|
|
27
|
-
"_shasum": "
|
|
26
|
+
"_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-gantt/-/ej2-gantt-22.2.11.tgz",
|
|
27
|
+
"_shasum": "3e8b2f541557af41cd85d60381a100eb8b6feaf4",
|
|
28
28
|
"_spec": "@syncfusion/ej2-gantt@*",
|
|
29
29
|
"_where": "/jenkins/workspace/elease-automation_release_21.1.1/packages/included",
|
|
30
30
|
"author": {
|
|
@@ -35,19 +35,19 @@
|
|
|
35
35
|
},
|
|
36
36
|
"bundleDependencies": false,
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@syncfusion/ej2-base": "~22.2.
|
|
38
|
+
"@syncfusion/ej2-base": "~22.2.12",
|
|
39
39
|
"@syncfusion/ej2-buttons": "~22.2.9",
|
|
40
|
-
"@syncfusion/ej2-calendars": "~22.2.
|
|
40
|
+
"@syncfusion/ej2-calendars": "~22.2.12",
|
|
41
41
|
"@syncfusion/ej2-data": "~22.2.5",
|
|
42
|
-
"@syncfusion/ej2-dropdowns": "~22.2.
|
|
43
|
-
"@syncfusion/ej2-grids": "~22.2.
|
|
44
|
-
"@syncfusion/ej2-inputs": "~22.2.
|
|
42
|
+
"@syncfusion/ej2-dropdowns": "~22.2.12",
|
|
43
|
+
"@syncfusion/ej2-grids": "~22.2.12",
|
|
44
|
+
"@syncfusion/ej2-inputs": "~22.2.12",
|
|
45
45
|
"@syncfusion/ej2-layouts": "~22.2.9",
|
|
46
46
|
"@syncfusion/ej2-lists": "~22.2.11",
|
|
47
47
|
"@syncfusion/ej2-navigations": "~22.2.11",
|
|
48
48
|
"@syncfusion/ej2-notifications": "~22.2.5",
|
|
49
49
|
"@syncfusion/ej2-popups": "~22.2.11",
|
|
50
|
-
"@syncfusion/ej2-richtexteditor": "~22.2.
|
|
50
|
+
"@syncfusion/ej2-richtexteditor": "~22.2.12",
|
|
51
51
|
"@syncfusion/ej2-svg-base": "~22.2.8",
|
|
52
52
|
"@syncfusion/ej2-treegrid": "~22.2.9"
|
|
53
53
|
},
|
|
@@ -74,6 +74,6 @@
|
|
|
74
74
|
"url": "git+https://github.com/syncfusion/ej2-gantt.git"
|
|
75
75
|
},
|
|
76
76
|
"typings": "index.d.ts",
|
|
77
|
-
"version": "22.2.
|
|
77
|
+
"version": "22.2.12",
|
|
78
78
|
"sideEffects": false
|
|
79
79
|
}
|
|
@@ -165,7 +165,7 @@ var ContextMenu = /** @class */ (function () {
|
|
|
165
165
|
taskfields = this.parent.taskFields;
|
|
166
166
|
if (!isNullOrUndefined(taskfields.duration)) {
|
|
167
167
|
var ganttProp = this.rowData.ganttProperties;
|
|
168
|
-
data[taskfields.duration] =
|
|
168
|
+
data[taskfields.duration] = data[taskfields.duration] <= 0 ? 1 : data[taskfields.duration];
|
|
169
169
|
}
|
|
170
170
|
else {
|
|
171
171
|
data[taskfields.startDate] = new Date(this.rowData.taskData[taskfields.startDate]);
|
|
@@ -178,6 +178,9 @@ var ContextMenu = /** @class */ (function () {
|
|
|
178
178
|
data[taskfields.milestone] = false;
|
|
179
179
|
}
|
|
180
180
|
}
|
|
181
|
+
if (data[taskfields.startDate]) {
|
|
182
|
+
this.parent.setRecordValue(taskfields.startDate, this.rowData.ganttProperties.startDate, data, true);
|
|
183
|
+
}
|
|
181
184
|
this.parent.updateRecordByID(data);
|
|
182
185
|
}
|
|
183
186
|
break;
|
|
@@ -794,6 +794,8 @@ var CriticalPath = /** @class */ (function () {
|
|
|
794
794
|
}
|
|
795
795
|
if (element.getElementsByClassName('e-gantt-child-taskbar-inner-div').length > 0) {
|
|
796
796
|
addClass(element.querySelectorAll('.e-gantt-child-taskbar-inner-div'), cls.criticalChildTaskBarInnerDiv);
|
|
797
|
+
var innerDivs = document.querySelector('.e-gantt-child-taskbar-inner-div');
|
|
798
|
+
innerDivs.style.outlineColor = "";
|
|
797
799
|
}
|
|
798
800
|
if (element.getElementsByClassName('e-gantt-child-progressbar-inner-div').length > 0) {
|
|
799
801
|
addClass(element.querySelectorAll('.e-gantt-child-progressbar-inner-div'), taskClass);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Gantt } from '../base/gantt';
|
|
2
2
|
import { IGanttData, ITaskbarEditedEventArgs, IParent } from '../base/interface';
|
|
3
|
-
import { RowDropEventArgs } from '../base/interface';
|
|
3
|
+
import { ITaskAddedEventArgs, RowDropEventArgs } from '../base/interface';
|
|
4
4
|
import { RowPosition } from '../base/enum';
|
|
5
5
|
import { CellEdit } from './cell-edit';
|
|
6
6
|
import { TaskbarEdit } from './taskbar-edit';
|
|
@@ -450,6 +450,17 @@ export declare class Edit {
|
|
|
450
450
|
* @private
|
|
451
451
|
*/
|
|
452
452
|
private addDataInRealDataSource;
|
|
453
|
+
/**
|
|
454
|
+
* Method to update the values to client side from server side.
|
|
455
|
+
*
|
|
456
|
+
* @param {Object} e - Defines the new modified data from the server.
|
|
457
|
+
* @param {ITaskAddedEventArgs} args - Defines the client side data.
|
|
458
|
+
* @returns {void} .
|
|
459
|
+
*/
|
|
460
|
+
updateClientDataFromServer(e: {
|
|
461
|
+
addedRecords: Object[];
|
|
462
|
+
changedRecords: Object[];
|
|
463
|
+
}, args: ITaskAddedEventArgs): void;
|
|
453
464
|
/**
|
|
454
465
|
* Method to add new record.
|
|
455
466
|
*
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isNullOrUndefined, isUndefined, extend, setValue, getValue, deleteObject, createElement } from '@syncfusion/ej2-base';
|
|
2
|
-
import { DataManager, Query, ODataAdaptor, WebApiAdaptor
|
|
2
|
+
import { DataManager, Query, ODataAdaptor, WebApiAdaptor } from '@syncfusion/ej2-data';
|
|
3
3
|
import { getUid } from '@syncfusion/ej2-grids';
|
|
4
4
|
import { getSwapKey, isScheduledTask, getTaskData, isRemoteData, getIndex, isCountRequired, updateDates } from '../base/utils';
|
|
5
5
|
import { CellEdit } from './cell-edit';
|
|
@@ -402,6 +402,11 @@ var Edit = /** @class */ (function () {
|
|
|
402
402
|
var ganttPropByMapping = getSwapKey(ganttObj.columnMapping);
|
|
403
403
|
var scheduleFieldNames = [];
|
|
404
404
|
var isScheduleValueUpdated = false;
|
|
405
|
+
if (!isNullOrUndefined(ganttData[tasks.milestone])) {
|
|
406
|
+
if (ganttData[tasks.milestone] === true) {
|
|
407
|
+
ganttData[tasks.milestone] = false;
|
|
408
|
+
}
|
|
409
|
+
}
|
|
405
410
|
for (var _i = 0, _b = Object.keys(data); _i < _b.length; _i++) {
|
|
406
411
|
var key = _b[_i];
|
|
407
412
|
if ([tasks.startDate, tasks.endDate, tasks.duration].indexOf(key) !== -1) {
|
|
@@ -463,6 +468,22 @@ var Edit = /** @class */ (function () {
|
|
|
463
468
|
else if (key === tasks.cssClass) {
|
|
464
469
|
ganttPropKey = 'cssClass';
|
|
465
470
|
}
|
|
471
|
+
else if (key === tasks.milestone) {
|
|
472
|
+
ganttPropKey = 'isMilestone';
|
|
473
|
+
if (!isNullOrUndefined(tasks.duration)) {
|
|
474
|
+
var ganttProp = ganttData.ganttProperties;
|
|
475
|
+
var durationValue = data[tasks.duration];
|
|
476
|
+
if (value) {
|
|
477
|
+
durationValue = 0;
|
|
478
|
+
}
|
|
479
|
+
else {
|
|
480
|
+
durationValue = durationValue <= 0 ? 1 : durationValue;
|
|
481
|
+
}
|
|
482
|
+
ganttObj.setRecordValue(tasks.duration, durationValue, ganttData, true);
|
|
483
|
+
ganttObj.setRecordValue('duration', durationValue, ganttProp, true);
|
|
484
|
+
ganttObj.setRecordValue('taskData.' + tasks.duration, durationValue, ganttData);
|
|
485
|
+
}
|
|
486
|
+
}
|
|
466
487
|
else if ((key === tasks.segments) && (!isNullOrUndefined(ganttData.ganttProperties.segments))) {
|
|
467
488
|
ganttPropKey = 'segments';
|
|
468
489
|
/* eslint-disable-next-line */
|
|
@@ -2865,6 +2886,57 @@ var Edit = /** @class */ (function () {
|
|
|
2865
2886
|
}
|
|
2866
2887
|
}
|
|
2867
2888
|
};
|
|
2889
|
+
/**
|
|
2890
|
+
* Method to update the values to client side from server side.
|
|
2891
|
+
*
|
|
2892
|
+
* @param {Object} e - Defines the new modified data from the server.
|
|
2893
|
+
* @param {ITaskAddedEventArgs} args - Defines the client side data.
|
|
2894
|
+
* @returns {void} .
|
|
2895
|
+
*/
|
|
2896
|
+
Edit.prototype.updateClientDataFromServer = function (e, args) {
|
|
2897
|
+
var serverReturnedValue = e.addedRecords[0];
|
|
2898
|
+
var _aLength = Object.keys(serverReturnedValue).length;
|
|
2899
|
+
for (var j = 0, _a = Object.keys(serverReturnedValue); j < _aLength; j++) {
|
|
2900
|
+
var key = _a[parseInt(j.toString(), 10)];
|
|
2901
|
+
args.data["" + key] = serverReturnedValue["" + key];
|
|
2902
|
+
}
|
|
2903
|
+
if (this.parent.taskFields.id !== null) {
|
|
2904
|
+
args.data.ganttProperties['taskId'] = serverReturnedValue[this.parent.taskFields.id];
|
|
2905
|
+
}
|
|
2906
|
+
if (this.parent.taskFields.name !== null) {
|
|
2907
|
+
args.data.ganttProperties['taskName'] = serverReturnedValue[this.parent.taskFields.name];
|
|
2908
|
+
}
|
|
2909
|
+
if (this.parent.taskFields.startDate !== null) {
|
|
2910
|
+
args.data.ganttProperties['startDate'] = serverReturnedValue[this.parent.taskFields.startDate];
|
|
2911
|
+
}
|
|
2912
|
+
if (this.parent.taskFields.endDate !== null) {
|
|
2913
|
+
args.data.ganttProperties['endDate'] = serverReturnedValue[this.parent.taskFields.endDate];
|
|
2914
|
+
}
|
|
2915
|
+
if (this.parent.taskFields.duration !== null) {
|
|
2916
|
+
args.data.ganttProperties['duration'] = parseInt(serverReturnedValue[this.parent.taskFields.duration]);
|
|
2917
|
+
}
|
|
2918
|
+
if (this.parent.taskFields.durationUnit !== null) {
|
|
2919
|
+
args.data.ganttProperties['durationUnit'] = serverReturnedValue[this.parent.taskFields.durationUnit];
|
|
2920
|
+
}
|
|
2921
|
+
if (this.parent.taskFields.progress !== null) {
|
|
2922
|
+
args.data.ganttProperties['progress'] = serverReturnedValue[this.parent.taskFields.progress];
|
|
2923
|
+
}
|
|
2924
|
+
if (this.parent.taskFields.dependency !== null) {
|
|
2925
|
+
args.data.ganttProperties['dependency'] = serverReturnedValue[this.parent.taskFields.dependency];
|
|
2926
|
+
}
|
|
2927
|
+
if (this.parent.taskFields.parentID !== null) {
|
|
2928
|
+
args.data.ganttProperties['parentID'] = serverReturnedValue[this.parent.taskFields.parentID];
|
|
2929
|
+
}
|
|
2930
|
+
if (this.parent.taskFields.baselineEndDate !== null) {
|
|
2931
|
+
args.data.ganttProperties['baselineEndDate'] = serverReturnedValue[this.parent.taskFields.baselineEndDate];
|
|
2932
|
+
}
|
|
2933
|
+
if (this.parent.taskFields.baselineStartDate !== null) {
|
|
2934
|
+
args.data.ganttProperties['baselineStartDate'] = serverReturnedValue[this.parent.taskFields.baselineStartDate];
|
|
2935
|
+
}
|
|
2936
|
+
if (this.parent.taskFields.resourceInfo !== null) {
|
|
2937
|
+
args.data.ganttProperties['resources'] = serverReturnedValue[this.parent.taskFields.resourceInfo];
|
|
2938
|
+
}
|
|
2939
|
+
};
|
|
2868
2940
|
/**
|
|
2869
2941
|
* Method to add new record.
|
|
2870
2942
|
*
|
|
@@ -2926,7 +2998,8 @@ var Edit = /** @class */ (function () {
|
|
|
2926
2998
|
/* tslint:disable-next-line */
|
|
2927
2999
|
var query = _this.parent.query instanceof Query ? _this.parent.query : new Query();
|
|
2928
3000
|
var adaptor = data_2.adaptor;
|
|
2929
|
-
|
|
3001
|
+
var moduleName = adaptor.getModuleName();
|
|
3002
|
+
if (!(moduleName == "WebApiAdaptor" || moduleName == "ODataAdaptor" || moduleName == "ODataV4Adaptor") || data_2.dataSource.batchUrl) {
|
|
2930
3003
|
/* tslint:disable-next-line */
|
|
2931
3004
|
var crud = data_2.saveChanges(updatedData_2, _this.parent.taskFields.id, null, query);
|
|
2932
3005
|
crud.then(function (e) {
|
|
@@ -2936,6 +3009,7 @@ var Edit = /** @class */ (function () {
|
|
|
2936
3009
|
_this.parent.setRecordValue('taskData', e.addedRecords[0], args.data);
|
|
2937
3010
|
_this.parent.setRecordValue(_this.parent.taskFields.id, e.addedRecords[0][_this.parent.taskFields.id], args.data);
|
|
2938
3011
|
_this.parent.setRecordValue('rowUniqueID', e.addedRecords[0][_this.parent.taskFields.id].toString(), args.data.ganttProperties, true);
|
|
3012
|
+
_this.updateClientDataFromServer(e, args);
|
|
2939
3013
|
var idsIndex = _this.parent.ids.indexOf(prevID_1);
|
|
2940
3014
|
if (idsIndex !== -1) {
|
|
2941
3015
|
_this.parent.ids[idsIndex] = e.addedRecords[0][_this.parent.taskFields.id].toString();
|
|
@@ -294,6 +294,9 @@ var Filter = /** @class */ (function () {
|
|
|
294
294
|
break;
|
|
295
295
|
}
|
|
296
296
|
if (!isNullOrUndefined(this.parent.element.parentNode)) {
|
|
297
|
+
if (parentNode.parentNode instanceof HTMLDocument) {
|
|
298
|
+
break;
|
|
299
|
+
}
|
|
297
300
|
parentNode = parentNode.parentNode;
|
|
298
301
|
marginLeft = parentNode.style.marginLeft;
|
|
299
302
|
}
|
|
@@ -1332,8 +1332,8 @@ var DateProcessor = /** @class */ (function () {
|
|
|
1332
1332
|
}
|
|
1333
1333
|
if (!editArgs) {
|
|
1334
1334
|
this.prevProjectStartDate = this.parent.cloneProjectStartDate;
|
|
1335
|
-
this.parent.cloneProjectStartDate = minStartDate ? minStartDate : new Date(projectStartDate.getTime());
|
|
1336
|
-
this.parent.cloneProjectEndDate = maxEndDate ? maxEndDate : new Date(projectEndDate.getTime());
|
|
1335
|
+
this.parent.cloneProjectStartDate = minStartDate ? (!this.parent.timelineModule.isZoomToFit) ? (!isNullOrUndefined(projectStartDate)) ? new Date(projectStartDate.getTime()) : minStartDate : minStartDate : new Date(projectStartDate.getTime());
|
|
1336
|
+
this.parent.cloneProjectEndDate = maxEndDate ? (!this.parent.timelineModule.isZoomToFit) ? (!isNullOrUndefined(projectEndDate)) ? new Date(projectEndDate.getTime()) : maxEndDate : maxEndDate : new Date(projectEndDate.getTime());
|
|
1337
1337
|
}
|
|
1338
1338
|
else {
|
|
1339
1339
|
setValue('minStartDate', minStartDate, editArgs);
|
package/src/gantt/base/gantt.js
CHANGED
|
@@ -779,7 +779,9 @@ var Gantt = /** @class */ (function (_super) {
|
|
|
779
779
|
this.wireEvents();
|
|
780
780
|
this.notify('initPredessorDialog', {});
|
|
781
781
|
}
|
|
782
|
-
this.
|
|
782
|
+
if (!this.isFromOnPropertyChange) {
|
|
783
|
+
this.splitterModule.updateSplitterPosition();
|
|
784
|
+
}
|
|
783
785
|
// if (this.gridLines === 'Vertical' || this.gridLines === 'Both') {
|
|
784
786
|
// this.renderChartVerticalLines();
|
|
785
787
|
// }
|
|
@@ -791,6 +793,8 @@ var Gantt = /** @class */ (function (_super) {
|
|
|
791
793
|
removeClass(ganttChartElement.querySelectorAll('.e-critical-milestone'), cls.criticalMilestone);
|
|
792
794
|
removeClass(this.element.querySelectorAll('.e-connector-line'), cls.criticalConnectorLineSVG);
|
|
793
795
|
removeClass(this.element.querySelectorAll('.e-connector-line-arrow'), cls.criticalConnectorArrowSVG);
|
|
796
|
+
var innerDivs = document.querySelector('.e-gantt-child-taskbar-inner-div');
|
|
797
|
+
innerDivs.style.outlineColor = "";
|
|
794
798
|
};
|
|
795
799
|
Gantt.prototype.wireEvents = function () {
|
|
796
800
|
if (this.allowKeyboard) {
|
|
@@ -1503,6 +1507,7 @@ var Gantt = /** @class */ (function (_super) {
|
|
|
1503
1507
|
break;
|
|
1504
1508
|
case 'projectStartDate':
|
|
1505
1509
|
case 'projectEndDate':
|
|
1510
|
+
this.timelineModule.isZoomToFit = false;
|
|
1506
1511
|
this.dataOperation.calculateProjectDates();
|
|
1507
1512
|
this.updateProjectDates(this.cloneProjectStartDate, this.cloneProjectEndDate, this.isTimelineRoundOff);
|
|
1508
1513
|
break;
|
|
@@ -2627,8 +2632,11 @@ var Gantt = /** @class */ (function (_super) {
|
|
|
2627
2632
|
}
|
|
2628
2633
|
else {
|
|
2629
2634
|
this.editModule.addRecord(data, rowPosition, rowIndex);
|
|
2635
|
+
if (rowPosition === 'Bottom') {
|
|
2636
|
+
this.selectedRowIndex = rowIndex;
|
|
2637
|
+
}
|
|
2630
2638
|
if (rowPosition === 'Above' || rowPosition === 'Below' || rowPosition === 'Child') {
|
|
2631
|
-
this.currentSelection = data;
|
|
2639
|
+
this.currentSelection = !isNullOrUndefined(data) ? data : this.currentSelection;
|
|
2632
2640
|
}
|
|
2633
2641
|
}
|
|
2634
2642
|
}
|
|
@@ -1528,17 +1528,15 @@ var TaskProcessor = /** @class */ (function (_super) {
|
|
|
1528
1528
|
else {
|
|
1529
1529
|
hierarchicalData = this.parent.dataSource;
|
|
1530
1530
|
}
|
|
1531
|
-
|
|
1532
|
-
|
|
1533
|
-
if (
|
|
1534
|
-
|
|
1535
|
-
task[_this.parent.taskFields.endDate] = record[_this.parent.taskFields.endDate];
|
|
1536
|
-
}
|
|
1537
|
-
if (!isNullOrUndefined(_this.parent.taskFields.endDate)) {
|
|
1538
|
-
task[_this.parent.taskFields.endDate] = record[_this.parent.taskFields.endDate];
|
|
1539
|
-
}
|
|
1531
|
+
hierarchicalData.map(function (record) {
|
|
1532
|
+
if (task.ganttProperties.taskId === record[_this.parent.taskFields.id]) {
|
|
1533
|
+
if (!isNullOrUndefined(_this.parent.taskFields.startDate)) {
|
|
1534
|
+
task[_this.parent.taskFields.startDate] = record[_this.parent.taskFields.startDate];
|
|
1540
1535
|
}
|
|
1541
|
-
|
|
1536
|
+
if (!isNullOrUndefined(_this.parent.taskFields.endDate)) {
|
|
1537
|
+
task[_this.parent.taskFields.endDate] = record[_this.parent.taskFields.endDate];
|
|
1538
|
+
}
|
|
1539
|
+
}
|
|
1542
1540
|
});
|
|
1543
1541
|
};
|
|
1544
1542
|
TaskProcessor.prototype.getWorkInHour = function (work, workUnit) {
|
|
@@ -1580,7 +1578,9 @@ var TaskProcessor = /** @class */ (function (_super) {
|
|
|
1580
1578
|
this.setRecordDate(ganttData, ganttProperties.endDate, dataMapping.endDate);
|
|
1581
1579
|
}
|
|
1582
1580
|
if (dataMapping.duration) {
|
|
1583
|
-
|
|
1581
|
+
if (!isNullOrUndefined(dataMapping.milestone) && !ganttData.taskData[dataMapping.milestone]) {
|
|
1582
|
+
this.setRecordDuration(ganttData, dataMapping.duration);
|
|
1583
|
+
}
|
|
1584
1584
|
}
|
|
1585
1585
|
if (dataMapping.durationUnit) {
|
|
1586
1586
|
data[dataMapping.durationUnit] = ganttProperties.durationUnit;
|
|
@@ -410,7 +410,8 @@ var ExportHelper = /** @class */ (function () {
|
|
|
410
410
|
row.height = pixelToPoint(this.parent.rowHeight);
|
|
411
411
|
this.copyStyles(this.ganttStyle.columnHeader, row.cells.getCell(0), row.isParentRow);
|
|
412
412
|
var count = this.columns.length;
|
|
413
|
-
|
|
413
|
+
row.cells.getCell(0).value = this.parent.localeObj.getConstant('emptyRecord');
|
|
414
|
+
this.mergeCells(1, 0, count);
|
|
414
415
|
};
|
|
415
416
|
ExportHelper.prototype.mergeCells = function (rowIndex, colIndex, lastColIndex) {
|
|
416
417
|
this.gantt.rows.getRow(rowIndex).cells.getCell(colIndex).columnSpan = lastColIndex;
|
|
@@ -309,6 +309,9 @@ var PdfTreeGridLayouter = /** @class */ (function (_super) {
|
|
|
309
309
|
}
|
|
310
310
|
}
|
|
311
311
|
var size = new SizeF(column.width, height);
|
|
312
|
+
if (cell.columnSpan > 1) {
|
|
313
|
+
size = new SizeF(cell.width, height);
|
|
314
|
+
}
|
|
312
315
|
if (!this.checkIfDefaultFormat(column.format) && this.checkIfDefaultFormat(cell.style.format)) {
|
|
313
316
|
cell.style.format = column.format;
|
|
314
317
|
}
|
|
@@ -337,12 +337,15 @@ var PdfTreeGrid = /** @class */ (function (_super) {
|
|
|
337
337
|
colSpan = cell.columnSpan;
|
|
338
338
|
currentCellIndex = j;
|
|
339
339
|
cell.isCellMergeStart = true;
|
|
340
|
+
var totalColumnWidth = this.columns.columns[currentCellIndex].width;
|
|
340
341
|
//set Column merges.
|
|
341
342
|
while (colSpan > 1) {
|
|
342
343
|
currentCellIndex++;
|
|
343
344
|
row.cells.getCell(currentCellIndex).isCellMergeContinue = true;
|
|
344
345
|
colSpan--;
|
|
346
|
+
totalColumnWidth += this.columns.columns[currentCellIndex].width;
|
|
345
347
|
}
|
|
348
|
+
cell.width = totalColumnWidth;
|
|
346
349
|
}
|
|
347
350
|
else if (cell.columnSpan === 1 && cell.rowSpan > 1) {
|
|
348
351
|
rowSpan = cell.rowSpan;
|
|
@@ -50,13 +50,16 @@ var EditTooltip = /** @class */ (function () {
|
|
|
50
50
|
* @returns {void} .
|
|
51
51
|
*/
|
|
52
52
|
EditTooltip.prototype.updateTooltipPosition = function (args) {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
53
|
+
var parentWithZoomStyle = this.parent.element.closest('[style*="zoom"]');
|
|
54
|
+
if (isNullOrUndefined(parentWithZoomStyle)) {
|
|
55
|
+
var containerPosition = this.parent.getOffsetRect(this.parent.chartPane);
|
|
56
|
+
var leftEnd = containerPosition.left + this.parent.chartPane.offsetWidth;
|
|
57
|
+
var tooltipPositionX = args.element.offsetLeft;
|
|
58
|
+
if (leftEnd < (tooltipPositionX + args.element.offsetWidth)) {
|
|
59
|
+
tooltipPositionX += leftEnd - (tooltipPositionX + args.element.offsetWidth);
|
|
60
|
+
}
|
|
61
|
+
args.element.style.left = tooltipPositionX + 'px';
|
|
62
|
+
}
|
|
60
63
|
args.element.style.visibility = 'visible';
|
|
61
64
|
};
|
|
62
65
|
/**
|
|
@@ -1478,13 +1478,16 @@ var Timeline = /** @class */ (function () {
|
|
|
1478
1478
|
this.parent.updateProjectDates(args.projectStartDate, args.ProjectEndDate, args.isTimelineRoundOff, isFrom);
|
|
1479
1479
|
if (type === 'prevTimeSpan' && isFrom === 'publicMethod') {
|
|
1480
1480
|
this.parent.ganttChartModule.updateScrollLeft(0);
|
|
1481
|
+
this.parent.timelineModule.isZoomToFit = false;
|
|
1481
1482
|
}
|
|
1482
1483
|
else if (type === 'nextTimeSpan' && isFrom === 'publicMethod') {
|
|
1483
1484
|
this.parent.ganttChartModule.updateScrollLeft(this.parent.timelineModule.totalTimelineWidth);
|
|
1485
|
+
this.parent.timelineModule.isZoomToFit = false;
|
|
1484
1486
|
}
|
|
1485
1487
|
else if (type === 'nextTimeSpan' && isFrom === 'TaskbarEditing') {
|
|
1486
1488
|
var currentScrollLeft = document.getElementsByClassName('e-chart-scroll-container e-content')[0].scrollLeft;
|
|
1487
1489
|
this.parent.element.querySelector('.e-timeline-header-container').scrollLeft = currentScrollLeft;
|
|
1490
|
+
this.parent.timelineModule.isZoomToFit = false;
|
|
1488
1491
|
}
|
|
1489
1492
|
this.parent.timelineModule.timeSpanActionEvent('actionComplete', type, isFrom);
|
|
1490
1493
|
}
|
|
@@ -185,34 +185,38 @@ var Tooltip = /** @class */ (function () {
|
|
|
185
185
|
*/
|
|
186
186
|
Tooltip.prototype.updateTooltipPosition = function (args) {
|
|
187
187
|
args.element.style.visibility = 'visible';
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
188
|
+
var parentWithZoomStyle = this.parent.element.closest('[style*="zoom"]');
|
|
189
|
+
if (isNullOrUndefined(parentWithZoomStyle)) {
|
|
190
|
+
if (isNullOrUndefined(this.tooltipMouseEvent) || args.target.classList.contains('e-notes-info')) {
|
|
191
|
+
return;
|
|
192
|
+
}
|
|
193
|
+
var postion = this.getPointorPosition(this.tooltipMouseEvent);
|
|
194
|
+
var containerPosition = this.parent.getOffsetRect(this.parent.chartPane);
|
|
195
|
+
var topEnd = containerPosition.top + this.parent.chartPane.offsetHeight;
|
|
196
|
+
var leftEnd = containerPosition.left + this.parent.chartPane.offsetWidth;
|
|
197
|
+
var tooltipPositionX = postion.x;
|
|
198
|
+
var tooltipPositionY = postion.y;
|
|
199
|
+
if (leftEnd < (tooltipPositionX + args.element.offsetWidth + 10)) {
|
|
200
|
+
while (leftEnd < (tooltipPositionX + args.element.offsetWidth + 10)) {
|
|
201
|
+
tooltipPositionX = leftEnd - args.element.offsetWidth - 10;
|
|
202
|
+
args.element.style.left = tooltipPositionX + 'px';
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
else {
|
|
206
|
+
tooltipPositionX = tooltipPositionX + 10;
|
|
207
|
+
args.element.style.left = tooltipPositionX + 'px';
|
|
208
|
+
}
|
|
209
|
+
if (window.innerHeight < args.element.offsetHeight + tooltipPositionY) {
|
|
210
|
+
tooltipPositionY = tooltipPositionY - args.element.offsetHeight - 10;
|
|
211
|
+
}
|
|
212
|
+
if ((topEnd < (tooltipPositionY + args.element.offsetHeight + 20))) {
|
|
213
|
+
tooltipPositionY = tooltipPositionY - args.element.offsetHeight - 10;
|
|
214
|
+
}
|
|
215
|
+
else {
|
|
216
|
+
tooltipPositionY = tooltipPositionY + 10;
|
|
217
|
+
}
|
|
218
|
+
args.element.style.top = tooltipPositionY + 'px';
|
|
219
|
+
}
|
|
216
220
|
};
|
|
217
221
|
/**
|
|
218
222
|
* Method to get mouse pointor position
|
package/styles/material-dark.css
CHANGED