fix(abc:st): fix invalid default value of date type (ng-alain#765)

- close ng-alain/ng-alain#1471
goten002 · May 20, 2020 · 6abc0d9 · 6abc0d9
1 parent 30774cd
commit 6abc0d9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/packages/abc/table/table-data-source.ts b/packages/abc/table/table-data-source.ts
@@ -66,7 +66,7 @@ export class STDataSource {
     @Host() private ynPipe: YNPipe,
     @Host() private numberPipe: DecimalPipe,
     private dom: DomSanitizer,
-  ) { }
+  ) {}
 
   process(options: STDataSourceOptions): Observable<STDataSourceResult> {
     let data$: Observable<STData[]>;
@@ -159,9 +159,7 @@ export class STDataSource {
       data$ = data$.pipe(map(result => res.process!(result, rawData)));
     }
 
-    data$ = data$.pipe(
-      map(result => this.optimizeData({ result, columns, rowClassName: options.rowClassName })),
-    );
+    data$ = data$.pipe(map(result => this.optimizeData({ result, columns, rowClassName: options.rowClassName })));
 
     return data$.pipe(
       map(result => {
@@ -208,7 +206,7 @@ export class STDataSource {
         text = this.currentyPipe.transform(value);
         break;
       case 'date':
-        text = this.datePipe.transform(value, col.dateFormat);
+        text = value === col.default ? col.default : this.datePipe.transform(value, col.dateFormat);
         break;
       case 'yn':
         text = this.ynPipe.transform(value === col.yn!.truth, col.yn!.yes!, col.yn!.no!, col.yn!.mode!);

diff --git a/packages/abc/table/test/table-data-source.spec.ts b/packages/abc/table/test/table-data-source.spec.ts
@@ -721,12 +721,22 @@ describe('abc: table: data-souce', () => {
           done();
         });
       });
-      it('via date', done => {
-        options.columns[0].type = 'date';
-        spyOn(datePipe, 'transform');
-        srv.process(options).subscribe(() => {
-          expect(datePipe.transform).toHaveBeenCalled();
-          done();
+      describe('via date', () => {
+        it('should be working', done => {
+          options.columns[0].type = 'date';
+          spyOn(datePipe, 'transform');
+          srv.process(options).subscribe(() => {
+            expect(datePipe.transform).toHaveBeenCalled();
+            done();
+          });
+        });
+        it('should be return default value', done => {
+          options.columns[0] = { index: 'date', type: 'date', default: '-' };
+          options.data = [{}, { date: new Date() }];
+          srv.process(options).subscribe(res => {
+            expect(res.list[0]._values[0].text).toBe('-');
+            done();
+          });
         });
       });
       it('via yn', done => {