From 00cdb322d2bd7f1e6571091eb460dc0ccbc36d3f Mon Sep 17 00:00:00 2001 From: wangziqi Date: Sat, 8 Aug 2026 16:36:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20QA=20=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E5=8F=91=E7=8E=B0=E7=9A=84=20console=20=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E2=80=94=E2=80=94useForm=20=E6=9C=AA=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E3=80=81RangePicker=20=E7=A9=BA=E5=80=BC=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E3=80=81dashboard=20=E5=8D=A0=E7=94=A8=E7=8E=87?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/src/pages/ClassroomRentals/index.tsx | 1 + apps/admin/src/pages/Roles/index.tsx | 2 +- apps/admin/src/pages/Users/index.tsx | 6 +++--- apps/server/src/dashboard/dashboard.service.ts | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/admin/src/pages/ClassroomRentals/index.tsx b/apps/admin/src/pages/ClassroomRentals/index.tsx index 6ac02f6..0c06bc1 100644 --- a/apps/admin/src/pages/ClassroomRentals/index.tsx +++ b/apps/admin/src/pages/ClassroomRentals/index.tsx @@ -507,6 +507,7 @@ const ClassroomRentalsPage: React.FC = () => { style={{ width: '100%' }} placeholder={['开始日期', '结束日期']} format="YYYY-MM-DD" + allowEmpty={[true, true]} disabled={!selectedClassroomId} disabledDate={(date) => unavailableDatesLoading || isDateUnavailable(date)} onPanelChange={(dates) => dates.forEach((date) => date && handleCalendarChange(date))} diff --git a/apps/admin/src/pages/Roles/index.tsx b/apps/admin/src/pages/Roles/index.tsx index 4d51097..f8f2f7c 100644 --- a/apps/admin/src/pages/Roles/index.tsx +++ b/apps/admin/src/pages/Roles/index.tsx @@ -352,7 +352,7 @@ const RolesPage: React.FC = () => { onOk={handleSubmit} onCancel={() => roleGuard.confirmClose(() => setModalOpen(false))} width={700} - destroyOnHidden + forceRender confirmLoading={saving} >
diff --git a/apps/admin/src/pages/Users/index.tsx b/apps/admin/src/pages/Users/index.tsx index 97ee139..7cbca91 100644 --- a/apps/admin/src/pages/Users/index.tsx +++ b/apps/admin/src/pages/Users/index.tsx @@ -449,7 +449,7 @@ const UsersPage: React.FC = () => { open={modalOpen} onOk={handleSubmit} onCancel={() => accountGuard.confirmClose(() => setModalOpen(false))} - destroyOnHidden + forceRender confirmLoading={saving} > @@ -496,7 +496,7 @@ const UsersPage: React.FC = () => { open={pwdModalOpen} onOk={handlePwdSubmit} onCancel={() => pwdGuard.confirmClose(() => setPwdModalOpen(false))} - destroyOnHidden + forceRender confirmLoading={saving} > @@ -515,7 +515,7 @@ const UsersPage: React.FC = () => { open={profileModalOpen} onOk={handleProfileSubmit} onCancel={() => profileGuard.confirmClose(() => setProfileModalOpen(false))} - destroyOnHidden + forceRender confirmLoading={saving} > diff --git a/apps/server/src/dashboard/dashboard.service.ts b/apps/server/src/dashboard/dashboard.service.ts index d940dfe..d9a8234 100644 --- a/apps/server/src/dashboard/dashboard.service.ts +++ b/apps/server/src/dashboard/dashboard.service.ts @@ -103,7 +103,7 @@ export class DashboardService { const totalCapacity = await capQb.getRawOne<{ total: string | number | null }>(); // MySQL 的 SUM() 聚合默认以字符串返回,需显式转成 number const cap = Number(totalCapacity?.total ?? 0) || 0; - const occupancyRate = cap > 0 ? ((occupiedBeds / cap) * 100).toFixed(1) : 0; + const occupancyRate = cap > 0 ? ((occupiedBeds / cap) * 100).toFixed(1) : '0.0'; const billStatsQb = this.billRepo .createQueryBuilder('b')