双栏布局调整

slowlyo · Dec 4, 2023 · b6f246c · b6f246c
1 parent 0169e1f
commit b6f246c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/admin-views/.env b/admin-views/.env
@@ -3,6 +3,6 @@ VITE_BASE_URL=/admin
 # 接口前缀 (默认)
 VITE_API_PREFIX=/admin-api
 # 代理地址, mode != production 时生效
-VITE_PROXY_URL=http://owl-admin-demo.test
+VITE_PROXY_URL=http://owl-admin.test
 # 代理地址是否更改origin
 VITE_PROXY_CHANGE_ORIGIN=Y
diff --git a/admin-views/src/layouts/DoubleLayout/index.tsx b/admin-views/src/layouts/DoubleLayout/index.tsx
@@ -124,13 +124,17 @@ export const DoubleLayout = () => {
                    className="border-r overflow-y-auto"
                    theme="light"
                    collapsed={collapsed}>
-                {(!collapsed && !!childrenRoutes?.length) && (
-                    <div className="h-[65px] border-b flex justify-center items-center text-xl font-semibold truncate">
-                        {getSetting('app_name')}
+                <div className="h-full overflow-hidden">
+                    {(!collapsed && !!childrenRoutes?.length) && (
+                        <div className="h-[65px] border-b flex justify-center items-center text-xl font-semibold truncate">
+                            {getSetting('app_name')}
+                        </div>
+                    )}
+
+                    <div className="h-full">
+                        <LayoutMenu collapsed={collapsed} routeProps={childrenRoutes}/>
                     </div>
-                )}
-
-                <LayoutMenu collapsed={collapsed} routeProps={childrenRoutes}/>
+                </div>
             </Sider>
             <Layout>
                 <Header className="h-[65px] leading-none flex justify-between items-center border-b p-0">