Bläddra i källkod

格式化代码

jihuaqiang 1 månad sedan
förälder
incheckning
070bdf2ded
2 ändrade filer med 20 tillägg och 18 borttagningar
  1. 14 15
      src/components/layout/sidebar.tsx
  2. 6 3
      src/views/messages/messages.tsx

+ 14 - 15
src/components/layout/sidebar.tsx

@@ -38,26 +38,16 @@ const PageSidebar = (props: {
 }) => {
 	const { notReadMessageCount } = useMessagesHook()
 	const [menuItems, setMenuItems] = useState<any[]>([])
-
-	useEffect(() => {
-		const _menuItems = getMenuItems(routes, notReadMessageCount)
-		console.log('menuItems', _menuItems)
-		setMenuItems(_menuItems)
-	}, [notReadMessageCount])
   const { autoCollapse = true } = props
   const navigate = useNavigate()
   const [selectedKeys, setSelectedKeys] = useState<string[]>([])
   const [lastOpenedMenu, setLastOpenedMenu] = useState<string[]>([])
   const location = useLocation()
 
-	const onSwitchMenu = ({ key, keyPath }: { key: string; keyPath: string[] }) => {
-    if (autoCollapse && keyPath.slice(1)) setLastOpenedMenu(keyPath.slice(1))
-    navigate(key)
-  }
-
-  const onOpenChange = (openKeys: string[]) => {
-    setLastOpenedMenu(openKeys)
-  }
+	useEffect(() => {
+		const _menuItems = getMenuItems(routes, notReadMessageCount)
+		setMenuItems(_menuItems)
+	}, [notReadMessageCount])
 
 	useEffect(() => {
 		setSelectedKeys([`${location.pathname}`])
@@ -66,7 +56,16 @@ const PageSidebar = (props: {
 			setLastOpenedMenu([`/${lastOpenedMenu}`])
 		}
     navigate(location.pathname)
-  }, [location.pathname, navigate])
+	}, [location.pathname, navigate])
+	
+	const onSwitchMenu = ({ key, keyPath }: { key: string; keyPath: string[] }) => {
+    if (autoCollapse && keyPath.slice(1)) setLastOpenedMenu(keyPath.slice(1))
+    navigate(key)
+  }
+
+  const onOpenChange = (openKeys: string[]) => {
+    setLastOpenedMenu(openKeys)
+  }
 
   return (
 		<Sider theme='light'>

+ 6 - 3
src/views/messages/messages.tsx

@@ -26,6 +26,11 @@ const Messages = () => {
 	const [loading, setLoading] = useState(false)
 	const [page, setPage] = useState(1)
 	const [total, setTotal] = useState(0)
+
+	useEffect(() => {
+		getMessages()
+	}, [page])
+	
 	const getMessages = async () => {
 		setLoading(true)
 		const response = await request.post<{ objs: Message[], totalSize	: number }>(getNoticeList,{
@@ -37,9 +42,7 @@ const Messages = () => {
 		setTotal(totalSize)
 		setLoading(false)
 	}
-	useEffect(() => {
-		getMessages()
-	}, [page])
+
 	const handleReadMessage = async (id: number, status: MessageStatus) => {
 		if (status === MessageStatus.READ) return
 		const response = await request.post(readNotice, {