@sd-angular/core 1.3.205 → 1.3.207

package/bundles/sd-angular-core-table.umd.js

@@ -1370,82 +1370,98 @@
                 var rawColumnFilter = filterInfo.rawColumnFilter, orderBy = filterInfo.orderBy, orderDirection = filterInfo.orderDirection, pageSize = filterInfo.pageSize, pageNumber = filterInfo.pageNumber;
                 var items = localItems.filter(function (tableItem) {
                     var e_5, _8;
-                    var _a, _b, _c, _d;
+                    var _a, _b, _c, _d, _e, _f;
                     var item = tableItem.data;
-                    try {
-                        for (var columns_1 = __values(columns), columns_1_1 = columns_1.next(); !columns_1_1.done; columns_1_1 = columns_1.next()) {
-                            var column = columns_1_1.value;
-                            var field = column.field, type = column.type;
-                            var filterValue = (rawColumnFilter[field] || '').toString().trim().toLowerCase();
-                            var columnValue = (item[field] || '').toString().trim().toLowerCase();
-                            if (filterValue) {
-                                if (!columnValue && type !== 'datetime' && type !== 'date' && type !== 'time') {
-                                    return false;
+                    var _loop_1 = function (column) {
+                        var field = column.field, type = column.type;
+                        var filterValue = (rawColumnFilter[field] || '').toString().trim().toLowerCase();
+                        var columnValue = (item[field] || '').toString().trim().toLowerCase();
+                        if (filterValue) {
+                            if (!columnValue && type !== 'datetime' && type !== 'date' && type !== 'time') {
+                                return { value: false };
+                            }
+                            if (type === 'string') {
+                                if (columnValue.indexOf(filterValue) === -1) {
+                                    return { value: false };
                                 }
-                                if (type === 'string') {
-                                    if (columnValue.indexOf(filterValue) === -1) {
-                                        return false;
+                            }
+                            else if (type === 'values' || type === 'lazy-values') {
+                                var columnType_1 = column;
+                                var isMultiple = ['MULTIPLE'].includes(columnType_1.option.selection);
+                                if (isMultiple) {
+                                    var columnValues_1 = (_a = item[field].map(function (i) { var _a; return ((_a = i[columnType_1.option.valueField]) !== null && _a !== void 0 ? _a : '').toString().trim().toLowerCase(); })) !== null && _a !== void 0 ? _a : [];
+                                    var filterValues = (_b = rawColumnFilter[field]) === null || _b === void 0 ? void 0 : _b.map(function (v) { return (v !== null && v !== void 0 ? v : '').toString().trim().toLowerCase(); });
+                                    if ((filterValues === null || filterValues === void 0 ? void 0 : filterValues.length) && filterValues.every(function (fv) { return !columnValues_1.includes(fv); })) {
+                                        return { value: false };
                                     }
                                 }
-                                else if (type === 'values' || type === 'lazy-values') {
+                                else {
                                     if (columnValue !== filterValue) {
-                                        return false;
+                                        return { value: false };
                                     }
                                 }
-                                else if (type === 'number') {
-                                    var fValue = +filterValue.replace('>=', '').replace('<=', '').replace('>', '').replace('<', '');
-                                    var cValue = +columnValue;
-                                    if (fValue || fValue === 0) {
-                                        if (!cValue && cValue !== 0) {
-                                            return false;
-                                        }
-                                        if (filterValue.indexOf('>=') > -1 && cValue < fValue) {
-                                            return false;
-                                        }
-                                        else if (filterValue.indexOf('<=') > -1 && cValue > fValue) {
-                                            return false;
-                                        }
-                                        else if (filterValue.indexOf('<') > -1 && cValue >= fValue) {
-                                            return false;
-                                        }
-                                        else if (filterValue.indexOf('>') > -1 && cValue <= fValue) {
-                                            return false;
-                                        }
-                                        else if (cValue !== fValue) {
-                                            return false;
-                                        }
+                            }
+                            else if (type === 'number') {
+                                var fValue = +filterValue.replace('>=', '').replace('<=', '').replace('>', '').replace('<', '');
+                                var cValue = +columnValue;
+                                if (fValue || fValue === 0) {
+                                    if (!cValue && cValue !== 0) {
+                                        return { value: false };
                                     }
-                                }
-                                else if (type === 'bool') {
-                                    if (filterValue === '1' && columnValue !== '1' && columnValue !== 'true') {
-                                        return false;
+                                    if (filterValue.indexOf('>=') > -1 && cValue < fValue) {
+                                        return { value: false };
                                     }
-                                    else if (filterValue === '0' && columnValue !== '0' && columnValue !== 'false') {
-                                        return false;
+                                    else if (filterValue.indexOf('<=') > -1 && cValue > fValue) {
+                                        return { value: false };
+                                    }
+                                    else if (filterValue.indexOf('<') > -1 && cValue >= fValue) {
+                                        return { value: false };
+                                    }
+                                    else if (filterValue.indexOf('>') > -1 && cValue <= fValue) {
+                                        return { value: false };
+                                    }
+                                    else if (cValue !== fValue) {
+                                        return { value: false };
                                     }
                                 }
-                                else if (type === 'datetime' || type === 'date' || type === 'time') {
-                                    var from = (_b = (_a = rawColumnFilter[field]) === null || _a === void 0 ? void 0 : _a.from) !== null && _b !== void 0 ? _b : rawColumnFilter[field];
-                                    var to = (_d = (_c = rawColumnFilter[field]) === null || _c === void 0 ? void 0 : _c.to) !== null && _d !== void 0 ? _d : rawColumnFilter[field];
-                                    var fromDate = Date.begin(from);
-                                    var toDate = Date.end(to);
-                                    if (fromDate || toDate) {
-                                        if (!columnValue) {
-                                            return false;
-                                        }
-                                        var columnTime = new Date(columnValue).getTime();
-                                        var fromDateTime = (fromDate === null || fromDate === void 0 ? void 0 : fromDate.getTime()) || null;
-                                        var toDateTime = (toDate === null || toDate === void 0 ? void 0 : toDate.getTime()) || null;
-                                        if (fromDateTime && fromDateTime > columnTime) {
-                                            return false;
-                                        }
-                                        if (toDateTime && columnTime > toDateTime) {
-                                            return false;
-                                        }
+                            }
+                            else if (type === 'bool') {
+                                if (filterValue === '1' && columnValue !== '1' && columnValue !== 'true') {
+                                    return { value: false };
+                                }
+                                else if (filterValue === '0' && columnValue !== '0' && columnValue !== 'false') {
+                                    return { value: false };
+                                }
+                            }
+                            else if (type === 'datetime' || type === 'date' || type === 'time') {
+                                var from = (_d = (_c = rawColumnFilter[field]) === null || _c === void 0 ? void 0 : _c.from) !== null && _d !== void 0 ? _d : rawColumnFilter[field];
+                                var to = (_f = (_e = rawColumnFilter[field]) === null || _e === void 0 ? void 0 : _e.to) !== null && _f !== void 0 ? _f : rawColumnFilter[field];
+                                var fromDate = Date.begin(from);
+                                var toDate = Date.end(to);
+                                if (fromDate || toDate) {
+                                    if (!columnValue) {
+                                        return { value: false };
+                                    }
+                                    var columnTime = new Date(columnValue).getTime();
+                                    var fromDateTime = (fromDate === null || fromDate === void 0 ? void 0 : fromDate.getTime()) || null;
+                                    var toDateTime = (toDate === null || toDate === void 0 ? void 0 : toDate.getTime()) || null;
+                                    if (fromDateTime && fromDateTime > columnTime) {
+                                        return { value: false };
+                                    }
+                                    if (toDateTime && columnTime > toDateTime) {
+                                        return { value: false };
                                     }
                                 }
                             }
                         }
+                    };
+                    try {
+                        for (var columns_1 = __values(columns), columns_1_1 = columns_1.next(); !columns_1_1.done; columns_1_1 = columns_1.next()) {
+                            var column = columns_1_1.value;
+                            var state_1 = _loop_1(column);
+                            if (typeof state_1 === "object")
+                                return state_1.value;
+                        }
                     }
                     catch (e_5_1) { e_5 = { error: e_5_1 }; }
                     finally {
@@ -1694,7 +1710,7 @@
                             items_1 = [];
                             promises_1 = [];
                             handleData = function () { return __awaiter(_this, void 0, void 0, function () {
-                                var _u, results, results_1, results_1_1, result, results_2, totalPage, percent, allColumns, allExportedColumns, _loop_1, exportItems_2, exportItems_2_1, item, e_7_1;
+                                var _u, results, results_1, results_1_1, result, results_2, totalPage, percent, allColumns, allExportedColumns, _loop_2, exportItems_2, exportItems_2_1, item, e_7_1;
                                 var e_8, _8, e_7, _9;
                                 var _this = this;
                                 return __generator(this, function (_10) {
@@ -1739,7 +1755,7 @@
                                             this.exportTitle = "Exporting..." + percent + "%";
                                             allColumns = __classPrivateFieldGet(this, _allColumns).call(this);
                                             allExportedColumns = __classPrivateFieldGet(this, _allExportedColumns).call(this);
-                                            _loop_1 = function (item) {
+                                            _loop_2 = function (item) {
                                                 var obj, handle, columns_3, columns_3_1, exportColumn, e_9_1;
                                                 var e_9, _8;
                                                 return __generator(this, function (_9) {
@@ -1878,7 +1894,7 @@
                                         case 6:
                                             if (!!exportItems_2_1.done) return [3 /*break*/, 9];
                                             item = exportItems_2_1.value;
-                                            return [5 /*yield**/, _loop_1(item)];
+                                            return [5 /*yield**/, _loop_2(item)];
                                         case 7:
                                             _10.sent();
                                             _10.label = 8;
@@ -2129,13 +2145,13 @@
             };
             this.detectChanges = function () { return _this.ref.detectChanges(); };
             _loadValues.set(this, function (columns) { return __awaiter(_this, void 0, void 0, function () {
-                var promises, _loop_2, this_1, columns_5, columns_5_1, column, results, _loop_3, this_2, results_3, results_3_1, result;
+                var promises, _loop_3, this_1, columns_5, columns_5_1, column, results, _loop_4, this_2, results_3, results_3_1, result;
                 var e_10, _8, e_11, _9;
                 return __generator(this, function (_10) {
                     switch (_10.label) {
                         case 0:
                             promises = [];
-                            _loop_2 = function (column) {
+                            _loop_3 = function (column) {
                                 if (column.type === 'values' && !this_1.cacheValues[column.field]) {
                                     if (typeof column.option.items === 'function') {
                                         promises.push(column.option
@@ -2172,7 +2188,7 @@
                             try {
                                 for (columns_5 = __values(columns), columns_5_1 = columns_5.next(); !columns_5_1.done; columns_5_1 = columns_5.next()) {
                                     column = columns_5_1.value;
-                                    _loop_2(column);
+                                    _loop_3(column);
                                 }
                             }
                             catch (e_10_1) { e_10 = { error: e_10_1 }; }
@@ -2186,7 +2202,7 @@
                             return [4 /*yield*/, Promise.all(promises)];
                         case 1:
                             results = _10.sent();
-                            _loop_3 = function (result) {
+                            _loop_4 = function (result) {
                                 this_2.cacheValues[result.key] = result.data.map(function (e) {
                                     var _8;
                                     return (_8 = {},
@@ -2200,7 +2216,7 @@
                             try {
                                 for (results_3 = __values(results), results_3_1 = results_3.next(); !results_3_1.done; results_3_1 = results_3.next()) {
                                     result = results_3_1.value;
-                                    _loop_3(result);
+                                    _loop_4(result);
                                 }
                             }
                             catch (e_11_1) { e_11 = { error: e_11_1 }; }
@@ -2216,15 +2232,15 @@
                 });
             }); });
             _format.set(this, function (rawItems, columns) { return __awaiter(_this, void 0, void 0, function () {
-                var _5, _6, _7, items, _loop_4, this_3, columns_6, columns_6_1, column, e_12_1;
+                var _5, _6, _7, items, _loop_5, this_3, columns_6, columns_6_1, column, e_12_1;
                 var e_12, _8;
                 var _this = this;
                 return __generator(this, function (_9) {
                     switch (_9.label) {
                         case 0:
                             items = rawItems.map(MapToSdTableItem);
-                            _loop_4 = function (column) {
-                                var field, cellStyle, click, tooltip, htmlTemplate, transform, _8, views, mapValue_1, values_1, lazyItems, _loop_5, items_2, items_2_1, item, e_13_1;
+                            _loop_5 = function (column) {
+                                var field, cellStyle, click, tooltip, htmlTemplate, transform, _8, views, mapValue_1, values_1, lazyItems, _loop_6, items_2, items_2_1, item, e_13_1;
                                 var e_13, _9;
                                 return __generator(this, function (_10) {
                                     switch (_10.label) {
@@ -2263,7 +2279,7 @@
                                             Object.assign(__classPrivateFieldGet(this_3, _cacheObjValues)[field], Array.toObject(lazyItems, column.option.valueField) || {});
                                             _10.label = 2;
                                         case 2:
-                                            _loop_5 = function (item) {
+                                            _loop_6 = function (item) {
                                                 var rowData, value, display, newValue, _8, date, time, val, vals, vals, option;
                                                 return __generator(this, function (_9) {
                                                     switch (_9.label) {
@@ -2367,7 +2383,7 @@
                                         case 4:
                                             if (!!items_2_1.done) return [3 /*break*/, 7];
                                             item = items_2_1.value;
-                                            return [5 /*yield**/, _loop_5(item)];
+                                            return [5 /*yield**/, _loop_6(item)];
                                         case 5:
                                             _10.sent();
                                             _10.label = 6;
@@ -2398,7 +2414,7 @@
                         case 2:
                             if (!!columns_6_1.done) return [3 /*break*/, 5];
                             column = columns_6_1.value;
-                            return [5 /*yield**/, _loop_4(column)];
+                            return [5 /*yield**/, _loop_5(column)];
                         case 3:
                             _9.sent();
                             _9.label = 4;