diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderLocal.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderLocal.tsx index 8bbd6fc8e..e12ca8fd3 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderLocal.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderLocal.tsx @@ -234,16 +234,6 @@ const BizDeployNodeConfigFieldsProviderLocal = () => { /> - - - - { > + + + + + + }) return z .object({ format: z.literal([FORMAT_PEM, FORMAT_PFX, FORMAT_JKS], t("workflow_node.deploy.form.local_format.placeholder")), + keyPath: z + .string() + .max(256, t("common.errmsg.string_max", { max: 256 })) + .nullish(), certPath: z .string() - .min(1, t("workflow_node.deploy.form.local_cert_path.tooltip")) + .min(1, t("workflow_node.deploy.form.local_cert_path.placeholder")) .max(256, t("common.errmsg.string_max", { max: 256 })), certPathForServerOnly: z .string() @@ -423,10 +429,6 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) .string() .max(256, t("common.errmsg.string_max", { max: 256 })) .nullish(), - keyPath: z - .string() - .max(256, t("common.errmsg.string_max", { max: 256 })) - .nullish(), pfxPassword: z .string() .max(64, t("common.errmsg.string_max", { max: 256 })) @@ -460,7 +462,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) if (!values.keyPath?.trim()) { ctx.addIssue({ code: "custom", - message: t("workflow_node.deploy.form.ssh_key_path.tooltip"), + message: t("workflow_node.deploy.form.local_key_path.placeholder"), path: ["keyPath"], }); } @@ -472,7 +474,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) if (!values.pfxPassword?.trim()) { ctx.addIssue({ code: "custom", - message: t("workflow_node.deploy.form.ssh_pfx_password.tooltip"), + message: t("workflow_node.deploy.form.local_pfx_password.placeholder"), path: ["pfxPassword"], }); } @@ -484,7 +486,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) if (!values.jksAlias?.trim()) { ctx.addIssue({ code: "custom", - message: t("workflow_node.deploy.form.ssh_jks_alias.tooltip"), + message: t("workflow_node.deploy.form.local_jks_alias.placeholder"), path: ["jksAlias"], }); } @@ -492,7 +494,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) if (!values.jksKeypass?.trim()) { ctx.addIssue({ code: "custom", - message: t("workflow_node.deploy.form.ssh_jks_keypass.tooltip"), + message: t("workflow_node.deploy.form.local_jks_keypass.placeholder"), path: ["jksKeypass"], }); } @@ -500,7 +502,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) if (!values.jksStorepass?.trim()) { ctx.addIssue({ code: "custom", - message: t("workflow_node.deploy.form.ssh_jks_storepass.tooltip"), + message: t("workflow_node.deploy.form.local_jks_storepass.placeholder"), path: ["jksStorepass"], }); } diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderSSH.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderSSH.tsx index b29e74ab1..a6a57f68f 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderSSH.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderSSH.tsx @@ -266,7 +266,7 @@ const BizDeployNodeConfigFieldsProviderSSH = () => { - - { > + + + + + + }) return z .object({ format: z.literal([FORMAT_PEM, FORMAT_PFX, FORMAT_JKS], t("workflow_node.deploy.form.ssh_format.placeholder")), - certPath: z - .string() - .min(1, t("workflow_node.deploy.form.ssh_cert_path.tooltip")) - .max(256, t("common.errmsg.string_max", { max: 256 })), keyPath: z .string() .max(256, t("common.errmsg.string_max", { max: 256 })) .nullish(), + certPath: z + .string() + .min(1, t("workflow_node.deploy.form.ssh_cert_path.placeholder")) + .max(256, t("common.errmsg.string_max", { max: 256 })), certPathForServerOnly: z .string() .max(256, t("common.errmsg.string_max", { max: 256 })) @@ -502,7 +504,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) if (!values.keyPath?.trim()) { ctx.addIssue({ code: "custom", - message: t("workflow_node.deploy.form.ssh_key_path.tooltip"), + message: t("workflow_node.deploy.form.ssh_key_path.placeholder"), path: ["keyPath"], }); } @@ -514,7 +516,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) if (!values.pfxPassword?.trim()) { ctx.addIssue({ code: "custom", - message: t("workflow_node.deploy.form.ssh_pfx_password.tooltip"), + message: t("workflow_node.deploy.form.ssh_pfx_password.placeholder"), path: ["pfxPassword"], }); } @@ -526,7 +528,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) if (!values.jksAlias?.trim()) { ctx.addIssue({ code: "custom", - message: t("workflow_node.deploy.form.ssh_jks_alias.tooltip"), + message: t("workflow_node.deploy.form.ssh_jks_alias.placeholder"), path: ["jksAlias"], }); } @@ -534,7 +536,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) if (!values.jksKeypass?.trim()) { ctx.addIssue({ code: "custom", - message: t("workflow_node.deploy.form.ssh_jks_keypass.tooltip"), + message: t("workflow_node.deploy.form.ssh_jks_keypass.placeholder"), path: ["jksKeypass"], }); } @@ -542,7 +544,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) if (!values.jksStorepass?.trim()) { ctx.addIssue({ code: "custom", - message: t("workflow_node.deploy.form.ssh_jks_storepass.tooltip"), + message: t("workflow_node.deploy.form.ssh_jks_storepass.placeholder"), path: ["jksStorepass"], }); } diff --git a/ui/src/i18n/locales/en/nls.workflow.nodes.json b/ui/src/i18n/locales/en/nls.workflow.nodes.json index e1d819208..03aa09be7 100644 --- a/ui/src/i18n/locales/en/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/en/nls.workflow.nodes.json @@ -612,17 +612,19 @@ "workflow_node.deploy.form.local_format.option.pem.label": "PEM (*.pem, *.crt, *.key)", "workflow_node.deploy.form.local_format.option.pfx.label": "PFX (*.pfx, *.p12)", "workflow_node.deploy.form.local_format.option.jks.label": "JKS (*.jks)", - "workflow_node.deploy.form.local_cert_path.label": "Certificate file saving path", - "workflow_node.deploy.form.local_cert_path.placeholder": "Please enter saving path for certificate file", - "workflow_node.deploy.form.local_cert_path.help": "Notes: It should include the full file path, not just the directory.", - "workflow_node.deploy.form.local_key_path.label": "Certificate's private key file saving path", - "workflow_node.deploy.form.local_key_path.placeholder": "Please enter saving path for certificate's private key file", + "workflow_node.deploy.form.local_key_path.label": "Private key file path", + "workflow_node.deploy.form.local_key_path.placeholder": "Please enter the local path for private key file", "workflow_node.deploy.form.local_key_path.help": "Notes: It should include the full file path, not just the directory.", - "workflow_node.deploy.form.local_servercert_path.label": "Server certificate file saving path (Optional)", - "workflow_node.deploy.form.local_servercert_path.placeholder": "Please enter saving path for server certificate file", + "workflow_node.deploy.form.local_cert_path.label": "Certificate file path", + "workflow_node.deploy.form.local_cert_path.placeholder": "Please enter the local path for certificate file", + "workflow_node.deploy.form.local_cert_path.help": "Notes: It should include the full file path, not just the directory.", + "workflow_node.deploy.form.local_fullchaincert_path.label": "Bundled fullchain certificate file path", + "workflow_node.deploy.form.local_fullchaincert_path.placeholder": "Please enter the local path for bundled fullchain certificate", + "workflow_node.deploy.form.local_servercert_path.label": "Server certificate file path (Optional)", + "workflow_node.deploy.form.local_servercert_path.placeholder": "Please enter the local path for server certificate file", "workflow_node.deploy.form.local_servercert_path.help": "Notes: It should include the full file path, not just the directory.", - "workflow_node.deploy.form.local_intermediacert_path.label": "Intermediate CA certificate file saving path (Optional)", - "workflow_node.deploy.form.local_intermediacert_path.placeholder": "Please enter saving path for intermediate CA certificate file", + "workflow_node.deploy.form.local_intermediacert_path.label": "Intermediate CA certificate file path (Optional)", + "workflow_node.deploy.form.local_intermediacert_path.placeholder": "Please enter the local path for intermediate CA certificate file", "workflow_node.deploy.form.local_intermediacert_path.help": "Notes: It should include the full file path, not just the directory.", "workflow_node.deploy.form.local_pfx_password.label": "PFX password", "workflow_node.deploy.form.local_pfx_password.placeholder": "Please enter PFX password", @@ -690,17 +692,19 @@ "workflow_node.deploy.form.ssh_format.option.pem.label": "PEM (*.pem, *.crt, *.key)", "workflow_node.deploy.form.ssh_format.option.pfx.label": "PFX (*.pfx, *.p12)", "workflow_node.deploy.form.ssh_format.option.jks.label": "JKS (*.jks)", - "workflow_node.deploy.form.ssh_cert_path.label": "Certificate file uploading path", - "workflow_node.deploy.form.ssh_cert_path.placeholder": "Please enter uploading path for certificate file", - "workflow_node.deploy.form.ssh_cert_path.help": "Notes: It should include the full file path, not just the directory.", - "workflow_node.deploy.form.ssh_key_path.label": "Certificate's private key file uploading path", - "workflow_node.deploy.form.ssh_key_path.placeholder": "Please enter uploading path for certificate's private key file", + "workflow_node.deploy.form.ssh_key_path.label": "Private key file path", + "workflow_node.deploy.form.ssh_key_path.placeholder": "Please enter the remote path for private key file", "workflow_node.deploy.form.ssh_key_path.help": "Notes: It should include the full file path, not just the directory.", - "workflow_node.deploy.form.ssh_servercert_path.label": "Server certificate file uploading path (Optional)", - "workflow_node.deploy.form.ssh_servercert_path.placeholder": "Please enter uploading path for server certificate file", + "workflow_node.deploy.form.ssh_cert_path.label": "Certificate file path", + "workflow_node.deploy.form.ssh_cert_path.placeholder": "Please enter the remote path for certificate", + "workflow_node.deploy.form.ssh_cert_path.help": "Notes: It should include the full file path, not just the directory.", + "workflow_node.deploy.form.ssh_fullchaincert_path.label": "Bundled fullchain certificate file path", + "workflow_node.deploy.form.ssh_fullchaincert_path.placeholder": "Please enter the remote path for bundled fullchain certificate", + "workflow_node.deploy.form.ssh_servercert_path.label": "Server certificate file path (Optional)", + "workflow_node.deploy.form.ssh_servercert_path.placeholder": "Please enter the remote path for server certificate file", "workflow_node.deploy.form.ssh_servercert_path.help": "Notes: It should include the full file path, not just the directory.", - "workflow_node.deploy.form.ssh_intermediacert_path.label": "Intermediate CA certificate file uploading path (Optional)", - "workflow_node.deploy.form.ssh_intermediacert_path.placeholder": "Please enter uploading path for intermediate CA certificate file", + "workflow_node.deploy.form.ssh_intermediacert_path.label": "Intermediate CA certificate file path (Optional)", + "workflow_node.deploy.form.ssh_intermediacert_path.placeholder": "Please enter the remote path for intermediate CA certificate file", "workflow_node.deploy.form.ssh_intermediacert_path.help": "Notes: It should include the full file path, not just the directory.", "workflow_node.deploy.form.ssh_pfx_password.label": "PFX password", "workflow_node.deploy.form.ssh_pfx_password.placeholder": "Please enter PFX password", diff --git a/ui/src/i18n/locales/zh/nls.workflow.nodes.json b/ui/src/i18n/locales/zh/nls.workflow.nodes.json index d5dcfa17e..242a19571 100644 --- a/ui/src/i18n/locales/zh/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/zh/nls.workflow.nodes.json @@ -610,17 +610,19 @@ "workflow_node.deploy.form.local_format.option.pem.label": "PEM 格式(*.pem, *.crt, *.key)", "workflow_node.deploy.form.local_format.option.pfx.label": "PFX 格式(*.pfx, *.p12)", "workflow_node.deploy.form.local_format.option.jks.label": "JKS 格式(*.jks)", - "workflow_node.deploy.form.local_cert_path.label": "证书文件保存路径", - "workflow_node.deploy.form.local_cert_path.placeholder": "请输入证书文件保存路径", - "workflow_node.deploy.form.local_cert_path.help": "注意:路径需包含完整的文件名,而不是只有目录。", - "workflow_node.deploy.form.local_key_path.label": "证书私钥文件保存路径", - "workflow_node.deploy.form.local_key_path.placeholder": "请输入证书私钥文件保存路径", + "workflow_node.deploy.form.local_key_path.label": "私钥文件路径", + "workflow_node.deploy.form.local_key_path.placeholder": "请输入私钥文件本地路径", "workflow_node.deploy.form.local_key_path.help": "注意:路径需包含完整的文件名,而不是只有目录。", - "workflow_node.deploy.form.local_servercert_path.label": "服务器证书文件保存路径(可选)", - "workflow_node.deploy.form.local_servercert_path.placeholder": "请输入服务器证书文件保存路径", + "workflow_node.deploy.form.local_cert_path.label": "证书文件路径", + "workflow_node.deploy.form.local_cert_path.placeholder": "请输入证书文件本地路径", + "workflow_node.deploy.form.local_cert_path.help": "注意:路径需包含完整的文件名,而不是只有目录。", + "workflow_node.deploy.form.local_fullchaincert_path.label": "证书链文件路径", + "workflow_node.deploy.form.local_fullchaincert_path.placeholder": "请输入证书链文件本地路径", + "workflow_node.deploy.form.local_servercert_path.label": "服务器证书文件路径(可选)", + "workflow_node.deploy.form.local_servercert_path.placeholder": "请输入服务器证书文件本地路径", "workflow_node.deploy.form.local_servercert_path.help": "注意:路径需包含完整的文件名,而不是只有目录。不填写时将不会保存服务器证书。", - "workflow_node.deploy.form.local_intermediacert_path.label": "中间证书文件保存路径(可选)", - "workflow_node.deploy.form.local_intermediacert_path.placeholder": "请输入中间证书文件保存路径", + "workflow_node.deploy.form.local_intermediacert_path.label": "中间证书文件路径(可选)", + "workflow_node.deploy.form.local_intermediacert_path.placeholder": "请输入中间证书文件本地路径", "workflow_node.deploy.form.local_intermediacert_path.help": "注意:路径需包含完整的文件名,而不是只有目录。不填写时将不会保存中间证书。", "workflow_node.deploy.form.local_pfx_password.label": "PFX 导出密码", "workflow_node.deploy.form.local_pfx_password.placeholder": "请输入 PFX 导出密码", @@ -688,19 +690,21 @@ "workflow_node.deploy.form.ssh_format.option.pem.label": "PEM 格式(*.pem, *.crt, *.key)", "workflow_node.deploy.form.ssh_format.option.pfx.label": "PFX 格式(*.pfx, *.p12)", "workflow_node.deploy.form.ssh_format.option.jks.label": "JKS 格式(*.jks)", - "workflow_node.deploy.form.ssh_cert_path.label": "证书文件上传路径", - "workflow_node.deploy.form.ssh_cert_path.placeholder": "请输入证书文件上传路径", - "workflow_node.deploy.form.ssh_cert_path.help": "注意:路径需包含完整的文件名,而不是只有目录。", - "workflow_node.deploy.form.ssh_key_path.label": "证书私钥文件上传路径", - "workflow_node.deploy.form.ssh_key_path.placeholder": "请输入证书私钥文件上传路径", + "workflow_node.deploy.form.ssh_key_path.label": "私钥文件路径", + "workflow_node.deploy.form.ssh_key_path.placeholder": "请输入私钥文件远程路径", "workflow_node.deploy.form.ssh_key_path.help": "注意:路径需包含完整的文件名,而不是只有目录。", - "workflow_node.deploy.form.ssh_pfx_password.label": "PFX 导出密码", - "workflow_node.deploy.form.ssh_servercert_path.label": "服务器证书文件上传路径(可选)", - "workflow_node.deploy.form.ssh_servercert_path.placeholder": "请输入服务器证书文件上传路径", + "workflow_node.deploy.form.ssh_cert_path.label": "证书文件路径", + "workflow_node.deploy.form.ssh_cert_path.placeholder": "请输入证书文件远程路径", + "workflow_node.deploy.form.ssh_cert_path.help": "注意:路径需包含完整的文件名,而不是只有目录。", + "workflow_node.deploy.form.ssh_fullchaincert_path.label": "证书链文件路径", + "workflow_node.deploy.form.ssh_fullchaincert_path.placeholder": "请输入证书链文件远程路径", + "workflow_node.deploy.form.ssh_servercert_path.label": "服务器证书文件路径(可选)", + "workflow_node.deploy.form.ssh_servercert_path.placeholder": "请输入服务器证书文件远程路径", "workflow_node.deploy.form.ssh_servercert_path.help": "注意:路径需包含完整的文件名,而不是只有目录。不填写时将不上传服务器证书。", - "workflow_node.deploy.form.ssh_intermediacert_path.label": "中间证书文件上传路径(可选)", - "workflow_node.deploy.form.ssh_intermediacert_path.placeholder": "请输入中间证书文件上传路径", + "workflow_node.deploy.form.ssh_intermediacert_path.label": "中间证书文件路径(可选)", + "workflow_node.deploy.form.ssh_intermediacert_path.placeholder": "请输入中间证书文件远程路径", "workflow_node.deploy.form.ssh_intermediacert_path.help": "注意:路径需包含完整的文件名,而不是只有目录。不填写时将不上传中间证书。", + "workflow_node.deploy.form.ssh_pfx_password.label": "PFX 导出密码", "workflow_node.deploy.form.ssh_pfx_password.placeholder": "请输入 PFX 导出密码", "workflow_node.deploy.form.ssh_pfx_password.tooltip": "这是什么?请参阅 https://learn.microsoft.com/zh-cn/windows-hardware/drivers/install/personal-information-exchange---pfx--files", "workflow_node.deploy.form.ssh_jks_alias.label": "JKS 别名",