@syncfusion/ej2-querybuilder 22.1.34 → 22.1.38

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

@@ -668,7 +668,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                         placeholder: this.l10n.getConstant('SelectField'), showClearButton: false,
                         popupHeight: ((this.columns.length > 5) ? height : 'auto'), changeOnBlur: false,
                         change: this.changeField.bind(this), value: !isNullOrUndefined(ddlValue) ? [ddlValue] : null,
-                        open: this.popupOpen.bind(this, false)
+                        open: this.popupOpen.bind(this, false), treeSettings: { expandOn: 'Click' }, select: this.onSelectField
                     };
                     if (this.fieldModel) {
                         ddlField = Object.assign({}, ddlField, this.fieldModel);
@@ -961,17 +961,24 @@ let QueryBuilder = class QueryBuilder extends Component {
         if (!args.cancel && (this.element.querySelectorAll('.e-group-container').length <= this.maxGroupCount)) {
             const target = eventTarget;
             let dltGroupBtn;
+            let groupID = '';
+            if (target.className.indexOf('e-group-container') < 0) {
+                groupID = target.querySelector('.e-group-container') && target.querySelector('.e-group-container').id;
+            }
+            else {
+                groupID = target.id;
+            }
             const groupElem = this.groupElem.cloneNode(true);
             groupElem.setAttribute('id', this.element.id + '_group' + this.groupIdCounter);
             if (this.headerTemplate) {
                 if (isRoot) {
                     isGroup = false;
                     groupElem.setAttribute('id', this.element.id + '_group0');
-                    this.headerTemplateFn(groupElem, not, condition, rule);
+                    this.headerTemplateFn(groupElem, not, condition, rule, groupID);
                     this.groupIdCounter = 0;
                 }
                 else {
-                    this.headerTemplateFn(groupElem, not, condition, rule);
+                    this.headerTemplateFn(groupElem, not, condition, rule, groupID);
                 }
             }
             this.groupIdCounter++;
@@ -1065,14 +1072,14 @@ let QueryBuilder = class QueryBuilder extends Component {
             }
         }
     }
-    headerTemplateFn(groupElem, not, condition, rule) {
+    headerTemplateFn(groupElem, not, condition, rule, groupID) {
         let template;
         const templateID = this.element.id + '_header';
         let args;
         const groupHdr = groupElem.querySelector('.e-group-header');
         if (this.headerTemplate) {
             args = { requestType: 'header-template-initialize', ruleID: groupElem.id,
-                notCondition: this.enableNotCondition ? not : undefined, condition: condition, rule: this.getRuleCollection(rule, true) };
+                notCondition: this.enableNotCondition ? not : undefined, condition: condition, rule: this.getRuleCollection(rule, true), groupID: groupID };
             this.trigger('actionBegin', args);
             this.headerFn = this.templateParser(this.headerTemplate);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1332,6 +1339,12 @@ let QueryBuilder = class QueryBuilder extends Component {
         }
         this.isFieldChange = false;
     }
+    onSelectField(args) {
+        if (args.itemData.hasChildren) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            this.showPopup();
+        }
+    }
     changeField(args) {
         if (args.isInteracted) {
             if (isNullOrUndefined(args.value)) {
@@ -1355,7 +1368,8 @@ let QueryBuilder = class QueryBuilder extends Component {
                         }
                         else {
                             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                            ddtElem.value = args.oldValue[0];
+                            const result = this.getLabelFromColumn(args.oldValue[0]);
+                            ddtElem.value = result;
                         }
                         return;
                     }
@@ -3684,7 +3698,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                     rule.value = null;
                 }
             }
-            if ((this.isRefreshed && this.enablePersistence) || (this.rule.field !== '' && rule.operator !== '' && (rule.value !== '' &&
+            if ((this.isRefreshed && this.enablePersistence) || (rule.field !== '' && rule.operator !== '' && (rule.value !== '' &&
                 rule.value !== undefined)) || (customObj && customObj.isQuestion)) {
                 const condition = rule.condition;
                 rule = {
@@ -3724,6 +3738,10 @@ let QueryBuilder = class QueryBuilder extends Component {
                 else {
                     rule = { 'condition': rule.condition, 'rules': rule.rules };
                 }
+                if (customObj) {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    rule.custom = customObj;
+                }
                 if (rule.rules.length === 0) {
                     rule = {};
                 }
@@ -4497,8 +4515,11 @@ let QueryBuilder = class QueryBuilder extends Component {
                     }
                 }
                 if (j !== jLen - 1) {
-                    if (condition === '') {
-                        condition = rules.rules[j].condition;
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    const rule = rules.rules[j];
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    if (condition === '' || (rule && rule.condition !== '' && rule.custom && rule.custom.isCustom)) {
+                        condition = rule.condition;
                     }
                     condition = sqlLocale ? this.l10n.getConstant(condition.toUpperCase()).toUpperCase() : condition.toUpperCase();
                     queryStr += ' ' + condition + ' ';
@@ -4646,7 +4667,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         // eslint-disable-next-line
         if (/^`?([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;
         }
@@ -4842,7 +4863,8 @@ let QueryBuilder = class QueryBuilder extends Component {
         let isLeftOpened = false;
         for (let i = 0, iLen = parser.length; i < iLen; i++) {
             if (parser[i][0] === 'Literal') {
-                rule = { label: parser[i][1], field: parser[i][1] };
+                const column = this.getColumn(parser[i][1]);
+                rule = { label: (column && column.label) ? column.label : parser[i][1], field: parser[i][1] };
                 if (parser[i + 1][0] === 'SubOperators') {
                     if (parser[i + 1][1].indexOf('null') > -1 || parser[i + 1][1].indexOf('empty') > -1) {
                         rule.operator = this.getOperator(' ', parser[i + 1][1], sqlLocale);