igniteui-webcomponents-grids 4.7.1 → 4.7.2-beta.1

package/esm2015/lib/ColumnFilterCondition_combined.js

@@ -159,8 +159,8 @@ import { JsonDictionaryArray } from "igniteui-webcomponents-core";
 import { SaveLayoutSortInfo } from "./SaveLayoutSortInfo";
 import { SaveLayoutGroupInfo } from "./SaveLayoutGroupInfo";
 import { SaveLayoutFilterInfo } from "./SaveLayoutFilterInfo";
-import { JsonDictionaryValue } from "igniteui-webcomponents-core";
 import { JsonDictionaryItem } from "igniteui-webcomponents-core";
+import { JsonDictionaryValue } from "igniteui-webcomponents-core";
 import { FunctionFilterExpression } from "igniteui-webcomponents-core";
 import { OperationFilterExpression } from "igniteui-webcomponents-core";
 import { LiteralFilterExpression } from "igniteui-webcomponents-core";
@@ -200,10 +200,10 @@ export let ColumnFilterCondition = /*@__PURE__*/ (() => {
             super(...arguments);
             this.b = null;
         }
-        c() {
+        isGroup() {
             return false;
         }
-        a(a, b) {
+        resolveFilter(a, b) {
             return null;
         }
     }
@@ -217,12 +217,12 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
     class ColumnComparisonFilterCondition extends ColumnFilterCondition {
         constructor() {
             super();
-            this.f = 0;
-            this.l = null;
-            this.i = false;
-            this.i = true;
+            this._operator = 0;
+            this._value = null;
+            this._isCaseSensitive = false;
+            this.isCaseSensitive = true;
         }
-        static d(a) {
+        static getApplicableOperators(a) {
             let b = new List$1(ColumnComparisonConditionOperatorType_$type, 0);
             switch (a) {
                 case 11: break;
@@ -265,34 +265,52 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                 return false;
             }
             let b = a;
-            if (b.f != this.f) {
+            if (b.operator != this.operator) {
                 return false;
             }
-            if (!Base.equalsStatic(b.l, this.l)) {
+            if (!Base.equalsStatic(b.value, this.value)) {
                 return false;
             }
-            if (!Base.equalsStatic(b.i, this.i)) {
+            if (!Base.equalsStatic(b.isCaseSensitive, this.isCaseSensitive)) {
                 return false;
             }
             return true;
         }
-        a(a, b) {
-            return this.h(a, b, this.f);
+        get operator() {
+            return this._operator;
+        }
+        set operator(a) {
+            this._operator = a;
+        }
+        get value() {
+            return this._value;
+        }
+        set value(a) {
+            this._value = a;
+        }
+        get isCaseSensitive() {
+            return this._isCaseSensitive;
+        }
+        set isCaseSensitive(a) {
+            this._isCaseSensitive = a;
+        }
+        resolveFilter(a, b) {
+            return this.h(a, b, this.operator);
         }
         h(a, b, c) {
             switch (c) {
                 case 12:
                     {
-                        if (this.l == null) {
+                        if (this.value == null) {
                             return null;
                         }
                         let d = FilterFactory.instance.property(a);
-                        let e = FilterFactory.instance.literal(this.l);
+                        let e = FilterFactory.instance.literal(this.value);
                         d = ColumnComparisonFilterCondition.g(b, d);
                         if (null == d) {
                             return null;
                         }
-                        if (!this.i) {
+                        if (!this.isCaseSensitive) {
                             d = d.toLower();
                             e = e.toLower();
                         }
@@ -300,16 +318,16 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                     }
                 case 13:
                     {
-                        if (this.l == null) {
+                        if (this.value == null) {
                             return null;
                         }
                         let f = FilterFactory.instance.property(a);
-                        let g = FilterFactory.instance.literal(this.l);
+                        let g = FilterFactory.instance.literal(this.value);
                         f = ColumnComparisonFilterCondition.g(b, f);
                         if (null == f) {
                             return null;
                         }
-                        if (!this.i) {
+                        if (!this.isCaseSensitive) {
                             f = f.toLower();
                             g = g.toLower();
                         }
@@ -317,16 +335,16 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                     }
                 case 17:
                     {
-                        if (this.l == null) {
+                        if (this.value == null) {
                             return null;
                         }
                         let h = FilterFactory.instance.property(a);
-                        let i = FilterFactory.instance.literal(this.l);
+                        let i = FilterFactory.instance.literal(this.value);
                         h = ColumnComparisonFilterCondition.g(b, h);
                         if (null == h) {
                             return null;
                         }
-                        if (!this.i) {
+                        if (!this.isCaseSensitive) {
                             h = h.toLower();
                             i = i.toLower();
                         }
@@ -334,16 +352,16 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                     }
                 case 15:
                     {
-                        if (this.l == null) {
+                        if (this.value == null) {
                             return null;
                         }
                         let j = FilterFactory.instance.property(a);
-                        let k = FilterFactory.instance.literal(this.l);
+                        let k = FilterFactory.instance.literal(this.value);
                         j = ColumnComparisonFilterCondition.g(b, j);
                         if (null == j) {
                             return null;
                         }
-                        if (!this.i) {
+                        if (!this.isCaseSensitive) {
                             j = j.toLower();
                             k = k.toLower();
                         }
@@ -351,16 +369,16 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                     }
                 case 16:
                     {
-                        if (this.l == null) {
+                        if (this.value == null) {
                             return null;
                         }
                         let l = FilterFactory.instance.property(a);
-                        let m = FilterFactory.instance.literal(this.l);
+                        let m = FilterFactory.instance.literal(this.value);
                         l = ColumnComparisonFilterCondition.g(b, l);
                         if (null == l) {
                             return null;
                         }
-                        if (!this.i) {
+                        if (!this.isCaseSensitive) {
                             l = l.toLower();
                             m = m.toLower();
                         }
@@ -369,8 +387,8 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                 case 0:
                     {
                         let n = FilterFactory.instance.property(a);
-                        let o = FilterFactory.instance.literal(this.k(this.l, b));
-                        if (b == 0 && !this.i) {
+                        let o = FilterFactory.instance.literal(this.k(this.value, b));
+                        if (b == 0 && !this.isCaseSensitive) {
                             n = n.toLower();
                             o = o.toLower();
                         }
@@ -378,8 +396,8 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                             return n.day().isEqualTo(o.day()).and(n.month().isEqualTo(o.month())).and(n.year().isEqualTo(o.year()));
                         }
                         else if (b == 2) {
-                            if (this.l != null && typeof this.l === 'string') {
-                                switch (this.l.toString().toLowerCase()) {
+                            if (this.value != null && typeof this.value === 'string') {
+                                switch (this.value.toString().toLowerCase()) {
                                     case "true":
                                         o = FilterFactory.instance.literal(true);
                                         break;
@@ -393,10 +411,10 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                     }
                 case 4:
                     {
-                        let p = this.k(this.l, b);
+                        let p = this.k(this.value, b);
                         let q = FilterFactory.instance.property(a);
                         let r = FilterFactory.instance.literal(p);
-                        if (b == 0 && !this.i) {
+                        if (b == 0 && !this.isCaseSensitive) {
                             q = q.toLower();
                             r = r.toLower();
                         }
@@ -408,10 +426,10 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                     }
                 case 5:
                     {
-                        let t = this.k(this.l, b);
+                        let t = this.k(this.value, b);
                         let u = FilterFactory.instance.property(a);
                         let v = FilterFactory.instance.literal(t);
-                        if (b == 0 && !this.i) {
+                        if (b == 0 && !this.isCaseSensitive) {
                             u = u.toLower();
                             v = v.toLower();
                         }
@@ -423,10 +441,10 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                     }
                 case 2:
                     {
-                        let x = this.k(this.l, b);
+                        let x = this.k(this.value, b);
                         let y = FilterFactory.instance.property(a);
                         let z = FilterFactory.instance.literal(x);
-                        if (b == 0 && !this.i) {
+                        if (b == 0 && !this.isCaseSensitive) {
                             y = y.toLower();
                             z = z.toLower();
                         }
@@ -438,10 +456,10 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                     }
                 case 3:
                     {
-                        let ab = this.k(this.l, b);
+                        let ab = this.k(this.value, b);
                         let ac = FilterFactory.instance.property(a);
                         let ad = FilterFactory.instance.literal(ab);
-                        if (b == 0 && !this.i) {
+                        if (b == 0 && !this.isCaseSensitive) {
                             ac = ac.toLower();
                             ad = ad.toLower();
                         }
@@ -454,8 +472,8 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                 case 1:
                     {
                         let af = FilterFactory.instance.property(a);
-                        let ag = FilterFactory.instance.literal(this.k(this.l, b));
-                        if (b == 0 && !this.i) {
+                        let ag = FilterFactory.instance.literal(this.k(this.value, b));
+                        if (b == 0 && !this.isCaseSensitive) {
                             af = af.toLower();
                             ag = ag.toLower();
                         }
@@ -466,16 +484,16 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                     }
                 case 14:
                     {
-                        if (this.l == null) {
+                        if (this.value == null) {
                             return null;
                         }
                         let ah = FilterFactory.instance.property(a);
-                        let ai = FilterFactory.instance.literal(this.l);
+                        let ai = FilterFactory.instance.literal(this.value);
                         ah = ColumnComparisonFilterCondition.g(b, ah);
                         if (null == ah) {
                             return null;
                         }
-                        if (!this.i) {
+                        if (!this.isCaseSensitive) {
                             ah = ah.toLower();
                             ai = ai.toLower();
                         }
@@ -497,8 +515,8 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                     {
                         let an = FilterFactory.instance.property(a);
                         let ao = 0;
-                        if (typeof this.l === 'string') {
-                            let ap = this.l;
+                        if (typeof this.value === 'string') {
+                            let ap = this.value;
                             if (((() => { let aq = tryParseInt32_1(ap, ao); ao = aq.p1; return aq.ret; })())) {
                                 let aq = FilterFactory.instance.literal(ao);
                                 return an.month().isEqualTo(aq);
@@ -521,13 +539,13 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                             }
                         }
                         else {
-                            let av = FilterFactory.instance.literal(this.l);
+                            let av = FilterFactory.instance.literal(this.value);
                             return an.month().isEqualTo(av);
                         }
                     }
                 case 39:
                     {
-                        let aw = this.l;
+                        let aw = this.value;
                         if (typeof aw === 'string') {
                             let ax = -1;
                             if (((() => { let ay = tryParseInt32_1(aw, ax); ax = ay.p1; return ay.ret; })())) {
@@ -686,7 +704,7 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
             }
             return b;
         }
-        static j(a) {
+        static getOperandNumber(a) {
             if (a == 43 || a == 42) {
                 return 0;
             }
@@ -694,10 +712,10 @@ export let ColumnComparisonFilterCondition = /*@__PURE__*/ (() => {
                 return 1;
             }
         }
-        static e(a) {
+        static getOperandNumbers(a) {
             let b = new Array(a.length);
             for (let c = 0; c < a.length; c++) {
-                b[c] = ColumnComparisonFilterCondition.j(a[c]);
+                b[c] = ColumnComparisonFilterCondition.getOperandNumber(a[c]);
             }
             return b;
         }
@@ -744,9 +762,15 @@ export let ColumnCustomFilterCondition = /*@__PURE__*/ (() => {
     class ColumnCustomFilterCondition extends ColumnFilterCondition {
         constructor() {
             super(...arguments);
-            this.e = null;
+            this._value = null;
             this._id = null;
-            this.d = 0;
+            this._index = 0;
+        }
+        get value() {
+            return this._value;
+        }
+        set value(a) {
+            this._value = a;
         }
         get id() {
             return this._id;
@@ -754,9 +778,15 @@ export let ColumnCustomFilterCondition = /*@__PURE__*/ (() => {
         set id(a) {
             this._id = a;
         }
-        a(a, b) {
-            let c = this.b.fq(this.id, this.d);
-            return this.b.es(c, this.e);
+        get index() {
+            return this._index;
+        }
+        set index(a) {
+            this._index = a;
+        }
+        resolveFilter(a, b) {
+            let c = this.b.fq(this.id, this.index);
+            return this.b.es(c, this.value);
         }
     }
     ColumnCustomFilterCondition.$t = /*@__PURE__*/ markType(ColumnCustomFilterCondition, 'ColumnCustomFilterCondition', ColumnFilterCondition.$);
@@ -779,15 +809,15 @@ export let ColumnFilterConditionCollection = /*@__PURE__*/ (() => {
  */
 export let ColumnFilterConditionGroup = /*@__PURE__*/ (() => {
     class ColumnFilterConditionGroup extends ColumnFilterCondition {
-        c() {
+        isGroup() {
             return true;
         }
         constructor() {
             super();
-            this.g = false;
+            this._usesOrOperator = false;
             this.f = null;
             this.f = new ColumnFilterConditionCollection();
-            this.g = false;
+            this.usesOrOperator = false;
         }
         equals(a) {
             if (a == null) {
@@ -797,26 +827,32 @@ export let ColumnFilterConditionGroup = /*@__PURE__*/ (() => {
                 return false;
             }
             let b = a;
-            if (b.h != this.h) {
+            if (b.count != this.count) {
                 return false;
             }
-            for (let c = 0; c < this.h; c++) {
+            for (let c = 0; c < this.count; c++) {
                 if (!Base.equalsStatic(this.item(c), b.item(c))) {
                     return false;
                 }
             }
             return true;
         }
-        get h() {
+        get count() {
             return this.f.count;
         }
-        i(a) {
+        get usesOrOperator() {
+            return this._usesOrOperator;
+        }
+        set usesOrOperator(a) {
+            this._usesOrOperator = a;
+        }
+        add(a) {
             this.f.add(a);
         }
-        k(a) {
+        remove(a) {
             this.f.remove(a);
         }
-        l(a) {
+        removeAt(a) {
             this.f.removeAt(a);
         }
         item(a, b) {
@@ -828,27 +864,27 @@ export let ColumnFilterConditionGroup = /*@__PURE__*/ (() => {
                 return this.f._inner[a];
             }
         }
-        j() {
+        clear() {
             this.f.clear();
         }
-        d() {
+        toArray() {
             let a = new Array(this.f.count);
             for (let b = 0; b < this.f.count; b++) {
                 a[b] = this.f._inner[b];
             }
             return a;
         }
-        a(a, b) {
+        resolveFilter(a, b) {
             if (this.f.count == 0) {
                 return null;
             }
-            let c = this.f._inner[this.f.count - 1].a(a, b);
+            let c = this.f._inner[this.f.count - 1].resolveFilter(a, b);
             for (let d = this.f.count - 2; d >= 0; d--) {
-                if (this.g) {
-                    c = FilterFactory.instance.or(this.f._inner[d].a(a, b), c);
+                if (this.usesOrOperator) {
+                    c = FilterFactory.instance.or(this.f._inner[d].resolveFilter(a, b), c);
                 }
                 else {
-                    c = FilterFactory.instance.and(this.f._inner[d].a(a, b), c);
+                    c = FilterFactory.instance.and(this.f._inner[d].resolveFilter(a, b), c);
                 }
             }
             return c;
@@ -2779,30 +2815,30 @@ export let CellModel = /*@__PURE__*/ (() => {
             a.c = AppearanceHelper.a(this.k2);
             if (this.ae != null) {
                 let b = this.ae;
-                if (this.p != null && b.n == null) {
+                if (this.p != null && b.p == null) {
                     let c = this.p.externalGrid.renderer;
                     let d = FontUtil.getFontInfoFromString(c, b.fontString);
-                    b.n = d.n;
-                    b.d = d.d;
-                    b.o = d.o;
+                    b.p = d.p;
+                    b.e = d.e;
                     b.q = d.q;
-                    b.r = d.r;
                     b.s = d.s;
+                    b.t = d.t;
+                    b.u = d.u;
+                }
+                if (b.p != null) {
+                    a.u = b.p;
                 }
-                if (b.n != null) {
-                    a.u = b.n;
+                if (!isNaN_(b.e)) {
+                    a.j = b.e;
                 }
-                if (!isNaN_(b.d)) {
-                    a.j = b.d;
+                if (b.u != null) {
+                    a.y = b.u;
                 }
                 if (b.s != null) {
-                    a.y = b.s;
+                    a.w = b.s;
                 }
                 if (b.q != null) {
-                    a.w = b.q;
-                }
-                if (b.o != null) {
-                    a.v = b.q;
+                    a.v = b.s;
                 }
             }
             return a;
@@ -3718,58 +3754,58 @@ export let SummaryCellModel = /*@__PURE__*/ (() => {
             b.af = AppearanceHelper.a(this.lg);
             if (this.lk != null) {
                 let c = this.lk;
-                if (this.p != null && c.n == null) {
+                if (this.p != null && c.p == null) {
                     let d = this.p.externalGrid.renderer;
                     let e = FontUtil.getFontInfoFromString(d, c.fontString);
-                    c.n = e.n;
-                    c.d = e.d;
-                    c.o = e.o;
+                    c.p = e.p;
+                    c.e = e.e;
                     c.q = e.q;
-                    c.r = e.r;
                     c.s = e.s;
+                    c.t = e.t;
+                    c.u = e.u;
+                }
+                if (c.p != null) {
+                    b.aj = c.p;
                 }
-                if (c.n != null) {
-                    b.aj = c.n;
+                if (!isNaN_(c.e)) {
+                    b.ag = c.e;
                 }
-                if (!isNaN_(c.d)) {
-                    b.ag = c.d;
+                if (c.u != null) {
+                    b.an = c.u;
                 }
                 if (c.s != null) {
-                    b.an = c.s;
+                    b.al = c.s;
                 }
                 if (c.q != null) {
-                    b.al = c.q;
-                }
-                if (c.o != null) {
-                    b.ak = c.q;
+                    b.ak = c.s;
                 }
             }
             if (this.ag != null) {
                 let f = this.ag;
-                if (this.p != null && f.n == null) {
+                if (this.p != null && f.p == null) {
                     let g = this.p.externalGrid.renderer;
                     let h = FontUtil.getFontInfoFromString(g, f.fontString);
-                    f.n = h.n;
-                    f.d = h.d;
-                    f.o = h.o;
+                    f.p = h.p;
+                    f.e = h.e;
                     f.q = h.q;
-                    f.r = h.r;
                     f.s = h.s;
+                    f.t = h.t;
+                    f.u = h.u;
+                }
+                if (f.p != null) {
+                    b.ap = f.p;
                 }
-                if (f.n != null) {
-                    b.ap = f.n;
+                if (!isNaN_(f.e)) {
+                    b.ah = f.e;
                 }
-                if (!isNaN_(f.d)) {
-                    b.ah = f.d;
+                if (f.u != null) {
+                    b.at = f.u;
                 }
                 if (f.s != null) {
-                    b.at = f.s;
+                    b.ar = f.s;
                 }
                 if (f.q != null) {
-                    b.ar = f.q;
-                }
-                if (f.o != null) {
-                    b.aq = f.q;
+                    b.aq = f.s;
                 }
             }
             return b;
@@ -5187,30 +5223,30 @@ export let Pager = /*@__PURE__*/ (() => {
             a.d = this.n.j().b();
             if (this.s != null) {
                 let b = this.s;
-                if (this.n != null && b.n == null) {
+                if (this.n != null && b.p == null) {
                     let c = this.n.m;
                     let d = FontUtil.getFontInfoFromString(c, b.fontString);
-                    b.n = d.n;
-                    b.d = d.d;
-                    b.o = d.o;
+                    b.p = d.p;
+                    b.e = d.e;
                     b.q = d.q;
-                    b.r = d.r;
                     b.s = d.s;
+                    b.t = d.t;
+                    b.u = d.u;
                 }
-                if (b.n != null) {
-                    a.l = b.n;
+                if (b.p != null) {
+                    a.l = b.p;
                 }
-                if (!isNaN_(b.d)) {
-                    a.g = b.d;
+                if (!isNaN_(b.e)) {
+                    a.g = b.e;
+                }
+                if (b.u != null) {
+                    a.p = b.u;
                 }
                 if (b.s != null) {
-                    a.p = b.s;
+                    a.n = b.s;
                 }
                 if (b.q != null) {
-                    a.n = b.q;
-                }
-                if (b.o != null) {
-                    a.m = b.q;
+                    a.m = b.s;
                 }
             }
             return a;
@@ -12284,7 +12320,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                 let d = this.a5.j._inner[c];
                 if (d != a && (d.ep != null || d.er != null)) {
                     let e = this.actualDataSource.resolveSchemaPropertyType(d.i8);
-                    let f = d.er != null ? d.er : d.ep.a(d.i8, e);
+                    let f = d.er != null ? d.er : d.ep.resolveFilter(d.i8, e);
                     if (b != null) {
                         switch (this.filterLogicalOperator) {
                             case 1:
@@ -12811,10 +12847,10 @@ export let DataGrid = /*@__PURE__*/ (() => {
                     if (i.f == null) {
                         i.f = new List$1(ColumnFilterCondition.$, 0);
                     }
-                    if (h.ep.c()) {
+                    if (h.ep.isGroup()) {
                         let n = h.ep;
-                        i.l = toNullable(Boolean_$type, n.g);
-                        let o = n.h;
+                        i.l = toNullable(Boolean_$type, n.usesOrOperator);
+                        let o = n.count;
                         for (let p = 0; p < o; p++) {
                             i.f.add(n.item(p));
                         }
@@ -13044,9 +13080,9 @@ export let DataGrid = /*@__PURE__*/ (() => {
                                         else if (u > 1) {
                                             let w = new ColumnFilterConditionGroup();
                                             for (let x = 0; x < u; x++) {
-                                                w.i(i.f._inner[x]);
+                                                w.add(i.f._inner[x]);
                                             }
-                                            w.g = i.l.value;
+                                            w.usesOrOperator = i.l.value;
                                             j.ep = w;
                                         }
                                     }
@@ -15055,10 +15091,10 @@ export let GridAnimationManager = /*@__PURE__*/ (() => {
                     let r = m;
                     let s = n;
                     if (r != null) {
-                        r.t(a.externalGrid.renderer);
+                        r.v(a.externalGrid.renderer);
                     }
                     if (s != null) {
-                        s.t(a.externalGrid.renderer);
+                        s.v(a.externalGrid.renderer);
                     }
                     let t = new FontInfo();
                     FontUtil.interpolateFont(t, l, r, s);
@@ -15241,10 +15277,10 @@ export let GridAnimationManager = /*@__PURE__*/ (() => {
                     let u = p;
                     let v = q;
                     if (u != null) {
-                        u.t(a.externalGrid.renderer);
+                        u.v(a.externalGrid.renderer);
                     }
                     if (v != null) {
-                        v.t(a.externalGrid.renderer);
+                        v.v(a.externalGrid.renderer);
                     }
                     let w = new FontInfo();
                     FontUtil.interpolateFont(w, o, u, v);
@@ -16692,7 +16728,7 @@ export let DefinitionBase = /*@__PURE__*/ (() => {
             }
             if (this.grid != null) {
                 if (this.ad != null) {
-                    this.ad.t(this.grid.externalGrid.renderer);
+                    this.ad.v(this.grid.externalGrid.renderer);
                 }
             }
             a.ag = this.ad;
@@ -18168,7 +18204,7 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             a.f1 = this.h1;
             if (this.grid != null) {
                 if (this.gb != null) {
-                    this.gb.t(this.grid.externalGrid.renderer);
+                    this.gb.v(this.grid.externalGrid.renderer);
                 }
             }
             a.af = this.gb;
@@ -18735,9 +18771,9 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
         }
         kf(a, b) {
             let c = new ColumnComparisonFilterCondition();
-            c.f = a;
-            c.l = b;
-            c.i = this.fo() == 2;
+            c.operator = a;
+            c.value = b;
+            c.isCaseSensitive = this.fo() == 2;
             this.ep = c;
             this.er = null;
         }
@@ -18751,9 +18787,9 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                         this.er = e;
                         this.ep = ((() => {
                             let $ret = new ColumnCustomFilterCondition();
-                            $ret.e = c;
+                            $ret.value = c;
                             $ret.id = a;
-                            $ret.d = b;
+                            $ret.index = b;
                             return $ret;
                         })());
                     }
@@ -22647,22 +22683,22 @@ export let SaveLayoutColumn = /*@__PURE__*/ (() => {
                                 let x = t.item("Value");
                                 let y = new ColumnCustomFilterCondition();
                                 y.id = u.value.toString();
-                                y.d = parseInt(v.value.toString());
+                                y.index = parseInt(v.value.toString());
                                 if (w != null) {
                                     switch (w.value.toString()) {
                                         case "String":
-                                            y.e = x.value.toString();
+                                            y.value = x.value.toString();
                                             break;
                                         case "Number":
-                                            y.e = parseFloat(x.value.toString());
+                                            y.value = parseFloat(x.value.toString());
                                             break;
                                         case "Date":
-                                            y.e = dateParse(x.value.toString());
+                                            y.value = dateParse(x.value.toString());
                                             break;
                                     }
                                 }
                                 else {
-                                    y.e = null;
+                                    y.value = null;
                                 }
                                 this.f.add(y);
                             }
@@ -22672,159 +22708,159 @@ export let SaveLayoutColumn = /*@__PURE__*/ (() => {
                                 let ab = t.item("ValueType");
                                 let ac = t.item("Value");
                                 let ad = new ColumnComparisonFilterCondition();
-                                ad.i = z.value;
+                                ad.isCaseSensitive = z.value;
                                 switch (aa.value.toString()) {
                                     case "Equals":
-                                        ad.f = 0;
+                                        ad.operator = 0;
                                         break;
                                     case "NotEquals":
-                                        ad.f = 1;
+                                        ad.operator = 1;
                                         break;
                                     case "LessThan":
-                                        ad.f = 2;
+                                        ad.operator = 2;
                                         break;
                                     case "LessThanOrEqualTo":
-                                        ad.f = 3;
+                                        ad.operator = 3;
                                         break;
                                     case "GreaterThan":
-                                        ad.f = 4;
+                                        ad.operator = 4;
                                         break;
                                     case "GreaterThanOrEqualTo":
-                                        ad.f = 5;
+                                        ad.operator = 5;
                                         break;
                                     case "Top":
-                                        ad.f = 6;
+                                        ad.operator = 6;
                                         break;
                                     case "Bottom":
-                                        ad.f = 7;
+                                        ad.operator = 7;
                                         break;
                                     case "TopPercentile":
-                                        ad.f = 8;
+                                        ad.operator = 8;
                                         break;
                                     case "BottomPercentile":
-                                        ad.f = 9;
+                                        ad.operator = 9;
                                         break;
                                     case "True":
-                                        ad.f = 10;
+                                        ad.operator = 10;
                                         break;
                                     case "False":
-                                        ad.f = 11;
+                                        ad.operator = 11;
                                         break;
                                     case "Contains":
-                                        ad.f = 12;
+                                        ad.operator = 12;
                                         break;
                                     case "DoesNotContain":
-                                        ad.f = 13;
+                                        ad.operator = 13;
                                         break;
                                     case "StartsWith":
-                                        ad.f = 14;
+                                        ad.operator = 14;
                                         break;
                                     case "DoesNotStartWith":
-                                        ad.f = 15;
+                                        ad.operator = 15;
                                         break;
                                     case "EndsWith":
-                                        ad.f = 16;
+                                        ad.operator = 16;
                                         break;
                                     case "DoesNotEndWith":
-                                        ad.f = 17;
+                                        ad.operator = 17;
                                         break;
                                     case "Today":
-                                        ad.f = 18;
+                                        ad.operator = 18;
                                         break;
                                     case "Tomorrow":
-                                        ad.f = 19;
+                                        ad.operator = 19;
                                         break;
                                     case "Yesterday":
-                                        ad.f = 20;
+                                        ad.operator = 20;
                                         break;
                                     case "NextWeek":
-                                        ad.f = 21;
+                                        ad.operator = 21;
                                         break;
                                     case "ThisWeek":
-                                        ad.f = 22;
+                                        ad.operator = 22;
                                         break;
                                     case "LastWeek":
-                                        ad.f = 23;
+                                        ad.operator = 23;
                                         break;
                                     case "NextMonth":
-                                        ad.f = 24;
+                                        ad.operator = 24;
                                         break;
                                     case "ThisMonth":
-                                        ad.f = 25;
+                                        ad.operator = 25;
                                         break;
                                     case "LastMonth":
-                                        ad.f = 26;
+                                        ad.operator = 26;
                                         break;
                                     case "NextQuater":
-                                        ad.f = 27;
+                                        ad.operator = 27;
                                         break;
                                     case "ThisQuater":
-                                        ad.f = 28;
+                                        ad.operator = 28;
                                         break;
                                     case "LastQuater":
-                                        ad.f = 29;
+                                        ad.operator = 29;
                                         break;
                                     case "NextYear":
-                                        ad.f = 30;
+                                        ad.operator = 30;
                                         break;
                                     case "ThisYear":
-                                        ad.f = 31;
+                                        ad.operator = 31;
                                         break;
                                     case "LastYear":
-                                        ad.f = 32;
+                                        ad.operator = 32;
                                         break;
                                     case "YearToDate":
-                                        ad.f = 33;
+                                        ad.operator = 33;
                                         break;
                                     case "Q1":
-                                        ad.f = 34;
+                                        ad.operator = 34;
                                         break;
                                     case "Q2":
-                                        ad.f = 35;
+                                        ad.operator = 35;
                                         break;
                                     case "Q3":
-                                        ad.f = 36;
+                                        ad.operator = 36;
                                         break;
                                     case "Q4":
-                                        ad.f = 37;
+                                        ad.operator = 37;
                                         break;
                                     case "Month":
-                                        ad.f = 38;
+                                        ad.operator = 38;
                                         break;
                                     case "Year":
-                                        ad.f = 39;
+                                        ad.operator = 39;
                                         break;
                                     case "Empty":
-                                        ad.f = 40;
+                                        ad.operator = 40;
                                         break;
                                     case "NotEmpty":
-                                        ad.f = 41;
+                                        ad.operator = 41;
                                         break;
                                     case "IsNull":
-                                        ad.f = 42;
+                                        ad.operator = 42;
                                         break;
                                     case "IsNotNull":
-                                        ad.f = 43;
+                                        ad.operator = 43;
                                         break;
                                     case "Custom":
-                                        ad.f = 44;
+                                        ad.operator = 44;
                                         break;
                                 }
                                 if (ab != null) {
                                     switch (ab.value.toString()) {
                                         case "String":
-                                            ad.l = ac.value.toString();
+                                            ad.value = ac.value.toString();
                                             break;
                                         case "Number":
-                                            ad.l = parseFloat(ac.value.toString());
+                                            ad.value = parseFloat(ac.value.toString());
                                             break;
                                         case "Date":
-                                            ad.l = dateParse(ac.value.toString());
+                                            ad.value = dateParse(ac.value.toString());
                                             break;
                                     }
                                 }
                                 else {
-                                    ad.l = null;
+                                    ad.value = null;
                                 }
                                 this.f.add(ad);
                             }
@@ -22914,20 +22950,20 @@ export let SaveLayoutColumn = /*@__PURE__*/ (() => {
                         if (typeCast(ColumnCustomFilterCondition.$, this.f._inner[e]) !== null) {
                             let f = this.f._inner[e];
                             a.i("\"ID\": " + "\"" + f.id + "\", ");
-                            a.i("\"Index\": " + f.d + ", ");
-                            if (f.e != null) {
-                                a.i("\"ValueType\": " + "\"" + getInstanceType(f.e).typeName + "\", ");
+                            a.i("\"Index\": " + f.index + ", ");
+                            if (f.value != null) {
+                                a.i("\"ValueType\": " + "\"" + getInstanceType(f.value).typeName + "\", ");
                             }
-                            a.i("\"Value\": " + "\"" + f.e + "\"");
+                            a.i("\"Value\": " + "\"" + f.value + "\"");
                         }
                         else {
                             let g = this.f._inner[e];
-                            a.i("\"IsCaseSensitive\": " + g.i + ", ");
-                            a.i("\"Operator\": " + "\"" + enumGetBox(ColumnComparisonConditionOperatorType_$type, g.f) + "\", ");
-                            if (g.l != null) {
-                                a.i("\"ValueType\": " + "\"" + getInstanceType(g.l).typeName + "\", ");
+                            a.i("\"IsCaseSensitive\": " + g.isCaseSensitive + ", ");
+                            a.i("\"Operator\": " + "\"" + enumGetBox(ColumnComparisonConditionOperatorType_$type, g.operator) + "\", ");
+                            if (g.value != null) {
+                                a.i("\"ValueType\": " + "\"" + getInstanceType(g.value).typeName + "\", ");
                             }
-                            a.i("\"Value\": " + "\"" + g.l + "\"");
+                            a.i("\"Value\": " + "\"" + g.value + "\"");
                         }
                         a.i("}");
                     }