@sd-angular/core 1.0.65 → 1.0.68

package/bundles/sd-angular-core-grid-material.umd.js

@@ -3073,7 +3073,7 @@
     SdDesktopCellView.decorators = [
         { type: core.Component, args: [{
                     selector: 'sd-desktop-cell-view',
-                    template: "<ng-container *ngIf=\"item[column.field] | cellView:item:column:gridOption:key | async as view\">\r\n  <ng-container *ngIf=\"view.display.hasHtml;else useValue\">\r\n    <div *ngIf=\"view.click\" (click)=\"view.click()\" class=\"text-break cursor-pointer\" [matTooltip]=\"view.tooltip\"\r\n      [innerHTML]=\"view.display.html | safeHtml\">\r\n    </div>\r\n    <div *ngIf=\"!view.click\" class=\"text-break\" [matTooltip]=\"view.tooltip\" [innerHTML]=\"view.display.html | safeHtml\">\r\n    </div>\r\n  </ng-container>\r\n  <ng-template #useValue>\r\n    <ng-container *ngIf=\"!!view.badge; else noBadge\">\r\n      <sd-badge [type]=\"view.badge.type\" [title]=\"view.display.value\" [color]=\"view.badge.color\"\r\n        [icon]=\"view.badge.icon\" [tooltip]=\"view.tooltip\" (sdClick)=\"column.click(item[column.field], item)\"></sd-badge>\r\n    </ng-container>\r\n    <ng-template #noBadge>\r\n      <ng-container *ngIf=\"column.type !== 'children'; else childrenView\">\r\n        <div *ngIf=\"column.type !== 'image'\" class=\"text-break\" [class.text-center]=\"view.display.align === 'center'\"\r\n          [class.text-right]=\"view.display.align === 'right'\" [matTooltip]=\"view.tooltip\">\r\n          <a *ngIf=\"!!view.click\" href=\"javascript:;\" (click)=\"view.click()\">{{view.display.value}}</a>\r\n          <ng-container *ngIf=\"!view.click\">{{view.display.value}}\r\n          </ng-container>\r\n        </div>\r\n        <div *ngIf=\"column.type === 'image'\" class=\"align-middle text-center\">\r\n          <img *ngIf=\"view.display.value\" [src]=\"view.display.value\" [width]=\"column.option?.width\"\r\n            [height]=\"column.option?.height\" class=\"c-image\" (click)=\"!!view.click && view.click()\"\r\n            [class.cursor-pointer]=\"!!view.click\">\r\n          <mat-icon *ngIf=\"!view.display.value\" class=\"c-img\" [class.cursor-pointer]=\"!!view.click\"\r\n            (click)=\"!!view.click && view.click()\">\r\n            image</mat-icon>\r\n        </div>\r\n      </ng-container>\r\n      <ng-template #childrenView>\r\n        <sd-desktop-cell-children-view [key]=\"key\" [item]=\"item\" [column]=\"column\">\r\n        </sd-desktop-cell-children-view>\r\n      </ng-template>\r\n    </ng-template>\r\n  </ng-template>\r\n</ng-container>",
+                    template: "<ng-container *ngIf=\"item[column.field] | cellView:item:column:gridOption:key | async as view\">\r\n  <ng-container *ngIf=\"view.display.hasHtml;else useValue\">\r\n    <div *ngIf=\"view.click\" (click)=\"view.click()\" class=\"text-break cursor-pointer\" [matTooltip]=\"view.tooltip\"\r\n      [class.text-center]=\"view.display.align === 'center'\" [class.text-right]=\"view.display.align === 'right'\"\r\n      [innerHTML]=\"view.display.html | safeHtml\">\r\n    </div>\r\n    <div *ngIf=\"!view.click\" class=\"text-break\" [matTooltip]=\"view.tooltip\"\r\n      [class.text-center]=\"view.display.align === 'center'\" [class.text-right]=\"view.display.align === 'right'\"\r\n      [innerHTML]=\"view.display.html | safeHtml\">\r\n    </div>\r\n  </ng-container>\r\n  <ng-template #useValue>\r\n    <ng-container *ngIf=\"!!view.badge; else noBadge\">\r\n      <sd-badge [type]=\"view.badge.type\" [title]=\"view.display.value\" [color]=\"view.badge.color\"\r\n        [icon]=\"view.badge.icon\" [tooltip]=\"view.tooltip\" (sdClick)=\"column.click(item[column.field], item)\"></sd-badge>\r\n    </ng-container>\r\n    <ng-template #noBadge>\r\n      <ng-container *ngIf=\"column.type !== 'children'; else childrenView\">\r\n        <div *ngIf=\"column.type !== 'image'\" class=\"text-break\" [class.text-center]=\"view.display.align === 'center'\"\r\n          [class.text-right]=\"view.display.align === 'right'\" [matTooltip]=\"view.tooltip\">\r\n          <a *ngIf=\"!!view.click\" href=\"javascript:;\" (click)=\"view.click()\">{{view.display.value}}</a>\r\n          <ng-container *ngIf=\"!view.click\">{{view.display.value}}\r\n          </ng-container>\r\n        </div>\r\n        <div *ngIf=\"column.type === 'image'\" class=\"align-middle text-center\">\r\n          <img *ngIf=\"view.display.value\" [src]=\"view.display.value\" [width]=\"column.option?.width\"\r\n            [height]=\"column.option?.height\" class=\"c-image\" (click)=\"!!view.click && view.click()\"\r\n            [class.cursor-pointer]=\"!!view.click\">\r\n          <mat-icon *ngIf=\"!view.display.value\" class=\"c-img\" [class.cursor-pointer]=\"!!view.click\"\r\n            (click)=\"!!view.click && view.click()\">\r\n            image</mat-icon>\r\n        </div>\r\n      </ng-container>\r\n      <ng-template #childrenView>\r\n        <sd-desktop-cell-children-view [key]=\"key\" [item]=\"item\" [column]=\"column\">\r\n        </sd-desktop-cell-children-view>\r\n      </ng-template>\r\n    </ng-template>\r\n  </ng-template>\r\n</ng-container>",
                     changeDetection: core.ChangeDetectionStrategy.OnPush,
                     styles: [".text-black400{color:#757575}.c-color-success{color:#4caf50}.c-color-danger{color:#f82c13}.c-image{-o-object-fit:contain;margin:5px 0;object-fit:contain}.c-img{font-size:30px;opacity:.5}.c-img.pointer:hover{opacity:.9}"]
                 },] }
@@ -4326,7 +4326,7 @@
         SdCellViewPipe.prototype.transform = function (value, rowData, column, gridOption, key) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var displayOnEmpty, align, click, tooltip, htmlTemplate, transform, result, transformDate, val, _b, option, seconds, _c, option;
+                var displayOnEmpty, align, click, tooltip, htmlTemplate, transform, result, transformDate, val, _b, option, seconds, _c, option, values, display, emptyValues;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -4417,14 +4417,33 @@
                             }
                             _d.label = 9;
                         case 9:
