Skip to content

Commit 40ae0dc

Browse files
authored
fix(abc:st): correct default value of date type (#1823)
1 parent 772ecb4 commit 40ae0dc

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

packages/abc/st/st-data-source.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,10 @@ export class STDataSource {
239239
text = this.currencySrv.format(value, col.currency?.format);
240240
break;
241241
case 'date':
242-
text = value === col.default ? col.default : this.datePipe.transform(value, col.dateFormat);
242+
text =
243+
value == null || value === col.default || (typeof value === 'number' && value <= 0)
244+
? col.default
245+
: this.datePipe.transform(value, col.dateFormat);
243246
break;
244247
case 'yn':
245248
text = this.ynPipe.transform(value === col.yn!.truth, col.yn!.yes!, col.yn!.no!, col.yn!.mode!, false);

packages/abc/st/test/st-data-source.spec.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -791,6 +791,14 @@ describe('abc: table: data-souce', () => {
791791
done();
792792
});
793793
});
794+
it('should be return default value when is 0 timestamp', done => {
795+
options.columns[0] = { index: 'date', type: 'date', default: '-' } as _STColumn;
796+
options.data = [{ date: 0 }, { date: new Date() }];
797+
srv.process(options).subscribe(res => {
798+
expect(res.list[0]._values[0].text).toBe('-');
799+
done();
800+
});
801+
});
794802
});
795803
it('via yn', done => {
796804
options.columns[0].type = 'yn';

0 commit comments

Comments
 (0)