@syncfusion/ej2-querybuilder 20.1.59 → 20.2.40

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) {
+        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);
@@ -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) {
+        if (column && column.ruleTemplate && type !== "insertRule") {
             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) {
+            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 };
@@ -569,6 +569,9 @@ 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');
@@ -606,7 +609,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             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') {
                     let ddlField;
                     const ddlValue = this.isImportRules ? this.GetRootColumnName(rule.field) : rule.field;
@@ -2305,6 +2308,14 @@ let QueryBuilder = class QueryBuilder extends Component {
         if (!(operator.indexOf('null') > -1 || operator.indexOf('empty') > -1)) {
             const 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');
                 const elem = select('#' + parentId + '_valuekey0', target.nextElementSibling);
@@ -3096,6 +3107,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                 case 'columns':
                     this.columns = newProp.columns;
                     this.columnSort();
+                    this.updateSubFieldsFromColumns(this.columns);
                     break;
                 case 'sortDirection':
                     this.sortDirection = newProp.sortDirection;