@syncfusion/ej2-querybuilder 19.3.43 → 19.4.38

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

@@ -134,6 +134,9 @@ let QueryBuilder = class QueryBuilder extends Component {
         this.isNotified = false;
         this.isAddSuccess = false;
         this.isNotValueChange = false;
+        this.isFieldChange = false;
+        this.isFieldClose = false;
+        this.isDestroy = false;
         MultiSelect.Inject(CheckBoxSelection);
     }
     getPersistData() {
@@ -606,8 +609,8 @@ let QueryBuilder = class QueryBuilder extends Component {
                     ddlField = {
                         dataSource: this.columns,
                         fields: this.fields, placeholder: this.l10n.getConstant('SelectField'),
-                        popupHeight: ((this.columns.length > 5) ? height : 'auto'),
-                        change: this.changeField.bind(this), value: rule ? ddlValue : null, open: this.popupOpen.bind(this)
+                        popupHeight: ((this.columns.length > 5) ? height : 'auto'), close: this.fieldClose.bind(this, ruleElem.id + '_filterkey'),
+                        change: this.changeField.bind(this), value: rule ? ddlValue : null, open: this.popupOpen.bind(this, true)
                     };
                     if (this.fieldModel) {
                         ddlField = Object.assign({}, ddlField, this.fieldModel);
@@ -629,11 +632,11 @@ let QueryBuilder = class QueryBuilder extends Component {
                     const ddlValue = this.isImportRules ? rule.field : rule.field;
                     ddlField = {
                         fields: { dataSource: this.columns,
-                            value: "field", text: "label", child: 'columns', expanded: "expanded" },
+                            value: 'field', text: 'label', child: 'columns', expanded: 'expanded' },
                         placeholder: this.l10n.getConstant('SelectField'), showClearButton: false,
                         popupHeight: ((this.columns.length > 5) ? height : 'auto'), changeOnBlur: false,
                         change: this.changeField.bind(this), value: this.isImportRules ? [ddlValue] : null,
-                        open: this.popupOpen.bind(this)
+                        open: this.popupOpen.bind(this, false)
                     };
                     if (this.fieldModel) {
                         ddlField = Object.assign({}, ddlField, this.fieldModel);
@@ -878,7 +881,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         else {
             clsName = 'e-removerule e-rule-delete e-css e-btn e-small e-button-hide';
         }
-        const delBtnElem = this.createElement('button', { attrs: { class: clsName } });
+        const delBtnElem = this.createElement('button', { attrs: { type: 'button', class: clsName } });
         tempElem.appendChild(delBtnElem);
         fieldElem.appendChild(tempElem);
         ruleElem.appendChild(fieldElem);
@@ -929,7 +932,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             }
             if (isGroup) {
                 const clsName = this.showButtons.groupDelete ? 'e-deletegroup' : 'e-deletegroup e-button-hide';
-                dltGroupBtn = this.createElement('button', { attrs: { class: clsName } });
+                dltGroupBtn = this.createElement('button', { attrs: { type: 'button', class: clsName } });
                 const button = new Button({ iconCss: 'e-icons e-delete-icon', cssClass: 'e-small e-round' });
                 button.appendTo(dltGroupBtn);
                 dltGroupBtn.setAttribute('title', this.l10n.getConstant('DeleteGroup'));
@@ -1233,21 +1236,38 @@ let QueryBuilder = class QueryBuilder extends Component {
             }
         }
     }
+    fieldClose(id) {
+        if (this.isFieldChange || this.isDestroy) {
+            return;
+        }
+        this.isFieldClose = true;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const ddl = getComponent(id, 'dropdownlist');
+        const item = ddl.popupObj.element.querySelector('.e-active');
+        const itemData = ddl.getItemData();
+        ddl.value = itemData.value;
+        const customArgs = { element: ddl.element, value: itemData.value, isInteracted: true,
+            previousItemData: this.prevItemData, previousItem: null, item: item, itemData: itemData, event: null, e: null };
+        this.changeField(customArgs);
+        this.isFieldChange = false;
+    }
     changeField(args) {
         if (args.isInteracted) {
+            this.isFieldChange = true;
+            this.prevItemData = args.itemData;
             const fieldElem = closest(args.element, '.e-rule-filter') || closest(args.element, '.e-rule-sub-filter');
             const column = this.fieldMode === 'DropdownTree' ? this.getColumn(args.value[0]) : this.getColumn(args.value);
             if (this.fieldMode === 'DropdownTree' && fieldElem != null) {
-                const ddtElem = fieldElem.querySelector(".e-control");
+                const ddtElem = fieldElem.querySelector('.e-control');
                 const ddt = getComponent(ddtElem, 'dropdowntree');
                 if (column) {
-                    if (column.type == 'object') {
+                    if (column.type === 'object') {
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
                         ddt.value = args.oldValue;
                         ddt.dataBind();
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
                         if (isNullOrUndefined(args.oldValue)) {
-                            ddtElem.value = "";
+                            ddtElem.value = '';
                         }
                         else {
                             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1411,7 +1431,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             popupHeight: ((subFieldData.length > 5) ? height : 'auto'),
             change: this.changeField.bind(this),
             index: 0,
-            open: this.popupOpen.bind(this)
+            open: this.popupOpen.bind(this, false)
         });
         dropDownList.appendTo('#' + ruleId + '_subfilterkey' + this.subFilterCounter);
         if (this.isImportRules) {
@@ -1532,7 +1552,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                     change: this.changeField.bind(this),
                     index: 0,
                     value: value,
-                    open: this.popupOpen.bind(this)
+                    open: this.popupOpen.bind(this, false)
                 };
                 if (this.operatorModel) {
                     ddlOperator = Object.assign({}, ddlOperator, this.operatorModel);
@@ -1551,10 +1571,13 @@ let QueryBuilder = class QueryBuilder extends Component {
             this.updateRules(ddlArgs.element, ddlArgs.item);
         }
     }
-    popupOpen(args) {
+    popupOpen(isField, args) {
         if (this.enableRtl) {
             addClass([args.popup.element], 'e-rtl');
         }
+        if (isField) {
+            this.isFieldClose = false;
+        }
     }
     destroyControls(target, isRuleTemplate) {
         const element = isRuleTemplate ? target : target.nextElementSibling;
@@ -1747,7 +1770,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             change: this.changeValue.bind(this, i),
             close: this.closePopup.bind(this, i),
             actionBegin: this.multiSelectOpen.bind(this, parentId + '_valuekey' + i),
-            open: this.popupOpen.bind(this)
+            open: this.popupOpen.bind(this, false)
         };
         if (this.valueModel && this.valueModel.multiSelectModel) {
             multiSelectValue = Object.assign({}, multiSelectValue, this.valueModel.multiSelectModel);
@@ -2168,6 +2191,9 @@ let QueryBuilder = class QueryBuilder extends Component {
         return 0;
     }
     getPreviousItemData(prevItemData, column) {
+        if (this.isFieldClose && prevItemData) {
+            prevItemData = this.getColumn(prevItemData.value);
+        }
         if (column.template && prevItemData && Object.keys(prevItemData).length < 4) {
             prevItemData.template = column.template;
         }
@@ -2659,6 +2685,7 @@ let QueryBuilder = class QueryBuilder extends Component {
      * @returns {void}
      */
     destroy() {
+        this.isDestroy = true;
         const queryElement = this.element;
         if (!queryElement) {
             return;
@@ -2714,6 +2741,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             this.clearQBTemplate();
         }
         classList(this.element, [], ['e-rtl', 'e-responsive', 'e-device']);
+        this.isDestroy = false;
     }
     /**
      * Adds single or multiple rules.
@@ -2841,7 +2869,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             }
         });
         const textElem = this.createElement('textarea', { attrs: { class: 'e-summary-text', readonly: 'true' }, styles: 'max-height:500px' });
-        const editElem = this.createElement('button', { attrs: { class: 'e-edit-rule e-css e-btn e-small e-flat e-primary' } });
+        const editElem = this.createElement('button', { attrs: { type: 'button', class: 'e-edit-rule e-css e-btn e-small e-flat e-primary' } });
         const divElem = this.createElement('div', { attrs: { class: 'e-summary-btndiv' } });
         contentElem.appendChild(textElem);
         textElem.textContent = this.getSqlFromRules(this.rule);
@@ -3495,6 +3523,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                     rule.not = notValue;
                 }
             }
+            else if ((isNullOrUndefined(rule.condition)) && isNullOrUndefined(rule.rules)) {
+                rule = { 'label': '', 'field': '', 'operator': '', 'type': '', 'value': '' };
+            }
             else {
                 if (this.enableNotCondition) {
                     rule = { 'condition': rule.condition, 'rules': rule.rules, 'not': rule.not };
@@ -3678,7 +3709,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                     }
                 }
             }
-            else if (ruleColl[i].operator.length) {
+            else if (!isNullOrUndefined(ruleColl[i].operator) && !isNullOrUndefined(ruleColl[i].operator.length)) {
                 const oper = ruleColl[i].operator.toLowerCase();
                 let isDateFilter = false;
                 const dateOperColl = ['equal', 'notequal', 'greaterthan', 'greaterthanorequal', 'lessthan', 'lessthanorequal'];
@@ -4381,6 +4412,12 @@ let QueryBuilder = class QueryBuilder extends Component {
             this.parser.push(['Literal', matchValue]);
             return matchValue.length + 2;
         }
+        // eslint-disable-next-line
+        if (this.checkNumberLiteral(sqlString)) {
+            matchValue = /^[0-9]+(\.[0-9]+)?/.exec(sqlString)[0];
+            this.parser.push(['Literal', matchValue]);
+            return matchValue.length;
+        }
         //String
         if (/^'((?:[^\\']+?|\\.|'')*)'(?!')/.exec(sqlString)) {
             matchValue = /^'((?:[^\\']+?|\\.|'')*)'(?!')/.exec(sqlString)[0];
@@ -4420,6 +4457,25 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
         return false;
     }
+    checkNumberLiteral(sqlString) {
+        const lastParser = this.parser[this.parser.length - 1];
+        if (!lastParser) {
+            return true;
+        }
+        else {
+            if (/^[0-9]+(\.[0-9]+)?/.exec(sqlString)) {
+                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;
+                }
+                if (lastParser[0] === 'Conditions' && (betweenParser && betweenParser[1].indexOf('between') < 0)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
     getOperator(value, operator) {
         const operators = {
             '=': 'equal', '!=': 'notequal', '<': 'lessthan', '>': 'greaterthan', '<=': 'lessthanorequal',
@@ -4448,14 +4504,8 @@ let QueryBuilder = class QueryBuilder extends Component {
         return operators[operator];
     }
     getTypeFromColumn(rules) {
-        const columnData = this.columns;
-        for (let i = 0; i < columnData.length; i++) {
-            if (columnData[i].field === rules.field) {
-                rules.type = columnData[i].type;
-                break;
-            }
-        }
-        return rules.type;
+        const columnData = this.getColumn(rules.field);
+        return columnData.type;
     }
     processParser(parser, rules, levelColl) {
         let j;
@@ -4470,6 +4520,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         let lLen;
         let grpCount;
         let operator;
+        let isLeftOpened = false;
         for (let i = 0, iLen = parser.length; i < iLen; i++) {
             if (parser[i][0] === 'Literal') {
                 rule = { label: parser[i][1], field: parser[i][1] };
@@ -4488,8 +4539,12 @@ let QueryBuilder = class QueryBuilder extends Component {
                     j = i + 1;
                     jLen = iLen;
                     for (j = i + 1; j < jLen; j++) {
-                        if (parser[j][0] === 'Right') {
+                        if (operator.indexOf('between') < 0 && parser[j][0] === 'Left') {
+                            isLeftOpened = true;
+                        }
+                        else if (parser[j][0] === 'Right' && isLeftOpened) {
                             i = j;
+                            isLeftOpened = false;
                             break;
                         }
                         else {