diff --git a/ui/src/components/CodeInput.tsx b/ui/src/components/CodeTextInput.tsx similarity index 88% rename from ui/src/components/CodeInput.tsx rename to ui/src/components/CodeTextInput.tsx index ef6a8d8e2..d1400d3c2 100644 --- a/ui/src/components/CodeInput.tsx +++ b/ui/src/components/CodeTextInput.tsx @@ -14,13 +14,15 @@ import DisabledContext from "antd/es/config-provider/DisabledContext"; import { useBrowserTheme } from "@/hooks"; import { mergeCls } from "@/utils/css"; -export interface CodeInputProps extends Omit { +export interface CodeTextInputProps extends Omit { disabled?: boolean; language?: string | string[]; + lineNumbers?: boolean; + lineWrapping?: boolean; readOnly?: boolean; } -const CodeInput = ({ className, style, disabled, language, readOnly, ...props }: CodeInputProps) => { +const CodeTextInput = ({ className, style, disabled, language, lineNumbers = true, lineWrapping = true, readOnly, ...props }: CodeTextInputProps) => { const { token: themeToken } = theme.useToken(); const { theme: browserTheme } = useBrowserTheme(); @@ -47,9 +49,12 @@ const CodeInput = ({ className, style, disabled, language, readOnly, ...props }: allowMultipleSelections: false, indentOnInput: false, }), - EditorView.lineWrapping, ]; + if (lineWrapping) { + temp.push(EditorView.lineWrapping); + } + const langs = Array.isArray(language) ? language : [language]; langs.forEach((lang) => { switch (lang) { @@ -69,7 +74,7 @@ const CodeInput = ({ className, style, disabled, language, readOnly, ...props }: }); return temp; - }, [language]); + }, [language, lineWrapping]); return (
{ +export interface FileTextInputProps extends Omit { accept?: string; uploadButtonProps?: Omit; uploadText?: string; onChange?: (value: string) => void; } -const TextFileInput = ({ className, style, accept, disabled, readOnly, uploadText, uploadButtonProps, onChange, ...props }: TextFileInputProps) => { +const FileTextInput = ({ className, style, accept, disabled, readOnly, uploadText, uploadButtonProps, onChange, ...props }: FileTextInputProps) => { const { t } = useTranslation(); const injectedDisabled = useContext(DisabledContext); @@ -53,4 +53,4 @@ const TextFileInput = ({ className, style, accept, disabled, readOnly, uploadTex ); }; -export default TextFileInput; +export default FileTextInput; diff --git a/ui/src/components/access/forms/AccessConfigFieldsProviderACMEDNS.tsx b/ui/src/components/access/forms/AccessConfigFieldsProviderACMEDNS.tsx index b39facecd..ffc63dcab 100644 --- a/ui/src/components/access/forms/AccessConfigFieldsProviderACMEDNS.tsx +++ b/ui/src/components/access/forms/AccessConfigFieldsProviderACMEDNS.tsx @@ -3,7 +3,7 @@ import { Form, Input } from "antd"; import { createSchemaFieldRule } from "antd-zod"; import { z } from "zod/v4"; -import TextFileInput from "@/components/TextFileInput"; +import FileTextInput from "@/components/FileTextInput"; import { useFormNestedFieldsContext } from "./_context"; @@ -35,7 +35,7 @@ const AccessConfigFieldsProviderACMEDNS = () => { rules={[formRule]} tooltip={} > - + ); diff --git a/ui/src/components/access/forms/AccessConfigFieldsProviderKubernetes.tsx b/ui/src/components/access/forms/AccessConfigFieldsProviderKubernetes.tsx index cb2167c69..ff568dabc 100644 --- a/ui/src/components/access/forms/AccessConfigFieldsProviderKubernetes.tsx +++ b/ui/src/components/access/forms/AccessConfigFieldsProviderKubernetes.tsx @@ -3,7 +3,7 @@ import { Form } from "antd"; import { createSchemaFieldRule } from "antd-zod"; import { z } from "zod"; -import TextFileInput from "@/components/TextFileInput"; +import FileTextInput from "@/components/FileTextInput"; import { useFormNestedFieldsContext } from "./_context"; @@ -27,7 +27,7 @@ const AccessConfigFormFieldsProviderKubernetes = () => { rules={[formRule]} tooltip={} > - + ); diff --git a/ui/src/components/access/forms/AccessConfigFieldsProviderSSH.tsx b/ui/src/components/access/forms/AccessConfigFieldsProviderSSH.tsx index 89003bd51..5bb9dbd2e 100644 --- a/ui/src/components/access/forms/AccessConfigFieldsProviderSSH.tsx +++ b/ui/src/components/access/forms/AccessConfigFieldsProviderSSH.tsx @@ -5,7 +5,7 @@ import { createSchemaFieldRule } from "antd-zod"; import { z } from "zod"; import Show from "@/components/Show"; -import TextFileInput from "@/components/TextFileInput"; +import FileTextInput from "@/components/FileTextInput"; import { mergeCls } from "@/utils/css"; import { validDomainName, validIPv4Address, validIPv6Address, validPortNumber } from "@/utils/validators"; @@ -70,7 +70,7 @@ const AccessConfigFormFieldsProviderSSH = ({ disabled }: { disabled?: boolean }) - + - + diff --git a/ui/src/components/access/forms/AccessConfigFieldsProviderWebhook.tsx b/ui/src/components/access/forms/AccessConfigFieldsProviderWebhook.tsx index 93e29191d..6883bdcff 100644 --- a/ui/src/components/access/forms/AccessConfigFieldsProviderWebhook.tsx +++ b/ui/src/components/access/forms/AccessConfigFieldsProviderWebhook.tsx @@ -4,7 +4,7 @@ import { Button, Dropdown, Form, Input, Select, Switch } from "antd"; import { createSchemaFieldRule } from "antd-zod"; import { z } from "zod"; -import CodeInput from "@/components/CodeInput"; +import CodeTextInput from "@/components/CodeTextInput"; import Show from "@/components/Show"; import Tips from "@/components/Tips"; @@ -214,7 +214,8 @@ const AccessConfigFormFieldsProviderWebhook = ({ usage = "none" }: AccessConfigF rules={[formRule]} tooltip={} > -
- - - + ); diff --git a/ui/src/components/workflow/WorkflowGraphImportInputBox.tsx b/ui/src/components/workflow/WorkflowGraphImportInputBox.tsx index 46bfd3239..88b812e25 100644 --- a/ui/src/components/workflow/WorkflowGraphImportInputBox.tsx +++ b/ui/src/components/workflow/WorkflowGraphImportInputBox.tsx @@ -5,7 +5,7 @@ import { createSchemaFieldRule } from "antd-zod"; import { parse as parseYaml } from "yaml"; import { z } from "zod"; -import CodeInput from "@/components/CodeInput"; +import CodeTextInput from "@/components/CodeTextInput"; import { WORKFLOW_NODE_TYPES, type WorkflowGraph, type WorkflowNode, type WorkflowNodeType } from "@/domain/workflow"; import { useAntdForm } from "@/hooks"; @@ -236,7 +236,7 @@ const WorkflowGraphImportInputBox = forwardRef - + ); diff --git a/ui/src/components/workflow/designer/forms/BizApplyNodeConfigForm.tsx b/ui/src/components/workflow/designer/forms/BizApplyNodeConfigForm.tsx index fba34b19c..eacd68aed 100644 --- a/ui/src/components/workflow/designer/forms/BizApplyNodeConfigForm.tsx +++ b/ui/src/components/workflow/designer/forms/BizApplyNodeConfigForm.tsx @@ -16,7 +16,7 @@ import ACMEDns01ProviderSelect from "@/components/provider/ACMEDns01ProviderSele import ACMEHttp01ProviderSelect from "@/components/provider/ACMEHttp01ProviderSelect"; import CAProviderSelect from "@/components/provider/CAProviderSelect"; import Show from "@/components/Show"; -import TextFileInput from "@/components/TextFileInput"; +import FileTextInput from "@/components/FileTextInput"; import { type AccessModel } from "@/domain/access"; import { acmeDns01ProvidersMap, acmeHttp01ProvidersMap, caProvidersMap } from "@/domain/provider"; import { type WorkflowNodeConfigForBizApply, defaultNodeConfigForBizApply } from "@/domain/workflow"; @@ -432,7 +432,7 @@ const BizApplyNodeConfigForm = ({ node, ...props }: BizApplyNodeConfigFormProps) - { rules={[formRule]} tooltip={} > - { rules={[formRule]} tooltip={} > - { - { - { - { - { - { - - - - + );