diff --git a/lib/ng-nest/ui/time-ago/time-ago.pipe.ts b/lib/ng-nest/ui/time-ago/time-ago.pipe.ts index 6cf56b5d9..4a23c4d1c 100644 --- a/lib/ng-nest/ui/time-ago/time-ago.pipe.ts +++ b/lib/ng-nest/ui/time-ago/time-ago.pipe.ts @@ -9,7 +9,8 @@ export class XTimeAgoPipe implements PipeTransform { locale: XI18nTimeAgo = {}; private catchContent: any; constructor(private datePipe: DatePipe, private i18n: XI18nService) {} - transform(input: XDate): string { + transform(input?: XDate): string { + if (!input) return ''; const date = XToDate(input); if (isNaN(date.valueOf())) { return input as string; diff --git a/lib/ng-nest/ui/timeline/timeline.property.ts b/lib/ng-nest/ui/timeline/timeline.property.ts index f876a1aef..a287acaa0 100644 --- a/lib/ng-nest/ui/timeline/timeline.property.ts +++ b/lib/ng-nest/ui/timeline/timeline.property.ts @@ -1,4 +1,4 @@ -import { XType, XSize, XData, XTemplate, XProperty, XIdentityProperty, XDataConvert, XWithConfig } from '@ng-nest/ui/core'; +import { XType, XSize, XData, XTemplate, XProperty, XIdentityProperty, XDataConvert, XWithConfig, XDate } from '@ng-nest/ui/core'; import { Input, Component } from '@angular/core'; /** @@ -45,7 +45,7 @@ export interface XTimelineNode extends XIdentityProperty { * @zh_CN 时间 * @en_US Time */ - time?: string | Date; + time?: XDate; /** * @zh_CN 内容 * @en_US Content