@sd-angular/core 1.3.200 → 1.3.202

package/fesm2015/sd-angular-core-table.js

@@ -1,5 +1,5 @@
 import { SdScrollDirective, SdCommonModule } from '@sd-angular/core/common';
-import { InjectionToken, Directive, TemplateRef, Input, Component, ChangeDetectionStrategy, ChangeDetectorRef, ViewChild, Injectable, Inject, Optional, EventEmitter, HostListener, QueryList, ContentChild, ContentChildren, Pipe, Output, NgModule } from '@angular/core';
+import { Directive, TemplateRef, Input, InjectionToken, Component, ChangeDetectionStrategy, ChangeDetectorRef, ViewChild, Injectable, Inject, Optional, EventEmitter, HostListener, QueryList, ContentChild, ContentChildren, Pipe, Output, NgModule } from '@angular/core';
 import { CommonModule, DatePipe, DecimalPipe } from '@angular/common';
 import { MatIconModule } from '@angular/material/icon';
 import { __classPrivateFieldGet, __classPrivateFieldSet, __awaiter } from 'tslib';
@@ -32,14 +32,6 @@ import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatListModule } from '@angular/material/list';
 import { SdGroupModule } from '@sd-angular/core/group';
 
-const DEFAULT_TABLE_CONFIG = {
-    paginate: {
-        pageSize: 20,
-        pages: [20, 50, 100, 200]
-    }
-};
-const TABLE_CONFIG = new InjectionToken('sd-table.configuration');
-
 class SdTabelCellDefDirective {
     constructor(templateRef) {
         this.templateRef = templateRef;
@@ -57,6 +49,35 @@ SdTabelCellDefDirective.propDecorators = {
     sdTableCellDef: [{ type: Input }]
 };
 
+class SdTableFilterDefDirective {
+    constructor(templateRef) {
+        this.templateRef = templateRef;
+    }
+    set showing(val) {
+        this.defaultShowing = (val === '') || val;
+    }
+}
+SdTableFilterDefDirective.decorators = [
+    { type: Directive, args: [{
+                selector: '[sdTableFilterDef]'
+            },] }
+];
+SdTableFilterDefDirective.ctorParameters = () => [
+    { type: TemplateRef }
+];
+SdTableFilterDefDirective.propDecorators = {
+    sdTableFilterDef: [{ type: Input }],
+    showing: [{ type: Input, args: ['defaultShowing',] }]
+};
+
+const DEFAULT_TABLE_CONFIG = {
+    paginate: {
+        pageSize: 20,
+        pages: [20, 50, 100, 200]
+    }
+};
+const TABLE_CONFIG = new InjectionToken('sd-table.configuration');
+
 var _filterRegister;
 class SdPopupFilter {
     constructor(cdRef) {
@@ -226,27 +247,6 @@ SdTableFilter.propDecorators = {
     _filterRegister: [{ type: Input, args: ['filterRegister',] }]
 };
 
-class SdTableFilterDefDirective {
-    constructor(templateRef) {
-        this.templateRef = templateRef;
-    }
-    set showing(val) {
-        this.defaultShowing = (val === '') || val;
-    }
-}
-SdTableFilterDefDirective.decorators = [
-    { type: Directive, args: [{
-                selector: '[sdTableFilterDef]'
-            },] }
-];
-SdTableFilterDefDirective.ctorParameters = () => [
-    { type: TemplateRef }
-];
-SdTableFilterDefDirective.propDecorators = {
-    sdTableFilterDef: [{ type: Input }],
-    showing: [{ type: Input, args: ['defaultShowing',] }]
-};
-
 class SdMaterialSubInformationDefDirective {
     constructor(templateRef) {
         this.templateRef = templateRef;
@@ -1195,9 +1195,16 @@ class SdTable {
                                 obj[column.field] = Date.toFormat(date, 'HH:mm');
                             }
                             else if (column.type === 'values' || column.type === 'lazy-values') {
-                                // Nếu là values thì lấy giá trị của value được chọn
-                                obj[column.field] =
-                                    ((_z = (_y = __classPrivateFieldGet(this, _cacheObjValues)[column.field]) === null || _y === void 0 ? void 0 : _y[item[column.field]]) === null || _z === void 0 ? void 0 : _z[column.option.displayField]) || item[column.field];
+                                const value = item[column.field];
+                                if (column.type === 'lazy-values' && typeof column.option.mapValue === 'function') {
+                                    const val = column.option.mapValue(value, item);
+                                    const vals = (Array.isArray(val) ? val : [val]).filter(e => !!(e === null || e === void 0 ? void 0 : e.toString()));
+                                    obj[column.field] = (_y = vals.map(val => { var _a, _b; return ((_b = (_a = __classPrivateFieldGet(this, _cacheObjValues)[column.field]) === null || _a === void 0 ? void 0 : _a[val]) === null || _b === void 0 ? void 0 : _b[column.option.displayField]) || val; })) === null || _y === void 0 ? void 0 : _y.join(', ');
+                                }
+                                else {
+                                    const vals = (Array.isArray(value) ? value : [value]).filter(e => !!(e === null || e === void 0 ? void 0 : e.toString()));
+                                    obj[column.field] = (_z = vals.map(val => { var _a, _b; return ((_b = (_a = __classPrivateFieldGet(this, _cacheObjValues)[column.field]) === null || _a === void 0 ? void 0 : _a[val]) === null || _b === void 0 ? void 0 : _b[column.option.displayField]) || val; })) === null || _z === void 0 ? void 0 : _z.join(', ');
+                                }
                             }
                             else {
                                 obj[column.field] = item[column.field];
@@ -1443,7 +1450,7 @@ class SdTable {
             }
         }));
         _format.set(this, (rawItems, columns) => __awaiter(this, void 0, void 0, function* () {
-            var _5, _6, _7, _8, _9;
+            var _5, _6, _7;
             const items = rawItems.map(MapToSdTableItem);
             for (const column of columns) {
                 // Clickable
@@ -1459,7 +1466,9 @@ class SdTable {
                         }
                         return (_b = item.data) === null || _b === void 0 ? void 0 : _b[field];
                     })
-                        .filter(val => (!!val || val === 0) && !Object.keys(__classPrivateFieldGet(this, _cacheObjValues)[field]).includes(val))
+                        .filter(val => !!(val === null || val === void 0 ? void 0 : val.toString()))
+                        .reduce((current, next) => [...current, ...(Array.isArray(next) ? next : [next])], [])
+                        .filter(val => !Object.keys(__classPrivateFieldGet(this, _cacheObjValues)[field]).includes(val))
                         .union();
                     if (values.length) {
                         const lazyItems = (yield views(values).catch(err => {
@@ -1522,10 +1531,13 @@ class SdTable {
                         }
                         if (column.type === 'values' || column.type === 'lazy-values') {
                             if (column.type === 'lazy-values' && typeof column.option.mapValue === 'function') {
-                                display.data = ((_6 = (_5 = __classPrivateFieldGet(this, _cacheObjValues)[field]) === null || _5 === void 0 ? void 0 : _5[column.option.mapValue(value, rowData)]) === null || _6 === void 0 ? void 0 : _6[column.option.displayField]) || value;
+                                const val = column.option.mapValue(value, rowData);
+                                const vals = (Array.isArray(val) ? val : [val]).filter(e => !!(e === null || e === void 0 ? void 0 : e.toString()));
+                                display.data = (_5 = vals.map(val => { var _a, _b; return ((_b = (_a = __classPrivateFieldGet(this, _cacheObjValues)[field]) === null || _a === void 0 ? void 0 : _a[val]) === null || _b === void 0 ? void 0 : _b[column.option.displayField]) || val; })) === null || _5 === void 0 ? void 0 : _5.join(', ');
                             }
                             else {
-                                display.data = ((_8 = (_7 = __classPrivateFieldGet(this, _cacheObjValues)[field]) === null || _7 === void 0 ? void 0 : _7[value]) === null || _8 === void 0 ? void 0 : _8[column.option.displayField]) || value;
+                                const vals = (Array.isArray(value) ? value : [value]).filter(e => !!(e === null || e === void 0 ? void 0 : e.toString()));
+                                display.data = (_6 = vals.map(val => { var _a, _b; return ((_b = (_a = __classPrivateFieldGet(this, _cacheObjValues)[field]) === null || _a === void 0 ? void 0 : _a[val]) === null || _b === void 0 ? void 0 : _b[column.option.displayField]) || val; })) === null || _6 === void 0 ? void 0 : _6.join(', ');
                             }
                         }
                         if (column.type === 'number' && Number.isNumber(value)) {
@@ -1545,7 +1557,7 @@ class SdTable {
                             display.badge = {
                                 type: !(column === null || column === void 0 ? void 0 : column.badgeType) ? 'icon' : column.badgeType,
                                 color: column.badge(value, rowData),
-                                icon: (_9 = column.badgeIcon) === null || _9 === void 0 ? void 0 : _9.call(column, value, rowData),
+                                icon: (_7 = column.badgeIcon) === null || _7 === void 0 ? void 0 : _7.call(column, value, rowData),
                             };
                         }
                         else if (column.type === 'bool') {
@@ -2527,5 +2539,5 @@ class SdTableQuickFilter {
  * Generated bundle index. Do not edit.
  */
 
-export { DEFAULT_TABLE_CONFIG, MatPaginatorIntlCro, SdFilterOperators, SdTable, SdTableModule, SdTableQuickFilter, TABLE_CONFIG, SdTableQuickAction as ɵa, SdDesktopCell as ɵb, SdSelectionVisibleSelectAllPipe as ɵba, SdGroupPipe as ɵbb, SdDesktopCellView as ɵc, SdDesktopCommand as ɵd, SdColumnInlineFilter as ɵe, SdPopupConfiguration as ɵf, SdTableConfigurationService as ɵg, TABLE_CONFIG as ɵi, SdTableFilter as ɵj, SdPopupFilter as ɵk, SdMaterialSubInformationDefDirective as ɵl, SdTabelCellDefDirective as ɵm, SdMaterialFooterDefDirective as ɵn, SdTableFilterDefDirective as ɵo, SdTableFilterService as ɵp, SdCommandFilterPipe as ɵq, SdCommandDisablePipe as ɵr, SdCommandIconPipe as ɵs, SdCommandTitlePipe as ɵt, SdColumnTooltipPipe as ɵu, SdFilterColumnPipe as ɵv, SdFilterExternalPipe as ɵw, SdSelectionActionFilterPipe as ɵx, SdSelectionVisiblePipe as ɵy, SdSelectionDisablePipe as ɵz };
+export { DEFAULT_TABLE_CONFIG, MatPaginatorIntlCro, SdFilterOperators, SdTabelCellDefDirective, SdTable, SdTableFilterDefDirective, SdTableModule, SdTableQuickFilter, TABLE_CONFIG, SdTableQuickAction as ɵa, SdDesktopCell as ɵb, SdDesktopCellView as ɵc, SdDesktopCommand as ɵd, SdColumnInlineFilter as ɵe, SdPopupConfiguration as ɵf, SdTableConfigurationService as ɵg, TABLE_CONFIG as ɵi, SdTableFilter as ɵj, SdPopupFilter as ɵk, SdMaterialSubInformationDefDirective as ɵl, SdMaterialFooterDefDirective as ɵm, SdTableFilterService as ɵn, SdCommandFilterPipe as ɵo, SdCommandDisablePipe as ɵp, SdCommandIconPipe as ɵq, SdCommandTitlePipe as ɵr, SdColumnTooltipPipe as ɵs, SdFilterColumnPipe as ɵt, SdFilterExternalPipe as ɵu, SdSelectionActionFilterPipe as ɵv, SdSelectionVisiblePipe as ɵw, SdSelectionDisablePipe as ɵx, SdSelectionVisibleSelectAllPipe as ɵy, SdGroupPipe as ɵz };
 //# sourceMappingURL=sd-angular-core-table.js.map