@syncfusion/ej2-querybuilder 25.1.42 → 25.2.4

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 25.1.42
+*  version : 25.2.4
 *  Copyright Syncfusion Inc. 2001 - 2023. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-querybuilder@*",
-  "_id": "@syncfusion/ej2-querybuilder@25.1.38",
+  "_id": "@syncfusion/ej2-querybuilder@25.2.3",
   "_inBundle": false,
-  "_integrity": "sha512-RLUddm+Ql/CK4B9L75aovBZ1SksSfwr8nonX77H2Q5jI20+6I8TLJAZo8MBSmybIpl6GA2/1JARXa24aDC322w==",
+  "_integrity": "sha512-g0zrXZsPCoiv5HFmQSjCcz2FTFV+IQiKYJe3NFSVmx7pPYRG5yDrm8e/YqbuuMkFJ+Hhmq82atsapjvbBNCdjw==",
   "_location": "/@syncfusion/ej2-querybuilder",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-querybuilder",
     "/@syncfusion/ej2-vue-querybuilder"
   ],
-  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-25.1.38.tgz",
-  "_shasum": "9901505552698bdd0ad97442067588722a2d4556",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-25.2.3.tgz",
+  "_shasum": "0935962d9265df19139327bc445b6e1796a5eef1",
   "_spec": "@syncfusion/ej2-querybuilder@*",
   "_where": "/jenkins/workspace/elease-automation_release_25.1.1/packages/included",
   "author": {
@@ -32,12 +32,12 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~25.1.35",
-    "@syncfusion/ej2-buttons": "~25.1.39",
-    "@syncfusion/ej2-calendars": "~25.1.42",
-    "@syncfusion/ej2-dropdowns": "~25.1.41",
-    "@syncfusion/ej2-inputs": "~25.1.42",
-    "@syncfusion/ej2-splitbuttons": "~25.1.38"
+    "@syncfusion/ej2-base": "~25.2.3",
+    "@syncfusion/ej2-buttons": "~25.2.4",
+    "@syncfusion/ej2-calendars": "~25.2.4",
+    "@syncfusion/ej2-dropdowns": "~25.2.4",
+    "@syncfusion/ej2-inputs": "~25.2.3",
+    "@syncfusion/ej2-splitbuttons": "~25.2.4"
   },
   "deprecated": false,
   "description": "Essential JS 2 QueryBuilder",
@@ -66,7 +66,7 @@
     "url": "https://github.com/syncfusion/ej2-javascript-ui-controls/tree/master/controls/querybuilder"
   },
   "typings": "index.d.ts",
-  "version": "25.1.42",
+  "version": "25.2.4",
   "sideEffects": false,
   "homepage": "https://www.syncfusion.com/javascript-ui-controls"
 }

package/src/query-builder/query-builder-model.d.ts

@@ -168,7 +168,7 @@ export interface RuleModel {
     /**
      * Specifies whether rule is locked or not.
      *
-     * @default false
+     * @default null
      */
     isLocked?: boolean;
 

package/src/query-builder/query-builder.d.ts

@@ -155,7 +155,7 @@ export declare class Rule extends ChildProperty<Rule> {
     /**
      * Specifies whether rule is locked or not.
      *
-     * @default false
+     * @default null
      */
     isLocked: boolean;
 }
@@ -341,6 +341,7 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
     private cloneGrpBtnClick;
     private isMiddleGroup;
     private cloneRuleBtnClick;
+    private isNumInput;
     /**
      * Triggers when the component is created.
      *
@@ -909,6 +910,8 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
     lockGroup(groupID: string): void;
     private sqlParser;
     private parseSqlStrings;
+    private checkCondition;
+    private getSingleQuoteString;
     private checkLiteral;
     private checkNumberLiteral;
     private getOperator;
@@ -916,6 +919,7 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
     private getLabelFromColumn;
     private getLabelFromField;
     private processParser;
+    private getValueFromParser;
     /**
      * Clone the Group
      *

package/src/query-builder/query-builder.js

@@ -128,7 +128,7 @@ var Rule = /** @class */ (function (_super) {
         Property(false)
     ], Rule.prototype, "not", void 0);
     __decorate([
-        Property(false)
+        Property(null)
     ], Rule.prototype, "isLocked", void 0);
     return Rule;
 }(ChildProperty));