-                            if (displayOnEmpty && (result.display.value === null || result.display.value === undefined || result.display.value === '')) {
-                                if (typeof (displayOnEmpty) === 'function') {
-                                    result.display.hasHtml = true;
-                                    result.display.html = displayOnEmpty(rowData, column);
+                            if (displayOnEmpty) {
+                                values = [null, undefined, ''];
+                                if (typeof (displayOnEmpty) === 'object') {
+                                    display = displayOnEmpty.display, emptyValues = displayOnEmpty.emptyValues;
+                                    values = __spread([null, undefined, ''], emptyValues);
+                                    if (values.includes(result.display.value)) {
+                                        if (typeof (display) === 'function') {
+                                            result.display.hasHtml = true;
+                                            result.display.html = display(rowData, column);
+                                        }
+                                        else {
+                                            result.display.hasHtml = true;
+                                            result.display.html = "<div class=\"T16R text-black400\">--</div>";
+                                        }
+                                    }
                                 }
                                 else {
-                                    result.display.hasHtml = true;
-                                    result.display.html = "<div class=\"T16R text-black400\">--</div>";
+                                    if (values.includes(result.display.value)) {
+                                        if (typeof (displayOnEmpty) === 'function') {
+                                            result.display.hasHtml = true;
+                                            result.display.html = displayOnEmpty(rowData, column);
+                                        }
+                                        else {
+                                            result.display.hasHtml = true;
+                                            result.display.html = "<div class=\"T16R text-black400\">--</div>";
+                                        }
+                                    }
                                 }
                             }
                             _d.label = 10;