cleanup

sunnylqm · sunnylqm · commit fd0a3f7b2e77 · 2025-09-21T09:29:53.000+08:00
diff --git a/bun.lock b/bun.lock
diff --git a/package.json b/package.json
@@ -10,12 +10,12 @@
   "dependencies": {
     "@ant-design/icons": "^6.0.2",
     "@ant-design/v5-patch-for-react-19": "^1.0.3",
-    "@rsbuild/core": "^1.5.6",
+    "@rsbuild/core": "^1.5.10",
     "@rsbuild/plugin-react": "^1.4.0",
     "@rsbuild/plugin-sass": "^1.4.0",
     "@rsbuild/plugin-svgr": "^1.2.2",
-    "@tanstack/react-query": "^5.87.4",
-    "antd": "^5.27.3",
+    "@tanstack/react-query": "^5.89.0",
+    "antd": "^5.27.4",
     "dayjs": "^1.11.18",
     "git-url-parse": "^16.1.0",
     "hash-wasm": "^4.12.0",
diff --git a/src/components/main-layout.tsx b/src/components/main-layout.tsx
@@ -13,6 +13,11 @@ import { useUserInfo } from "@/utils/hooks";
 import Footer from "./footer";
 import Sider from "./sider";
 
+interface Style {
+  header: React.CSSProperties;
+  body: React.CSSProperties;
+}
+
 const MainLayout = () => {
   const { user } = useUserInfo();
 
@@ -22,41 +27,59 @@ const MainLayout = () => {
       <Layout>
         <Layout.Header style={style.header}>
           <Row className="h-full" justify="end">
-            <Menu mode="horizontal" selectable={false}>
-              <Menu.Item key="issues" icon={<CommentOutlined />}>
-                <ExtLink href="https://github.com/reactnativecn/react-native-pushy/issues">
-                  讨论
-                </ExtLink>
-              </Menu.Item>
-              <Menu.Item key="document" icon={<ReadOutlined />}>
-                <ExtLink href="https://pushy.reactnative.cn/docs/getting-started.html">
-                  文档
-                </ExtLink>
-              </Menu.Item>
-              <Menu.Item key="about" icon={<InfoCircleOutlined />}>
-                <ExtLink href="https://reactnative.cn/about.html">
-                  关于我们
-                </ExtLink>
-              </Menu.Item>
-              {user && (
-                <Menu.SubMenu
-                  key="user"
-                  icon={<UserOutlined />}
-                  title={user.name}
-                >
-                  <Menu.Item
-                    key="logout"
-                    onClick={() => {
-                      logout();
-                      message.info("您已退出登录");
-                    }}
-                    icon={<LogoutOutlined />}
-                  >
-                    退出登录
-                  </Menu.Item>
-                </Menu.SubMenu>
-              )}
-            </Menu>
+            <Menu
+              mode="horizontal"
+              selectable={false}
+              items={[
+                {
+                  key: "issues",
+                  icon: <CommentOutlined />,
+                  label: (
+                    <ExtLink href="https://github.com/reactnativecn/react-native-pushy/issues">
+                      讨论
+                    </ExtLink>
+                  ),
+                },
+                {
+                  key: "document",
+                  icon: <ReadOutlined />,
+                  label: (
+                    <ExtLink href="https://pushy.reactnative.cn/docs/getting-started.html">
+                      文档
+                    </ExtLink>
+                  ),
+                },
+                {
+                  key: "about",
+                  icon: <InfoCircleOutlined />,
+                  label: (
+                    <ExtLink href="https://reactnative.cn/about.html">
+                      关于我们
+                    </ExtLink>
+                  ),
+                },
+                ...(user
+                  ? [
+                      {
+                        key: "user",
+                        icon: <UserOutlined />,
+                        label: user.name,
+                        children: [
+                          {
+                            key: "logout",
+                            icon: <LogoutOutlined />,
+                            label: "退出登录",
+                            onClick: () => {
+                              logout();
+                              message.info("您已退出登录");
+                            },
+                          },
+                        ],
+                      },
+                    ]
+                  : []),
+              ]}
+            />
           </Row>
         </Layout.Header>
         <Layout.Content id="main-body" style={style.body}>
@@ -81,7 +104,7 @@ const ExtLink = ({ children, href }: ExtLinkProps) => (
   <a
     href={href}
     target="_blank"
-    onClick={(e) => e.stopPropagation()}
+    // onClick={(e) => e.stopPropagation()}
     rel="noreferrer"
   >
     {children}
diff --git a/src/components/sider.tsx b/src/components/sider.tsx
@@ -4,10 +4,7 @@ import { rootRouterPath } from "@/router";
 import { api } from "@/services/api";
 import { useAppList, useUserInfo } from "@/utils/hooks";
 import {
-  AndroidFilled,
-  AppleFilled,
   AppstoreOutlined,
-  HarmonyOSOutlined,
   PlusOutlined,
   UserOutlined,
 } from "@ant-design/icons";
@@ -28,6 +25,14 @@ import { Link, useLocation } from "react-router-dom";
 import { ReactComponent as LogoH } from "../assets/logo-h.svg";
 import PlatformIcon from "./platform-icon";
 
+interface SiderMenuProps {
+  selectedKeys: string[];
+}
+
+interface Style {
+  sider: React.CSSProperties;
+}
+
 function addApp() {
   let name = "";
   let platform = "android";
@@ -173,44 +178,62 @@ const SiderMenu = ({ selectedKeys }: SiderMenuProps) => {
         defaultOpenKeys={["apps"]}
         selectedKeys={selectedKeys}
         mode="inline"
-      >
-        <Menu.Item key="user" icon={<UserOutlined />}>
-          <Link to={rootRouterPath.user}>账户设置</Link>
-        </Menu.Item>
-        <Menu.SubMenu key="apps" title="应用管理" icon={<AppstoreOutlined />}>
-          {apps?.map((i) => (
-            <Menu.Item key={i.id} className="!h-16">
-              <div className="flex flex-row items-center gap-4">
-                <div className="flex flex-col justify-center">
-                  <PlatformIcon platform={i.platform} className="!text-xl" />
-                </div>
-                <Link
-                  to={`/apps/${i.id}`}
-                  className="flex flex-col h-16 justify-center"
-                >
-                  <div className="flex flex-row items-center font-bold">
-                    {i.name}
-                    {i.status === "paused" && <Tag className="ml-2">暂停</Tag>}
-                  </div>
-                  {i.checkCount && (
-                    <div className="text-xs text-gray-500 mb-2">
-                      <Tooltip
-                        mouseEnterDelay={1}
-                        title="今日此应用查询热更的次数"
-                      >
-                        <a>{i.checkCount.toLocaleString()} 次</a>
-                      </Tooltip>
+        items={[
+          {
+            key: "user",
+            icon: <UserOutlined />,
+            label: <Link to={rootRouterPath.user}>账户设置</Link>,
+          },
+          {
+            key: "apps",
+            icon: <AppstoreOutlined />,
+            label: "应用管理",
+            children: [
+              ...(apps?.map((i) => ({
+                key: i.id,
+                className: "!h-16",
+                label: (
+                  <div className="flex flex-row items-center gap-4">
+                    <div className="flex flex-col justify-center">
+                      <PlatformIcon
+                        platform={i.platform}
+                        className="!text-xl"
+                      />
                     </div>
-                  )}
-                </Link>
-              </div>
-            </Menu.Item>
-          ))}
-          <Menu.Item key="add-app" icon={<PlusOutlined />} onClick={addApp}>
-            添加应用
-          </Menu.Item>
-        </Menu.SubMenu>
-      </Menu>
+                    <Link
+                      to={`/apps/${i.id}`}
+                      className="flex flex-col h-16 justify-center"
+                    >
+                      <div className="flex flex-row items-center font-bold">
+                        {i.name}
+                        {i.status === "paused" && (
+                          <Tag className="ml-2">暂停</Tag>
+                        )}
+                      </div>
+                      {i.checkCount && (
+                        <div className="text-xs text-gray-500 mb-2">
+                          <Tooltip
+                            mouseEnterDelay={1}
+                            title="今日此应用查询热更的次数"
+                          >
+                            <a>{i.checkCount.toLocaleString()} 次</a>
+                          </Tooltip>
+                        </div>
+                      )}
+                    </Link>
+                  </div>
+                ),
+              })) || []),
+              {
+                key: "add-app",
+                icon: <PlusOutlined />,
+                label: "添加应用",
+                onClick: addApp,
+              },
+            ],
+          },
+        ]}
+      />
     </div>
   );
 };
diff --git a/src/pages/register.tsx b/src/pages/register.tsx
@@ -103,7 +103,7 @@ export const Register = () => {
                   validator: (_, value) =>
                     value
                       ? Promise.resolve()
-                      : Promise.reject(new Error("请阅读并同意后勾选此处")),
+                      : Promise.reject(Error("请阅读并同意后勾选此处")),
                 },
               ]}
               hasFeedback
diff --git a/src/pages/reset-password/components/set-password.tsx b/src/pages/reset-password/components/set-password.tsx
@@ -36,9 +36,7 @@ export default function SetPassword() {
             validator(_, value: string) {
               if (value && !isPasswordValid(value)) {
                 return Promise.reject(
-                  new Error(
-                    "密码中需要同时包含大、小写字母和数字，且长度不少于6位"
-                  )
+                  Error("密码中需要同时包含大、小写字母和数字，且长度不少于6位")
                 );
               }
               return Promise.resolve();
@@ -56,7 +54,7 @@ export default function SetPassword() {
           ({ getFieldValue }) => ({
             validator(_, value: string) {
               if (getFieldValue("newPwd") !== value) {
-                return Promise.reject(new Error("两次输入的密码不一致"));
+                return Promise.reject(Error("两次输入的密码不一致"));
               }
               return Promise.resolve();
             },
diff --git a/src/pages/user.tsx b/src/pages/user.tsx
@@ -129,7 +129,7 @@ function UserPanel() {
       <Descriptions
         title="账户信息"
         column={1}
-        labelStyle={{ width: 134 }}
+        styles={{ label: { width: 134 } }}
         bordered
       >
         <Descriptions.Item label="用户名">{name}</Descriptions.Item>
diff --git a/src/services/api.ts b/src/services/api.ts
@@ -26,15 +26,15 @@ export const api = {
     }),
   createApp: (params: { name: string; platform: string }) =>
     request<{ id: number }>("post", "/app/create", params).then((response) => {
-      if (!response) throw new Error("Failed to create app");
+      if (!response) throw Error("Failed to create app");
       const { id } = response;
       queryClient.setQueryData(["appList"], ({ data }: { data: App[] }) => ({
         data: [...(data || []), { ...params, id }],
       }));
     }),
   updateApp: (
     appId: number,
-    params: Omit<App, "appKey" | "checkCount" | "id" | "platform">,
+    params: Omit<App, "appKey" | "checkCount" | "id" | "platform">
   ) =>
     request("put", `/app/${appId}`, params).then(() => {
       queryClient.setQueryData(["app", appId], (old: App | undefined) => ({
@@ -49,7 +49,7 @@ export const api = {
   getPackages: (appId: number) =>
     request<{ data: Package[]; count: number }>(
       "get",
-      `/app/${appId}/package/list?limit=1000`,
+      `/app/${appId}/package/list?limit=1000`
     ),
   updatePackage: ({
     appId,
@@ -69,9 +69,9 @@ export const api = {
         ["packages", appId],
         ({ data }: { data: Package[] }) => ({
           data: data?.map((i) =>
-            i.id === packageId ? { ...i, ...params } : i,
+            i.id === packageId ? { ...i, ...params } : i
           ),
-        }),
+        })
       );
       if (params.versionId !== undefined) {
         queryClient.invalidateQueries({ queryKey: ["versions", appId] });
@@ -83,7 +83,7 @@ export const api = {
         ["packages", appId],
         ({ data }: { data: Package[] }) => ({
           data: data?.filter((i) => i.id !== packageId),
-        }),
+        })
       );
     }),
   // version
@@ -98,7 +98,7 @@ export const api = {
   }) =>
     request<{ data: Version[]; count: number }>(
       "get",
-      `/app/${appId}/version/list?offset=${offset}&limit=${limit}`,
+      `/app/${appId}/version/list?offset=${offset}&limit=${limit}`
     ),
   updateVersion: ({
     versionId,
@@ -117,10 +117,10 @@ export const api = {
             ? {
                 ...old,
                 data: old.data?.map((i) =>
-                  i.id === versionId ? { ...i, ...params } : i,
+                  i.id === versionId ? { ...i, ...params } : i
                 ),
               }
-            : undefined,
+            : undefined
       );
     }),
   deleteVersion: ({ appId, versionId }: { appId: number; versionId: number }) =>
@@ -133,7 +133,7 @@ export const api = {
                 ...old,
                 data: old.data?.filter((i) => i.id !== versionId),
               }
-            : undefined,
+            : undefined
       );
     }),
   // order
diff --git a/src/utils/helper.ts b/src/utils/helper.ts

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ function UserPanel() {`
`129`	`129`	`<Descriptions`
`130`	`130`	`title="账户信息"`
`131`	`131`	`column={1}`
`132`		`- labelStyle={{ width: 134 }}`
	`132`	`+ styles={{ label: { width: 134 } }}`
`133`	`133`	`bordered`
`134`	`134`	`>`
`135`	`135`	`<Descriptions.Item label="用户名">{name}</Descriptions.Item>`