@syncfusion/ej2-querybuilder 23.2.7 → 24.1.41

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

@@ -822,7 +822,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                     if (rule.rules[index].value instanceof Array) {
                         valArray = rule.rules[index].value;
                     }
-                    if (excludeOprs.indexOf(rule.rules[index].operator) < 0 &&
+                    if (excludeOprs.indexOf(rule.rules[index].operator) < -1 &&
                         (isNullOrUndefined(rule.rules[index].value) &&
                             rule.rules[index].type !== 'date') || rule.rules[index].value === '' ||
                         (rule.rules[index].value instanceof Array && valArray.length < 1)) {
@@ -1274,12 +1274,20 @@ let QueryBuilder = class QueryBuilder extends Component {
         const groupID = groupElem && groupElem.id.replace(this.element.id + '_', '');
         const ruleID = ruleElem.id.replace(this.element.id + '_', '');
         const dateElement = args;
+        let dropDownObj;
         if (dateElement.element && dateElement.element.className.indexOf('e-datepicker') > -1) {
             element = dateElement.element;
+            dropDownObj = getComponent(closest(element, '.e-rule-container').querySelector('.e-filter-input'), 'dropdownlist');
+            if (dropDownObj) {
+                this.selectedColumn = dropDownObj.getDataByValue(dropDownObj.value);
+            }
+            dropDownObj = getComponent(closest(element, '.e-rule-container').querySelector('.e-filter-input'), 'dropdowntree');
+            if (dropDownObj) {
+                this.selectedColumn = this.getColumn(dropDownObj.value[0]);
+            }
         }
         let value;
         let rbValue;
-        let dropDownObj;
         if (element.className.indexOf('e-radio') > -1) {
             // eslint-disable-next-line
             rbValue = parseInt(element.id.split('valuekey')[1], 0);
@@ -1564,7 +1572,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) > -1) {
                     dropDownList.value = subField[i].field;
                     this.selectedColumn = subField[i];
                     subFieldValue = true;
@@ -2392,7 +2400,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
         const operator = tempRule.operator.toString();
         let isTempRendered = false;
-        if (!(operator.indexOf('null') > -1 || operator.indexOf('empty') > -1)) {
+        if (!(operator.indexOf('null') > -1 || operator.indexOf('isempty') > -1 || operator.indexOf('isnotempty') > -1)) {
             const parentId = closest(target, '.e-rule-container').id;
             prevItemData = this.getPreviousItemData(prevItemData, column);
             if (prevItemData && prevItemData.template === undefined) {
@@ -2520,7 +2528,6 @@ let QueryBuilder = class QueryBuilder extends Component {
                 const valElemColl = this.columnTemplateFn(args, this, ruleID, templateID);
                 valElem = (valElemColl[0].nodeType === 3) ? valElemColl[1] : valElemColl[0];
                 target.nextElementSibling.appendChild(valElem);
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
             }
             else if (this.isVue3) {
                 valElem = this.columnTemplateFn(args, this, 'Template', templateID);
@@ -4767,9 +4774,14 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
         else {
             const secParser = this.parser[this.parser.length - 2];
+            const betweenParser = this.parser[this.parser.length - 3];
             if (lastParser[0] === 'Left' && (secParser && secParser[0] === 'Conditions')) {
                 return true;
             }
+            const betweenOperator = 'between';
+            if (lastParser[0] === 'Conditions' && (betweenParser && betweenParser[1].indexOf(betweenOperator) < 0)) {
+                return true;
+            }
         }
         return false;
     }