@syncfusion/ej2-querybuilder 25.1.35 → 25.1.38

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

@@ -1756,7 +1756,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             this.GetRootColumnName(rule.field) === this.GetRootColumnName(this.previousColumn.field))) {
             const subField = this.selectedColumn.columns;
             for (let 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;
@@ -2122,17 +2122,11 @@ let QueryBuilder = class QueryBuilder extends Component {
         if (!this.dataColl.length && values.length) {
             isValues = true;
         }
-        let fieldValue = this.selectedRule.field;
-        const isNested = this.selectedRule.field.indexOf(this.separator);
-        if (isNested !== 0 && this.fieldMode !== 'DropdownTree') {
-            const nest = this.selectedRule.field.split(this.separator);
-            fieldValue = nest[nest.length - 1];
-        }
         let 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',
@@ -2262,7 +2256,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         const columnData = this.getItemData(parentId);
         let selectedValue;
         const 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 {
@@ -2301,7 +2295,7 @@ let QueryBuilder = class QueryBuilder extends Component {
     renderNumberValue(parentId, rule, operator, idx, ruleValElem, itemData, length) {
         const columnData = this.getItemData(parentId);
         const isTemplate = (typeof columnData.template === 'string');
-        let selectedVal = (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1 || this.isPublic || isTemplate) ? rule.value : this.setDefaultValue(parentId, false, true);
+        let 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);
@@ -2437,6 +2431,10 @@ let QueryBuilder = class QueryBuilder extends Component {
                                 let datePicker;
                                 const place = this.l10n.getConstant('SelectValue');
                                 const isTemplate = (typeof itemData.template === 'string');
+                                if (rule.value && !isNullOrUndefined(format)) {
+                                    selVal = (length > 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) {
@@ -2537,7 +2535,15 @@ let QueryBuilder = class QueryBuilder extends Component {
                 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];
@@ -2554,7 +2560,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         const radiobutton = new RadioButton(radioBtn);
         radiobutton.appendTo('#' + parentId + '_valuekey' + i);
         if (isCheck) {
-            this.updateRules(radiobutton.element, orgValue, 0);
+            this.updateRules(radiobutton.element, orgValue, 0, true);
         }
     }
     getOperatorIndex(ddlObj, rule) {
@@ -5050,6 +5056,7 @@ let QueryBuilder = class QueryBuilder extends Component {
      */
     cloneRule(ruleID, groupID, index) {
         const getRule = this.getRule(ruleID.replace(this.element.id + '_', ''));
+        let isCloneRule = this.showButtons.cloneRule;
         groupID = groupID.replace(this.element.id + '_', '');
         this.ruleIndex = index;
         this.cloneRuleBtnClick = true;
@@ -5060,7 +5067,8 @@ let QueryBuilder = class QueryBuilder extends Component {
             }], 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.
@@ -5073,6 +5081,7 @@ let QueryBuilder = class QueryBuilder extends Component {
     cloneGroup(groupID, parentGroupID, index) {
         parentGroupID = parentGroupID.replace(this.element.id + '_', '');
         const group = this.getGroup(parentGroupID);
+        let isCloneGroup = this.showButtons.cloneGroup;
         groupID = groupID.replace(this.element.id + '_', '');
         this.groupIndex = index;
         this.cloneGrpBtnClick = true;
@@ -5080,7 +5089,8 @@ let QueryBuilder = class QueryBuilder extends Component {
         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.
@@ -5089,6 +5099,9 @@ let QueryBuilder = class QueryBuilder extends Component {
      * @returns {void}
      */
     lockRule(ruleID) {
+        if (ruleID.indexOf(this.element.id) < 0) {
+            ruleID = this.element.id + '_' + ruleID;
+        }
         const target = document.getElementById(ruleID).querySelectorAll('.e-lock-rule-btn')[0];
         this.ruleLock(target);
     }
@@ -5099,6 +5112,9 @@ let QueryBuilder = class QueryBuilder extends Component {
      * @returns {void}
      */
     lockGroup(groupID) {
+        if (groupID.indexOf(this.element.id) < 0) {
+            groupID = this.element.id + '_' + groupID;
+        }
         const target = document.getElementById(groupID).querySelectorAll('.e-lock-grp-btn')[0];
         this.groupLock(target);
     }
@@ -5194,9 +5210,9 @@ let QueryBuilder = class QueryBuilder extends Component {
             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;
         }