@syncfusion/ej2-querybuilder 20.4.42 → 20.4.51

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

@@ -612,7 +612,13 @@ let QueryBuilder = class QueryBuilder extends Component {
             if (!column || (column && !column.ruleTemplate) || !rule.field) {
                 if (this.fieldMode === 'Default') {
                     let ddlField;
-                    const ddlValue = this.isImportRules ? this.GetRootColumnName(rule.field) : rule.field;
+                    let ddlValue;
+                    if (this.separator && rule.field) {
+                        ddlValue = this.GetRootColumnName(rule.field);
+                    }
+                    else {
+                        ddlValue = this.isImportRules ? this.GetRootColumnName(rule.field) : rule.field;
+                    }
                     ddlField = {
                         dataSource: this.columns,
                         fields: this.fields, placeholder: this.l10n.getConstant('SelectField'),
@@ -624,8 +630,13 @@ let QueryBuilder = class QueryBuilder extends Component {
                     }
                     dropDownList = new DropDownList(ddlField);
                     dropDownList.appendTo('#' + ruleElem.id + '_filterkey');
-                    const ddlVal = this.isImportRules ?
-                        this.GetRootColumnName(rule.field) : dropDownList.value;
+                    let ddlVal;
+                    if (this.separator && rule.field) {
+                        ddlVal = this.GetRootColumnName(rule.field);
+                    }
+                    else {
+                        ddlVal = this.isImportRules ? this.GetRootColumnName(rule.field) : dropDownList.value;
+                    }
                     this.selectedColumn = dropDownList.getDataByValue(ddlVal);
                     if (Object.keys(rule).length) {
                         this.changeRule(rule, {
@@ -641,7 +652,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                             value: 'field', text: 'label', child: 'columns', expanded: 'expanded' },
                         placeholder: this.l10n.getConstant('SelectField'), showClearButton: false,
                         popupHeight: ((this.columns.length > 5) ? height : 'auto'), changeOnBlur: false,
-                        change: this.changeField.bind(this), value: this.isImportRules ? [ddlValue] : null,
+                        change: this.changeField.bind(this), value: !isNullOrUndefined(ddlValue) ? [ddlValue] : null,
                         open: this.popupOpen.bind(this, false)
                     };
                     if (this.fieldModel) {
@@ -654,7 +665,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                         dropdowntree.element.value = value;
                     }
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    const ddlVal = this.isImportRules ?
+                    const ddlVal = !isNullOrUndefined(rule.field) ?
                         this.GetRootColumnName(rule.field) : dropdowntree.value;
                     this.selectedColumn = this.getColumn(ddlVal);
                     if (Object.keys(rule).length) {
@@ -731,7 +742,6 @@ let QueryBuilder = class QueryBuilder extends Component {
         const tooltip = new Tooltip({ content: this.l10n.getConstant('ValidationMessage'),
             position: 'BottomCenter', cssClass: 'e-querybuilder-error' });
         tooltip.appendTo(element);
-        // eslint-disable-next-line
         tooltip.open(element);
     }
     /**
@@ -1068,7 +1078,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         return groupElem;
     }
     /**
-     * notify the changes to component.
+     * Notify the changes to component.
      *
      * @param {string | number | boolean | Date | string[] | number[] | Date[]} value - 'value' to be passed to update the rule value.
      * @param {Element} element - 'element' to be passed to update the rule.
@@ -1346,6 +1356,9 @@ let QueryBuilder = class QueryBuilder extends Component {
             if (column && column.ruleTemplate) {
                 this.templateChange(args.element, column.field, 'field');
             }
+            else if (column && column.columns && column.columns[0].ruleTemplate) {
+                this.templateChange(args.element, column.columns[0].field, 'field');
+            }
             else {
                 const groupElem = closest(args.element, '.e-group-container');
                 const rules = this.getParentGroup(groupElem);
@@ -1499,7 +1512,8 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
         const dropDownList = new DropDownList(ddlField);
         dropDownList.appendTo('#' + ruleId + '_subfilterkey' + this.subFilterCounter);
-        if (this.isImportRules) {
+        if (this.isImportRules || (this.previousColumn && this.previousColumn.ruleTemplate &&
+            this.GetRootColumnName(rule.field) === this.GetRootColumnName(this.previousColumn.field))) {
             const subField = this.selectedColumn.columns;
             for (let i = 0; i < subField.length; i++) {
                 if (rule.field === subField[i].field || rule.field.indexOf(subField[i].field) > -1) {
@@ -1514,12 +1528,13 @@ let QueryBuilder = class QueryBuilder extends Component {
         this.subFieldElem = subFieldElem;
         // eslint-disable-next-line
         ddlArgs.itemData = ddlArgs.itemData;
-        if (!this.isImportRules || (!subFieldValue && this.selectedColumn.columns)) {
+        if (!subFieldValue && this.selectedColumn.columns) {
             if (!subFieldValue && this.isImportRules) {
                 dropDownList.value = null;
             }
             this.selectedColumn = this.selectedColumn.columns[0];
         }
+        this.previousColumn = this.selectedColumn;
         if (!this.selectedColumn.columns) {
             this.changeRuleValues(tempElem, rule, tempRule, ddlArgs);
         }
@@ -1731,7 +1746,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
     }
     /**
-     * return values bound to the column.
+     * Return values bound to the column.
      *
      * @param {string} field - 'field' to be passed to get the field values.
      * @returns {object[]} - Values bound to the column
@@ -3783,7 +3798,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
     }
     /**
-     * return the Query from current rules collection.
+     * Return the Query from current rules collection.
      *
      * @returns {Promise} - Query from current rules collection
      * @blazorType object
@@ -3983,7 +3998,7 @@ let QueryBuilder = class QueryBuilder extends Component {
     }
     /* eslint-disable */
     /**
-     * return the operator bound to the column.
+     * Return the operator bound to the column.
      *
      * @returns {[key: string]: Object}[] - Operator bound to the column
      */
@@ -4630,10 +4645,22 @@ let QueryBuilder = class QueryBuilder extends Component {
         if (/^'((?:[^\\']+?|\\.|'')*)'(?!')/.exec(sqlString)) {
             // eslint-disable-next-line
             matchValue = /^'((?:[^\\']+?|\\.|'')*)'(?!')/.exec(sqlString)[0];
