@syncfusion/ej2-querybuilder 27.1.58 → 27.2.3

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

@@ -1144,7 +1144,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                     dropDownObj = getComponent(ruleElemCln[i].querySelector('.e-rule-filter input.e-dropdownlist'), 'dropdownlist');
                     if (dropDownObj && dropDownObj.value) {
                         this.selectedColumn = dropDownObj.getDataByValue(dropDownObj.value);
-                        validateRule = !isNullOrUndefined(dropDownObj.index) && this.selectedColumn.validation;
+                        validateRule = !isNullOrUndefined(dropDownObj.value) && this.selectedColumn.validation;
                     }
                 }
                 fieldElem = tempElem.querySelector('.e-rule-field input.e-control');
@@ -1203,7 +1203,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                         }
                     }
                 }
-                else if ((dropDownObj && dropDownObj.element && isNullOrUndefined(dropDownObj.index)) ||
+                else if ((dropDownObj && dropDownObj.element && isNullOrUndefined(dropDownObj.value)) ||
                     (dropDownTreeObj && dropDownTreeObj.element && (isNullOrUndefined(dropDownTreeObj.value) ||
                         dropDownTreeObj.value.length < 1))) {
                     if (fieldElem.parentElement.className.indexOf('e-tooltip') < 0) {
@@ -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) {
@@ -3129,7 +3137,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;