Browse Source

refactor(approval-flow): use ABP date utilities

pull/1568/head
colin 3 weeks ago
parent
commit
ff33a202ba
  1. 15
      apps/vben5/packages/@abp/approval-flow/src/components/instances/ApprovalInstanceDetailModal.vue
  2. 3
      apps/vben5/packages/@abp/approval-flow/src/components/instances/StatusFlow.vue
  3. 8
      apps/vben5/packages/@abp/approval-flow/src/components/instances/approval-table-utils.ts

15
apps/vben5/packages/@abp/approval-flow/src/components/instances/ApprovalInstanceDetailModal.vue

@ -10,6 +10,7 @@ import { computed, ref, watch } from 'vue';
import { $t } from '@vben/locales';
import { formatToDateTime } from '@abp/core';
import {
Button,
Descriptions,
@ -320,10 +321,6 @@ function actionText(actionKey?: null | string): string {
}
return $t(`ElsaNextApprovalFlow.ApprovalRecordAction:${actionKey}`);
}
function format(value?: null | string): string {
return value ? new Date(value).toLocaleString() : '-';
}
</script>
<template>
@ -499,14 +496,14 @@ function format(value?: null | string): string {
<DescriptionsItem
:label="$t('ElsaNextApprovalFlow.ApprovalFlow:Common:StartedAt')"
>
{{ format(detail.instance.startedAt) }}
{{ formatToDateTime(detail.instance.startedAt) }}
</DescriptionsItem>
<DescriptionsItem
:label="
$t('ElsaNextApprovalFlow.ApprovalFlow:Instance:FinishedAt')
"
>
{{ format(detail.instance.finishedAt) }}
{{ formatToDateTime(detail.instance.finishedAt) }}
</DescriptionsItem>
</Descriptions>
</Tabs.TabPane>
@ -532,7 +529,7 @@ function format(value?: null | string): string {
}}
</span>
<span class="ml-2 text-xs text-gray-400">
{{ format(record.occurredAt) }}
{{ formatToDateTime(record.occurredAt) }}
</span>
</div>
<div
@ -544,12 +541,12 @@ function format(value?: null | string): string {
$t(
'ElsaNextApprovalFlow.ApprovalFlow:Instance:FirstViewed',
)
}}:{{ format(record.firstViewedAt) }}
}}:{{ formatToDateTime(record.firstViewedAt) }}
</span>
<span v-if="record.completedAt" class="ml-3">
{{
$t('ElsaNextApprovalFlow.ApprovalFlow:Instance:Completed')
}}:{{ format(record.completedAt) }}
}}:{{ formatToDateTime(record.completedAt) }}
</span>
<span
v-if="record.firstViewedAt && record.completedAt"

3
apps/vben5/packages/@abp/approval-flow/src/components/instances/StatusFlow.vue

@ -7,6 +7,7 @@ import type {
import { $t } from '@vben/locales';
import { formatToDateTime } from '@abp/core';
import { Tag } from 'ant-design-vue';
const props = defineProps<{
@ -138,7 +139,7 @@ function onChildSelect() {
}}
</span>
<span v-if="latestRecord(node.id)?.occurredAt" class="status-time">
{{ new Date(latestRecord(node.id)!.occurredAt).toLocaleString() }}
{{ formatToDateTime(latestRecord(node.id)!.occurredAt) }}
</span>
</div>
<div v-if="node.kind === 'cc'" class="status-line status-muted">

8
apps/vben5/packages/@abp/approval-flow/src/components/instances/approval-table-utils.ts

@ -1,5 +1,7 @@
import { $t } from '@vben/locales';
import { formatToDateTime, toDate } from '@abp/core';
export function actionText(actionKey?: null | string): string {
if (!actionKey) {
return '-';
@ -8,7 +10,7 @@ export function actionText(actionKey?: null | string): string {
}
export function formatDateTime(value?: null | string): string {
return value ? new Date(value).toLocaleString() : '-';
return value ? formatToDateTime(value) : '-';
}
export function statusColor(status: string): string {
@ -61,8 +63,8 @@ export function formatDuration(
if (!firstViewedAt || !completedAt) {
return '-';
}
const start = new Date(firstViewedAt).getTime();
const end = new Date(completedAt).getTime();
const start = toDate(firstViewedAt).valueOf();
const end = toDate(completedAt).valueOf();
if (Number.isNaN(start) || Number.isNaN(end) || end < start) {
return '-';
}

Loading…
Cancel
Save