@syncfusion/ej2-querybuilder 19.3.44 → 19.4.40

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

@@ -878,7 +878,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 +929,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'));
@@ -2841,7 +2841,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);
@@ -4448,14 +4448,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 +4464,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 +4483,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 {