feat(ui): enhance certificate downloading

feat(ui): responsive table
feat(ui): responsive sider menu
2025-07-10 21:19:55 +00:00 · 2024-12-09 19:42:56 +08:00 · 2024-12-09 19:32:09 +08:00 · 2024-12-09 19:25:35 +08:00
6 changed files with 174 additions and 95 deletions
--- a/ui/src/components/certificate/CertificateDetail.tsx
+++ b/ui/src/components/certificate/CertificateDetail.tsx
@ -1,7 +1,7 @@
 import { useTranslation } from "react-i18next";
-import { Button, Form, Input, message, Tooltip } from "antd";
+import { Button, Dropdown, Form, Input, message, Space, Tooltip } from "antd";
 import { CopyToClipboard } from "react-copy-to-clipboard";
-import { Clipboard as ClipboardIcon } from "lucide-react";
+import { ChevronDown as ChevronDownIcon, Clipboard as ClipboardIcon, ThumbsUp as ThumbsUpIcon } from "lucide-react";

 import { type Certificate } from "@/domain/certificate";
 import { saveFiles2Zip } from "@/utils/file";
@ -15,8 +15,7 @@ const CertificateDetail = ({ data }: CertificateDetailProps) => {

  const [messageApi, MessageContextHolder] = message.useMessage();

-  const handleDownloadClick = async () => {
-    // TODO: 支持下载多种格式
+  const handleDownloadPEMClick = async () => {
    const zipName = `${data.id}-${data.san}.zip`;
    const files = [
      {
@ -73,14 +72,41 @@ const CertificateDetail = ({ data }: CertificateDetailProps) => {
      </Form>

      <div className="flex items-center justify-end">
-        <Button
-          type="primary"
-          onClick={() => {
-            handleDownloadClick();
+        <Dropdown
+          menu={{
+            items: [
+              {
+                key: "PEM",
+                label: "PEM",
+                extra: <ThumbsUpIcon size="14" />,
+                onClick: () => handleDownloadPEMClick(),
+              },
+              {
+                key: "PFX",
+                label: "PFX",
+                onClick: () => {
+                  // TODO: 下载 PFX 格式证书
+                  alert("TODO");
+                },
+              },
+              {
+                key: "JKS",
+                label: "JKS",
+                onClick: () => {
+                  // TODO: 下载 JKS 格式证书
+                  alert("TODO");
+                },
+              },
+            ],
          }}
        >
-          {t("certificate.action.download")}
-        </Button>
+          <Button type="primary">
+            <Space>
+              <span>{t("certificate.action.download")}</span>
+              <ChevronDownIcon size={14} />
+            </Space>
+          </Button>
+        </Dropdown>
      </div>
    </div>
  );
--- a/ui/src/pages/ConsoleLayout.tsx
+++ b/ui/src/pages/ConsoleLayout.tsx
@ -1,7 +1,7 @@
-import { useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Link, Navigate, Outlet, useLocation, useNavigate } from "react-router-dom";
 import { useTranslation } from "react-i18next";
-import { Button, Dropdown, Layout, Menu, Tooltip, theme, type ButtonProps, type MenuProps } from "antd";
+import { Button, Drawer, Dropdown, Layout, Menu, Tooltip, theme, type ButtonProps, type MenuProps } from "antd";
 import {
  Languages as LanguagesIcon,
  LogOut as LogOutIcon,
@ -21,65 +21,21 @@ import { getPocketBase } from "@/repository/pocketbase";
 import { ConfigProvider } from "@/providers/config";

 const ConsoleLayout = () => {
-  const location = useLocation();
  const navigate = useNavigate();

  const { t } = useTranslation();

  const { token: themeToken } = theme.useToken();
-  const { theme: browserTheme } = useTheme();

-  const menuItems: Required<MenuProps>["items"] = [
-    {
-      key: "/",
-      icon: <HomeIcon size={16} />,
-      label: t("dashboard.page.title"),
-      onClick: () => navigate("/"),
-    },
-    {
-      key: "/workflows",
-      icon: <WorkflowIcon size={16} />,
-      label: t("workflow.page.title"),
-      onClick: () => navigate("/workflows"),
-    },
-    {
-      key: "/certificates",
-      icon: <ShieldCheckIcon size={16} />,
-      label: t("certificate.page.title"),
-      onClick: () => navigate("/certificates"),
-    },
-    {
-      key: "/accesses",
-      icon: <ServerIcon size={16} />,
-      label: t("access.page.title"),
-      onClick: () => navigate("/accesses"),
-    },
-  ];
-  const [menuSelectedKey, setMenuSelectedKey] = useState<string>();
+  const [siderOpen, setSiderOpen] = useState(false);

-  const getActiveMenuItem = () => {
-    const item =
-      menuItems.find((item) => item!.key === location.pathname) ??
-      menuItems.find((item) => item!.key !== "/" && location.pathname.startsWith(item!.key as string));
-    return item;
+  const handleSiderOpen = () => {
+    setSiderOpen(true);
  };

-  useEffect(() => {
-    const item = getActiveMenuItem();
-    if (item) {
-      setMenuSelectedKey(item.key as string);
-    } else {
-      setMenuSelectedKey(undefined);
-    }
-  }, [location.pathname]);
-
-  useEffect(() => {
-    if (menuSelectedKey && menuSelectedKey !== getActiveMenuItem()?.key) {
-      navigate(menuSelectedKey);
-    }
-  }, [menuSelectedKey]);
-
-  // TODO: 响应式侧边栏菜单
+  const handleSiderClose = () => {
+    setSiderOpen(false);
+  };

  const handleLogoutClick = () => {
    auth.clear();
@ -99,22 +55,10 @@ const ConsoleLayout = () => {
    <>
      <ConfigProvider>
        <Layout className="w-full min-h-screen">
-          <Layout.Sider theme={browserTheme} width={256}>
+          <Layout.Sider className="max-md:hidden" theme="light" width={256}>
            <div className="flex flex-col items-center justify-between w-full h-full overflow-hidden">
-              <Link to="/" className="flex items-center gap-2 w-full px-4 font-semibold overflow-hidden">
-                <img src="/logo.svg" className="w-[36px] h-[36px]" />
-                <span className="w-[64px] h-[64px] leading-[64px] dark:text-white truncate">Certimate</span>
-              </Link>
-              <div className="flex-grow w-full overflow-x-hidden overflow-y-auto">
-                <Menu
-                  items={menuItems}
-                  mode="vertical"
-                  selectedKeys={menuSelectedKey ? [menuSelectedKey] : []}
-                  theme={browserTheme}
-                  onSelect={({ key }) => {
-                    setMenuSelectedKey(key);
-                  }}
-                />
+              <div className="w-full">
+                <SiderMenu />
              </div>
              <div className="w-full py-2 text-center">
                <Version />
@ -125,7 +69,22 @@ const ConsoleLayout = () => {
          <Layout>
            <Layout.Header style={{ padding: 0, background: themeToken.colorBgContainer }}>
              <div className="flex items-center justify-between size-full px-4 overflow-hidden">
-                <div className="flex items-center gap-4 size-full">{/* <Button icon={<MenuIcon />} size="large" /> */}</div>
+                <div className="flex items-center gap-4 size-full">
+                  <Button className="md:hidden" icon={<MenuIcon />} size="large" onClick={handleSiderOpen} />
+                  <Drawer
+                    closable={false}
+                    destroyOnClose
+                    open={siderOpen}
+                    placement="left"
+                    styles={{
+                      content: { paddingTop: themeToken.paddingSM, paddingBottom: themeToken.paddingSM },
+                      body: { padding: 0 },
+                    }}
+                    onClose={handleSiderClose}
+                  >
+                    <SiderMenu onSelect={() => handleSiderClose()} />
+                  </Drawer>
+                </div>
                <div className="flex-grow flex items-center justify-end gap-4 size-full overflow-hidden">
                  <Tooltip title={t("common.menu.theme")} mouseEnterDelay={2}>
                    <ThemeToggleButton size="large" />
@ -155,7 +114,99 @@ const ConsoleLayout = () => {
  );
 };

-const ThemeToggleButton = ({ size }: { size?: ButtonProps["size"] }) => {
+const SiderMenu = React.memo(({ onSelect }: { onSelect?: (key: string) => void }) => {
+  const location = useLocation();
+  const navigate = useNavigate();
+
+  const { t } = useTranslation();
+
+  const MENU_KEY_HOME = "/";
+  const MENU_KEY_WORKFLOWS = "/workflows";
+  const MENU_KEY_CERTIFICATES = "/certificates";
+  const MENU_KEY_ACCESSES = "/accesses";
+  const menuItems: Required<MenuProps>["items"] = [
+    {
+      key: MENU_KEY_HOME,
+      icon: <HomeIcon size={16} />,
+      label: t("dashboard.page.title"),
+      onClick: () => {
+        navigate(MENU_KEY_HOME);
+        onSelect?.(MENU_KEY_HOME);
+      },
+    },
+    {
+      key: MENU_KEY_WORKFLOWS,
+      icon: <WorkflowIcon size={16} />,
+      label: t("workflow.page.title"),
+      onClick: () => {
+        navigate(MENU_KEY_WORKFLOWS);
+        onSelect?.(MENU_KEY_WORKFLOWS);
+      },
+    },
+    {
+      key: MENU_KEY_CERTIFICATES,
+      icon: <ShieldCheckIcon size={16} />,
+      label: t("certificate.page.title"),
+      onClick: () => {
+        navigate(MENU_KEY_CERTIFICATES);
+        onSelect?.(MENU_KEY_CERTIFICATES);
+      },
+    },
+    {
+      key: MENU_KEY_ACCESSES,
+      icon: <ServerIcon size={16} />,
+      label: t("access.page.title"),
+      onClick: () => {
+        navigate(MENU_KEY_ACCESSES);
+        onSelect?.(MENU_KEY_ACCESSES);
+      },
+    },
+  ];
+  const [menuSelectedKey, setMenuSelectedKey] = useState<string>();
+
+  const getActiveMenuItem = () => {
+    const item =
+      menuItems.find((item) => item!.key === location.pathname) ??
+      menuItems.find((item) => item!.key !== MENU_KEY_HOME && location.pathname.startsWith(item!.key as string));
+    return item;
+  };
+
+  useEffect(() => {
+    const item = getActiveMenuItem();
+    if (item) {
+      setMenuSelectedKey(item.key as string);
+    } else {
+      setMenuSelectedKey(undefined);
+    }
+  }, [location.pathname]);
+
+  useEffect(() => {
+    if (menuSelectedKey && menuSelectedKey !== getActiveMenuItem()?.key) {
+      navigate(menuSelectedKey);
+    }
+  }, [menuSelectedKey]);
+
+  return (
+    <>
+      <Link to="/" className="flex items-center gap-2 w-full px-4 font-semibold overflow-hidden">
+        <img src="/logo.svg" className="w-[36px] h-[36px]" />
+        <span className="w-[64px] h-[64px] leading-[64px] dark:text-white truncate">Certimate</span>
+      </Link>
+      <div className="flex-grow w-full overflow-x-hidden overflow-y-auto">
+        <Menu
+          items={menuItems}
+          mode="vertical"
+          selectedKeys={menuSelectedKey ? [menuSelectedKey] : []}
+          onSelect={({ key }) => {
+            setMenuSelectedKey(key);
+          }}
+        />
+      </div>
+    </>
+  );
+});
+
+const ThemeToggleButton = React.memo(({ size }: { size?: ButtonProps["size"] }) => {
  const { t } = useTranslation();

  const { theme, setThemeMode } = useTheme();
@ -183,9 +234,9 @@ const ThemeToggleButton = ({ size }: { size?: ButtonProps["size"] }) => {
      <Button icon={theme === "dark" ? <MoonIcon size={18} /> : <SunIcon size={18} />} size={size} />
    </Dropdown>
  );
-};
+});

-const LocaleToggleButton = ({ size }: { size?: ButtonProps["size"] }) => {
+const LocaleToggleButton = React.memo(({ size }: { size?: ButtonProps["size"] }) => {
  const { i18n } = useTranslation();

  const items: Required<MenuProps>["items"] = Object.keys(i18n.store.data).map((key) => {
@ -201,6 +252,6 @@ const LocaleToggleButton = ({ size }: { size?: ButtonProps["size"] }) => {
      <Button icon={<LanguagesIcon size={18} />} size={size} />
    </Dropdown>
  );
-};
+});

 export default ConsoleLayout;
--- a/ui/src/pages/accesses/AccessList.tsx
+++ b/ui/src/pages/accesses/AccessList.tsx
@ -23,7 +23,7 @@ const AccessList = () => {
    {
      key: "$index",
      align: "center",
-      title: "",
+      fixed: "left",
      width: 50,
      render: (_, __, index) => (page - 1) * pageSize + index + 1,
    },
@ -36,11 +36,12 @@ const AccessList = () => {
    {
      key: "provider",
      title: t("common.text.provider"),
+      ellipsis: true,
      render: (_, record) => {
        return (
-          <Space className="max-w-full" size={4}>
+          <Space className="max-w-full truncate" size={4}>
            <Avatar src={accessProvidersMap.get(record.configType)?.icon} size="small" />
-            <Typography.Text>{t(accessProvidersMap.get(record.configType)?.name ?? "")}</Typography.Text>
+            <Typography.Text ellipsis>{t(accessProvidersMap.get(record.configType)?.name ?? "")}</Typography.Text>
          </Space>
        );
      },
@ -156,8 +157,6 @@ const AccessList = () => {
    });
  };

-  // TODO: 响应式表格
-
  return (
    <>
      {ModelContextHolder}
@ -199,6 +198,7 @@ const AccessList = () => {
          },
        }}
        rowKey={(record) => record.id}
+        scroll={{ x: "max(100%, 960px)" }}
      />
    </>
  );
--- a/ui/src/pages/certificates/CertificateList.tsx
+++ b/ui/src/pages/certificates/CertificateList.tsx
@ -27,7 +27,7 @@ const CertificateList = () => {
    {
      key: "$index",
      align: "center",
-      title: "",
+      fixed: "left",
      width: 50,
      render: (_, __, index) => (page - 1) * pageSize + index + 1,
    },
@ -39,6 +39,7 @@ const CertificateList = () => {
    {
      key: "expiry",
      title: t("certificate.props.expiry"),
+      ellipsis: true,
      defaultFilteredValue: searchParams.has("state") ? [searchParams.get("state") as string] : undefined,
      filterDropdown: ({ setSelectedKeys, confirm, clearFilters }) => {
        const items: Required<MenuProps>["items"] = [
@ -107,6 +108,7 @@ const CertificateList = () => {
    {
      key: "source",
      title: t("certificate.props.source"),
+      ellipsis: true,
      render: (_, record) => {
        const workflowId = record.workflow;
        return workflowId ? (
@ -213,8 +215,6 @@ const CertificateList = () => {
    setCurrentRecord(certificate);
  };

-  // TODO: 响应式表格
-
  return (
    <>
      {NotificationContextHolder}
@ -242,6 +242,7 @@ const CertificateList = () => {
          },
        }}
        rowKey={(record) => record.id}
+        scroll={{ x: "max(100%, 960px)" }}
      />

      <CertificateDetailDrawer
--- a/ui/src/pages/dashboard/Dashboard.tsx
+++ b/ui/src/pages/dashboard/Dashboard.tsx
@ -65,7 +65,7 @@ const Dashboard = () => {

      <PageHeader title={t("dashboard.page.title")} />

-      <Row gutter={[16, 16]}>
+      <Row className="justify-stretch" gutter={[16, 16]}>
        <Col {...statisticGridSpans}>
          <StatisticCard
            icon={<SquareSigmaIcon size={48} strokeWidth={1} color={themeToken.colorInfo} />}
@ -134,7 +134,7 @@ const StatisticCard = ({
  onClick?: () => void;
 }) => {
  return (
-    <Card className="overflow-hidden" bordered={false} hoverable onClick={onClick}>
+    <Card className="size-full overflow-hidden" bordered={false} hoverable onClick={onClick}>
      <Space size="middle">
        {icon}
        <Statistic
--- a/ui/src/pages/workflows/WorkflowList.tsx
+++ b/ui/src/pages/workflows/WorkflowList.tsx
@ -43,13 +43,14 @@ const WorkflowList = () => {
    {
      key: "$index",
      align: "center",
-      title: "",
+      fixed: "left",
      width: 50,
      render: (_, __, index) => (page - 1) * pageSize + index + 1,
    },
    {
      key: "name",
      title: t("common.text.name"),
+      ellipsis: true,
      render: (_, record) => (
        <Space className="max-w-full" direction="vertical" size={4}>
          <Typography.Text ellipsis>{record.name}</Typography.Text>
@ -62,6 +63,7 @@ const WorkflowList = () => {
    {
      key: "type",
      title: t("workflow.props.executionMethod"),
+      ellipsis: true,
      render: (_, record) => {
        const method = record.type;
        if (!method) {
@ -279,8 +281,6 @@ const WorkflowList = () => {
    navigate("/workflows/detail");
  };

-  // TODO: 响应式表格
-
  return (
    <>
      {ModelContextHolder}
@ -323,6 +323,7 @@ const WorkflowList = () => {
          },
        }}
        rowKey={(record) => record.id}
+        scroll={{ x: "max(100%, 960px)" }}
      />
    </>
  );
Author	SHA1	Message	Date
Fu Diwei	a4eff0b408	feat(ui): enhance certificate downloading	2024-12-09 19:42:56 +08:00
Fu Diwei	7b85da901d	feat(ui): responsive table	2024-12-09 19:32:09 +08:00
Fu Diwei	be27789ea8	feat(ui): responsive sider menu	2024-12-09 19:25:35 +08:00