-
+
+
{
messageApi.success(t("common.text.copied"));
}}
>
- }>
+ }>
@@ -85,23 +89,21 @@ const CertificateDetail = ({ data, ...props }: CertificateDetailProps) => {
{
key: "PEM",
label: "PEM",
- extra:
,
+ extra:
,
onClick: () => handleDownloadPEMClick(),
},
{
key: "PFX",
label: "PFX",
onClick: () => {
- // TODO: 下载 PFX 格式证书
- alert("TODO");
+ alert("TODO: 暂时不支持下载 PFX 证书");
},
},
{
key: "JKS",
label: "JKS",
onClick: () => {
- // TODO: 下载 JKS 格式证书
- alert("TODO");
+ alert("TODO: 暂时不支持下载 JKS 证书");
},
},
],
@@ -110,7 +112,7 @@ const CertificateDetail = ({ data, ...props }: CertificateDetailProps) => {
diff --git a/ui/src/components/certificate/CertificateDetailDrawer.tsx b/ui/src/components/certificate/CertificateDetailDrawer.tsx
index 0966f611..9db04ab6 100644
--- a/ui/src/components/certificate/CertificateDetailDrawer.tsx
+++ b/ui/src/components/certificate/CertificateDetailDrawer.tsx
@@ -1,15 +1,16 @@
-import { cloneElement, useMemo } from "react";
import { useControllableValue } from "ahooks";
import { Drawer } from "antd";
+import Show from "@/components/Show";
import { type CertificateModel } from "@/domain/certificate";
+import { useTriggerElement } from "@/hooks";
import CertificateDetail from "./CertificateDetail";
export type CertificateDetailDrawerProps = {
data?: CertificateModel;
loading?: boolean;
open?: boolean;
- trigger?: React.ReactElement;
+ trigger?: React.ReactNode;
onOpenChange?: (open: boolean) => void;
};
@@ -20,26 +21,26 @@ const CertificateDetailDrawer = ({ data, loading, trigger, ...props }: Certifica
trigger: "onOpenChange",
});
- const triggerEl = useMemo(() => {
- if (!trigger) {
- return null;
- }
-
- return cloneElement(trigger, {
- ...trigger.props,
- onClick: () => {
- setOpen(true);
- trigger.props?.onClick?.();
- },
- });
- }, [trigger, setOpen]);
+ const triggerEl = useTriggerElement(trigger, { onClick: () => setOpen(true) });
return (
<>
{triggerEl}
-
setOpen(false)}>
- {data ? : <>}
+ setOpen(false)}
+ >
+
+
+
);
diff --git a/ui/src/components/certimate/EmailsEdit.tsx b/ui/src/components/certimate/EmailsEdit.tsx
deleted file mode 100644
index 49bad862..00000000
--- a/ui/src/components/certimate/EmailsEdit.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { useTranslation } from "react-i18next";
-import { z } from "zod";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { ClientResponseError } from "pocketbase";
-
-import { cn } from "@/components/ui/utils";
-import { Button } from "@/components/ui/button";
-import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
-import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { type PbErrorData } from "@/domain/base";
-import { useContactStore } from "@/stores/contact";
-
-type EmailsEditProps = {
- className?: string;
- trigger: React.ReactNode;
-};
-
-const EmailsEdit = ({ className, trigger }: EmailsEditProps) => {
- const { emails, setEmails, fetchEmails } = useContactStore();
-
- const [open, setOpen] = useState(false);
- const { t } = useTranslation();
-
- const formSchema = z.object({
- email: z.string().email("common.errmsg.email_invalid"),
- });
-
- const form = useForm>({
- resolver: zodResolver(formSchema),
- defaultValues: {
- email: "",
- },
- });
-
- useEffect(() => {
- fetchEmails();
- }, []);
-
- const onSubmit = async (data: z.infer) => {
- if (emails.includes(data.email)) {
- form.setError("email", {
- message: "common.errmsg.email_duplicate",
- });
- return;
- }
-
- try {
- await setEmails([...emails, data.email]);
-
- form.reset();
- form.clearErrors();
-
- setOpen(false);
- } catch (e) {
- const err = e as ClientResponseError;
-
- Object.entries(err.response.data as PbErrorData).forEach(([key, value]) => {
- form.setError(key as keyof z.infer, {
- type: "manual",
- message: value.message,
- });
- });
- }
- };
-
- return (
-
- );
-};
-
-export default EmailsEdit;
diff --git a/ui/src/components/certimate/KVList.tsx b/ui/src/components/certimate/KVList.tsx
deleted file mode 100644
index 9c0800f4..00000000
--- a/ui/src/components/certimate/KVList.tsx
+++ /dev/null
@@ -1,243 +0,0 @@
-import { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { produce } from "immer";
-import { Edit, Plus, Trash2 } from "lucide-react";
-
-import Show from "@/components/Show";
-import { Button } from "@/components/ui/button";
-import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { KVType } from "@/domain/domain";
-
-type KVListProps = {
- variables?: KVType[];
- onValueChange?: (variables: KVType[]) => void;
-};
-
-const KVList = ({ variables, onValueChange }: KVListProps) => {
- const [locVariables, setLocVariables] = useState([]);
-
- const { t } = useTranslation();
-
- useEffect(() => {
- if (variables) {
- setLocVariables(variables);
- }
- }, [variables]);
-
- const handleAddClick = (variable: KVType) => {
- // 查看是否存在key，存在则更新，不存在则添加
- const index = locVariables.findIndex((item) => {
- return item.key === variable.key;
- });
-
- const newList = produce(locVariables, (draft) => {
- if (index === -1) {
- draft.push(variable);
- } else {
- draft[index] = variable;
- }
- });
-
- setLocVariables(newList);
-
- onValueChange?.(newList);
- };
-
- const handleDeleteClick = (index: number) => {
- const newList = [...locVariables];
- newList.splice(index, 1);
- setLocVariables(newList);
-
- onValueChange?.(newList);
- };
-
- const handleEditClick = (index: number, variable: KVType) => {
- const newList = [...locVariables];
- newList[index] = variable;
- setLocVariables(newList);
-
- onValueChange?.(newList);
- };
-
- return (
- <>
-
-
-
-
-
-
- {t("common.button.add")}
-