@syncfusion/ej2-multicolumn-combobox 28.1.33 → 28.1.39

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 28.1.33
+*  version : 28.1.39
 *  Copyright Syncfusion Inc. 2001 - 2024. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-multicolumn-combobox@*",
-  "_id": "@syncfusion/ej2-multicolumn-combobox@27.1.48",
+  "_id": "@syncfusion/ej2-multicolumn-combobox@28.1.33",
   "_inBundle": false,
-  "_integrity": "sha512-3M6eeoxmQtVL5TU4WkFvbm16AVl0QnBSeImZ1c3VYXBhdFroNPJdHliJYdYSjnAnCwsEpaOGso4YqgvMUzZnCw==",
+  "_integrity": "sha512-iM70wymmPk+g9d2eRD42TPv6mPdb4oEw8WNw3R3qqUul8YfOJ5u6iSinleJmZmd73KAc/gB7rZJVQhQOtT+2JQ==",
   "_location": "/@syncfusion/ej2-multicolumn-combobox",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-multicolumn-combobox",
     "/@syncfusion/ej2-vue-multicolumn-combobox"
   ],
-  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-release/@syncfusion/ej2-multicolumn-combobox/-/ej2-multicolumn-combobox-27.1.48.tgz",
-  "_shasum": "414177525854a656c6873d8f39ff0028eaa1db09",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-multicolumn-combobox/-/ej2-multicolumn-combobox-28.1.33.tgz",
+  "_shasum": "19ef9d6aefa015269a5b906d8f90c984de767506",
   "_spec": "@syncfusion/ej2-multicolumn-combobox@*",
   "_where": "/jenkins/workspace/elease-automation_release_28.1.1/packages/included",
   "author": {
@@ -36,7 +36,7 @@
   "bundleDependencies": false,
   "dependencies": {
     "@syncfusion/ej2-base": "~28.1.33",
-    "@syncfusion/ej2-grids": "~28.1.33"
+    "@syncfusion/ej2-grids": "~28.1.38"
   },
   "deprecated": false,
   "description": "Essential JS 2 Component",
@@ -57,6 +57,6 @@
     "url": "git+https://github.com/syncfusion/ej2-multicolumn-combobox-component.git"
   },
   "typings": "index.d.ts",
-  "version": "28.1.33",
+  "version": "28.1.39",
   "sideEffects": false
 }

package/src/multicolumn-combobox/multi-column-combo-box-model.d.ts

@@ -1,4 +1,4 @@
-import { Component, EventHandler, INotifyPropertyChanged, Property, NotifyPropertyChanges, closest, attributes, append, compile, detach, KeyboardEvents } from '@syncfusion/ej2-base';import { ChildProperty, prepend, Collection, getUniqueID, Complex, isNullOrUndefined as isNOU, select, L10n, Browser } from '@syncfusion/ej2-base';import { formatUnit, addClass, removeClass, NumberFormatOptions, DateFormatOptions, Event, EmitType, AnimationModel, Animation, KeyboardEventArgs } from '@syncfusion/ej2-base';import { Input, InputObject } from '@syncfusion/ej2-inputs';import { DataManager, Query, Group } from '@syncfusion/ej2-data';import { Popup } from '@syncfusion/ej2-popups';import { Grid, Resize, FailureEventArgs, VirtualScroll, Group as GridGroup, Edit, Sort, GridColumnModel } from '@syncfusion/ej2-grids';
+import { Component, EventHandler, INotifyPropertyChanged, Property, NotifyPropertyChanges, closest, attributes, append, compile, detach, KeyboardEvents, getValue } from '@syncfusion/ej2-base';import { ChildProperty, prepend, Collection, getUniqueID, Complex, isNullOrUndefined as isNOU, select, L10n, Browser } from '@syncfusion/ej2-base';import { formatUnit, addClass, removeClass, NumberFormatOptions, DateFormatOptions, Event, EmitType, AnimationModel, Animation, KeyboardEventArgs } from '@syncfusion/ej2-base';import { Input, InputObject } from '@syncfusion/ej2-inputs';import { DataManager, Query, Group } from '@syncfusion/ej2-data';import { Popup } from '@syncfusion/ej2-popups';import { Grid, Resize, FailureEventArgs, VirtualScroll, Group as GridGroup, Edit, Sort, GridColumnModel } from '@syncfusion/ej2-grids';
 import {TextAlign,GridLine,WrapMode,ResizeArgs,DataResult,FilterType,FloatLabelType,SortOrder,SortType,PopupEventArgs,FilteringEventArgs,SelectEventArgs,ChangeEventArgs} from "./multi-column-combo-box";
 import {ComponentModel} from '@syncfusion/ej2-base';
 

