@syncfusion/ej2-grids
Advanced tools
Comparing version 24.2.4 to 24.2.5
/*! | ||
* filename: index.d.ts | ||
* version : 24.2.4 | ||
* version : 24.2.5 | ||
* Copyright Syncfusion Inc. 2001 - 2023. All rights reserved. | ||
@@ -5,0 +5,0 @@ * Use of this code is subject to the terms of our license. |
{ | ||
"_from": "@syncfusion/ej2-grids@*", | ||
"_id": "@syncfusion/ej2-grids@24.2.3", | ||
"_id": "@syncfusion/ej2-grids@24.2.4", | ||
"_inBundle": false, | ||
"_integrity": "sha512-PPy0g4HXFiMKbkhBnvFNgeGVvLOcb9YrvedhKRFQTsEyRXZ2sAWVU1/TiEvJPDT8ntHxHX6rKIxlrZph+WfjwQ==", | ||
"_integrity": "sha512-AI4j8b2n2hCfWmVY5OoLlu5QNVg96jz9YWnh7JmSrWthIeh2baqV1EwWqqAKm70xx9paqdoVD8dlnrOQn+LqWQ==", | ||
"_location": "/@syncfusion/ej2-grids", | ||
@@ -31,4 +31,4 @@ "_phantomChildren": {}, | ||
], | ||
"_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-grids/-/ej2-grids-24.2.3.tgz", | ||
"_shasum": "0f88362eb0e0a22823e0811a216c441d2f31c711", | ||
"_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-grids/-/ej2-grids-24.2.4.tgz", | ||
"_shasum": "494846e5b6f1bdbdfa9730d35e3c9b338701c84e", | ||
"_spec": "@syncfusion/ej2-grids@*", | ||
@@ -41,11 +41,11 @@ "_where": "/jenkins/workspace/elease-automation_release_24.1.1/packages/included", | ||
"dependencies": { | ||
"@syncfusion/ej2-base": "~24.2.3", | ||
"@syncfusion/ej2-buttons": "~24.2.3", | ||
"@syncfusion/ej2-calendars": "~24.2.3", | ||
"@syncfusion/ej2-base": "~24.2.5", | ||
"@syncfusion/ej2-buttons": "~24.2.5", | ||
"@syncfusion/ej2-calendars": "~24.2.5", | ||
"@syncfusion/ej2-compression": "~24.2.3", | ||
"@syncfusion/ej2-data": "~24.2.3", | ||
"@syncfusion/ej2-dropdowns": "~24.2.4", | ||
"@syncfusion/ej2-dropdowns": "~24.2.5", | ||
"@syncfusion/ej2-excel-export": "~24.2.4", | ||
"@syncfusion/ej2-file-utils": "~24.2.3", | ||
"@syncfusion/ej2-inputs": "~24.2.4", | ||
"@syncfusion/ej2-inputs": "~24.2.5", | ||
"@syncfusion/ej2-lists": "~24.2.4", | ||
@@ -55,4 +55,4 @@ "@syncfusion/ej2-navigations": "~24.2.4", | ||
"@syncfusion/ej2-pdf-export": "~24.2.3", | ||
"@syncfusion/ej2-popups": "~24.2.3", | ||
"@syncfusion/ej2-splitbuttons": "~24.2.3" | ||
"@syncfusion/ej2-popups": "~24.2.5", | ||
"@syncfusion/ej2-splitbuttons": "~24.2.5" | ||
}, | ||
@@ -83,5 +83,5 @@ "deprecated": false, | ||
"typings": "index.d.ts", | ||
"version": "24.2.4", | ||
"version": "24.2.5", | ||
"sideEffects": false, | ||
"homepage": "https://www.syncfusion.com/javascript-ui-controls" | ||
} |
@@ -14,3 +14,4 @@ import { Pager } from '../../pager/pager'; | ||
private evtHandlers; | ||
private isCancel; | ||
/** @hidden */ | ||
isCancel: boolean; | ||
private parent; | ||
@@ -17,0 +18,0 @@ /** @hidden */ |
@@ -22,2 +22,3 @@ import { extend } from '@syncfusion/ej2-base'; | ||
this.isInitialRender = true; | ||
/** @hidden */ | ||
this.isCancel = false; | ||
@@ -211,4 +212,4 @@ Pager.Inject(ExternalMessage, PagerDropDown); | ||
e.cancel = true; | ||
this.pageSettings.currentPage = prevPage; | ||
this.pagerObj.currentPage = prevPage; | ||
this.parent.setProperties({ pageSettings: { currentPage: prevPage } }, true); | ||
this.pagerObj.setProperties({ currentPage: prevPage }, true); | ||
this.isCancel = true; | ||
@@ -215,0 +216,0 @@ return; |
@@ -153,3 +153,5 @@ var __extends = (this && this.__extends) || (function () { | ||
ExcelFilterBase.prototype.wireExEvents = function () { | ||
EventHandler.add(this.dlg, 'mouseover', this.hoverHandler, this); | ||
if (!Browser.isDevice) { | ||
EventHandler.add(this.dlg, 'mouseover', this.hoverHandler, this); | ||
} | ||
EventHandler.add(this.dlg, 'click', this.clickExHandler, this); | ||
@@ -160,3 +162,5 @@ EventHandler.add(this.dlg, 'keyup', this.keyUp, this); | ||
ExcelFilterBase.prototype.unwireExEvents = function () { | ||
EventHandler.remove(this.dlg, 'mouseover', this.hoverHandler); | ||
if (!Browser.isDevice) { | ||
EventHandler.remove(this.dlg, 'mouseover', this.hoverHandler); | ||
} | ||
EventHandler.remove(this.dlg, 'click', this.clickExHandler); | ||
@@ -174,3 +178,3 @@ EventHandler.remove(this.dlg, 'keyup', this.keyUp); | ||
} | ||
else if (this.options.isResponsiveFilter | ||
else if ((this.options.isResponsiveFilter || Browser.isDevice) | ||
&& this.getLocalizedLabel(options[this.options.type]) === menuItem.innerText.trim()) { | ||
@@ -177,0 +181,0 @@ this.hoverHandler(e); |
@@ -188,8 +188,17 @@ var __extends = (this && this.__extends) || (function () { | ||
var isFiltered = false; | ||
if (!this.parent.renderModule.data.isRemote() && this.parent.allowFiltering && this.parent.filterSettings.columns.length) { | ||
if (!(this.parent.renderModule.data.isRemote() || (!isNullOrUndefined(this.parent.dataSource) | ||
&& this.parent.dataSource.result)) && ((this.parent.allowFiltering | ||
&& this.parent.filterSettings.columns.length) || this.parent.searchSettings.key.length)) { | ||
isFiltered = true; | ||
} | ||
var currentViewData = this.parent.dataSource instanceof Array ? | ||
(isFiltered ? this.parent.getFilteredRecords() : this.parent.dataSource) : (this.parent.dataSource["" + gridData].json.length ? | ||
this.parent.dataSource["" + gridData].json : this.parent.getCurrentViewRecords()); | ||
var currentViewData; | ||
if (!isNullOrUndefined(this.parent.dataSource) && this.parent.dataSource.result) { | ||
currentViewData = this.parent.getCurrentViewRecords(); | ||
} | ||
else { | ||
currentViewData = this.parent.dataSource instanceof Array ? | ||
(isFiltered ? this.parent.getFilteredRecords() : this.parent.dataSource) : (this.parent.dataSource["" + gridData].json.length ? | ||
(isFiltered ? this.parent.getFilteredRecords() : this.parent.dataSource["" + gridData].json) | ||
: this.parent.getCurrentViewRecords()); | ||
} | ||
if (this.parent.parentDetails && !this.parent.getDataModule().isRemote()) { | ||
@@ -196,0 +205,0 @@ currentViewData = this.getData(); |
@@ -100,2 +100,9 @@ import { remove, resetBlazorTemplate, blazorTemplates, getValue } from '@syncfusion/ej2-base'; | ||
} | ||
if (args.requestType === 'grouping') { | ||
// Remove the dropped column name from groupsettings.columns if args.cancel is true | ||
var index = _this.parent.groupSettings.columns.indexOf(args.columnName); | ||
if (index !== -1) { | ||
_this.parent.groupSettings.columns.splice(index, 1); | ||
} | ||
} | ||
return; | ||
@@ -102,0 +109,0 @@ } |
@@ -92,5 +92,9 @@ import { createElement, remove } from '@syncfusion/ej2-base'; | ||
this.pagerModule.dataBind(); | ||
this.pagerModule.trigger('dropDownChanged', { pageSize: this.pagerModule.isAllPage || | ||
(this.pagerModule.isAllPage === undefined && this.dropDownListObject.value === this.pagerModule.getLocalizedLabel('All')) ? | ||
this.pagerModule.totalRecordsCount : parseInt(this.dropDownListObject.value, 10) }); | ||
if (!this.pagerModule.isCancel) { | ||
this.pagerModule.trigger('dropDownChanged', { | ||
pageSize: this.pagerModule.isAllPage || | ||
(this.pagerModule.isAllPage === undefined && this.dropDownListObject.value === this.pagerModule.getLocalizedLabel('All')) ? | ||
this.pagerModule.totalRecordsCount : parseInt(this.dropDownListObject.value, 10) | ||
}); | ||
} | ||
}; | ||
@@ -97,0 +101,0 @@ PagerDropDown.prototype.refresh = function () { |
@@ -54,2 +54,4 @@ import { Component, ModuleDeclaration, L10n, EmitType, KeyboardEventArgs } from '@syncfusion/ej2-base'; | ||
private firstPagerFocus; | ||
/** @hidden */ | ||
isCancel: boolean; | ||
/*** @hidden */ | ||
@@ -56,0 +58,0 @@ localeObj: L10n; |
@@ -57,2 +57,4 @@ var __extends = (this && this.__extends) || (function () { | ||
_this.firstPagerFocus = false; | ||
/** @hidden */ | ||
_this.isCancel = false; | ||
_this.parent = parent; | ||
@@ -269,2 +271,6 @@ return _this; | ||
this.currentPageChanged(newProp, oldProp); | ||
if (this.isCancel && this.hasParent) { | ||
this.parent | ||
.setProperties({ pageSettings: { pageSize: oldProp.pageSize } }, true); | ||
} | ||
} | ||
@@ -752,2 +758,3 @@ else { | ||
if (!args.cancel) { | ||
this.isCancel = false; | ||
this.refresh(); | ||
@@ -757,3 +764,5 @@ } | ||
if (oldProp.pageSize && this.pageSize !== oldProp.pageSize) { | ||
this.setProperties({ pageSize: oldProp.pageSize }, false); | ||
this.isCancel = true; | ||
this.setProperties({ pageSize: oldProp.pageSize }, true); | ||
this.pagerdropdownModule.setDropDownValue('value', oldProp.pageSize); | ||
this.pagerdropdownModule['dropDownListObject'].text = oldProp.pageSize + ''; | ||
@@ -760,0 +769,0 @@ } |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
37333212
378758