@syncfusion/ej2-querybuilder 19.4.52 → 19.4.56

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

@@ -137,6 +137,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         this.isFieldChange = false;
         this.isFieldClose = false;
         this.isDestroy = false;
+        this.isGetNestedData = false;
         MultiSelect.Inject(CheckBoxSelection);
     }
     getPersistData() {
@@ -729,6 +730,7 @@ let QueryBuilder = class QueryBuilder extends Component {
      */
     validateFields() {
         let isValid = true;
+        let dropDownTreeObj;
         if (this.allowValidation) {
             const excludeOprs = ['isnull', 'isnotnull', 'isempty', 'isnotempty'];
             let i;
@@ -748,9 +750,18 @@ let QueryBuilder = class QueryBuilder extends Component {
                 rule = this.getParentGroup(groupElem);
                 index = 0;
                 indexElem = tempElem = ruleElemCln[i];
-                dropDownObj = getComponent(ruleElemCln[i].querySelector('.e-rule-field input.e-control'), 'dropdownlist');
-                this.selectedColumn = dropDownObj.getDataByValue(dropDownObj.value);
-                validateRule = !isNullOrUndefined(dropDownObj.index) && this.selectedColumn.validation;
+                if (this.fieldMode === 'DropdownTree') {
+                    dropDownTreeObj = getComponent(ruleElemCln[i].querySelector('.e-rule-field input.e-control'), 'dropdowntree');
+                    if (dropDownTreeObj.value && dropDownTreeObj.value.length) {
+                        this.selectedColumn = this.getColumn(dropDownTreeObj.value[0]);
+                        validateRule = this.selectedColumn.validation;
+                    }
+                }
+                else {
+                    dropDownObj = getComponent(ruleElemCln[i].querySelector('.e-rule-field input.e-control'), 'dropdownlist');
+                    this.selectedColumn = dropDownObj.getDataByValue(dropDownObj.value);
+                    validateRule = !isNullOrUndefined(dropDownObj.index) && this.selectedColumn.validation;
+                }
                 fieldElem = tempElem.querySelector('.e-rule-field input.e-control');
                 if (validateRule && validateRule.isRequired) {
                     while (indexElem && indexElem.previousElementSibling !== null) {
@@ -788,7 +799,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                         }
                     }
                 }
-                else if (dropDownObj.element && isNullOrUndefined(dropDownObj.index)) {
+                else if ((dropDownObj && dropDownObj.element && isNullOrUndefined(dropDownObj.index)) ||
+                    (dropDownTreeObj && dropDownTreeObj.element && (isNullOrUndefined(dropDownTreeObj.value) ||
+                        dropDownTreeObj.value.length < 1))) {
                     if (fieldElem.parentElement.className.indexOf('e-tooltip') < 0) {
                         this.renderToolTip(fieldElem.parentElement);
                     }
@@ -1268,7 +1281,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             const fieldElem = closest(args.element, '.e-rule-filter') || closest(args.element, '.e-rule-sub-filter');
             const column = this.fieldMode === 'DropdownTree' ? this.getColumn(args.value[0]) : this.getColumn(args.value);
             if (this.fieldMode === 'DropdownTree' && fieldElem != null) {
-                const ddtElem = fieldElem.querySelector('.e-control');
+                const ddtElem = fieldElem.querySelector('.e-dropdowntree.e-control');
                 const ddt = getComponent(ddtElem, 'dropdowntree');
                 if (column) {
                     if (column.type === 'object') {
@@ -1749,15 +1762,36 @@ let QueryBuilder = class QueryBuilder extends Component {
     getDistinctValues(dataSource, field) {
         const original = {};
         const result = [];
+        let nest = [];
+        let value = "";
+        let isNested = field.indexOf(this.separator);
         for (let i = 0, iLen = dataSource.length; i < iLen; i++) {
-            let value = dataSource[i][field];
+            if (isNested === 0) {
+                value = dataSource[i][field];
+            }
+            else {
+                nest = field.split(this.separator);
+                nest.forEach(element => {
+                    if (value) {
+                        value = value[element];
+                    }
+                    else {
+                        value = dataSource[i][element];
+                    }
+                });
+            }
             if (Number(dataSource[i][field]) === dataSource[i][field] && dataSource[i][field] % 1 !== 0) {
                 value = dataSource[i][field].toString();
             }
             const data = {};
-            if (!(value in original)) {
+            if (!(value in original) && !isNullOrUndefined(value)) {
                 original[value] = 1;
-                data[field] = value;
+                if (isNested === 0) {
+                    data[field] = value;
+                }
+                else {
+                    data[nest[nest.length - 1]] = value;
+                }
                 result.push(data);
             }
         }
@@ -1767,6 +1801,7 @@ let QueryBuilder = class QueryBuilder extends Component {
         let isFetched = false;
         let ds;
         let isValues = false;
+        this.isGetNestedData = false;
         if (this.dataColl[1]) {
             if (Object.keys(this.dataColl[1]).indexOf(rule.field) > -1) {
                 isFetched = true;
@@ -1777,11 +1812,17 @@ let QueryBuilder = class QueryBuilder extends Component {
         if (!this.dataColl.length && values.length) {
             isValues = true;
         }
+        let fieldValue = this.selectedRule.field;
+        let isNested = this.selectedRule.field.indexOf(this.separator);
+        if (isNested !== 0 && this.fieldMode !== "DropdownTree") {
+            let nest = this.selectedRule.field.split(this.separator);
+            fieldValue = nest[nest.length - 1];
+        }
         let multiSelectValue;
         multiSelectValue = {
             dataSource: isValues ? values : (isFetched ? ds : this.dataManager),
             query: new Query([rule.field]),
-            fields: { text: this.selectedRule.field, value: this.selectedRule.field },
+            fields: { text: fieldValue, value: fieldValue },
             placeholder: this.l10n.getConstant('SelectValue'),
             value: selectedValue,
             mode: 'CheckBox',
@@ -1809,6 +1850,10 @@ let QueryBuilder = class QueryBuilder extends Component {
                 if (Object.keys(this.dataColl[1]).indexOf(value) > -1) {
                     isFetched = true;
                 }
+                const isNest = value.indexOf(this.separator);
+                if (isNest !== 0 && this.isGetNestedData) {
+                    isFetched = true;
+                }
             }
             if (!isFetched) {
                 args.cancel = true;
@@ -1836,6 +1881,7 @@ let QueryBuilder = class QueryBuilder extends Component {
             }
             this.dataColl = extend(this.dataColl, dummyData, [], true);
             multiselectObj.dataSource = this.getDistinctValues(this.dataColl, value);
+            this.isGetNestedData = true;
             hideSpinner(closest(element, '.e-multi-select-wrapper').parentElement);
         }).catch((e) => {
             deferred.reject(e);
@@ -3553,7 +3599,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                 }
             }
             else if ((isNullOrUndefined(rule.condition)) && isNullOrUndefined(rule.rules)) {
-                rule = { 'label': '', 'field': '', 'operator': '', 'type': '', 'value': '' };
+                rule = {};
             }
             else {
                 if (this.enableNotCondition) {
@@ -3839,7 +3885,7 @@ let QueryBuilder = class QueryBuilder extends Component {
                     break;
                 }
             }
-            else if (field.indexOf(this.separator) > -1) {
+            else if (field && field.indexOf(this.separator) > -1) {
                 if (columns[i].field === field.split(this.separator)[0]) {
                     column = columns[i];
                     break;
@@ -4072,6 +4118,9 @@ let QueryBuilder = class QueryBuilder extends Component {
                 }
             }
         }
+        if (rule.rules.length === 0) {
+            rule.rules[0] = { 'label': '', 'field': '', 'operator': '', 'type': '', 'value': '' };
+        }
         const ruleColl = rule.rules;
         if (!isNullOrUndefined(ruleColl)) {
             for (let i = 0, len = ruleColl.length; i < len; i++) {