-
+
{nickName}
- {email}
+ {nickName}
+
+ {role} - {roleName}
+
+ {email}
+
-
- {data && (
-
window.open("https://github.com/d3george/slash-admin")}>
+ window.open("https://github.com/d3george/slash-admin", "WindowName", "noopener")}
+ >
+ {/* 小屏隐藏菜单栏 */}
- {data?.province}
- {data?.city}
- {data?.weather}
- {data?.temperature}°
- {data?.winddirection}风
- {data?.windpower}级
- 湿度 {data?.humidity} %
-
- )}
-
+ {data?.province}
+ {data?.city}
+ {data?.weather}
+ {data?.temperature}°
+ {data?.winddirection}风
+ {data?.windpower}级
+ 湿度 {data?.humidity} %
+
+ {
);
-};
-
-export default Main;
+});
diff --git a/src/layouts/dashboard/multi-tabs/components/sortable-container.tsx b/src/layouts/default/multi-tabs/components/sortable-container.tsx
similarity index 100%
rename from src/layouts/dashboard/multi-tabs/components/sortable-container.tsx
rename to src/layouts/default/multi-tabs/components/sortable-container.tsx
diff --git a/src/layouts/dashboard/multi-tabs/components/sortable-item.tsx b/src/layouts/default/multi-tabs/components/sortable-item.tsx
similarity index 91%
rename from src/layouts/dashboard/multi-tabs/components/sortable-item.tsx
rename to src/layouts/default/multi-tabs/components/sortable-item.tsx
index 0886cd5..8c8242f 100644
--- a/src/layouts/dashboard/multi-tabs/components/sortable-item.tsx
+++ b/src/layouts/default/multi-tabs/components/sortable-item.tsx
@@ -36,6 +36,11 @@ export const SortableItem = ({ tab, onClick }: Props) => {
{...listeners}
id={`tab${tab.key.split("/").join("-")}`}
onClick={onClick}
+ onKeyDown={(e) => {
+ if (e.key === "Enter" || e.key === " ") {
+ onClick();
+ }
+ }}
className={cn("flex-shrink-0 rounded-t-lg border border-border", isActive && "text-primary")}
>
+
);
-}
+});
diff --git a/src/layouts/dashboard/nav/nav-logo.tsx b/src/layouts/default/nav/nav-logo.tsx
similarity index 100%
rename from src/layouts/dashboard/nav/nav-logo.tsx
rename to src/layouts/default/nav/nav-logo.tsx
diff --git a/src/layouts/dashboard/nav/nav-vertical.tsx b/src/layouts/default/nav/nav-vertical.tsx
similarity index 92%
rename from src/layouts/dashboard/nav/nav-vertical.tsx
rename to src/layouts/default/nav/nav-vertical.tsx
index 3704ee0..167b7d5 100644
--- a/src/layouts/dashboard/nav/nav-vertical.tsx
+++ b/src/layouts/default/nav/nav-vertical.tsx
@@ -1,26 +1,23 @@
import type { MenuProps } from "antd";
import { Layout, Menu } from "antd";
-import { useEffect, useMemo, useState } from "react";
+import { forwardRef, useEffect, useMemo, useState } from "react";
import { useMatches, useNavigate } from "react-router";
import Scrollbar from "@/components/scrollbar";
import { useFlattenedRoutes, usePathname, usePermissionRoutes, useRouteToMenuFn } from "@/router/hooks";
import { menuFilter } from "@/router/utils";
import { useSettingActions, useSettings } from "@/store/settingStore";
-
+import { ThemeLayout, ThemeMode } from "#/enum";
import { NAV_WIDTH } from "../config";
-
import NavLogo from "./nav-logo";
-import { ThemeLayout, ThemeMode } from "#/enum";
-
-const { Sider } = Layout;
-
type Props = {
closeSideBarDrawer?: () => void;
};
-export default function NavVertical(props: Props) {
+// export default function NavVertical(props: Props) {
+export default forwardRef(function Nav(props, ref) {
+ const { Sider } = Layout;
const navigate = useNavigate();
const matches = useMatches();
const pathname = usePathname();
@@ -84,6 +81,7 @@ export default function NavVertical(props: Props) {
return (
);
-}
+});
diff --git a/src/layouts/simple/index.tsx b/src/layouts/simple/index.tsx
index d4a3d16..dde7182 100644
--- a/src/layouts/simple/index.tsx
+++ b/src/layouts/simple/index.tsx
@@ -1,6 +1,6 @@
import type React from "react";
-import HeaderSimple from "../components/header-simple";
+import SimpLeLayoutComponent from "./simple-layout";
type Props = {
children: React.ReactNode;
@@ -8,7 +8,7 @@ type Props = {
export default function SimpleLayout({ children }: Props) {
return (
);
}
diff --git a/src/locales/lang/en_US/sys.json b/src/locales/lang/en_US/sys.json
index 4b17be8..732288e 100644
--- a/src/locales/lang/en_US/sys.json
+++ b/src/locales/lang/en_US/sys.json
@@ -150,6 +150,7 @@
"500": "500"
}
},
- "docs": "Document"
+ "docs": "Document",
+ "about": "About"
}
}
diff --git a/src/locales/lang/zh_CN/sys.json b/src/locales/lang/zh_CN/sys.json
index 10e5293..bd29cb8 100644
--- a/src/locales/lang/zh_CN/sys.json
+++ b/src/locales/lang/zh_CN/sys.json
@@ -146,6 +146,7 @@
"closeRight": "关闭右侧标签页",
"fullscreen": "内容全屏",
"refresh": "刷新"
- }
+ },
+ "about": "关于"
}
}
diff --git a/src/main.tsx b/src/main.tsx
index b706c91..3023aa9 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -17,20 +17,9 @@ import "./locales/i18n";
import "./global.css";
import "./theme/theme.css";
-// root component
import App from "./App";
import ProgressBar from "./components/progress-bar";
-// const charAt = `
-// ███████╗██╗ █████╗ ███████╗██╗ ██╗
-// ██╔════╝██║ ██╔══██╗██╔════╝██║ ██║
-// ███████╗██║ ███████║███████╗███████║
-// ╚════██║██║ ██╔══██║╚════██║██╔══██║
-// ███████║███████╗██║ ██║███████║██║ ██║
-// ╚══════╝╚══════╝╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝
-// `;
-// console.info(`%c${charAt}`, "color: #5BE49B");
-
const root = ReactDOM.createRoot(document.getElementById("root") as HTMLElement);
root.render(
diff --git a/src/pages/about/index.tsx b/src/pages/about/index.tsx
new file mode 100644
index 0000000..307f279
--- /dev/null
+++ b/src/pages/about/index.tsx
@@ -0,0 +1,84 @@
+import { useQuery } from "@tanstack/react-query";
+import { Card, Descriptions, Skeleton, Space, Tag } from "antd";
+
+import { dependenciesService } from "@/api/services";
+
+export default function About() {
+ const { data, isPending } = useQuery({
+ queryKey: ["devicesInformationData"],
+ queryFn: async () => {
+ const res = await dependenciesService.getDevicesInformation();
+ return res ?? {};
+ },
+ staleTime: 1000 * 60 * 10, // 10分钟内不重新请求
+ refetchOnWindowFocus: false, // 窗口聚焦时不自动请求
+ });
+ return (
+
+
+
+ ({
+ key: `prod_${index}`,
+ label: {name} ,
+ children: {version} ,
+ span: 1,
+ labelStyle: { width: 250 },
+ })),
+ ]}
+ />
+
+
+
+
+ ({
+ key: `prod_${index}`,
+ label: {name} ,
+ children: {version} ,
+ span: 1,
+ labelStyle: { width: 250 },
+ })),
+ ]}
+ />
+
+
+
+
+ ({
+ key: `prod_${index}`,
+ label: {name} ,
+ children: {version} ,
+ span: 1,
+ labelStyle: { width: 250 },
+ })),
+ ]}
+ />
+
+
+
+
+ ({
+ key: `prod_${index}`,
+ label: {name} ,
+ children: {version} ,
+ span: 1,
+ labelStyle: { width: 250 },
+ })),
+ ]}
+ />
+
+
+
+ );
+}
diff --git a/src/pages/components/markdown/index.tsx b/src/pages/components/markdown/index.tsx
index 12d3136..75f2b2a 100644
--- a/src/pages/components/markdown/index.tsx
+++ b/src/pages/components/markdown/index.tsx
@@ -46,6 +46,7 @@ const TEXT = `
+ \`\`\`tsx import React from 'react'; import ReactDOM from 'react-dom'; diff --git a/src/pages/components/upload/index.tsx b/src/pages/components/upload/index.tsx index 658870f..fa95fe5 100644 --- a/src/pages/components/upload/index.tsx +++ b/src/pages/components/upload/index.tsx @@ -1,5 +1,6 @@ import { Card, Col, Row, Space, Switch, Tabs, type TabsProps, Typography } from "antd"; import { useState } from "react"; +import { toast } from "sonner"; import { Iconify } from "@/components/icon"; import { Upload, UploadAvatar, UploadBox } from "@/components/upload"; @@ -11,6 +12,23 @@ export default function UploadPage() { setThumbnail(checked); }; + const handleOnChange = (info: { file: { name?: string; status?: string }; fileList: any }) => { + const { status } = info.file; + console.log("status", status); + if (status !== "uploading") { + console.log(info.file, info.fileList); + } + if (status === "done") { + toast.success(`${info.file.name} file uploaded successfully.`, { + position: "top-center", + }); + } else if (status === "error") { + toast.error(`${info.file.name} file uploaded failed.`, { + position: "top-center", + }); + } + }; + const ThumbnailSwitch =
-
-
);
@@ -43,16 +61,16 @@ export default function UploadPage() {
},
}}
>
-
);
diff --git a/src/pages/dashboard/workbench/banner-card.tsx b/src/pages/dashboard/workbench/banner-card.tsx
index 28c42b7..43434d5 100644
--- a/src/pages/dashboard/workbench/banner-card.tsx
+++ b/src/pages/dashboard/workbench/banner-card.tsx
@@ -1,7 +1,7 @@
import { Col, Row } from "antd";
import Character3 from "@/assets/images/characters/character_3.png";
-import { Iconify } from "@/components/icon";
+// import { Iconify } from "@/components/icon";
import { useUserInfo } from "@/store/userStore";
import { themeVars } from "@/theme/theme.css";
@@ -18,38 +18,12 @@ export default function BannerCard() {
style={{ background: bg, height: "100%" }}
>
-
-
+
diff --git a/src/pages/management/system/user/user-modal.tsx b/src/pages/management/system/user/user-modal.tsx
index 0c6bc43..996d6d1 100644
--- a/src/pages/management/system/user/user-modal.tsx
+++ b/src/pages/management/system/user/user-modal.tsx
@@ -44,7 +44,7 @@ export default function UserModal({ title, show, formValue, roleListData, onOk,
};
return (
-
+
-
);
diff --git a/src/layouts/components/header-simple.tsx b/src/layouts/simple/simple-layout.tsx
similarity index 71%
rename from src/layouts/components/header-simple.tsx
rename to src/layouts/simple/simple-layout.tsx
index 2516cdc..20e21f1 100644
--- a/src/layouts/components/header-simple.tsx
+++ b/src/layouts/simple/simple-layout.tsx
@@ -1,12 +1,12 @@
import Logo from "@/components/logo";
-import SettingButton from "./setting-button";
+import GlobalSettings from "@/components/global-settings";
export default function HeaderSimple() {
return (
+ \`\`\`tsx import React from 'react'; import ReactDOM from 'react-dom'; diff --git a/src/pages/components/upload/index.tsx b/src/pages/components/upload/index.tsx index 658870f..fa95fe5 100644 --- a/src/pages/components/upload/index.tsx +++ b/src/pages/components/upload/index.tsx @@ -1,5 +1,6 @@ import { Card, Col, Row, Space, Switch, Tabs, type TabsProps, Typography } from "antd"; import { useState } from "react"; +import { toast } from "sonner"; import { Iconify } from "@/components/icon"; import { Upload, UploadAvatar, UploadBox } from "@/components/upload"; @@ -11,6 +12,23 @@ export default function UploadPage() { setThumbnail(checked); }; + const handleOnChange = (info: { file: { name?: string; status?: string }; fileList: any }) => { + const { status } = info.file; + console.log("status", status); + if (status !== "uploading") { + console.log(info.file, info.fileList); + } + if (status === "done") { + toast.success(`${info.file.name} file uploaded successfully.`, { + position: "top-center", + }); + } else if (status === "error") { + toast.error(`${info.file.name} file uploaded failed.`, { + position: "top-center", + }); + } + }; + const ThumbnailSwitch =
-
Hi, {nickName} ,Welcome Back 👋
-
- Welcome to join the Discord channel to discuss everything about Slash Admin, or you can visite my blog:
-
+
-
Hi, {nickName} ,Welcome Back 👋
-
+
{tabs.map((tab, index) => (