Skip to content

增强 util-formatDate ts 类型提示 #6886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

增强 util-formatDate ts 类型提示 #6886

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dff307f
feat: 为 auth layout 添加 slot: logo, 提升组件的灵活性和可复用性
GreatAuk Jun 27, 2025
8fa54e1
Merge branch 'main' of https://github.com/GreatAuk/vue-vben-admin
GreatAuk Jul 2, 2025
7f40bea
Merge branch 'main' of https://github.com/GreatAuk/vue-vben-admin
GreatAuk Sep 2, 2025
aee2e9a
Merge branch 'main' of https://github.com/GreatAuk/vue-vben-admin
GreatAuk Oct 16, 2025
3bf6cf1
Merge branch 'main' of https://github.com/GreatAuk/vue-vben-admin
GreatAuk Nov 7, 2025
85b85bc
feat: 增强 util-formatDate ts 类型提示
GreatAuk Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions packages/@core/base/shared/src/utils/date.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,19 @@ dayjs.extend(timezone);

type FormatDate = Date | dayjs.Dayjs | number | string;

export function formatDate(time: FormatDate, format = 'YYYY-MM-DD') {
type Format =
| 'HH'
| 'HH:mm'
| 'HH:mm:ss'
| 'YYYY'
| 'YYYY-MM'
| 'YYYY-MM-DD'
| 'YYYY-MM-DD HH'
| 'YYYY-MM-DD HH:mm'
| 'YYYY-MM-DD HH:mm:ss'
| (string & {});

export function formatDate(time?: FormatDate, format: Format = 'YYYY-MM-DD') {
try {
const date = dayjs.isDayjs(time) ? time : dayjs(time);
if (!date.isValid()) {
Expand All @@ -16,11 +28,11 @@ export function formatDate(time: FormatDate, format = 'YYYY-MM-DD') {
return date.tz().format(format);
} catch (error) {
console.error(`Error formatting date: ${error}`);
return String(time);
return String(time ?? '');
}
}

export function formatDateTime(time: FormatDate) {
export function formatDateTime(time?: FormatDate) {
return formatDate(time, 'YYYY-MM-DD HH:mm:ss');
}

Expand Down
Loading