@@ -1503,12 +1503,22 @@ var QueryBuilder = /** @class */ (function (_super) {
         var _this = this;
         var element;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        if (this.isNumInput && typeof args.value === 'number') {
+            this.isNumInput = false;
+            return;
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         if (args.element && args.element.classList.contains('e-multiselect')) {
             var multiSelectArgs = args;
             element = multiSelectArgs.element;
         }
         else if (args.event) {
             element = args.event.target;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        }
+        else if (args.type === 'input' && args.currentTarget) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            element = args.currentTarget;
         }
         else {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1565,6 +1575,14 @@ var QueryBuilder = /** @class */ (function (_super) {
         }
         else {
             value = args.value;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            if (args.type === 'input' && args.currentTarget) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                value = Number(args.currentTarget.value);
+                var numericTextBoxObj = getInstance(args.currentTarget, NumericTextBox);
+                numericTextBoxObj.value = value;
+                this.isNumInput = true;
+            }
         }
         if (args.name === 'input' && this.immediateModeDelay) {
             window.clearInterval(this.timer);
@@ -2414,6 +2432,7 @@ var QueryBuilder = /** @class */ (function (_super) {
             var numeric = new NumericTextBox(numericTxt);
             numeric.appendTo('#' + parentId + '_valuekey' + idx);
             numeric.element.setAttribute('aria-label', itemData.label + ' ' + 'Value');
+            numeric.element.oninput = this.changeValue.bind(this, idx);
         }
     };
     QueryBuilder.prototype.processValueString = function (value, type) {
@@ -3226,7 +3245,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         if (this.portals && this.portals.length) {
             this.clearQBTemplate();
         }
-        popupElement = document.querySelectorAll('.qb-dropdownlist');
+        popupElement = document.querySelectorAll('.qb-dropdownlist.e-popup');
         if (popupElement) {
             for (i = 0; i < popupElement.length; i++) {
                 popupElement[i].remove();
@@ -4068,7 +4087,9 @@ var QueryBuilder = /** @class */ (function (_super) {
         var ruleCondtion = currentRule.condition;
         var notCondition = currentRule.not;
         var ruleColl = extend([], currentRule.rules, [], true);
-        var rule = this.getRuleCollection({ condition: ruleCondtion, rules: ruleColl, not: notCondition }, true);
+        var rule = !isNullOrUndefined(currentRule.isLocked) ?
+            this.getRuleCollection({ condition: ruleCondtion, rules: ruleColl, not: notCondition, isLocked: currentRule.isLocked }, true) :
+            this.getRuleCollection({ condition: ruleCondtion, rules: ruleColl, not: notCondition }, true);
         return rule;
     };
     QueryBuilder.prototype.getRuleCollection = function (rule, isValidRule) {
@@ -4101,10 +4122,11 @@ var QueryBuilder = /** @class */ (function (_super) {
             if ((this.isRefreshed && this.enablePersistence) || (rule.field !== '' && rule.operator !== '' && (rule.value !== '' &&
                 rule.value !== undefined)) || (customObj && customObj.isQuestion)) {
                 var condition = rule.condition;
-                rule = {
-                    'label': rule.label, 'field': rule.field, 'operator': rule.operator, 'type': rule.type, 'value': rule.value,
-                    'isLocked': rule.isLocked
-                };
+                var lockedRule = rule.isLocked;
+                rule = { 'label': rule.label, 'field': rule.field, 'operator': rule.operator, 'type': rule.type, 'value': rule.value };
+                if (!isNullOrUndefined(lockedRule)) {
+                    rule.isLocked = lockedRule;
+                }
                 if (condition) {
                     rule.condition = condition;
                 }
@@ -4137,11 +4159,15 @@ var QueryBuilder = /** @class */ (function (_super) {
                 rule = {};
             }
             else {
+                var isLocked = rule.isLocked;
                 if (this.enableNotCondition) {
-                    rule = { 'condition': rule.condition, 'rules': rule.rules, 'not': rule.not, 'isLocked': rule.isLocked };
+                    rule = { 'condition': rule.condition, 'rules': rule.rules, 'not': rule.not };
                 }
                 else {
-                    rule = { 'condition': rule.condition, 'rules': rule.rules, 'isLocked': rule.isLocked };
+                    rule = { 'condition': rule.condition, 'rules': rule.rules };
+                }
+                if (!isNullOrUndefined(isLocked)) {
+                    rule.isLocked = isLocked;
                 }
                 if (customObj) {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -4182,6 +4208,9 @@ var QueryBuilder = /** @class */ (function (_super) {
         else {
             rule = { condition: this.rule.condition, rules: this.rule.rules };
         }
+        if (!isNullOrUndefined(this.rule.isLocked)) {
+            rule.isLocked = this.rule.isLocked;
+        }
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         if (this.rule.custom) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -5315,6 +5344,11 @@ var QueryBuilder = /** @class */ (function (_super) {
                     }
                 }
             }
+            else if (sqlString[matchValue.length] && (sqlString[matchValue.length] !== ')') &&
+                !this.checkCondition(sqlString, matchValue)) {
+                matchValue = this.getSingleQuoteString(sqlString, matchValue);
+            }
+            // end
             this.parser.push(['String', matchValue]);
             return matchValue.length;
         }
@@ -5344,6 +5378,27 @@ var QueryBuilder = /** @class */ (function (_super) {
         }
         return 1;
     };
+    QueryBuilder.prototype.checkCondition = function (sqlString, matchValue) {
+        if (sqlString.slice(matchValue.length + 1, matchValue.length + 4) === 'AND' ||
+            sqlString.slice(matchValue.length + 1, matchValue.length + 3) === 'OR') {
+            return true;
+        }
+        return false;
+    };
+    QueryBuilder.prototype.getSingleQuoteString = function (sqlString, matchValue) {
+        if (sqlString[matchValue.length] && (sqlString[matchValue.length] !== ')') &&
+            !this.checkCondition(sqlString, matchValue) && sqlString[matchValue.length] !== ',') {
+            var tempStr = sqlString.replace(matchValue, '');
+            // eslint-disable-next-line
+            if (isNullOrUndefined(/^'((?:[^\\']+?|\\.|'')*)'(?!')/.exec(tempStr))) {
+                // eslint-disable-next-line
+                var parsedValue = /^((?:[^\\']+?|\\.|'')*)'(?!')/.exec(tempStr)[0];
+                matchValue += parsedValue;
+                matchValue = this.getSingleQuoteString(sqlString, matchValue);
+            }
+        }
+        return matchValue;
+    };
     QueryBuilder.prototype.checkLiteral = function () {
         var lastParser = this.parser[this.parser.length - 1];
         if (!lastParser) {
@@ -5600,7 +5655,11 @@ var QueryBuilder = /** @class */ (function (_super) {
                     }
                     else {
                         rule.type = 'string';
-                        rule.value = parser[i + 2][1] ? parser[i + 2][1].replace(/'/g, '') : parser[i + 2][1];
+                        var val = parser[i + 2][1];
+                        if (val && val[0] === '\'') {
+                            val = val.substring(1, val.length - 1);
+                        }
+                        rule.value = val;
                     }
                     rule.type = this.getTypeFromColumn(rule);
                 }
@@ -5650,6 +5709,27 @@ var QueryBuilder = /** @class */ (function (_super) {
         }
         return rules;
     };
+    QueryBuilder.prototype.getValueFromParser = function (parser, idx) {
+        var value = '';
+        var k;
+        for (k = idx; k < parser.length; k++) {
+            if (parser[k][0] !== 'String' || parser[k][1] === ',' || parser[k][1] === ', ') {
+                break;
+            }
+            else {
+                if (value !== '') {
+                    idx += 1;
+                }
+                if (parser[k][1] !== null) {
+                    value += parser[k][1];
+                }
+                else {
+                    value = null;
+                }
+            }
+        }
+        return { value: value, idx: idx };
+    };
     /**
      * Clone the Group
      *