@syncfusion/ej2-treegrid 29.1.39 → 29.2.8
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/dist/ej2-treegrid.min.js +2 -2
- package/dist/ej2-treegrid.umd.min.js +2 -2
- package/dist/ej2-treegrid.umd.min.js.map +1 -1
- package/dist/es6/ej2-treegrid.es2015.js +37 -20
- package/dist/es6/ej2-treegrid.es2015.js.map +1 -1
- package/dist/es6/ej2-treegrid.es5.js +37 -20
- package/dist/es6/ej2-treegrid.es5.js.map +1 -1
- package/dist/global/ej2-treegrid.min.js +2 -2
- package/dist/global/ej2-treegrid.min.js.map +1 -1
- package/dist/global/index.d.ts +1 -1
- package/package.json +15 -51
- package/src/treegrid/actions/sort.js +6 -1
- package/src/treegrid/base/interface.d.ts +5 -1
- package/src/treegrid/base/treegrid-model.d.ts +1 -1
- package/src/treegrid/base/treegrid.d.ts +4 -0
- package/src/treegrid/base/treegrid.js +27 -5
- package/src/treegrid/renderer/virtual-row-model-generator.js +4 -15
- package/src/treegrid/renderer/virtual-tree-content-render.js +1 -0
package/dist/global/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* filename: index.d.ts
|
|
3
|
-
* version : 29.
|
|
3
|
+
* version : 29.2.8
|
|
4
4
|
* Copyright Syncfusion Inc. 2001 - 2024. 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,51 +1,19 @@
|
|
|
1
1
|
{
|
|
2
|
-
"
|
|
3
|
-
"
|
|
4
|
-
"
|
|
5
|
-
"
|
|
6
|
-
"
|
|
7
|
-
"
|
|
8
|
-
"
|
|
9
|
-
|
|
10
|
-
"registry": true,
|
|
11
|
-
"raw": "@syncfusion/ej2-treegrid@*",
|
|
12
|
-
"name": "@syncfusion/ej2-treegrid",
|
|
13
|
-
"escapedName": "@syncfusion%2fej2-treegrid",
|
|
14
|
-
"scope": "@syncfusion",
|
|
15
|
-
"rawSpec": "*",
|
|
16
|
-
"saveSpec": null,
|
|
17
|
-
"fetchSpec": "*"
|
|
18
|
-
},
|
|
19
|
-
"_requiredBy": [
|
|
20
|
-
"/",
|
|
21
|
-
"/@syncfusion/ej2",
|
|
22
|
-
"/@syncfusion/ej2-angular-treegrid",
|
|
23
|
-
"/@syncfusion/ej2-gantt",
|
|
24
|
-
"/@syncfusion/ej2-react-treegrid",
|
|
25
|
-
"/@syncfusion/ej2-vue-treegrid"
|
|
26
|
-
],
|
|
27
|
-
"_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-29.1.37.tgz",
|
|
28
|
-
"_shasum": "650f83e1df1da1bc026fa0ca36cf6aeafdb5936d",
|
|
29
|
-
"_spec": "@syncfusion/ej2-treegrid@*",
|
|
30
|
-
"_where": "/jenkins/workspace/elease-automation_release_29.1.1/packages/included",
|
|
31
|
-
"author": {
|
|
32
|
-
"name": "Syncfusion Inc."
|
|
33
|
-
},
|
|
34
|
-
"bugs": {
|
|
35
|
-
"url": "https://github.com/syncfusion/ej2-treegrid/issues"
|
|
36
|
-
},
|
|
37
|
-
"bundleDependencies": false,
|
|
2
|
+
"name": "@syncfusion/ej2-treegrid",
|
|
3
|
+
"version": "29.2.8",
|
|
4
|
+
"description": "Essential JS 2 TreeGrid Component",
|
|
5
|
+
"author": "Syncfusion Inc.",
|
|
6
|
+
"license": "SEE LICENSE IN license",
|
|
7
|
+
"main": "./dist/ej2-treegrid.umd.min.js",
|
|
8
|
+
"module": "./index.js",
|
|
9
|
+
"es2015": "./dist/es6/ej2-treegrid.es5.js",
|
|
38
10
|
"dependencies": {
|
|
39
|
-
"@syncfusion/ej2-base": "~29.
|
|
40
|
-
"@syncfusion/ej2-data": "~29.
|
|
41
|
-
"@syncfusion/ej2-grids": "~29.
|
|
42
|
-
"@syncfusion/ej2-popups": "~29.
|
|
11
|
+
"@syncfusion/ej2-base": "~29.2.4",
|
|
12
|
+
"@syncfusion/ej2-data": "~29.2.4",
|
|
13
|
+
"@syncfusion/ej2-grids": "~29.2.8",
|
|
14
|
+
"@syncfusion/ej2-popups": "~29.2.8"
|
|
43
15
|
},
|
|
44
|
-
"deprecated": false,
|
|
45
|
-
"description": "Essential JS 2 TreeGrid Component",
|
|
46
16
|
"devDependencies": {},
|
|
47
|
-
"es2015": "./dist/es6/ej2-treegrid.es5.js",
|
|
48
|
-
"homepage": "https://www.syncfusion.com/javascript-ui-controls",
|
|
49
17
|
"keywords": [
|
|
50
18
|
"ej2",
|
|
51
19
|
"syncfusion",
|
|
@@ -67,15 +35,11 @@
|
|
|
67
35
|
"collapsible-table",
|
|
68
36
|
"multi-level-table"
|
|
69
37
|
],
|
|
70
|
-
"license": "SEE LICENSE IN license",
|
|
71
|
-
"main": "./dist/ej2-treegrid.umd.min.js",
|
|
72
|
-
"module": "./index.js",
|
|
73
|
-
"name": "@syncfusion/ej2-treegrid",
|
|
74
38
|
"repository": {
|
|
75
39
|
"type": "git",
|
|
76
|
-
"url": "
|
|
40
|
+
"url": "https://github.com/syncfusion/ej2-treegrid.git"
|
|
77
41
|
},
|
|
78
42
|
"typings": "index.d.ts",
|
|
79
|
-
"
|
|
80
|
-
"
|
|
43
|
+
"sideEffects": false,
|
|
44
|
+
"homepage": "https://www.syncfusion.com/javascript-ui-controls"
|
|
81
45
|
}
|
|
@@ -53,8 +53,13 @@ var Sort = /** @class */ (function () {
|
|
|
53
53
|
this.flatSortedData = [];
|
|
54
54
|
};
|
|
55
55
|
Sort.prototype.iterateSort = function (data, srtQry) {
|
|
56
|
+
var gridQuery = this.parent.query;
|
|
57
|
+
var filterQuery = [];
|
|
58
|
+
if (!isNullOrUndefined(gridQuery)) {
|
|
59
|
+
filterQuery = gridQuery.queries.filter(function (q) { return q.fn === 'onWhere'; });
|
|
60
|
+
}
|
|
56
61
|
for (var d = 0; d < data.length; d++) {
|
|
57
|
-
if (this.parent.grid.filterSettings.columns.length > 0 || this.parent.grid.searchSettings.key !== '') {
|
|
62
|
+
if (filterQuery.length > 0 || this.parent.grid.filterSettings.columns.length > 0 || this.parent.grid.searchSettings.key !== '') {
|
|
58
63
|
if (!isNullOrUndefined(getParentData(this.parent, data[parseInt(d.toString(), 10)].uniqueID, true))) {
|
|
59
64
|
this.storedIndex++;
|
|
60
65
|
this.flatSortedData[this.storedIndex] = data[parseInt(d.toString(), 10)];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Column } from '../models/column';
|
|
2
|
-
import { SaveEventArgs, DataStateChangeEventArgs as GridDataStateChangeEventArgs, ExcelExportProperties, RowDragEventArgs as GridRowDragEventArgs } from '@syncfusion/ej2-grids';
|
|
2
|
+
import { SaveEventArgs, DataStateChangeEventArgs as GridDataStateChangeEventArgs, ExcelExportProperties, RowDragEventArgs as GridRowDragEventArgs, ActionEventArgs as GridActionEventArgs } from '@syncfusion/ej2-grids';
|
|
3
3
|
import { PdfExportProperties } from '@syncfusion/ej2-grids';
|
|
4
4
|
/**
|
|
5
5
|
* Specifies FlatData interfaces.
|
|
@@ -180,3 +180,7 @@ export interface DataStateChangeEventArgs extends GridDataStateChangeEventArgs {
|
|
|
180
180
|
export interface RowDragEventArgs extends GridRowDragEventArgs {
|
|
181
181
|
dropPosition: string;
|
|
182
182
|
}
|
|
183
|
+
export interface ActionEventArgs extends GridActionEventArgs {
|
|
184
|
+
/** Maintains Treegrid's Collapse state in virtualization */
|
|
185
|
+
isCollapseMaintain?: boolean;
|
|
186
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Component, addClass, createElement, EventHandler, isNullOrUndefined, ModuleDeclaration, extend, merge, SanitizeHtmlHelper} from '@syncfusion/ej2-base';import { removeClass, EmitType, Complex, Collection, KeyboardEventArgs, getValue, NumberFormatOptions, DateFormatOptions } from '@syncfusion/ej2-base';import {Event, Property, NotifyPropertyChanges, INotifyPropertyChanged, setValue, KeyboardEvents, L10n } from '@syncfusion/ej2-base';import { Column, ColumnModel } from '../models/column';import { BeforeBatchSaveArgs, BeforeBatchAddArgs, BatchDeleteArgs, BeforeBatchDeleteArgs, Row, getNumberFormat } from '@syncfusion/ej2-grids';import { GridModel, ColumnQueryModeType, HeaderCellInfoEventArgs, EditSettingsModel as GridEditModel, Freeze as FreezeColumn } from '@syncfusion/ej2-grids';import { RowDragEventArgs, RowDropEventArgs, RowDropSettingsModel, RowDropSettings, getUid, parentsUntil } from '@syncfusion/ej2-grids';import { LoadingIndicator } from '../models/loading-indicator';import { LoadingIndicatorModel } from '../models/loading-indicator-model';import {
|
|
1
|
+
import { Component, addClass, createElement, EventHandler, isNullOrUndefined, ModuleDeclaration, extend, merge, SanitizeHtmlHelper} from '@syncfusion/ej2-base';import { removeClass, EmitType, Complex, Collection, KeyboardEventArgs, getValue, NumberFormatOptions, DateFormatOptions } from '@syncfusion/ej2-base';import {Event, Property, NotifyPropertyChanges, INotifyPropertyChanged, setValue, KeyboardEvents, L10n } from '@syncfusion/ej2-base';import { Column, ColumnModel } from '../models/column';import { BeforeBatchSaveArgs, BeforeBatchAddArgs, BatchDeleteArgs, BeforeBatchDeleteArgs, Row, getNumberFormat } from '@syncfusion/ej2-grids';import { GridModel, ColumnQueryModeType, HeaderCellInfoEventArgs, EditSettingsModel as GridEditModel, Freeze as FreezeColumn } from '@syncfusion/ej2-grids';import { RowDragEventArgs, RowDropEventArgs, RowDropSettingsModel, RowDropSettings, getUid, parentsUntil } from '@syncfusion/ej2-grids';import { LoadingIndicator } from '../models/loading-indicator';import { LoadingIndicatorModel } from '../models/loading-indicator-model';import { TextAlign } from'@syncfusion/ej2-grids';import { DetailDataBoundEventArgs, ClipMode, ColumnChooser} from '@syncfusion/ej2-grids';import { SearchEventArgs, AddEventArgs, EditEventArgs, DeleteEventArgs} from '@syncfusion/ej2-grids';import { SaveEventArgs, CellSaveArgs, BatchAddArgs, BatchCancelArgs, BeginEditArgs, CellEditArgs} from '@syncfusion/ej2-grids';import { FilterSettings } from '../models/filter-settings';import { TextWrapSettings } from '../models/textwrap-settings';import { TextWrapSettingsModel } from '../models/textwrap-settings-model';import {Filter} from '../actions/filter';import { Logger as TreeLogger } from '../actions/logger';import { BeforeCopyEventArgs, BeforePasteEventArgs } from '@syncfusion/ej2-grids';import { TreeClipboard } from '../actions/clipboard';import {Aggregate} from '../actions/summary';import { Reorder } from '../actions/reorder';import { Resize } from '../actions/resize';import { Selection as TreeGridSelection } from '../actions/selection';import { ColumnMenu } from '../actions/column-menu';import { DetailRow } from '../actions/detail-row';import { Freeze } from '../actions/freeze-column';import { Print } from '../actions/print';import * as events from '../base/constant';import { FilterSettingsModel } from '../models/filter-settings-model';import { SearchSettings} from '../models/search-settings';import { SearchSettingsModel } from '../models/search-settings-model';import {RowInfo, RowDataBoundEventArgs, PageEventArgs, FilterEventArgs, FailureEventArgs, SortEventArgs } from '@syncfusion/ej2-grids';import { RowSelectingEventArgs, RowSelectEventArgs, RowDeselectingEventArgs, RowDeselectEventArgs, IIndex, ISelectedCell } from '@syncfusion/ej2-grids';import {ColumnModel as GridColumnModel, Column as GridColumn, CellSelectEventArgs, CellDeselectEventArgs } from '@syncfusion/ej2-grids';import { SelectionSettings } from '../models/selection-settings';import { SelectionSettingsModel } from '../models/selection-settings-model';import {getActualProperties, SortDirection, getObject, ColumnDragEventArgs } from '@syncfusion/ej2-grids';import { PrintMode, Data, IGrid, ContextMenuItemModel } from '@syncfusion/ej2-grids';import { ColumnMenuItem, ColumnMenuItemModel, CheckBoxChangeEventArgs } from '@syncfusion/ej2-grids';import { ExcelExportCompleteArgs, ExcelHeaderQueryCellInfoEventArgs, ExcelQueryCellInfoEventArgs } from '@syncfusion/ej2-grids';import { PdfExportCompleteArgs, PdfHeaderQueryCellInfoEventArgs, PdfQueryCellInfoEventArgs } from '@syncfusion/ej2-grids';import { ExcelExportProperties, PdfExportProperties, CellSelectingEventArgs, PrintEventArgs } from '@syncfusion/ej2-grids';import { ColumnMenuOpenEventArgs } from '@syncfusion/ej2-grids';import {BeforeDataBoundArgs} from '@syncfusion/ej2-grids';import { DataManager, ReturnOption, RemoteSaveAdaptor, Query, JsonAdaptor, Deferred, UrlAdaptor } from '@syncfusion/ej2-data';import { createSpinner, hideSpinner, showSpinner, Dialog } from '@syncfusion/ej2-popups';import { isRemoteData, isOffline, extendArray, isCountRequired, findChildrenRecords } from '../utils';import { Grid, QueryCellInfoEventArgs, Logger } from '@syncfusion/ej2-grids';import { Render } from '../renderer/render';import { VirtualTreeContentRenderer } from '../renderer/virtual-tree-content-render';import { DataManipulation } from './data';import { RowDD } from '../actions/rowdragdrop';import { Sort } from '../actions/sort';import { ITreeData, RowExpandedEventArgs, RowCollapsedEventArgs, RowCollapsingEventArgs, TreeGridExcelExportProperties, ActionEventArgs } from './interface';import { DataStateChangeEventArgs, RowExpandingEventArgs, TreeGridPdfExportProperties } from './interface';import { iterateArrayOrObject, GridLine } from '@syncfusion/ej2-grids';import { DataSourceChangedEventArgs, RecordDoubleClickEventArgs, ResizeArgs } from '@syncfusion/ej2-grids';import { ToolbarItems, ToolbarItem, ContextMenuItem, ContextMenuItems, RowPosition, CopyHierarchyType } from '../enum';import { ItemModel, ClickEventArgs, BeforeOpenCloseMenuEventArgs, MenuEventArgs } from '@syncfusion/ej2-navigations';import { PageSettings } from '../models/page-settings';import { PageSettingsModel } from '../models/page-settings-model';import { AggregateRow } from '../models/summary';import { AggregateRowModel } from '../models/summary-model';import { ExcelExport } from '../actions/excel-export';import { PdfExport } from '../actions/pdf-export';import { Toolbar } from '../actions/toolbar';import { Page } from '../actions/page';import { ContextMenu } from '../actions/context-menu';import { EditSettings } from '../models/edit-settings';import { EditSettingsModel } from '../models/edit-settings-model';import { Edit} from '../actions/edit';import { SortSettings } from '../models/sort-settings';import { SortSettingsModel } from '../models/sort-settings-model';import { isHidden, getExpandStatus } from '../utils';import { editAction } from '../actions/crud-actions';import { InfiniteScrollSettings } from '../models/infinite-scroll-settings';import { InfiniteScrollSettingsModel } from '../models/infinite-scroll-settings-model';import { TreeActionEventArgs } from '..';import * as literals from '../base/constant';
|
|
2
2
|
import {ComponentModel} from '@syncfusion/ej2-base';
|
|
3
3
|
|
|
4
4
|
/**
|
|
@@ -115,6 +115,7 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
|
|
|
115
115
|
private treeColumnTextAlign;
|
|
116
116
|
private treeColumnField;
|
|
117
117
|
private stackedHeader;
|
|
118
|
+
private freezeColumnRefresh;
|
|
118
119
|
private isExcel;
|
|
119
120
|
/** @hidden */
|
|
120
121
|
initialRender: boolean;
|
|
@@ -1731,6 +1732,9 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
|
|
|
1731
1732
|
private mergeColumns;
|
|
1732
1733
|
private setFrozenCount;
|
|
1733
1734
|
private splitFrozenCount;
|
|
1735
|
+
private removeBorder;
|
|
1736
|
+
private frozenLeftBorderColumns;
|
|
1737
|
+
private frozenRightBorderColumns;
|
|
1734
1738
|
private isFrozenGrid;
|
|
1735
1739
|
private updateTreeGridModel;
|
|
1736
1740
|
/**
|
|
@@ -75,6 +75,7 @@ var TreeGrid = /** @class */ (function (_super) {
|
|
|
75
75
|
_this.isFromChartSide = false;
|
|
76
76
|
_this.modifiedRecords = [];
|
|
77
77
|
_this.stackedHeader = false;
|
|
78
|
+
_this.freezeColumnRefresh = true;
|
|
78
79
|
_this.objectEqualityChecker = function (old, current) {
|
|
79
80
|
if (old) {
|
|
80
81
|
var keys = Object.keys(old);
|
|
@@ -511,6 +512,7 @@ var TreeGrid = /** @class */ (function (_super) {
|
|
|
511
512
|
this.columnModel = [];
|
|
512
513
|
this.isExpandAll = false;
|
|
513
514
|
this.isCollapseAll = false;
|
|
515
|
+
this.freezeColumnRefresh = true;
|
|
514
516
|
this.keyConfigs = {
|
|
515
517
|
ctrlDownArrow: 'ctrl+downarrow',
|
|
516
518
|
ctrlUpArrow: 'ctrl+uparrow',
|
|
@@ -553,6 +555,10 @@ var TreeGrid = /** @class */ (function (_super) {
|
|
|
553
555
|
TreeGrid.prototype.requiredModules = function () {
|
|
554
556
|
var modules = [];
|
|
555
557
|
var splitFrozenCount = 'splitFrozenCount';
|
|
558
|
+
var mergedColumns = 'mergedColumns';
|
|
559
|
+
if (this["" + mergedColumns]) {
|
|
560
|
+
this.grid["" + mergedColumns] = this["" + mergedColumns];
|
|
561
|
+
}
|
|
556
562
|
if (isNullOrUndefined(this['changedProperties'].columns)) {
|
|
557
563
|
this.grid["" + splitFrozenCount](this.getColumns());
|
|
558
564
|
}
|
|
@@ -1489,12 +1495,12 @@ var TreeGrid = /** @class */ (function (_super) {
|
|
|
1489
1495
|
_this.grid.refresh();
|
|
1490
1496
|
}
|
|
1491
1497
|
if (args.action === 'filter') {
|
|
1492
|
-
if (_this.filterModule['currentFilterObject'] !== '' && _this.enableVirtualization && !_this.initialRender && !(isRemoteData(_this) && _this.enableVirtualization)) {
|
|
1498
|
+
if (!args.isCollapseMaintain && _this.filterModule['currentFilterObject'] !== '' && _this.enableVirtualization && !_this.initialRender && !(isRemoteData(_this) && _this.enableVirtualization)) {
|
|
1493
1499
|
_this.expandAll();
|
|
1494
1500
|
}
|
|
1495
1501
|
}
|
|
1496
1502
|
if (args.requestType === 'searching') {
|
|
1497
|
-
if (_this.searchSettings.key !== '' && _this.enableVirtualization && !_this.initialRender && !(isRemoteData(_this) && _this.enableVirtualization)) {
|
|
1503
|
+
if (!args.isCollapseMaintain && _this.searchSettings.key !== '' && _this.enableVirtualization && !_this.initialRender && !(isRemoteData(_this) && _this.enableVirtualization)) {
|
|
1498
1504
|
_this.expandAll();
|
|
1499
1505
|
}
|
|
1500
1506
|
}
|
|
@@ -2771,14 +2777,30 @@ var TreeGrid = /** @class */ (function (_super) {
|
|
|
2771
2777
|
};
|
|
2772
2778
|
TreeGrid.prototype.setFrozenCount = function () {
|
|
2773
2779
|
var persist3 = 'setFrozenCount';
|
|
2774
|
-
this.grid["" + persist3].apply(this
|
|
2780
|
+
this.grid["" + persist3].apply(this);
|
|
2775
2781
|
};
|
|
2776
2782
|
TreeGrid.prototype.splitFrozenCount = function (columns) {
|
|
2777
2783
|
var persist4 = 'splitFrozenCount';
|
|
2778
|
-
this.
|
|
2784
|
+
var instance = this.frozenColumns > 0 ? this.grid : this;
|
|
2785
|
+
this.grid["" + persist4].apply(instance, [columns]);
|
|
2786
|
+
};
|
|
2787
|
+
TreeGrid.prototype.removeBorder = function (columns) {
|
|
2788
|
+
var persist5 = 'removeBorder';
|
|
2789
|
+
this.grid["" + persist5].apply(this.grid, [columns]);
|
|
2790
|
+
};
|
|
2791
|
+
TreeGrid.prototype.frozenLeftBorderColumns = function (columns) {
|
|
2792
|
+
var persist6 = 'frozenLeftBorderColumns';
|
|
2793
|
+
this.grid["" + persist6].apply(this.grid, [columns]);
|
|
2794
|
+
};
|
|
2795
|
+
TreeGrid.prototype.frozenRightBorderColumns = function (columns) {
|
|
2796
|
+
var persist7 = 'frozenRightBorderColumns';
|
|
2797
|
+
this.grid["" + persist7].apply(this.grid, [columns]);
|
|
2779
2798
|
};
|
|
2780
2799
|
TreeGrid.prototype.isFrozenGrid = function () {
|
|
2781
|
-
|
|
2800
|
+
var hasFreezeProp = Array.isArray(this.columns) &&
|
|
2801
|
+
this.columns.some(function (col) { return !!col.freeze; });
|
|
2802
|
+
return (this.frozenColumns > 0 || this.frozenRows > 0 || this.getFrozenColumns() > 0 ||
|
|
2803
|
+
hasFreezeProp);
|
|
2782
2804
|
};
|
|
2783
2805
|
TreeGrid.prototype.updateTreeGridModel = function () {
|
|
2784
2806
|
this.setProperties({ filterSettings: getObject('properties', this.grid.filterSettings) }, true);
|
|
@@ -15,7 +15,7 @@ import { VirtualRowModelGenerator } from '@syncfusion/ej2-grids';
|
|
|
15
15
|
import * as events from '../base/constant';
|
|
16
16
|
import { isNullOrUndefined } from '@syncfusion/ej2-base';
|
|
17
17
|
import { DataManager } from '@syncfusion/ej2-data';
|
|
18
|
-
import { isCountRequired } from '../utils';
|
|
18
|
+
import { isCountRequired, isRemoteData } from '../utils';
|
|
19
19
|
/**
|
|
20
20
|
* RowModelGenerator is used to generate grid data rows.
|
|
21
21
|
*
|
|
@@ -38,22 +38,11 @@ var TreeVirtualRowModelGenerator = /** @class */ (function (_super) {
|
|
|
38
38
|
return _super.prototype.getData.call(this);
|
|
39
39
|
};
|
|
40
40
|
TreeVirtualRowModelGenerator.prototype.generateRows = function (data, notifyArgs) {
|
|
41
|
-
if (!isNullOrUndefined(notifyArgs.virtualInfo) && notifyArgs.virtualInfo.loadNext &&
|
|
42
|
-
notifyArgs.virtualInfo.nextInfo.page !== this.parent.pageSettings.currentPage) {
|
|
43
|
-
this.parent.setProperties({ pageSettings: { currentPage: notifyArgs.virtualInfo.nextInfo.page } }, true);
|
|
44
|
-
}
|
|
45
|
-
else if (!isNullOrUndefined(notifyArgs.virtualInfo) && !notifyArgs.virtualInfo.loadNext &&
|
|
46
|
-
notifyArgs.virtualInfo.page !== this.parent.pageSettings.currentPage) {
|
|
47
|
-
this.parent.setProperties({ pageSettings: { currentPage: notifyArgs.virtualInfo.page } }, true);
|
|
48
|
-
}
|
|
49
41
|
var info = this.getDataInfo();
|
|
50
42
|
if (!isNullOrUndefined(notifyArgs.virtualInfo)) {
|
|
51
|
-
if (
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|| notifyArgs.virtualInfo.blockIndexes.length === 1) {
|
|
55
|
-
notifyArgs.virtualInfo.blockIndexes = info.blockIndexes;
|
|
56
|
-
}
|
|
43
|
+
if ((!isRemoteData(this.parent.root) || isCountRequired(this.parent))
|
|
44
|
+
|| notifyArgs.virtualInfo.blockIndexes.length === 1) {
|
|
45
|
+
notifyArgs.virtualInfo.blockIndexes = info.blockIndexes;
|
|
57
46
|
}
|
|
58
47
|
else {
|
|
59
48
|
notifyArgs.virtualInfo.blockIndexes = this.getBlockIndexes(notifyArgs.virtualInfo.page);
|
|
@@ -780,6 +780,7 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
|
|
|
780
780
|
|| (this.parent.isFrozenGrid() && this.parent.getVisibleFrozenLeftCount() >= viewInfo.columnIndexes[0]
|
|
781
781
|
&& this.prevInfo.columnIndexes.toString().includes(viewInfo.columnIndexes.toString()))))) {
|
|
782
782
|
this.parent.removeMaskRow();
|
|
783
|
+
this.parent.notify('removeGanttShimmer', { requestType: 'hideShimmer' });
|
|
783
784
|
if (Browser.isIE) {
|
|
784
785
|
this.parent.hideSpinner();
|
|
785
786
|
}
|