@syncfusion/ej2-querybuilder 20.2.40 → 20.2.46

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

@@ -512,7 +512,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
     };
     QueryBuilder.prototype.selectBtn = function (target, event) {
         if (event.name === 'beforeOpen') {
-            if (this.showButtons.groupInsert) {
+            if (this.showButtons.groupInsert || isNullOrUndefined(this.showButtons.groupInsert)) {
                 if (this.element.querySelectorAll('.e-group-container').length >= this.maxGroupCount + 1) {
                     addClass([event.element.querySelector('li span.e-addgroup').parentElement], 'e-button-hide');
                 }
@@ -548,7 +548,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             ruleListElem.appendChild(ruleElem);
             this.ruleIdCounter++;
         }
-        if (column && column.ruleTemplate && type !== "insertRule") {
+        if (column && column.ruleTemplate) {
             args = { requestType: 'template-initialize', ruleID: ruleElem.id, action: action, fields: this.fields, rule: rule };
             this.trigger('actionBegin', args);
             this.ruleTemplateFn = this.templateParser(column.ruleTemplate);
@@ -580,7 +580,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             elem = this.ruleElem.querySelector('.e-rule-field').cloneNode(true);
         }
         ruleElem.appendChild(elem);
-        if (column && column.ruleTemplate && type !== "insertRule") {
+        if (column && column.ruleTemplate) {
             this.renderReactTemplates();
         }
         return ruleElem;
@@ -610,7 +610,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         var ruleElem;
         var newRule = { 'label': '', 'field': '', 'type': '', 'operator': '' };
         if (!args.cancel) {
-            if (column && column.ruleTemplate && args.type !== "insertRule") {
+            if (column && column.ruleTemplate) {
                 this.selectedColumn = column;
                 operators = this.selectedColumn.operators;
                 newRule = { 'label': column.label, 'field': column.field, 'type': column.type, 'operator': operators[0].value };
@@ -621,9 +621,6 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                 this.trigger('actionBegin', args_1);
             }
             else {
-                if (column && column.ruleTemplate) {
-                    act = args.type;
-                }
                 ruleElem = this.appendRuleElem(trgt, column, act, pId, 'field');
                 ruleElem.querySelector('.e-filter-input').setAttribute('id', ruleElem.id + '_filterkey');
                 var element = ruleElem.querySelector('button');
@@ -661,7 +658,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
             if (!this.isImportRules) {
                 this.updateAddedRule(trgt, rule, newRule, isRlTmp, pId);
             }
-            if (!column || (column && !column.ruleTemplate) || (column && (column.ruleTemplate && args.type == "insertRule"))) {
+            if (!column || (column && !column.ruleTemplate)) {
                 if (this.fieldMode === 'Default') {
                     var ddlField = void 0;
                     var ddlValue = this.isImportRules ? this.GetRootColumnName(rule.field) : rule.field;
@@ -957,7 +954,7 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
         tempElem = this.createElement('div', { attrs: { class: 'e-rule-value' } });
         fieldElem.appendChild(tempElem);
         tempElem = this.createElement('div', { attrs: { class: 'e-rule-value-delete' } });
-        if (this.showButtons.ruleDelete) {
+        if (this.showButtons.ruleDelete || isNullOrUndefined(this.showButtons.ruleDelete)) {
             clsName = 'e-removerule e-rule-delete e-css e-btn e-small';
         }
         else {
@@ -1014,7 +1011,13 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                 this.btnGroupId++;
             }
             if (isGroup) {
-                var clsName = this.showButtons.groupDelete ? 'e-deletegroup' : 'e-deletegroup e-button-hide';
+                var clsName = void 0;
+                if (this.showButtons.groupDelete || isNullOrUndefined(this.showButtons.groupDelete)) {
+                    clsName = 'e-deletegroup';
+                }
+                else {
+                    clsName = 'e-deletegroup e-button-hide';
+                }
                 dltGroupBtn = this.createElement('button', { attrs: { type: 'button', class: clsName } });
                 var button = new Button({ iconCss: 'e-icons e-delete-icon', cssClass: 'e-small e-round' });
                 button.appendTo(dltGroupBtn);
@@ -4819,8 +4822,14 @@ var QueryBuilder = /** @__PURE__ @class */ (function (_super) {
                             rule.type = 'string';
                         }
                         else if (operator.indexOf('between') > -1 && parser[j - 1][0] === 'Conditions') {
-                            rule.value = numVal;
-                            rule.type = 'number';
+                            if (strVal.length !== 0) {
+                                rule.value = strVal;
+                                rule.type = 'string';
+                            }
+                            else {
+                                rule.value = numVal;
+                                rule.type = 'number';
+                            }
                         }
                         numVal = [];
                         strVal = [];