Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

2026-05-10 20:52:10 +08:00 · 2026-04-28 09:49:13 +08:00
parent 5586be16b9 36d7dc23fa
commit 6a5c5ae54c
4 changed files with 26 additions and 4 deletions
--- a/packages/@core/base/shared/src/utils/date.ts
+++ b/packages/@core/base/shared/src/utils/date.ts
@@ -20,6 +20,9 @@ type Format =
  | (string & {});

 export function formatDate(time?: FormatDate, format: Format = 'YYYY-MM-DD') {
+  if (time === undefined || time === null || time === '') {
+    return '';
+  }
  try {
    const date = dayjs.isDayjs(time) ? time : dayjs(time);
    if (!date.isValid()) {