@syncfusion/ej2-multicolumn-combobox 28.1.33 → 28.1.39

package/dist/es6/ej2-multicolumn-combobox.es5.js

@@ -1,4 +1,4 @@
-import { Property, ChildProperty, Event, getUniqueID, isNullOrUndefined, addClass, removeClass, formatUnit, attributes, prepend, Browser, append, L10n, select, compile, EventHandler, KeyboardEvents, closest, Animation, detach, Complex, Collection, NotifyPropertyChanges, Component } from '@syncfusion/ej2-base';
+import { Property, ChildProperty, Event, getUniqueID, isNullOrUndefined, addClass, removeClass, formatUnit, getValue, attributes, prepend, Browser, append, L10n, select, compile, EventHandler, KeyboardEvents, closest, Animation, detach, Complex, Collection, NotifyPropertyChanges, Component } from '@syncfusion/ej2-base';
 import { Input } from '@syncfusion/ej2-inputs';
 import { DataManager, Query } from '@syncfusion/ej2-data';
 import { Popup } from '@syncfusion/ej2-popups';
@@ -413,8 +413,23 @@ var MultiColumnComboBox = /** @__PURE__ @class */ (function (_super) {
     };
     /* eslint-disable @typescript-eslint/no-explicit-any */
     MultiColumnComboBox.prototype.isRowMatching = function (data, selectedValue, selectedText) {
-        var values = Object.values(data).map(String);
-        return values.includes(selectedValue) && values.includes(selectedText);
+        var flattenData = function (data) {
+            var result = [];
+            if (data && typeof data === 'object') {
+                if (Array.isArray(data)) {
+                    data.forEach(function (item) { return result.push.apply(result, flattenData(item)); });
+                }
+                else {
+                    Object.keys(data).forEach(function (key) { return result.push.apply(result, flattenData(data["" + key])); });
+                }
+            }
+            else if (data != null) {
+                result.push(String(data));
+            }
+            return result;
+        };
+        var flattenedValues = flattenData(data);
+        return (flattenedValues.indexOf(selectedValue) !== -1 && flattenedValues.indexOf(selectedText) !== -1);
     };
     MultiColumnComboBox.prototype.updateRowSelection = function (args) {
         var _this = this;
@@ -652,6 +667,10 @@ var MultiColumnComboBox = /** @__PURE__ @class */ (function (_super) {
         this.inputEle.setAttribute('aria-disabled', value);
         this.inputWrapper.setAttribute('aria-disabled', value);
     };
+    MultiColumnComboBox.prototype.updateFieldValue = function (fieldValue, dataObj) {
+        var fieldVal = getValue(fieldValue, dataObj).toString();
+        return fieldVal;
+    };
     MultiColumnComboBox.prototype.initValue = function (isRerender, isValue, isInitial) {
         var _this = this;
         var prevItemData = this.gridObj.getSelectedRecords()[0];
@@ -677,8 +696,9 @@ var MultiColumnComboBox = /** @__PURE__ @class */ (function (_super) {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     var dataLists = e.result;
                     var filteredData = dataLists.filter(function (item) {
-                        return item[isRerender ? (isValue ? _this.fields.value : _this.fields.text) :
-                            !isNullOrUndefined(_this.value) ? _this.fields.value : _this.fields.text].toString() === value_1;
+                        var fieldVal = _this.updateFieldValue(isRerender ? (isValue ? _this.fields.value : _this.fields.text) :
+                            !isNullOrUndefined(_this.value) ? _this.fields.value : _this.fields.text, item);
+                        return fieldVal === value_1;
                     });
                     if (filteredData.length > 0) {
                         item = filteredData[0];
@@ -690,8 +710,9 @@ var MultiColumnComboBox = /** @__PURE__ @class */ (function (_super) {
             }
             else if (!isNullOrUndefined(this.dataSource) && this.dataSource instanceof Array) {
                 item = this.dataSource.filter(function (data) {
-                    return data[isRerender ? (isValue ? _this.fields.value : _this.fields.text) :
-                        !isNullOrUndefined(_this.value) ? _this.fields.value : _this.fields.text].toString() === value_1;
+                    var fieldVal = _this.updateFieldValue(isRerender ? (isValue ? _this.fields.value : _this.fields.text) :
+                        !isNullOrUndefined(_this.value) ? _this.fields.value : _this.fields.text, data);
+                    return fieldVal === value_1;
                 })[0];
                 updateValues(this.dataSource);
             }
@@ -738,8 +759,9 @@ var MultiColumnComboBox = /** @__PURE__ @class */ (function (_super) {
         }
     };
     MultiColumnComboBox.prototype.updateChangeEvent = function (item, prevItemData, prevItemEle, currentValue, currentText, currentIndex, isRerender, isInitial) {
+        var fieldValue = item ? this.updateFieldValue(this.fields.value, item) : null;
         var ChangeEventArgs = {
-            value: item ? item[this.fields.value].toString() : null,
+            value: item ? fieldValue : null,
             itemData: { text: currentText, value: currentValue },
             item: this.getDataByValue(this.value),
             previousItemData: prevItemData,
@@ -752,10 +774,12 @@ var MultiColumnComboBox = /** @__PURE__ @class */ (function (_super) {
     };
     MultiColumnComboBox.prototype.updateCurrentValues = function (item, dataList) {
         if (!isNullOrUndefined(item)) {
-            Input.setValue(item[this.fields.text].toString(), this.inputEle, this.floatLabelType, this.showClearButton);
+            var fieldText = this.updateFieldValue(this.fields.text, item);
+            var fieldValue = this.updateFieldValue(this.fields.value, item);
+            Input.setValue(fieldText, this.inputEle, this.floatLabelType, this.showClearButton);
             return {
-                currentValue: item[this.fields.value].toString(),
-                currentText: item[this.fields.text].toString(),
+                currentValue: fieldValue,
+                currentText: fieldText,
                 currentIndex: dataList.indexOf(item)
             };
         }
@@ -933,16 +957,16 @@ var MultiColumnComboBox = /** @__PURE__ @class */ (function (_super) {
             cancel: false
         };
         var selectedRecords = this.gridObj.getSelectedRecords()[0];
-        var fieldText = selectedRecords ? selectedRecords[this.fields.text].toString() : '';
-        var fieldValue = selectedRecords ? selectedRecords[this.fields.value].toString() : '';
+        var dataText = selectedRecords ? this.updateFieldValue(this.fields.text, selectedRecords) : '';
+        var dataValue = selectedRecords ? this.updateFieldValue(this.fields.value, selectedRecords) : '';
         var ChangeEventArgs = {
             isInteracted: e ? true : false,
             item: selectedRecords,
             itemElement: row,
-            itemData: { text: fieldText, value: fieldValue },
+            itemData: { text: selectedRecords ? dataText : '', value: selectedRecords ? dataValue : '' },
             event: e,
             cancel: false,
-            value: fieldValue,
+            value: selectedRecords ? dataValue : '',
             previousItemData: { text: this.text, value: this.value },
             previousItemElement: this.previousItemElement
         };
@@ -952,9 +976,9 @@ var MultiColumnComboBox = /** @__PURE__ @class */ (function (_super) {
                 var event_1 = e;
                 var isUpdateVal = event_1.key === 'Enter' || event_1.key === 'Tab' || event_1.shiftKey && event_1.key === 'Tab' || event_1.altKey && event_1.key === 'ArrowUp';
                 if (!isKeyNav || (isKeyNav && isUpdateVal)) {
-                    _this.updateValues(selectedRecord[_this.fields.value], selectedRecord[_this.fields.text], _this.gridObj.selectedRowIndex, ChangeEventArgs);
+                    _this.updateValues(selectedRecords ? dataValue : '', selectedRecords ? dataText : '', _this.gridObj.selectedRowIndex, ChangeEventArgs);
                 }
-                Input.setValue(selectedRecord[_this.fields.text], _this.inputEle, _this.floatLabelType, _this.showClearButton);
+                Input.setValue(selectedRecords ? dataText : '', _this.inputEle, _this.floatLabelType, _this.showClearButton);
                 if (!isKeyNav || (isKeyNav && isUpdateVal)) {
                     _this.hidePopup(e);
                 }
@@ -1037,10 +1061,12 @@ var MultiColumnComboBox = /** @__PURE__ @class */ (function (_super) {
     MultiColumnComboBox.prototype.filterDatas = function (dataSource, inputValue) {
         var _this = this;
         var data = dataSource.filter(function (item) {
-            return item[_this.fields.text].toString().toLowerCase().startsWith(inputValue.toLowerCase());
+            var fieldText = _this.updateFieldValue(_this.fields.text, item);
+            return fieldText.toLowerCase().startsWith(inputValue.toLowerCase());
         });
         var exactData = dataSource.filter(function (item) {
-            return item[_this.fields.text].toString() === inputValue;
+            var fieldText = _this.updateFieldValue(_this.fields.text, item);
+            return fieldText === inputValue;
         });
         return { data: data, exactData: exactData };
     };
@@ -1100,7 +1126,8 @@ var MultiColumnComboBox = /** @__PURE__ @class */ (function (_super) {
         });
     };
     MultiColumnComboBox.prototype.filterData = function (item, filterType, inputValue, fields) {
-        var itemValue = item[fields ? fields.text : this.fields.text].toString().toLowerCase();
+        var dataValue = this.updateFieldValue(fields ? fields.text : this.fields.text, item);
+        var itemValue = dataValue.toLowerCase();
         switch (filterType) {
             case 'startswith':
                 return itemValue.startsWith(inputValue);
@@ -1222,13 +1249,13 @@ var MultiColumnComboBox = /** @__PURE__ @class */ (function (_super) {
                 if (!isNullOrUndefined(this.text)) {
                     this.updateInputValue(this.text);
                 }
-                this.updateValuesOnInput(e);
+                var isClearVal = this.inputEle.value === '' ? true : false;
+                this.updateValuesOnInput(e, null, isClearVal);
             }
         }
     };
     MultiColumnComboBox.prototype.updateValuesOnInput = function (mouseEvent, keyEvent, isClearValues, isKeyDown) {
         var _this = this;
-        if (isClearValues === void 0) { isClearValues = false; }
         if (isKeyDown === void 0) { isKeyDown = false; }
         var e = mouseEvent ? mouseEvent : keyEvent;
         var val = isKeyDown ? this.matchedContent : this.exactMatchedContent;
@@ -1237,19 +1264,21 @@ var MultiColumnComboBox = /** @__PURE__ @class */ (function (_super) {
         }
         this.hidePopup(e);
         if (this.matchedRowEle && !isClearValues && val) {
-            var prevOnChange = this.isProtectedOnChange;
-            this.isProtectedOnChange = true;
             setTimeout(function () {
-                _this.inputEle.value = _this.matchedContent[_this.fields.text].toString();
-                _this.value = _this.matchedContent[_this.fields.value].toString();
+                var prevOnChange = _this.isProtectedOnChange;
+                _this.isProtectedOnChange = true;
+                var fieldText = _this.updateFieldValue(_this.fields.text, _this.matchedContent);
+                var fieldValue = _this.updateFieldValue(_this.fields.value, _this.matchedContent);
+                _this.inputEle.value = fieldText;
+                _this.value = fieldValue;
                 var selectIndex = _this.findIndex(_this.gridObj.currentViewData, _this.matchedContent);
                 _this.index = selectIndex;
-                _this.text = _this.matchedContent[_this.fields.text].toString();
+                _this.text = fieldText;
                 _this.gridObj.selectRow(selectIndex);
                 _this.selectedGridRow(_this.gridObj.getRowByIndex(selectIndex), e);
                 _this.previousItemElement = _this.gridObj.getSelectedRows()[0];
+                _this.isProtectedOnChange = prevOnChange;
             }, 100);
-            this.isProtectedOnChange = prevOnChange;
         }
         else {
             if (this.isDataFiltered) {
@@ -1600,7 +1629,8 @@ var MultiColumnComboBox = /** @__PURE__ @class */ (function (_super) {
         var _this = this;
         if (!isNullOrUndefined(this.dataSource) && this.dataSource instanceof Array) {
             return this.dataSource.filter(function (item) {
-                return item[_this.fields.value].toString() === value;
+                var fieldValue = _this.updateFieldValue(_this.fields.value, item);
+                return fieldValue === value;
             })[0];
         }
         else if (!isNullOrUndefined(this.dataSource) && this.dataSource instanceof DataManager) {
@@ -1608,7 +1638,8 @@ var MultiColumnComboBox = /** @__PURE__ @class */ (function (_super) {
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 var dataLists = e.result;
                 return dataLists.filter(function (item) {
-                    return item[_this.fields.value].toString() === value;
+                    var fieldValue = _this.updateFieldValue(_this.fields.value, item);
+                    return fieldValue === value;
                 })[0];
             });
         }