@syncfusion/ej2-querybuilder 27.2.2 → 27.2.5

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

@@ -2775,9 +2775,17 @@ let QueryBuilder = class QueryBuilder extends Component {
     }
     getItemData(parentId) {
         let fieldObj = getComponent(document.getElementById(parentId + '_filterkey'), 'dropdownlist');
+        const parentFieldObj = this.element.querySelector(`#${parentId}`);
         if (this.fieldMode === 'DropdownTree') {
             fieldObj = getComponent(document.getElementById(parentId + '_filterkey'), 'dropdowntree');
         }
+        else if (parentFieldObj) {
+            const subFieldObjList = parentFieldObj.querySelectorAll('.e-rule-sub-filter');
+            if (subFieldObjList.length > 0) {
+                const lastSubFieldObj = subFieldObjList[subFieldObjList.length - 1].querySelector('.e-dropdownlist');
+                fieldObj = getComponent(lastSubFieldObj, 'dropdownlist');
+            }
+        }
         return this.fieldMode === 'DropdownTree' ? this.getColumn(fieldObj.value[0]) : this.getColumn(fieldObj.value);
     }
     setDefaultValue(parentId, isArryValue, isNumber) {
@@ -2826,6 +2834,11 @@ let QueryBuilder = class QueryBuilder extends Component {
                     this.setDefaultValue(parentId, true, false);
                 selectedValue = selectedVal.join(',');
             }
+            if (operator === 'between' || operator === 'notbetween') {
+                if (selectedValue.length > 1) {
+                    selectedValue = selectedValue[idx];
+                }
+            }
             let txtBox;
             txtBox = {
                 placeholder: this.l10n.getConstant('SelectValue'),
@@ -3129,7 +3142,7 @@ let QueryBuilder = class QueryBuilder extends Component {
     getPreviousItemData(prevItemData, column) {
         if (this.isFieldClose && prevItemData) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            prevItemData = this.getColumn(prevItemData.value);
+            prevItemData = this.getColumn(prevItemData.value ? prevItemData.value : prevItemData.field);
         }
         if (column && column.template && prevItemData && Object.keys(prevItemData).length < 4) {
             prevItemData.template = column.template;
@@ -3563,6 +3576,12 @@ let QueryBuilder = class QueryBuilder extends Component {
                         rule.rules[index].value = this.processValueString(selectedValue, rule.rules[index].type);
                     }
                 }
+                else if (oper === 'between' || oper === 'notbetween') {
+                    if (typeof rule.rules[index].value === 'string') {
+                        rule.rules[index].value = [];
+                    }
+                    rule.rules[index].value[i] = selectedValue;
+                }
                 else {
                     rule.rules[index].value = selectedValue;
                 }
@@ -5139,6 +5158,10 @@ let QueryBuilder = class QueryBuilder extends Component {
                 if ((rule.operator === 'in' || rule.operator === 'notin') && rule.value && rule.value.length === 0) {
                     rule = {};
                 }
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                if ((rule.operator === 'between' || rule.operator === 'notbetween') && Array.isArray(rule.value) && (rule.value.length < 2 || rule.value.some((val) => val === '' || val === null))) {
+                    rule = {};
+                }
             }
             else {
                 rule = {};
@@ -7522,6 +7545,7 @@ class QueryLibrary {
         let stringValue;
         let key;
         let betweenValue;
+        let fieldType;
         let condition;
         let value;
         let subRules;
@@ -7693,7 +7717,13 @@ class QueryLibrary {
                                 ruleValue = stringValue.replace('$', '');
                                 type = 'string';
                             }
-                            if (!isNaN(Date.parse(stringValue))) { // Date type operators
+                            for (const column of this.parent.columns) {
+                                if (column.field === condition) {
+                                    fieldType = column.type;
+                                    break;
+                                }
+                            }
+                            if (!isNaN(Date.parse(stringValue)) || fieldType === 'date') { // Date type operators
                                 operatorValue = operatorValue || this.getOperatorFromMongoOperator(key);
                                 type = 'date';
                                 ruleValue = stringValue;