From 7cf530b0b63c8a06777f3915b08d742e46e2a5fc Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 09 四月 2025 15:42:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

---
 rsf-admin/src/page/system/role/AssignPermissions.jsx |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/rsf-admin/src/page/system/role/AssignPermissions.jsx b/rsf-admin/src/page/system/role/AssignPermissions.jsx
index d9fd08b..7be80ae 100644
--- a/rsf-admin/src/page/system/role/AssignPermissions.jsx
+++ b/rsf-admin/src/page/system/role/AssignPermissions.jsx
@@ -177,11 +177,11 @@
             <Card sx={{
                 ml: 1,
                 mr: 1,
-                height: '620px'
+                height: 'calc(100vh - 140px)',
+                overflowY: 'auto'
             }}>
                 <CardContent sx={{
                     overflow: 'auto',
-                    height: '100%',
                     display: 'flex',
                     flexDirection: 'column',
                     justifyContent: 'space-between'
@@ -218,7 +218,6 @@
                         </Box>
 
                         <Box sx={{
-                            height: 480,
                             minWidth: 290,
                             overflow: 'auto',
                             marginTop: '10px',

--
Gitblit v1.9.1