@syncfusion/ej2-querybuilder 20.2.38 → 20.2.40

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.2.38
+*  version : 20.2.40
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-querybuilder@*",
-  "_id": "@syncfusion/ej2-querybuilder@20.2.36",
+  "_id": "@syncfusion/ej2-querybuilder@20.2.38",
   "_inBundle": false,
-  "_integrity": "sha512-7h7tWDEQJikcCbIsVAOIDBGd1Xqk/UKmj/All6+JXfsoaRuDHNTxvY1Tcw9IQQgu9lp8sWqdrwyyj9uM+nbCag==",
+  "_integrity": "sha512-PWhJtEaU2h/F+rAYhFk/+OyY9mRmAVwovdo6AcvB4yCMyTv+v+dJEr8i9y2W3yAPP9NMLUYTiC7ZjkoMMtNV3g==",
   "_location": "/@syncfusion/ej2-querybuilder",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-querybuilder",
     "/@syncfusion/ej2-vue-querybuilder"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-20.2.36.tgz",
-  "_shasum": "31bd26df69a496a2ad22b2fd262796abf8289176",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-20.2.38.tgz",
+  "_shasum": "ee5e422fb1ed1849df995ee0d1a2e94c86a44581",
   "_spec": "@syncfusion/ej2-querybuilder@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -32,10 +32,10 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.2.38",
+    "@syncfusion/ej2-base": "~20.2.39",
     "@syncfusion/ej2-buttons": "~20.2.38",
-    "@syncfusion/ej2-calendars": "~20.2.38",
-    "@syncfusion/ej2-dropdowns": "~20.2.38",
+    "@syncfusion/ej2-calendars": "~20.2.40",
+    "@syncfusion/ej2-dropdowns": "~20.2.40",
     "@syncfusion/ej2-inputs": "~20.2.38",
     "@syncfusion/ej2-splitbuttons": "~20.2.38"
   },
@@ -69,6 +69,6 @@
     "url": "https://github.com/syncfusion/ej2-javascript-ui-controls/tree/master/controls/querybuilder"
   },
   "typings": "index.d.ts",
-  "version": "20.2.38",
+  "version": "20.2.40",
   "sideEffects": false
 }

package/src/query-builder/query-builder.js

@@ -557,7 +557,7 @@ var QueryBuilder = /** @class */ (function (_super) {
             ruleListElem.appendChild(ruleElem);
             this.ruleIdCounter++;
         }
-        if (column && column.ruleTemplate) {
+        if (column && column.ruleTemplate && type !== "insertRule") {
             args = { requestType: 'template-initialize', ruleID: ruleElem.id, action: action, fields: this.fields, rule: rule };
             this.trigger('actionBegin', args);
             this.ruleTemplateFn = this.templateParser(column.ruleTemplate);
@@ -589,7 +589,7 @@ var QueryBuilder = /** @class */ (function (_super) {
             elem = this.ruleElem.querySelector('.e-rule-field').cloneNode(true);
         }
         ruleElem.appendChild(elem);
-        if (column && column.ruleTemplate) {
+        if (column && column.ruleTemplate && type !== "insertRule") {
             this.renderReactTemplates();
         }
         return ruleElem;
@@ -619,7 +619,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         var ruleElem;
         var newRule = { 'label': '', 'field': '', 'type': '', 'operator': '' };
         if (!args.cancel) {
-            if (column && column.ruleTemplate) {
+            if (column && column.ruleTemplate && args.type !== "insertRule") {
                 this.selectedColumn = column;
                 operators = this.selectedColumn.operators;
                 newRule = { 'label': column.label, 'field': column.field, 'type': column.type, 'operator': operators[0].value };
@@ -630,6 +630,9 @@ var QueryBuilder = /** @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');
@@ -667,7 +670,7 @@ var QueryBuilder = /** @class */ (function (_super) {
             if (!this.isImportRules) {
                 this.updateAddedRule(trgt, rule, newRule, isRlTmp, pId);
             }
-            if (!column || (column && !column.ruleTemplate)) {
+            if (!column || (column && !column.ruleTemplate) || (column && (column.ruleTemplate && args.type == "insertRule"))) {
                 if (this.fieldMode === 'Default') {
                     var ddlField = void 0;
                     var ddlValue = this.isImportRules ? this.GetRootColumnName(rule.field) : rule.field;
@@ -2376,6 +2379,14 @@ var QueryBuilder = /** @class */ (function (_super) {
         if (!(operator.indexOf('null') > -1 || operator.indexOf('empty') > -1)) {
             var parentId = closest(target, '.e-rule-container').id;
             prevItemData = this.getPreviousItemData(prevItemData, column);
+            if (prevItemData && prevItemData.template === undefined) {
+                if (prevItemData.columns) {
+                    prevItemData = this.getColumn(rule.field);
+                }
+            }
+            else if (this.fieldMode === 'DropdownTree' && prevItemData === undefined) {
+                prevItemData = this.getColumn(rule.field);
+            }
             if (prevItemData && prevItemData.template) {
                 this.templateDestroy(prevItemData, parentId + '_valuekey0');
                 var elem = select('#' + parentId + '_valuekey0', target.nextElementSibling);