WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

[Elements} fix(merge-strategy): add return type to merge method - 20.1.x #16388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IMinchev64 wants to merge 1 commit into
base: 20.1.x
Choose a base branch
from
Open

[Elements} fix(merge-strategy): add return type to merge method - 20.1.x #16388

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions projects/igniteui-angular/src/lib/data-operations/merge-strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
isDate = false,
isTime = false,
grid?: GridType
) {
): any[] {
let prev = null;
let index = 0;
for (const rec of data) {
Expand Down Expand Up @@ -94,8 +94,8 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {

/* blazorCSSuppress */
public comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean {
const a = this.getFieldValue(prevRecord,field, isDate, isTime);
const b = this.getFieldValue(record,field, isDate, isTime);
const a = this.getFieldValue(prevRecord, field, isDate, isTime);
const b = this.getFieldValue(record, field, isDate, isTime);
const an = (a === null || a === undefined);
const bn = (b === null || b === undefined);
if (an) {
Expand Down Expand Up @@ -149,8 +149,8 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
export class DefaultTreeGridMergeStrategy extends DefaultMergeStrategy {
/* blazorCSSuppress */
public override comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean {
const a = this.getFieldValue( prevRecord.data, field, isDate, isTime);
const b = this.getFieldValue(record.data,field, isDate, isTime);
const a = this.getFieldValue(prevRecord.data, field, isDate, isTime);
const b = this.getFieldValue(record.data, field, isDate, isTime);
const an = (a === null || a === undefined);
const bn = (b === null || b === undefined);
if (an) {
Expand All @@ -168,8 +168,8 @@ export class DefaultTreeGridMergeStrategy extends DefaultMergeStrategy {
export class ByLevelTreeGridMergeStrategy extends DefaultMergeStrategy {
/* blazorCSSuppress */
public override comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean {
const a = this.getFieldValue( prevRecord.data, field, isDate, isTime);
const b = this.getFieldValue(record.data,field, isDate, isTime);
const a = this.getFieldValue(prevRecord.data, field, isDate, isTime);
const b = this.getFieldValue(record.data, field, isDate, isTime);
const levelA = prevRecord.level;
const levelB = record.level;
const an = (a === null || a === undefined);
Expand Down
Loading