@syncfusion/ej2-gantt 20.2.49 → 20.2.50
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 +10 -0
- 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 +34 -45
- package/dist/es6/ej2-gantt.es2015.js.map +1 -1
- package/dist/es6/ej2-gantt.es5.js +52 -59
- 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 +9 -9
- package/src/gantt/actions/dialog-edit.js +14 -1
- package/src/gantt/actions/edit.js +35 -19
- package/src/gantt/actions/filter.d.ts +0 -1
- package/src/gantt/actions/filter.js +2 -38
- package/src/gantt/actions/toolbar.js +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Browser, ChildProperty, Collection, Complex, Component, Event, EventHandler, Internationalization, KeyboardEvents, L10n, NotifyPropertyChanges, Property, addClass, append, classList, closest, compile, createElement, deleteObject, extend, formatUnit, getValue, isNullOrUndefined, isObject, isObjectArray, isUndefined, merge, remove, removeClass, setValue } from '@syncfusion/ej2-base';
|
|
2
2
|
import { Dialog, Tooltip, createSpinner, hideSpinner, showSpinner } from '@syncfusion/ej2-popups';
|
|
3
|
-
import { Edit, ForeignKey, Grid, Page, Predicate, Toolbar, ValueFormatter, click, filterAfterOpen, getActualProperties, getCustomDateFormat,
|
|
3
|
+
import { Edit, ForeignKey, Grid, Page, Predicate, Toolbar, ValueFormatter, click, filterAfterOpen, getActualProperties, getCustomDateFormat, getForeignData, getObject, getUid, parentsUntil, setCssInGridPopUp } from '@syncfusion/ej2-grids';
|
|
4
4
|
import { CacheAdaptor, DataManager, DataUtil, Deferred, ODataAdaptor, ODataV4Adaptor, Query, RemoteSaveAdaptor, UrlAdaptor, WebApiAdaptor, WebMethodAdaptor } from '@syncfusion/ej2-data';
|
|
5
5
|
import { ColumnMenu, ContextMenu, Edit as Edit$1, ExcelExport, Filter, Reorder, Resize, RowDD, Selection, Sort, TreeGrid, VirtualScroll } from '@syncfusion/ej2-treegrid';
|
|
6
6
|
import { Splitter } from '@syncfusion/ej2-layouts';
|
|
@@ -20417,7 +20417,20 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
|
|
|
20417
20417
|
var rowResource = ganttData.ganttProperties.resourceInfo;
|
|
20418
20418
|
var inputModel = this.beforeOpenArgs[itemName];
|
|
20419
20419
|
var resourceTreeGridId = ganttObj.element.id + '' + itemName + 'TabContainer';
|
|
20420
|
-
var resourceData =
|
|
20420
|
+
var resourceData = [];
|
|
20421
|
+
if (this.parent.viewType === 'ResourceView') {
|
|
20422
|
+
for (var i = 0; i < ganttObj.currentViewData.length; i++) {
|
|
20423
|
+
for (var j = 0; j < ganttObj.resources.length; j++) {
|
|
20424
|
+
if (ganttObj.currentViewData[i][ganttObj.taskFields.id] === ganttObj.resources[j][resourceSettings.id] &&
|
|
20425
|
+
(ganttObj.currentViewData[i].hasChildRecords || isNullOrUndefined(ganttObj.currentViewData[i].parentItem))) {
|
|
20426
|
+
resourceData.push(ganttObj.resources[j]);
|
|
20427
|
+
}
|
|
20428
|
+
}
|
|
20429
|
+
}
|
|
20430
|
+
}
|
|
20431
|
+
else {
|
|
20432
|
+
resourceData = extend([], [], ganttObj.resources, true);
|
|
20433
|
+
}
|
|
20421
20434
|
this.parent.dataOperation.updateResourceUnit(resourceData);
|
|
20422
20435
|
if (!isNullOrUndefined(rowResource)) {
|
|
20423
20436
|
var count = void 0;
|
|
@@ -22291,7 +22304,7 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
|
|
|
22291
22304
|
this.parent.dataOperation.updateMappingData(ganttData, 'duration');
|
|
22292
22305
|
this.parent.dataOperation.updateMappingData(ganttData, 'endDate');
|
|
22293
22306
|
}
|
|
22294
|
-
else if (key ===
|
|
22307
|
+
else if (key === tasks.type) {
|
|
22295
22308
|
ganttObj.setRecordValue('taskType', data[key], ganttData.ganttProperties, true);
|
|
22296
22309
|
//this.parent.dataOperation.updateMappingData(ganttData, 'taskType');
|
|
22297
22310
|
}
|
|
@@ -23383,14 +23396,22 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
|
|
|
23383
23396
|
*/
|
|
23384
23397
|
Edit$$1.prototype.deleteResourceRecords = function (selectedRecords) {
|
|
23385
23398
|
var deleteRecords = [];
|
|
23386
|
-
|
|
23399
|
+
var _loop_1 = function (i) {
|
|
23387
23400
|
if (selectedRecords[i].parentItem) {
|
|
23388
23401
|
var data = selectedRecords[i];
|
|
23389
|
-
|
|
23390
|
-
for (var j = 0; j < ids.length; j++) {
|
|
23391
|
-
deleteRecords.push(this.parent.flatData[this.parent.ids.indexOf(ids[j].toString())]);
|
|
23392
|
-
}
|
|
23402
|
+
deleteRecords.push(this_1.parent.flatData[this_1.parent.ids.indexOf(data.ganttProperties.rowUniqueID)]);
|
|
23393
23403
|
}
|
|
23404
|
+
else {
|
|
23405
|
+
var resourceParent = this_1.parent.flatData.filter(function (data) {
|
|
23406
|
+
return (parseInt(data.ganttProperties.taskId) == parseInt(selectedRecords[i].ganttProperties.taskId) &&
|
|
23407
|
+
data.hasChildRecords);
|
|
23408
|
+
})[0];
|
|
23409
|
+
deleteRecords.push(resourceParent);
|
|
23410
|
+
}
|
|
23411
|
+
};
|
|
23412
|
+
var this_1 = this;
|
|
23413
|
+
for (var i = 0; i < selectedRecords.length; i++) {
|
|
23414
|
+
_loop_1(i);
|
|
23394
23415
|
}
|
|
23395
23416
|
this.deleteRow(deleteRecords);
|
|
23396
23417
|
};
|
|
@@ -23837,6 +23858,14 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
|
|
|
23837
23858
|
eventArgs.modifiedTaskData = getTaskData(args.updatedRecordCollection, null, null, this.parent);
|
|
23838
23859
|
setValue('action', args.action, eventArgs);
|
|
23839
23860
|
this.parent.isOnDelete = false;
|
|
23861
|
+
if (this.parent.viewType === 'ResourceView') {
|
|
23862
|
+
var updateUnAssignedResources = eventArgs.data.filter(function (data) {
|
|
23863
|
+
return !data.hasChildRecords;
|
|
23864
|
+
});
|
|
23865
|
+
for (var i = 0; i < updateUnAssignedResources.length; i++) {
|
|
23866
|
+
this.checkWithUnassignedTask(updateUnAssignedResources[i]);
|
|
23867
|
+
}
|
|
23868
|
+
}
|
|
23840
23869
|
this.parent.trigger('actionComplete', eventArgs);
|
|
23841
23870
|
this.deletedTaskDetails = [];
|
|
23842
23871
|
this.parent.initiateEditAction(false);
|
|
@@ -24254,27 +24283,27 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
|
|
|
24254
24283
|
}
|
|
24255
24284
|
}
|
|
24256
24285
|
}
|
|
24257
|
-
var
|
|
24258
|
-
var originalData =
|
|
24259
|
-
var treeIndex =
|
|
24260
|
-
var uniqueTaskID =
|
|
24261
|
-
originalIndex =
|
|
24286
|
+
var _loop_2 = function (i) {
|
|
24287
|
+
var originalData = this_2.parent.modifiedRecords[i];
|
|
24288
|
+
var treeIndex = this_2.parent.allowRowDragAndDrop ? 1 : 0;
|
|
24289
|
+
var uniqueTaskID = this_2.parent.taskFields.id;
|
|
24290
|
+
originalIndex = this_2.parent.currentViewData.findIndex(function (data) {
|
|
24262
24291
|
return (data[uniqueTaskID] == originalData[uniqueTaskID]);
|
|
24263
24292
|
});
|
|
24264
|
-
if (
|
|
24265
|
-
|
|
24266
|
-
data: originalData, cell:
|
|
24267
|
-
column:
|
|
24293
|
+
if (this_2.parent.treeGrid.getRows()[originalIndex]) {
|
|
24294
|
+
this_2.parent.treeGrid.renderModule.cellRender({
|
|
24295
|
+
data: originalData, cell: this_2.parent.treeGrid.getRows()[originalIndex].cells[this_2.parent.treeColumnIndex + treeIndex],
|
|
24296
|
+
column: this_2.parent.treeGrid.grid.getColumns()[this_2.parent.treeColumnIndex],
|
|
24268
24297
|
requestType: 'rowDragAndDrop'
|
|
24269
24298
|
});
|
|
24270
|
-
|
|
24271
|
-
data: originalData, row:
|
|
24299
|
+
this_2.parent.treeGrid.renderModule.RowModifier({
|
|
24300
|
+
data: originalData, row: this_2.parent.treeGrid.getRows()[originalIndex], rowHeight: this_2.parent.rowHeight
|
|
24272
24301
|
});
|
|
24273
24302
|
}
|
|
24274
24303
|
};
|
|
24275
|
-
var
|
|
24304
|
+
var this_2 = this, originalIndex;
|
|
24276
24305
|
for (var i = 0; i < this.parent.modifiedRecords.length; i++) {
|
|
24277
|
-
|
|
24306
|
+
_loop_2(i);
|
|
24278
24307
|
}
|
|
24279
24308
|
};
|
|
24280
24309
|
/**
|
|
@@ -25631,45 +25660,9 @@ var Filter$1 = /** @__PURE__ @class */ (function () {
|
|
|
25631
25660
|
}
|
|
25632
25661
|
}
|
|
25633
25662
|
};
|
|
25634
|
-
Filter$$1.prototype.setPosition = function (li, ul) {
|
|
25635
|
-
var gridPos = this.parent.element.getBoundingClientRect();
|
|
25636
|
-
var liPos = li.getBoundingClientRect();
|
|
25637
|
-
var left = liPos.right + window.scrollX;
|
|
25638
|
-
var top = liPos.top + window.scrollY;
|
|
25639
|
-
if (gridPos.right < (left + ul.offsetWidth)) {
|
|
25640
|
-
if ((liPos.left - ul.offsetWidth) > gridPos.left) {
|
|
25641
|
-
left = (liPos.left - ul.offsetWidth);
|
|
25642
|
-
}
|
|
25643
|
-
else {
|
|
25644
|
-
left -= (left + ul.offsetWidth) - gridPos.right;
|
|
25645
|
-
}
|
|
25646
|
-
}
|
|
25647
|
-
ul.style.top = top + 'px';
|
|
25648
|
-
ul.style.left = left + 'px';
|
|
25649
|
-
};
|
|
25650
25663
|
Filter$$1.prototype.updateFilterMenuPosition = function (element, args) {
|
|
25651
25664
|
addClass([element], 'e-gantt');
|
|
25652
|
-
document.querySelector('#' + this.parent.
|
|
25653
|
-
var targetElement;
|
|
25654
|
-
if (this.parent.showColumnMenu) {
|
|
25655
|
-
targetElement = document.querySelector('#treeGrid' + this.parent.controlId + '_gridcontrol_colmenu_Filter');
|
|
25656
|
-
element.style.zIndex = targetElement.parentElement.style.zIndex;
|
|
25657
|
-
if (this.parent.treeGrid.filterSettings.type === 'Menu') {
|
|
25658
|
-
this.setPosition(targetElement, getValue('filterModel.dlgObj.element', args));
|
|
25659
|
-
}
|
|
25660
|
-
else {
|
|
25661
|
-
this.setPosition(targetElement, getValue('filterModel.dialogObj.element', args));
|
|
25662
|
-
}
|
|
25663
|
-
}
|
|
25664
|
-
else {
|
|
25665
|
-
targetElement = this.parent.treeGrid.grid.getColumnHeaderByField(args.columnName).querySelector('.e-filtermenudiv');
|
|
25666
|
-
if (this.parent.treeGrid.filterSettings.type === 'Menu') {
|
|
25667
|
-
getFilterMenuPostion(targetElement, getValue('filterModel.dlgObj', args));
|
|
25668
|
-
}
|
|
25669
|
-
else {
|
|
25670
|
-
getFilterMenuPostion(targetElement, getValue('filterModel.dialogObj', args));
|
|
25671
|
-
}
|
|
25672
|
-
}
|
|
25665
|
+
document.querySelector('#' + this.parent.treeGrid.grid.element.id).appendChild(element);
|
|
25673
25666
|
if (this.parent.treeGrid.filterSettings.type === 'Menu') {
|
|
25674
25667
|
element.querySelector('.e-valid-input').focus();
|
|
25675
25668
|
}
|
|
@@ -26705,7 +26698,7 @@ var Toolbar$3 = /** @__PURE__ @class */ (function () {
|
|
|
26705
26698
|
var isDeleteSelected = gObj.selectionModule ? gObj.selectionModule.selectedRowIndexes.length > 0 ||
|
|
26706
26699
|
gObj.selectionModule.getSelectedRowCellIndexes().length > 0 ? true : false : false;
|
|
26707
26700
|
// eslint-disable-next-line
|
|
26708
|
-
edit.allowDeleting &&
|
|
26701
|
+
edit.allowDeleting && hasData && isDeleteSelected && !touchEdit ?
|
|
26709
26702
|
enableItems.push(gID + '_delete') : disableItems.push(gID + '_delete');
|
|
26710
26703
|
if (gObj.editSettings.mode === 'Auto' && !isNullOrUndefined(gObj.editModule.cellEditModule)
|
|
26711
26704
|
&& gObj.editModule.cellEditModule.isCellEdit) {
|