fix conflict

ui/src/components/certimate/DeployEditDialog.tsx

@@ -28,6 +28,7 @@ import DeployToSSH from "./DeployToSSH";
 import DeployToWebhook from "./DeployToWebhook";
 import DeployToKubernetesSecret from "./DeployToKubernetesSecret";
 import DeployToVolcengineLive from "./DeployToVolcengineLive";
+import DeployToVolcengineCDN from "./DeployToVolcengineCDN";
 import { deployTargetsMap, type DeployConfig } from "@/domain/domain";
 import { accessProvidersMap } from "@/domain/access";
 import { useConfigContext } from "@/providers/config";
@@ -178,6 +179,9 @@ const DeployEditDialog = ({ trigger, deployConfig, onSave }: DeployEditDialogPro
     case "volcengine-live":
       childComponent = <DeployToVolcengineLive />;
       break;
+    case "volcengine-cdn":
+      childComponent = <DeployToVolcengineCDN />;
+      break;
   }
 
   return (

ui/src/components/certimate/DeployToVolcengineCDN.tsx

@@ -0,0 +1,68 @@
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { z } from "zod";
+import { produce } from "immer";
+
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { useDeployEditContext } from "./DeployEdit";
+
+type DeployToVolcengineCDNConfigParams = {
+  domain?: string;
+};
+
+const DeployToVolcengineCDN = () => {
+  const { t } = useTranslation();
+
+  const { config, setConfig, errors, setErrors } = useDeployEditContext<DeployToVolcengineCDNConfigParams>();
+
+  useEffect(() => {
+    if (!config.id) {
+      setConfig({
+        ...config,
+        config: {},
+      });
+    }
+  }, []);
+
+  useEffect(() => {
+    setErrors({});
+  }, []);
+
+  const formSchema = z.object({
+    domain: z.string().regex(/^(?:\*\.)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$/, {
+      message: t("common.errmsg.domain_invalid"),
+    }),
+  });
+
+  useEffect(() => {
+    const res = formSchema.safeParse(config.config);
+    setErrors({
+      ...errors,
+      domain: res.error?.errors?.find((e) => e.path[0] === "domain")?.message,
+    });
+  }, [config]);
+
+  return (
+    <div className="flex flex-col space-y-8">
+      <div>
+        <Label>{t("domain.deployment.form.domain.label.wildsupported")}</Label>
+        <Input
+          placeholder={t("domain.deployment.form.domain.placeholder")}
+          className="w-full mt-1"
+          value={config?.config?.domain}
+          onChange={(e) => {
+            const nv = produce(config, (draft) => {
+              draft.config ??= {};
+              draft.config.domain = e.target.value?.trim();
+            });
+            setConfig(nv);
+          }}
+        />
+        <div className="text-red-600 text-sm mt-1">{errors?.domain}</div>
+      </div>
+    </div>
+  );
+};
+
+export default DeployToVolcengineCDN;

ui/src/domain/domain.ts

@@ -92,6 +92,7 @@ export const deployTargetList: string[][] = [
   ["webhook", "common.provider.webhook", "/imgs/providers/webhook.svg"],
   ["k8s-secret", "common.provider.kubernetes.secret", "/imgs/providers/k8s.svg"],
   ["volcengine-live", "common.provider.volcengine.live", "/imgs/providers/volcengine.svg"],
+  ["volcengine-cdn", "common.provider.volcengine.cdn", "/imgs/providers/volcengine.svg"],
 ];
 
 export const deployTargetsMap: Map<DeployTarget["type"], DeployTarget> = new Map(

ui/src/domain/version.ts

@@ -1 +1 @@
-export const version = "Certimate v0.2.19";
+export const version = "Certimate v0.2.20";

ui/src/domain/workflow.ts

@@ -97,7 +97,6 @@ export type WorkflowNode = {
 
   input?: WorkflowNodeIo[];
   config?: WorkflowNodeConfig;
-  configured?: boolean;
   output?: WorkflowNodeIo[];
 
   next?: WorkflowNode | WorkflowBranchNode;
@@ -429,3 +428,4 @@ export const workflowNodeDropdownList: WorkflowwNodeDropdwonItem[] = [
     },
   },
 ];
+

ui/src/i18n/locales/en/nls.common.json

@@ -92,5 +92,6 @@
   "common.provider.serverchan": "ServerChan",
   "common.provider.bark": "Bark",
   "common.provider.volcengine": "Volcengine",
-  "common.provider.volcengine.live": "Volcengine - Live"
+  "common.provider.volcengine.live": "Volcengine - Live",
+  "common.provider.volcengine.cdn": "Volcengine - CDN"
 }

ui/src/i18n/locales/zh/nls.common.json

@@ -92,5 +92,6 @@
   "common.provider.serverchan": "Server酱",
   "common.provider.bark": "Bark",
   "common.provider.volcengine": "火山引擎",
-  "common.provider.volcengine.live": "火山引擎 - 视频直播"
+  "common.provider.volcengine.live": "火山引擎 - 视频直播",
+  "common.provider.volcengine.cdn": "火山引擎 - CDN"
 }

ui/src/pages/workflow/index.tsx

@@ -58,19 +58,19 @@ const Workflow = () => {
       },
     },
     {
-      accessorKey: "executionMethod",
+      accessorKey: "type",
       header: "执行方式",
       cell: ({ row }) => {
-        const method = row.getValue("executionMethod");
+        const method = row.getValue("type");
         if (!method) {
           return "-";
         } else if (method === "manual") {
           return "手动";
         } else if (method === "auto") {
-          const crontab: string = row.getValue("crontab");
+          const crontab: string = row.original.crontab ?? "";
           return (
-            <div className="flex flex-col">
-              定时
+            <div className="flex flex-col space-y-1">
+              <div>定时</div>
               <div className="text-muted-foreground text-xs">{crontab}</div>
             </div>
           );
@@ -211,3 +211,4 @@ const Workflow = () => {
 };
 
 export default Workflow;
+