@syncfusion/ej2-querybuilder 26.1.35 → 26.1.40

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

@@ -1154,8 +1154,16 @@ let QueryBuilder = class QueryBuilder extends Component {
     updateDropdowntreeDS(columns) {
         for (let i = 0; i < columns.length; i++) {
             if (columns[parseInt(i.toString(), 10)].type === 'object') {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                if (this.isAngular && columns[parseInt(i.toString(), 10)].template) {
+                    delete columns[parseInt(i.toString(), 10)].template;
+                }
                 columns[parseInt(i.toString(), 10)].selectable = false;
                 this.updateDropdowntreeDS(columns[parseInt(i.toString(), 10)].columns);
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            }
+            else if (this.isAngular && columns[parseInt(i.toString(), 10)].template) {
+                delete columns[parseInt(i.toString(), 10)].template;
             }
         }
     }
@@ -1317,10 +1325,12 @@ let QueryBuilder = class QueryBuilder extends Component {
                     }
                     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].type !== 'date') || rule.rules[index].value === '' || rule.rules[index].value === null ||
                         (rule.rules[index].value instanceof Array && valArray.length < 1)) {
                         const valElem = tempElem.querySelectorAll('.e-rule-value .e-control');
-                        isValid = false;
+                        if (excludeOprs.indexOf(rule.rules[index].operator) < 0) {
+                            isValid = false;
+                        }
                         for (let j = 0, jLen = valElem.length; j < jLen; j++) {
                             const element = valElem[j];
                             let elem;
@@ -1335,6 +1345,18 @@ let QueryBuilder = class QueryBuilder extends Component {
                             }
                             j++;
                         }
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    }
+                    else if (rule.rules[index].type === 'date' && (rule.rules[index].value === null || rule.rules[index].value.indexOf(null) > -1)) {
+                        const valElem = tempElem.querySelectorAll('.e-rule-value .e-control');
+                        if (excludeOprs.indexOf(rule.rules[index].operator) < 0) {
+                            isValid = false;
+                        }
+                        for (let j = 0, jLen = valElem.length; j < jLen; j++) {
+                            if (valElem[j].parentElement.className.indexOf('e-tooltip') < 0 && valElem[j].className.indexOf('e-tooltip') < 0 && (isNullOrUndefined(rule.rules[index].value) || rule.rules[index].value[j] == null)) {
+                                this.renderToolTip(valElem[j].parentElement);
+                            }
+                        }
                     }
                 }
                 else if ((dropDownObj && dropDownObj.element && isNullOrUndefined(dropDownObj.index)) ||
@@ -2086,6 +2108,9 @@ let QueryBuilder = class QueryBuilder extends Component {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             element = args.element;
         }
+        if (!element) {
+            return;
+        }
         if (element.className.indexOf('e-day') > -1 || element.className.indexOf('e-today') > -1 || element.className.indexOf('e-cell') > -1) {
             const calenderArgs = args;
             element = calenderArgs.element;
@@ -3711,6 +3736,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                 if (valElem[1] && valElem[1].parentElement.className.indexOf('e-tooltip') > -1) {
                     getComponent(valElem[1].parentElement, 'tooltip').destroy();
                 }
+                if (valElem[2] && valElem[2].parentElement.className.indexOf('e-tooltip') > -1) {
+                    getComponent(valElem[2].parentElement, 'tooltip').destroy();
+                }
             }
         }
     }
@@ -5801,7 +5829,9 @@ let QueryBuilder = class QueryBuilder extends Component {
             for (let j = 0, jLen = rules.rules.length; j < jLen; j++) {
                 if (rules.rules[j].rules) {
                     queryStr = this.getSqlString(rules.rules[j], enableEscape, queryStr, sqlLocale);
-                    condition = rules.rules[j].condition;
+                    if (this.enableSeparateConnector) {
+                        condition = rules.rules[j].condition;
+                    }
                 }
                 else {
                     const rule = rules.rules[j];
@@ -6474,6 +6504,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         let grpCount;
         let operator;
         let isLeftOpened = false;
+        let isNotOpened = false;
         for (let i = 0, iLen = parser.length; i < iLen; i++) {
             if (parser[i][0] === 'Literal') {
                 const column = this.getColumn(parser[i][1]);
@@ -6609,6 +6640,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             }
             else if (parser[i][0] === 'Left') {
                 if (!(parser[0][0] === 'Left') && (parser[i - 1][1] === 'not' || sqlLocale && this.l10n.getConstant('NOT').toLowerCase() === parser[i - 1][1])) {
+                    isNotOpened = true;
                     continue;
                 }
                 this.parser = parser.splice(i + 1, iLen - (i + 1));
@@ -6639,6 +6671,10 @@ let QueryBuilder = class QueryBuilder extends Component {
                 }
             }
             else if (parser[i][0] === 'Right') {
+                if (isNotOpened && parser[i + 1][0] === 'Right') {
+                    isNotOpened = false;
+                    continue;
+                }
                 this.parser = parser.splice(i + 1, iLen - (i + 1));
                 levelColl.pop(); //To get the parent Group
                 rules = this.rule;