package/src/multicolumn-combobox/multi-column-combo-box.d.ts

@@ -827,6 +827,7 @@ export declare class MultiColumnComboBox extends Component<HTMLElement> implemen
     private setHTMLAttributes;
     private setEnable;
     private setAriaDisabled;
+    private updateFieldValue;
     private initValue;
     private updateChangeEvent;
     private updateCurrentValues;

package/src/multicolumn-combobox/multi-column-combo-box.js

@@ -52,7 +52,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { Component, EventHandler, Property, NotifyPropertyChanges, closest, attributes, append, compile, detach, KeyboardEvents } from '@syncfusion/ej2-base';
+import { Component, EventHandler, Property, NotifyPropertyChanges, closest, attributes, append, compile, detach, KeyboardEvents, getValue } from '@syncfusion/ej2-base';
 import { ChildProperty, prepend, Collection, getUniqueID, Complex, isNullOrUndefined as isNOU, select, L10n, Browser } from '@syncfusion/ej2-base';
 import { formatUnit, addClass, removeClass, Event, Animation } from '@syncfusion/ej2-base';
 import { Input } from '@syncfusion/ej2-inputs';
@@ -418,8 +418,23 @@ var MultiColumnComboBox = /** @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;
@@ -657,6 +672,10 @@ var MultiColumnComboBox = /** @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];
@@ -682,8 +701,9 @@ var MultiColumnComboBox = /** @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) :
-                            !isNOU(_this.value) ? _this.fields.value : _this.fields.text].toString() === value_1;
+                        var fieldVal = _this.updateFieldValue(isRerender ? (isValue ? _this.fields.value : _this.fields.text) :
+                            !isNOU(_this.value) ? _this.fields.value : _this.fields.text, item);
+                        return fieldVal === value_1;
                     });
                     if (filteredData.length > 0) {
                         item = filteredData[0];
@@ -695,8 +715,9 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
             }
             else if (!isNOU(this.dataSource) && this.dataSource instanceof Array) {
                 item = this.dataSource.filter(function (data) {
-                    return data[isRerender ? (isValue ? _this.fields.value : _this.fields.text) :
-                        !isNOU(_this.value) ? _this.fields.value : _this.fields.text].toString() === value_1;
+                    var fieldVal = _this.updateFieldValue(isRerender ? (isValue ? _this.fields.value : _this.fields.text) :
+                        !isNOU(_this.value) ? _this.fields.value : _this.fields.text, data);
+                    return fieldVal === value_1;
                 })[0];
                 updateValues(this.dataSource);
             }
@@ -743,8 +764,9 @@ var MultiColumnComboBox = /** @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,
@@ -757,10 +779,12 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
     };
     MultiColumnComboBox.prototype.updateCurrentValues = function (item, dataList) {
         if (!isNOU(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)
             };
         }
@@ -938,16 +962,16 @@ var MultiColumnComboBox = /** @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
         };
@@ -957,9 +981,9 @@ var MultiColumnComboBox = /** @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);
                 }
@@ -1042,10 +1066,12 @@ var MultiColumnComboBox = /** @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 };
     };
@@ -1105,7 +1131,8 @@ var MultiColumnComboBox = /** @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);
@@ -1227,13 +1254,13 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
                 if (!isNOU(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;
@@ -1242,19 +1269,21 @@ var MultiColumnComboBox = /** @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) {
@@ -1605,7 +1634,8 @@ var MultiColumnComboBox = /** @class */ (function (_super) {
         var _this = this;
         if (!isNOU(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 (!isNOU(this.dataSource) && this.dataSource instanceof DataManager) {
@@ -1613,7 +1643,8 @@ var MultiColumnComboBox = /** @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];
             });
         }