fangmingyue 1年前
父节点
当前提交
659dcdc32c

+ 6
- 6
src/layouts/AuthLayout/components/Menus.jsx 查看文件

@@ -1,10 +1,10 @@
1
-import React from 'react';
2
-import { Menu } from 'antd';
1
+import React from 'react'
2
+import { Menu } from 'antd'
3 3
 
4
-const menuStyle = { height: '100%' };
4
+const menuStyle = { height: '100%' }
5 5
 
6 6
 export default (props) => {
7
-  const { theme, items, location } = props;
7
+  const { theme, items, location } = props
8 8
 
9 9
   // const selectedKeys = React.useMemo(() => {
10 10
   //   const parts = location.pathname.split('/').filter(Boolean);
@@ -18,12 +18,12 @@ export default (props) => {
18 18
   //   return keys;
19 19
   // }, [location.pathname]);
20 20
 
21
-  const selectedKeys = [location.pathname];
21
+  const selectedKeys = [location.pathname]
22 22
   return (
23 23
     <Menu
24 24
       mode="inline"
25 25
       style={menuStyle}
26
-      theme={theme}
26
+      theme="light"
27 27
       items={items}
28 28
       selectedKeys={selectedKeys}
29 29
     />

+ 11
- 12
src/layouts/AuthLayout/components/SiderBar.jsx 查看文件

@@ -1,21 +1,20 @@
1
-import React, { useMemo } from 'react';
2
-import { Layout, Spin } from 'antd';
3
-import { getPropertyValue } from '@/utils/css';
4
-import Menus from './Menus';
5
-
6
-const { Sider } = Layout;
1
+import React, { useMemo } from 'react'
2
+import { Layout, Spin } from 'antd'
3
+import { getPropertyValue } from '@/utils/css'
4
+import Menus from './Menus'
7 5
 
6
+const { Sider } = Layout
8 7
 
9 8
 export default (props) => {
10
-  const { theme, location, menus } = props;
9
+  const { theme, location, menus } = props
11 10
 
12 11
   const width = useMemo(() => {
13
-    return /\d+/.exec(getPropertyValue('--siderbar-width'))[0] - 0;
14
-  }, []);
12
+    return /\d+/.exec(getPropertyValue('--siderbar-width'))[0] - 0
13
+  }, [])
15 14
 
16 15
   return (
17
-    <Sider className='layout-sidebar' theme={theme} collapsible width={width}>
18
-      <Menus theme={theme} items={menus} location={location} />
16
+    <Sider className="layout-sidebar" theme="light" collapsible width={width}>
17
+      <Menus items={menus} location={location} />
19 18
     </Sider>
20
-  );
19
+  )
21 20
 }

+ 26
- 26
src/layouts/AuthLayout/index.jsx 查看文件

@@ -1,36 +1,36 @@
1
-import React from "react";
2
-import { Spin, Layout } from "antd";
3
-import HtmlTitle from "./components/HtmlTitle";
1
+import React from 'react'
2
+import { Spin, Layout } from 'antd'
3
+import HtmlTitle from './components/HtmlTitle'
4 4
 // import Main from './Main';
5
-import { useLocation, useNavigate } from "react-router-dom";
6
-import { useModel } from "@/store";
5
+import { useLocation, useNavigate } from 'react-router-dom'
6
+import { useModel } from '@/store'
7 7
 
8
-import SiderBar from "./components/SiderBar";
9
-import Header from "./components/Header";
10
-import Container from "./components/Container";
11
-import { authRoutes } from "@/routes/routes";
12
-import { getMenuItems } from "@/routes/menus";
13
-import RequireLogin from "./RequireLogin";
14
-import "./style.less";
8
+import SiderBar from './components/SiderBar'
9
+import Header from './components/Header'
10
+import Container from './components/Container'
11
+import { authRoutes } from '@/routes/routes'
12
+import { getMenuItems } from '@/routes/menus'
13
+import RequireLogin from './RequireLogin'
14
+import './style.less'
15 15
 
16 16
 const Spinner = () => (
17 17
   <div
18 18
     style={{
19
-      width: "100%",
20
-      height: "100%",
21
-      display: "grid",
22
-      placeItems: "center",
19
+      width: '100%',
20
+      height: '100%',
21
+      display: 'grid',
22
+      placeItems: 'center',
23 23
     }}
24 24
   >
25 25
     <Spin />
26 26
   </div>
27
-);
27
+)
28 28
 
29 29
 export default (props) => {
30
-  const { theme } = useModel("system");
31
-  const { user, menus } = useModel("user");
32
-  const navigate = useNavigate();
33
-  const location = useLocation();
30
+  const { theme } = useModel('system')
31
+  const { user, menus } = useModel('user')
32
+  const navigate = useNavigate()
33
+  const location = useLocation()
34 34
   // const menus = getMenuItems(authRoutes);
35 35
   // const RequireLogin = React.lazy(() => {
36 36
   //   return withLogin(import("./Main"));
@@ -42,15 +42,15 @@ export default (props) => {
42 42
       <HtmlTitle />
43 43
       {/* <React.Suspense fallback={<Spinner />}> */}
44 44
       <RequireLogin>
45
-        <Layout className={theme} style={{ height: "100vh" }}>
45
+        <Layout className={theme} style={{ height: '100vh' }}>
46 46
           <Header theme={theme} user={user} />
47
-          <Layout style={{ height: "calc(100vh - var(--header-height))" }}>
48
-            <SiderBar theme={theme} menus={menus} location={location} />
47
+          <Layout style={{ height: 'calc(100vh - var(--header-height))' }}>
48
+            <SiderBar menus={menus} location={location} />
49 49
             <Container location={location} />
50 50
           </Layout>
51 51
         </Layout>
52 52
       </RequireLogin>
53 53
       {/* </React.Suspense> */}
54 54
     </Spin>
55
-  );
56
-};
55
+  )
56
+}

+ 1
- 1
src/store/models/system.js 查看文件

@@ -2,7 +2,7 @@ import { useState, useCallback } from "react";
2 2
 
3 3
 export default function useSystem () {
4 4
   // 主题
5
-  const [theme, updateTheme] = useState('light');
5
+  const [theme, updateTheme] = useState('dark');
6 6
 
7 7
   // 其他配置
8 8
   const [app, setApp] = useState({