@syncfusion/ej2-querybuilder 25.1.37 → 25.1.40

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

@@ -1736,13 +1736,12 @@ let QueryBuilder = class QueryBuilder extends Component {
         const subFieldElem = this.createElement('input', { attrs: { type: 'text', id: ruleId + '_subfilterkey' + this.subFilterCounter } });
         tempElem.appendChild(subFieldElem);
         const height = (this.element.className.indexOf('e-device') > -1) ? '250px' : '200px';
-        const subFieldData = Object.keys(this.selectedColumn.columns[0]);
         let ddlField;
         ddlField = {
             dataSource: this.selectedColumn.columns,
             fields: this.fields,
             placeholder: this.l10n.getConstant('SelectField'),
-            popupHeight: ((subFieldData.length > 5) ? height : 'auto'),
+            popupHeight: ((this.selectedColumn.columns.length > 5) ? height : 'auto'),
             change: this.changeField.bind(this),
             index: 0,
             open: this.popupOpen.bind(this, false)
@@ -1756,7 +1755,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             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) {
+                if (rule.field === subField[i].field || rule.field.indexOf(subField[i].field + this.separator) > -1) {
                     dropDownList.value = subField[i].field;
                     this.selectedColumn = subField[i];
                     subFieldValue = true;
@@ -2256,7 +2255,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         const columnData = this.getItemData(parentId);
         let selectedValue;
         const isTemplate = (typeof columnData.template === 'string');
-        if (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1 || this.isPublic || isTemplate) {
+        if (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1 || this.isPublic || isTemplate || rule.value != '') {
             selectedValue = rule.value;
         }
         else {
@@ -2295,7 +2294,7 @@ let QueryBuilder = class QueryBuilder extends Component {
     renderNumberValue(parentId, rule, operator, idx, ruleValElem, itemData, length) {
         const columnData = this.getItemData(parentId);
         const isTemplate = (typeof columnData.template === 'string');
-        let selectedVal = (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1 || this.isPublic || isTemplate) ? rule.value : this.setDefaultValue(parentId, false, true);
+        let selectedVal = (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1 || this.isPublic || isTemplate || typeof rule.value === 'number') ? rule.value : this.setDefaultValue(parentId, false, true);
         if ((operator === 'in' || operator === 'notin') && (this.dataColl.length || columnData.values)) {
             selectedVal = (this.isImportRules || this.ruleIndex > -1 || this.groupIndex > -1) ? rule.value : this.setDefaultValue(parentId, true, false);
             this.renderMultiSelect(columnData, parentId, idx, selectedVal, columnData.values);
@@ -2431,6 +2430,10 @@ let QueryBuilder = class QueryBuilder extends Component {
                                 let datePicker;
                                 const place = this.l10n.getConstant('SelectValue');
                                 const isTemplate = (typeof itemData.template === 'string');
+                                if (rule.value && !isNullOrUndefined(format)) {
+                                    selVal = (length > 1) ? rule.value[i] : rule.value;
+                                    selectedValue = this.parseDate(selVal, format) || new Date();
+                                }
                                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                                 if (!itemData.field && !itemData.key && itemData.value) {
                                     if (itemData.value instanceof Date) {
@@ -2531,7 +2534,15 @@ let QueryBuilder = class QueryBuilder extends Component {
                 isCheck = values[i].toString().toLowerCase() === itemData.value.toString().toLowerCase();
             }
             else if (i === 0) {
-                isCheck = true;
+                if (typeof rule.value === 'boolean') {
+                    isCheck = rule.value ? true : false;
+                }
+                else {
+                    isCheck = true;
+                }
+            }
+            if (typeof rule.value === 'boolean' && i === 1) {
+                isCheck = !rule.value ? true : false;
             }
             value = values[i].toString();
             orgValue = values[i];
@@ -2548,7 +2559,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         const radiobutton = new RadioButton(radioBtn);
         radiobutton.appendTo('#' + parentId + '_valuekey' + i);
         if (isCheck) {
-            this.updateRules(radiobutton.element, orgValue, 0);
+            this.updateRules(radiobutton.element, orgValue, 0, true);
         }
     }
     getOperatorIndex(ddlObj, rule) {
@@ -5198,9 +5209,9 @@ let QueryBuilder = class QueryBuilder extends Component {
             return matchValue.length;
         }
         // eslint-disable-next-line
-        if (this.checkLiteral() && /^'?([a-z_][a-z0-9 _.\[\]\(\)]{0,}(\:(number|float|string|date|boolean))?)'?/i.exec(sqlString)) {
+        if (this.checkLiteral() && /^'?([a-z_][a-z0-9 _.\[\]\(\)-]{0,}(\:(number|float|string|date|boolean))?)'?/i.exec(sqlString)) {
             // eslint-disable-next-line
-            matchValue = /^'?([a-z_][a-z0-9 _.\[\]\(\)]{0,}(\:(number|float|string|date|boolean))?)'?/i.exec(sqlString)[1];
+            matchValue = /^'?([a-z_][a-z0-9 _.\[\]\(\)-]{0,}(\:(number|float|string|date|boolean))?)'?/i.exec(sqlString)[1];
             this.parser.push(['Literal', matchValue]);
             return matchValue.length + 2;
         }