From 330f2d81ed70eb220ca57141c96c4f765c7ac96a Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 29 Jan 2026 20:42:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=A7=9F=E6=88=B7=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=9F=E6=88=B7=E7=BC=96=E8=BE=91=E6=97=B6?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4=E5=A4=84=E7=90=86=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复租户编辑时，从接口获取的 expireTime 字符串未转换为 dayjs 对象导致表单显示异常的问题。
同时移除未使用的 dayjs 导入和过期时间默认值注释，避免潜在的类型错误。
---
 apps/web-antd/src/views/system/tenant/data.tsx          | 6 ++----
 apps/web-antd/src/views/system/tenant/tenant-drawer.vue | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/web-antd/src/views/system/tenant/data.tsx b/apps/web-antd/src/views/system/tenant/data.tsx
index f5b6b32a..4ce519d8 100644
--- a/apps/web-antd/src/views/system/tenant/data.tsx
+++ b/apps/web-antd/src/views/system/tenant/data.tsx
@@ -3,8 +3,6 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
 
 import { getPopupContainer } from '@vben/utils';
 
-import dayjs from 'dayjs';
-
 import { z } from '#/adapter/form';
 
 export const querySchema: FormSchemaGetter = () => [
@@ -73,7 +71,7 @@ export const columns: VxeGridProps['columns'] = [
   },
 ];
 
-const defaultExpireTime = dayjs().add(365, 'days').startOf('day');
+// const defaultExpireTime = dayjs().add(365, 'days').startOf('day');
 
 export const drawerSchema: FormSchemaGetter = () => [
   {
@@ -188,7 +186,7 @@ export const drawerSchema: FormSchemaGetter = () => [
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
       getPopupContainer,
     },
-    defaultValue: defaultExpireTime,
+    // defaultValue: defaultExpireTime,
     fieldName: 'expireTime',
     help: `已经设置过期时间不允许重置为'无期限'\n即在开通时未设置无期限 以后都不允许设置`,
     label: '过期时间',
diff --git a/apps/web-antd/src/views/system/tenant/tenant-drawer.vue b/apps/web-antd/src/views/system/tenant/tenant-drawer.vue
index 09e66fc5..f59241b7 100644
--- a/apps/web-antd/src/views/system/tenant/tenant-drawer.vue
+++ b/apps/web-antd/src/views/system/tenant/tenant-drawer.vue
@@ -108,6 +108,9 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
         tenantInfo(id),
         setupPackageSelect(),
       ]);
+      record.expireTime = record.expireTime
+        ? (dayjs(record.expireTime) as any)
+        : undefined;
       await formApi.setValues(record);
     } else {
       await setupPackageSelect();