-
+
FatWeb
@@ -115,11 +116,9 @@ const MainFramework: React.FC = () => {
key={subRoute.id}
>
{
})}
{
-
+
{routeChildren?.map((route) => {
return (
@@ -187,7 +184,7 @@ const MainFramework: React.FC = () => {
)
}
-export default MainFramework
+export default HomeFramework
diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index 02ff4d2..92a8bac 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -12,6 +12,7 @@ import '@/assets/css/pages/login.scss'
const Login: React.FC = () => {
const [messageApi, contextHolder] = message.useMessage()
const navigate = useNavigate()
+ const [searchParams] = useSearchParams()
const [isLoggingIn, setIsLoggingIn] = useState(false)
const onFinish = (values: LoginForm) => {
@@ -25,7 +26,11 @@ const Login: React.FC = () => {
setToken(data?.token ?? '')
void messageApi.success('登录成功')
setTimeout(() => {
- navigate('/')
+ if (searchParams.has('redirect')) {
+ navigate(searchParams.get('redirect') ?? '/')
+ } else {
+ navigate('/')
+ }
}, 1500)
break
case SYSTEM_USERNAME_NOT_FOUND:
diff --git a/src/pages/ToolsFramework.tsx b/src/pages/ToolsFramework.tsx
new file mode 100644
index 0000000..fb3c76d
--- /dev/null
+++ b/src/pages/ToolsFramework.tsx
@@ -0,0 +1,197 @@
+import React from 'react'
+import FitFullScreen from '@/components/common/FitFullScreen'
+import '@/assets/css/pages/tools-framework.scss'
+import Icon from '@ant-design/icons'
+import { toolsJsonObjects } from '@/router/tools.tsx'
+import HideScrollbar, { HideScrollbarElement } from '@/components/common/HideScrollbar.tsx'
+import { getLocalStorage, setLocalStorage } from '@/utils/common.ts'
+
+const ToolsFramework: React.FC = () => {
+ const hideScrollbarRef = useRef
(null)
+ const [submenuTop, setSubmenuTop] = useState(0)
+ const [submenuLeft, setSubmenuLeft] = useState(0)
+ const [hideSidebar, setHideSidebar] = useState(getLocalStorage('hideSidebar') === 'false')
+
+ const switchSidebar = () => {
+ setHideSidebar(!hideSidebar)
+ setLocalStorage('hideSidebar', hideSidebar ? 'true' : 'false')
+ setTimeout(() => {
+ hideScrollbarRef.current?.refreshLayout()
+ }, 300)
+ }
+
+ const showSubmenu = (e: React.MouseEvent) => {
+ const parentElement = e.currentTarget.parentElement
+ if (parentElement && parentElement.childElementCount === 2) {
+ const parentClientRect = parentElement.getBoundingClientRect()
+ if (parentClientRect.top <= screen.height / 2) {
+ setSubmenuTop(parentClientRect.top)
+ } else {
+ setSubmenuTop(
+ parentClientRect.top -
+ (parentElement.lastElementChild?.clientHeight ?? 0) +
+ e.currentTarget.clientHeight
+ )
+ }
+ setSubmenuLeft(parentClientRect.right)
+ }
+ }
+
+ return (
+ <>
+
+
+
+
+
+
+ 氮工具
+
+
+
+
+ -
+
+
+ isPending ? 'pending' : isActive ? 'active' : ''
+ }
+ >
+
+ {toolsJsonObjects[0].icon ? (
+
+ ) : undefined}
+
+ {toolsJsonObjects[0].name}
+
+
+ -
+
+
+ isPending ? ' pending' : isActive ? ' active' : ''
+ }
+ >
+
+ {toolsJsonObjects[1].icon ? (
+
+ ) : undefined}
+
+ {toolsJsonObjects[1].name}
+
+
+ -
+
+
+
+
+
+
+ {toolsJsonObjects.map((tool) => {
+ return tool.menu &&
+ tool.id !== 'tools' &&
+ tool.id !== 'tools-all' ? (
+ -
+
+
+ isPending
+ ? 'pending'
+ : isActive
+ ? 'active'
+ : ''
+ }
+ >
+
+ {tool.icon ? (
+
+ ) : undefined}
+
+ {tool.name}
+
+
+
+ {tool.children.map((subTool) => {
+ return subTool.menu ? (
+
-
+
+ isPending
+ ? 'pending'
+ : isActive
+ ? 'active'
+ : ''
+ }
+ >
+
+ {subTool.name}
+
+
+
+ ) : undefined
+ })}
+
+
+ ) : undefined}
+
+ ) : undefined
+ })}
+
+
+
+
+
+
+
+
+
+ 未登录
+
+