@syncfusion/ej2-querybuilder 25.1.35 → 25.1.38

package/dist/es6/ej2-querybuilder.es5.js

@@ -1813,7 +1813,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             this.GetRootColumnName(rule.field) === this.GetRootColumnName(this.previousColumn.field))) {
             var subField = this.selectedColumn.columns;
             for (var i = 0; i < subField.length; i++) {
-                if (rule.field === subField[i].field) {
+                if (rule.field === subField[i].field || rule.field.indexOf(subField[i].field + this.separator) > -1) {
                     dropDownList.value = subField[i].field;
                     this.selectedColumn = subField[i];
                     subFieldValue = true;
@@ -2183,17 +2183,11 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         if (!this.dataColl.length && values.length) {
             isValues = true;
         }
-        var fieldValue = this.selectedRule.field;
-        var isNested = this.selectedRule.field.indexOf(this.separator);
-        if (isNested !== 0 && this.fieldMode !== 'DropdownTree') {
-            var nest = this.selectedRule.field.split(this.separator);
-            fieldValue = nest[nest.length - 1];
-        }
         var multiSelectValue;
         multiSelectValue = {
             dataSource: isValues ? values : (isFetched ? ds : this.dataManager),
             query: new Query([rule.field]),
-            fields: { text: fieldValue, value: fieldValue },
+            fields: { text: this.selectedRule.field, value: this.selectedRule.field },
             placeholder: this.l10n.getConstant('SelectValue'),
             value: selectedValue,
             mode: 'CheckBox',
@@ -2324,7 +2318,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         var columnData = this.getItemData(parentId);
         var selectedValue;
         var isTemplate = (typeof columnData.template === 'string');
-        if (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1 || this.isPublic || isTemplate) {
+        if (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1 || this.isPublic || isTemplate || rule.value != '') {
             selectedValue = rule.value;
         }
         else {
@@ -2363,7 +2357,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
     QueryBuilder.prototype.renderNumberValue = function (parentId, rule, operator, idx, ruleValElem, itemData, length) {
         var columnData = this.getItemData(parentId);
         var isTemplate = (typeof columnData.template === 'string');
-        var selectedVal = (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1 || this.isPublic || isTemplate) ? rule.value : this.setDefaultValue(parentId, false, true);
+        var selectedVal = (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1 || this.isPublic || isTemplate || typeof rule.value === 'number') ? rule.value : this.setDefaultValue(parentId, false, true);
         if ((operator === 'in' || operator === 'notin') && (this.dataColl.length || columnData.values)) {
             selectedVal = (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1) ? rule.value : this.setDefaultValue(parentId, true, false);
             this.renderMultiSelect(columnData, parentId, idx, selectedVal, columnData.values);
@@ -2499,6 +2493,10 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                                 var datePicker = void 0;
                                 var place = this.l10n.getConstant('SelectValue');
                                 var isTemplate = (typeof itemData.template === 'string');
+                                if (rule.value && !isNullOrUndefined(format)) {
+                                    selVal = (length_1 > 1) ? rule.value[i] : rule.value;
+                                    selectedValue = this.parseDate(selVal, format) || new Date();
+                                }
                                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                                 if (!itemData.field && !itemData.key && itemData.value) {
                                     if (itemData.value instanceof Date) {
@@ -2599,7 +2597,15 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                 isCheck = values[i].toString().toLowerCase() === itemData.value.toString().toLowerCase();
             }
             else if (i === 0) {
-                isCheck = true;
+                if (typeof rule.value === 'boolean') {
+                    isCheck = rule.value ? true : false;
+                }
+                else {
+                    isCheck = true;
+                }
+            }
+            if (typeof rule.value === 'boolean' && i === 1) {
+                isCheck = !rule.value ? true : false;
             }
             value = values[i].toString();
             orgValue = values[i];
@@ -2616,7 +2622,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         var radiobutton = new RadioButton(radioBtn);
         radiobutton.appendTo('#' + parentId + '_valuekey' + i);
         if (isCheck) {
-            this.updateRules(radiobutton.element, orgValue, 0);
+            this.updateRules(radiobutton.element, orgValue, 0, true);
         }
     };
     QueryBuilder.prototype.getOperatorIndex = function (ddlObj, rule) {
@@ -5118,6 +5124,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
      */
     QueryBuilder.prototype.cloneRule = function (ruleID, groupID, index) {
         var getRule = this.getRule(ruleID.replace(this.element.id + '_', ''));
+        var isCloneRule = this.showButtons.cloneRule;
         groupID = groupID.replace(this.element.id + '_', '');
         this.ruleIndex = index;
         this.cloneRuleBtnClick = true;
@@ -5128,7 +5135,8 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             }], groupID);
         this.ruleIndex = -1;
         this.cloneRuleBtnClick = false;
-        this.showButtons.cloneRule = false;
+        this.showButtons.cloneRule = isCloneRule;
+        isCloneRule = false;
     };
     /**
      * Clones the group based on the group ID to the specific group.
@@ -5141,6 +5149,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
     QueryBuilder.prototype.cloneGroup = function (groupID, parentGroupID, index) {
         parentGroupID = parentGroupID.replace(this.element.id + '_', '');
         var group = this.getGroup(parentGroupID);
+        var isCloneGroup = this.showButtons.cloneGroup;
         groupID = groupID.replace(this.element.id + '_', '');
         this.groupIndex = index;
         this.cloneGrpBtnClick = true;
@@ -5148,7 +5157,8 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         this.addGroups([{ 'condition': group.condition, 'not': group.not, 'rules': group.rules }], groupID);
         this.groupIndex = -1;
         this.cloneGrpBtnClick = false;
-        this.showButtons.cloneGroup = false;
+        this.showButtons.cloneGroup = isCloneGroup;
+        isCloneGroup = false;
     };
     /**
      * Locks the rule based on the rule ID.
@@ -5157,6 +5167,9 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
      * @returns {void}
      */
     QueryBuilder.prototype.lockRule = function (ruleID) {
+        if (ruleID.indexOf(this.element.id) < 0) {
+            ruleID = this.element.id + '_' + ruleID;
+        }
         var target = document.getElementById(ruleID).querySelectorAll('.e-lock-rule-btn')[0];
         this.ruleLock(target);
     };
@@ -5167,6 +5180,9 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
      * @returns {void}
      */
     QueryBuilder.prototype.lockGroup = function (groupID) {
+        if (groupID.indexOf(this.element.id) < 0) {
+            groupID = this.element.id + '_' + groupID;
+        }
         var target = document.getElementById(groupID).querySelectorAll('.e-lock-grp-btn')[0];
         this.groupLock(target);
     };
@@ -5262,9 +5278,9 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             return matchValue.length;
         }
         // eslint-disable-next-line
-        if (this.checkLiteral() && /^'?([a-z_][a-z0-9 _.\[\]\(\)]{0,}(\:(number|float|string|date|boolean))?)'?/i.exec(sqlString)) {
+        if (this.checkLiteral() && /^'?([a-z_][a-z0-9 _.\[\]\(\)-]{0,}(\:(number|float|string|date|boolean))?)'?/i.exec(sqlString)) {
             // eslint-disable-next-line
-            matchValue = /^'?([a-z_][a-z0-9 _.\[\]\(\)]{0,}(\:(number|float|string|date|boolean))?)'?/i.exec(sqlString)[1];
+            matchValue = /^'?([a-z_][a-z0-9 _.\[\]\(\)-]{0,}(\:(number|float|string|date|boolean))?)'?/i.exec(sqlString)[1];
             this.parser.push(['Literal', matchValue]);
             return matchValue.length + 2;
         }