@syncfusion/ej2-querybuilder 20.2.45 → 20.2.46

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

@@ -497,7 +497,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             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);
@@ -529,7 +529,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             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;
@@ -558,7 +558,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         let ruleElem;
         let 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 };
@@ -569,9 +569,6 @@ let QueryBuilder = class QueryBuilder extends Component {
                 this.trigger('actionBegin', args);
             }
             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');
                 let element = ruleElem.querySelector('button');
@@ -609,7 +606,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             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') {
                     let ddlField;
                     const ddlValue = this.isImportRules ? this.GetRootColumnName(rule.field) : rule.field;
@@ -4757,8 +4754,14 @@ let QueryBuilder = class QueryBuilder extends Component {
                             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 = [];