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

package/esm5/lib/ColumnFilterCondition_combined.js

@@ -160,8 +160,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";
@@ -202,10 +202,10 @@ var ColumnFilterCondition = /** @class */ /*@__PURE__*/ (function (_super) {
         _this.b = null;
         return _this;
     }
-    ColumnFilterCondition.prototype.c = function () {
+    ColumnFilterCondition.prototype.isGroup = function () {
         return false;
     };
-    ColumnFilterCondition.prototype.a = function (a, b) {
+    ColumnFilterCondition.prototype.resolveFilter = function (a, b) {
         return null;
     };
     ColumnFilterCondition.$t = markType(ColumnFilterCondition, 'ColumnFilterCondition');
@@ -219,13 +219,13 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
     __extends(ColumnComparisonFilterCondition, _super);
     function ColumnComparisonFilterCondition() {
         var _this = _super.call(this) || this;
-        _this.f = 0;
-        _this.l = null;
-        _this.i = false;
-        _this.i = true;
+        _this._operator = 0;
+        _this._value = null;
+        _this._isCaseSensitive = false;
+        _this.isCaseSensitive = true;
         return _this;
     }
-    ColumnComparisonFilterCondition.d = function (a) {
+    ColumnComparisonFilterCondition.getApplicableOperators = function (a) {
         var b = new List$1(ColumnComparisonConditionOperatorType_$type, 0);
         switch (a) {
             case 11: break;
@@ -268,34 +268,64 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
             return false;
         }
         var 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;
     };
-    ColumnComparisonFilterCondition.prototype.a = function (a, b) {
-        return this.h(a, b, this.f);
+    Object.defineProperty(ColumnComparisonFilterCondition.prototype, "operator", {
+        get: function () {
+            return this._operator;
+        },
+        set: function (a) {
+            this._operator = a;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(ColumnComparisonFilterCondition.prototype, "value", {
+        get: function () {
+            return this._value;
+        },
+        set: function (a) {
+            this._value = a;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(ColumnComparisonFilterCondition.prototype, "isCaseSensitive", {
+        get: function () {
+            return this._isCaseSensitive;
+        },
+        set: function (a) {
+            this._isCaseSensitive = a;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    ColumnComparisonFilterCondition.prototype.resolveFilter = function (a, b) {
+        return this.h(a, b, this.operator);
     };
     ColumnComparisonFilterCondition.prototype.h = function (a, b, c) {
         switch (c) {
             case 12:
                 {
-                    if (this.l == null) {
+                    if (this.value == null) {
                         return null;
                     }
                     var d = FilterFactory.instance.property(a);
-                    var e = FilterFactory.instance.literal(this.l);
+                    var 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();
                     }
@@ -303,16 +333,16 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
                 }
             case 13:
                 {
-                    if (this.l == null) {
+                    if (this.value == null) {
                         return null;
                     }
                     var f = FilterFactory.instance.property(a);
-                    var g = FilterFactory.instance.literal(this.l);
+                    var 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();
                     }
@@ -320,16 +350,16 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
                 }
             case 17:
                 {
-                    if (this.l == null) {
+                    if (this.value == null) {
                         return null;
                     }
                     var h = FilterFactory.instance.property(a);
-                    var i = FilterFactory.instance.literal(this.l);
+                    var 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();
                     }
@@ -337,16 +367,16 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
                 }
             case 15:
                 {
-                    if (this.l == null) {
+                    if (this.value == null) {
                         return null;
                     }
                     var j = FilterFactory.instance.property(a);
-                    var k = FilterFactory.instance.literal(this.l);
+                    var 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();
                     }
@@ -354,16 +384,16 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
                 }
             case 16:
                 {
-                    if (this.l == null) {
+                    if (this.value == null) {
                         return null;
                     }
                     var l = FilterFactory.instance.property(a);
-                    var m = FilterFactory.instance.literal(this.l);
+                    var 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();
                     }
@@ -372,8 +402,8 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
             case 0:
                 {
                     var n = FilterFactory.instance.property(a);
-                    var o = FilterFactory.instance.literal(this.k(this.l, b));
-                    if (b == 0 && !this.i) {
+                    var o = FilterFactory.instance.literal(this.k(this.value, b));
+                    if (b == 0 && !this.isCaseSensitive) {
                         n = n.toLower();
                         o = o.toLower();
                     }
@@ -381,8 +411,8 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
                         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;
@@ -396,10 +426,10 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
                 }
             case 4:
                 {
-                    var p = this.k(this.l, b);
+                    var p = this.k(this.value, b);
                     var q = FilterFactory.instance.property(a);
                     var r = FilterFactory.instance.literal(p);
-                    if (b == 0 && !this.i) {
+                    if (b == 0 && !this.isCaseSensitive) {
                         q = q.toLower();
                         r = r.toLower();
                     }
@@ -411,10 +441,10 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
                 }
             case 5:
                 {
-                    var t = this.k(this.l, b);
+                    var t = this.k(this.value, b);
                     var u = FilterFactory.instance.property(a);
                     var v = FilterFactory.instance.literal(t);
-                    if (b == 0 && !this.i) {
+                    if (b == 0 && !this.isCaseSensitive) {
                         u = u.toLower();
                         v = v.toLower();
                     }
@@ -426,10 +456,10 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
                 }
             case 2:
                 {
-                    var x = this.k(this.l, b);
+                    var x = this.k(this.value, b);
                     var y = FilterFactory.instance.property(a);
                     var z = FilterFactory.instance.literal(x);
-                    if (b == 0 && !this.i) {
+                    if (b == 0 && !this.isCaseSensitive) {
                         y = y.toLower();
                         z = z.toLower();
                     }
@@ -441,10 +471,10 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
                 }
             case 3:
                 {
-                    var ab = this.k(this.l, b);
+                    var ab = this.k(this.value, b);
                     var ac = FilterFactory.instance.property(a);
                     var ad = FilterFactory.instance.literal(ab);
-                    if (b == 0 && !this.i) {
+                    if (b == 0 && !this.isCaseSensitive) {
                         ac = ac.toLower();
                         ad = ad.toLower();
                     }
@@ -457,8 +487,8 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
             case 1:
                 {
                     var af = FilterFactory.instance.property(a);
-                    var ag = FilterFactory.instance.literal(this.k(this.l, b));
-                    if (b == 0 && !this.i) {
+                    var ag = FilterFactory.instance.literal(this.k(this.value, b));
+                    if (b == 0 && !this.isCaseSensitive) {
                         af = af.toLower();
                         ag = ag.toLower();
                     }
@@ -469,16 +499,16 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
                 }
             case 14:
                 {
-                    if (this.l == null) {
+                    if (this.value == null) {
                         return null;
                     }
                     var ah = FilterFactory.instance.property(a);
-                    var ai = FilterFactory.instance.literal(this.l);
+                    var 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();
                     }
@@ -500,8 +530,8 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
                 {
                     var an = FilterFactory.instance.property(a);
                     var ao_1 = 0;
-                    if (typeof this.l === 'string') {
-                        var ap_1 = this.l;
+                    if (typeof this.value === 'string') {
+                        var ap_1 = this.value;
                         if (((function () { var aq = tryParseInt32_1(ap_1, ao_1); ao_1 = aq.p1; return aq.ret; })())) {
                             var aq = FilterFactory.instance.literal(ao_1);
                             return an.month().isEqualTo(aq);
@@ -524,13 +554,13 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
                         }
                     }
                     else {
-                        var av = FilterFactory.instance.literal(this.l);
+                        var av = FilterFactory.instance.literal(this.value);
                         return an.month().isEqualTo(av);
                     }
                 }
             case 39:
                 {
-                    var aw_1 = this.l;
+                    var aw_1 = this.value;
                     if (typeof aw_1 === 'string') {
                         var ax_1 = -1;
                         if (((function () { var ay = tryParseInt32_1(aw_1, ax_1); ax_1 = ay.p1; return ay.ret; })())) {
@@ -689,7 +719,7 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
         }
         return b;
     };
-    ColumnComparisonFilterCondition.j = function (a) {
+    ColumnComparisonFilterCondition.getOperandNumber = function (a) {
         if (a == 43 || a == 42) {
             return 0;
         }
@@ -697,10 +727,10 @@ var ColumnComparisonFilterCondition = /** @class */ /*@__PURE__*/ (function (_su
             return 1;
         }
     };
-    ColumnComparisonFilterCondition.e = function (a) {
+    ColumnComparisonFilterCondition.getOperandNumbers = function (a) {
         var b = new Array(a.length);
         for (var c = 0; c < a.length; c++) {
-            b[c] = ColumnComparisonFilterCondition.j(a[c]);
+            b[c] = ColumnComparisonFilterCondition.getOperandNumber(a[c]);
         }
         return b;
     };
@@ -747,11 +777,21 @@ var ColumnCustomFilterCondition = /** @class */ /*@__PURE__*/ (function (_super)
     __extends(ColumnCustomFilterCondition, _super);
     function ColumnCustomFilterCondition() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.e = null;
+        _this._value = null;
         _this._id = null;
-        _this.d = 0;
+        _this._index = 0;
         return _this;
     }
+    Object.defineProperty(ColumnCustomFilterCondition.prototype, "value", {
+        get: function () {
+            return this._value;
+        },
+        set: function (a) {
+            this._value = a;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(ColumnCustomFilterCondition.prototype, "id", {
         get: function () {
             return this._id;
@@ -762,9 +802,19 @@ var ColumnCustomFilterCondition = /** @class */ /*@__PURE__*/ (function (_super)
         enumerable: false,
         configurable: true
     });
-    ColumnCustomFilterCondition.prototype.a = function (a, b) {
-        var c = this.b.fq(this.id, this.d);
-        return this.b.es(c, this.e);
+    Object.defineProperty(ColumnCustomFilterCondition.prototype, "index", {
+        get: function () {
+            return this._index;
+        },
+        set: function (a) {
+            this._index = a;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    ColumnCustomFilterCondition.prototype.resolveFilter = function (a, b) {
+        var c = this.b.fq(this.id, this.index);
+        return this.b.es(c, this.value);
     };
     ColumnCustomFilterCondition.$t = markType(ColumnCustomFilterCondition, 'ColumnCustomFilterCondition', ColumnFilterCondition.$);
     return ColumnCustomFilterCondition;
@@ -789,13 +839,13 @@ var ColumnFilterConditionGroup = /** @class */ /*@__PURE__*/ (function (_super)
     __extends(ColumnFilterConditionGroup, _super);
     function ColumnFilterConditionGroup() {
         var _this = _super.call(this) || this;
-        _this.g = false;
+        _this._usesOrOperator = false;
         _this.f = null;
         _this.f = new ColumnFilterConditionCollection();
-        _this.g = false;
+        _this.usesOrOperator = false;
         return _this;
     }
-    ColumnFilterConditionGroup.prototype.c = function () {
+    ColumnFilterConditionGroup.prototype.isGroup = function () {
         return true;
     };
     ColumnFilterConditionGroup.prototype.equals = function (a) {
@@ -806,30 +856,40 @@ var ColumnFilterConditionGroup = /** @class */ /*@__PURE__*/ (function (_super)
             return false;
         }
         var b = a;
-        if (b.h != this.h) {
+        if (b.count != this.count) {
             return false;
         }
-        for (var c = 0; c < this.h; c++) {
+        for (var c = 0; c < this.count; c++) {
             if (!Base.equalsStatic(this.item(c), b.item(c))) {
                 return false;
             }
         }
         return true;
     };
-    Object.defineProperty(ColumnFilterConditionGroup.prototype, "h", {
+    Object.defineProperty(ColumnFilterConditionGroup.prototype, "count", {
         get: function () {
             return this.f.count;
         },
         enumerable: false,
         configurable: true
     });
-    ColumnFilterConditionGroup.prototype.i = function (a) {
+    Object.defineProperty(ColumnFilterConditionGroup.prototype, "usesOrOperator", {
+        get: function () {
+            return this._usesOrOperator;
+        },
+        set: function (a) {
+            this._usesOrOperator = a;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    ColumnFilterConditionGroup.prototype.add = function (a) {
         this.f.add(a);
     };
-    ColumnFilterConditionGroup.prototype.k = function (a) {
+    ColumnFilterConditionGroup.prototype.remove = function (a) {
         this.f.remove(a);
     };
-    ColumnFilterConditionGroup.prototype.l = function (a) {
+    ColumnFilterConditionGroup.prototype.removeAt = function (a) {
         this.f.removeAt(a);
     };
     ColumnFilterConditionGroup.prototype.item = function (a, b) {
@@ -841,27 +901,27 @@ var ColumnFilterConditionGroup = /** @class */ /*@__PURE__*/ (function (_super)
             return this.f._inner[a];
         }
     };
-    ColumnFilterConditionGroup.prototype.j = function () {
+    ColumnFilterConditionGroup.prototype.clear = function () {
         this.f.clear();
     };
-    ColumnFilterConditionGroup.prototype.d = function () {
+    ColumnFilterConditionGroup.prototype.toArray = function () {
         var a = new Array(this.f.count);
         for (var b = 0; b < this.f.count; b++) {
             a[b] = this.f._inner[b];
         }
         return a;
     };
-    ColumnFilterConditionGroup.prototype.a = function (a, b) {
+    ColumnFilterConditionGroup.prototype.resolveFilter = function (a, b) {
         if (this.f.count == 0) {
             return null;
         }
-        var c = this.f._inner[this.f.count - 1].a(a, b);
+        var c = this.f._inner[this.f.count - 1].resolveFilter(a, b);
         for (var 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;
@@ -3233,30 +3293,30 @@ var CellModel = /** @class */ /*@__PURE__*/ (function (_super) {
         a.c = AppearanceHelper.a(this.k2);
         if (this.ae != null) {
             var b = this.ae;
-            if (this.p != null && b.n == null) {
+            if (this.p != null && b.p == null) {
                 var c = this.p.externalGrid.renderer;
                 var 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;
@@ -4297,58 +4357,58 @@ var SummaryCellModel = /** @class */ /*@__PURE__*/ (function (_super) {
         b.af = AppearanceHelper.a(this.lg);
         if (this.lk != null) {
             var c = this.lk;
-            if (this.p != null && c.n == null) {
+            if (this.p != null && c.p == null) {
                 var d = this.p.externalGrid.renderer;
                 var 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) {
             var f = this.ag;
-            if (this.p != null && f.n == null) {
+            if (this.p != null && f.p == null) {
                 var g = this.p.externalGrid.renderer;
                 var 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;
@@ -5962,30 +6022,30 @@ var Pager = /** @class */ /*@__PURE__*/ (function (_super) {
         a.d = this.n.j().b();
         if (this.s != null) {
             var b = this.s;
-            if (this.n != null && b.n == null) {
+            if (this.n != null && b.p == null) {
                 var c = this.n.m;
                 var 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.l = b.p;
             }
-            if (b.n != null) {
-                a.l = b.n;
+            if (!isNaN_(b.e)) {
+                a.g = b.e;
             }
-            if (!isNaN_(b.d)) {
-                a.g = b.d;
+            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;
@@ -14206,7 +14266,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             var d = this.a5.j._inner[c];
             if (d != a && (d.ep != null || d.er != null)) {
                 var e = this.actualDataSource.resolveSchemaPropertyType(d.i8);
-                var f = d.er != null ? d.er : d.ep.a(d.i8, e);
+                var f = d.er != null ? d.er : d.ep.resolveFilter(d.i8, e);
                 if (b != null) {
                     switch (this.filterLogicalOperator) {
                         case 1:
@@ -14777,10 +14837,10 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (i.f == null) {
                     i.f = new List$1(ColumnFilterCondition.$, 0);
                 }
-                if (h.ep.c()) {
+                if (h.ep.isGroup()) {
                     var n = h.ep;
-                    i.l = toNullable(Boolean_$type, n.g);
-                    var o = n.h;
+                    i.l = toNullable(Boolean_$type, n.usesOrOperator);
+                    var o = n.count;
                     for (var p = 0; p < o; p++) {
                         i.f.add(n.item(p));
                     }
@@ -15010,9 +15070,9 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                                     else if (u > 1) {
                                         var w = new ColumnFilterConditionGroup();
                                         for (var 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;
                                     }
                                 }
@@ -17178,10 +17238,10 @@ var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super) {
                 var r = m;
                 var 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);
                 }
                 var t = new FontInfo();
                 FontUtil.interpolateFont(t, l, r, s);
@@ -17365,10 +17425,10 @@ var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super) {
                 var u = p;
                 var 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);
                 }
                 var w = new FontInfo();
                 FontUtil.interpolateFont(w, o, u, v);
@@ -19029,7 +19089,7 @@ var DefinitionBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         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;
@@ -20794,7 +20854,7 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         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;
@@ -21365,9 +21425,9 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     DataGridColumn.prototype.kf = function (a, b) {
         var 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;
     };
@@ -21381,9 +21441,9 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
                     this.er = e;
                     this.ep = ((function () {
                         var $ret = new ColumnCustomFilterCondition();
-                        $ret.e = c;
+                        $ret.value = c;
                         $ret.id = a;
-                        $ret.d = b;
+                        $ret.index = b;
                         return $ret;
                     })());
                 }
@@ -25623,22 +25683,22 @@ var SaveLayoutColumn = /** @class */ /*@__PURE__*/ (function (_super) {
                             var x = t.item("Value");
                             var 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);
                         }
@@ -25648,159 +25708,159 @@ var SaveLayoutColumn = /** @class */ /*@__PURE__*/ (function (_super) {
                             var ab = t.item("ValueType");
                             var ac = t.item("Value");
                             var 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);
                         }
@@ -25890,20 +25950,20 @@ var SaveLayoutColumn = /** @class */ /*@__PURE__*/ (function (_super) {
                     if (typeCast(ColumnCustomFilterCondition.$, this.f._inner[e]) !== null) {
                         var 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 {
                         var 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("}");
                 }