+            if (matchValue[matchValue.length - 2] === '(') {
+                let isClosed = false;
+                for (let j = matchValue.length; j < sqlString.length; j++) {
+                    matchValue += sqlString[j];
+                    if (sqlString[j] === ')') {
+                        isClosed = true;
+                    }
+                    if (isClosed && sqlString[j] === "'") {
+                        break;
+                    }
+                }
+            }
             this.parser.push(['String', matchValue]);
             return matchValue.length;
         }
-        //Double String
+        // Double String
         // eslint-disable-next-line
         if (/^"([^\\"]*(?:\\.[^\\"]*)*)"/.exec(sqlString)) {
             // eslint-disable-next-line
@@ -4830,7 +4857,11 @@ let QueryBuilder = class QueryBuilder extends Component {
                                 break;
                             }
                             if (operator.indexOf('like') > -1 && parser[j][0] === 'String') {
-                                const val = parser[j][1] ? parser[j][1].replace(/'/g, '').replace(/%/g, '') : parser[j][1];
+                                let val = parser[j][1];
+                                if (parser[j][1] && parser[j][1][0] === "'") {
+                                    val = parser[j][1].substring(1, parser[j][1].length - 1);
+                                }
+                                val = val ? val.replace(/%/g, '') : parser[j][1];
                                 rule.value = val;
                                 rule.type = 'string';
                             }
@@ -4842,7 +4873,11 @@ let QueryBuilder = class QueryBuilder extends Component {
                                     numVal.push(Number(parser[j][1]));
                                 }
                                 else if (parser[j][0] === 'String') {
-                                    strVal.push(parser[j][1].replace(/'/g, ''));
+                                    let val = parser[j][1];
+                                    if (parser[j][1] && parser[j][1][0] === "'") {
+                                        val = parser[j][1].substring(1, parser[j][1].length - 1);
+                                    }
+                                    strVal.push(val);
                                 }
                             }
                             else {
@@ -4850,7 +4885,11 @@ let QueryBuilder = class QueryBuilder extends Component {
                                     numVal.push(Number(parser[j][1]));
                                 }
                                 else if (parser[j][0] === 'String') {
-                                    strVal.push(parser[j][1].replace(/'/g, ''));
+                                    let val = parser[j][1];
+                                    if (parser[j][1] && parser[j][1][0] === "'") {
+                                        val = parser[j][1].substring(1, parser[j][1].length - 1);
+                                    }
+                                    strVal.push(val);
                                 }
                             }
                             rule.type = this.getTypeFromColumn(rule);