From cfdb09fe5ba4e90731d4c5a852d58720fc5c763b Mon Sep 17 00:00:00 2001 From: zhang Date: Wed, 22 May 2024 22:40:56 +0800 Subject: [PATCH] style: format code style (#3857) * first commit * style: format code style * style: format code --- src/components/CodeEditor/src/CodeEditor.vue | 3 ++- .../CodeEditor/src/codemirror/CodeMirror.vue | 2 +- src/components/CodeEditor/src/typing.ts | 8 +++----- src/components/Form/src/BasicForm.vue | 11 ++++++----- src/components/Form/src/components/FormItem.vue | 6 +++--- src/components/Form/src/types/form.ts | 14 +++++++++++--- src/views/demo/editor/code/Editor.vue | 1 + src/views/demo/editor/code/index.vue | 4 ++-- 8 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/components/CodeEditor/src/CodeEditor.vue b/src/components/CodeEditor/src/CodeEditor.vue index a58b4cb34..2a439ea89 100644 --- a/src/components/CodeEditor/src/CodeEditor.vue +++ b/src/components/CodeEditor/src/CodeEditor.vue @@ -16,6 +16,7 @@ import { isString } from '@/utils/is'; import { MODE } from './typing'; import type { EditorConfiguration } from 'codemirror'; + const props = defineProps({ value: { type: [Object, String] as PropType | string> }, mode: { @@ -29,7 +30,7 @@ readonly: { type: Boolean }, autoFormat: { type: Boolean, default: true }, bordered: { type: Boolean, default: false }, - config: { type: Object as PropType, default: {} }, + config: { type: Object as PropType, default: () => {} }, }); const emit = defineEmits(['change', 'update:value', 'format-error']); diff --git a/src/components/CodeEditor/src/codemirror/CodeMirror.vue b/src/components/CodeEditor/src/codemirror/CodeMirror.vue index 957bba0b1..96ec138b5 100644 --- a/src/components/CodeEditor/src/codemirror/CodeMirror.vue +++ b/src/components/CodeEditor/src/codemirror/CodeMirror.vue @@ -51,7 +51,7 @@ value: { type: String, default: '' }, readonly: { type: Boolean, default: false }, bordered: { type: Boolean, default: false }, - config: { type: Object as PropType, default: {} }, + config: { type: Object as PropType, default: () => {} }, }); const emit = defineEmits(['change']); diff --git a/src/components/CodeEditor/src/typing.ts b/src/components/CodeEditor/src/typing.ts index 598a6784f..b154c79e5 100644 --- a/src/components/CodeEditor/src/typing.ts +++ b/src/components/CodeEditor/src/typing.ts @@ -1,7 +1,5 @@ export enum MODE { JSON = 'application/json', - HTML = 'htmlmixed', - JS = 'javascript', APL = 'apl', ASCIIARMOR = 'asciiarmor', ASTERISK = 'asterisk', @@ -121,12 +119,12 @@ export enum MODE { Z80 = 'z80', } /** - * @description: DynamicImport codemirror + * @description: DynamicImport codemirror */ export function parserDynamicImport(str: MODE): () => Promise { - let dynamicArray = { + const dynamicArray = { // adapt before demo - "application/json": async () => await import('codemirror/mode/javascript/javascript'), + 'application/json': async () => await import('codemirror/mode/javascript/javascript'), apl: async () => await import('codemirror/mode/apl/apl'), asciiarmor: async () => await import('codemirror/mode/asciiarmor/asciiarmor'), asterisk: async () => await import('codemirror/mode/asterisk/asterisk'), diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue index 3dc5468bb..501fd8a1e 100644 --- a/src/components/Form/src/BasicForm.vue +++ b/src/components/Form/src/BasicForm.vue @@ -339,12 +339,12 @@ // margin-bottom: 20px; // } - &.suffix-item, &.prefix-item { + &.suffix-item, + &.prefix-item { .ant-form-item-children { display: flex; - } - } - &.suffix-item, &.prefix-item{ + } + .prefix { display: inline-flex; align-items: center; @@ -352,6 +352,7 @@ padding-right: 6px; line-height: 1; } + .suffix { display: inline-flex; align-items: center; @@ -361,7 +362,7 @@ } } } - + .ant-form-explain { font-size: 14px; } diff --git a/src/components/Form/src/components/FormItem.vue b/src/components/Form/src/components/FormItem.vue index 1f84f7068..32da3121b 100644 --- a/src/components/Form/src/components/FormItem.vue +++ b/src/components/Form/src/components/FormItem.vue @@ -383,9 +383,9 @@ labelCol={labelCol} wrapperCol={wrapperCol} name={field} - class={{ - 'suffix-item': !!suffix, - 'prefix-item': !!prefix + class={{ + 'suffix-item': !!suffix, + 'prefix-item': !!prefix, }} > {renderLabelHelpMessage()} diff --git a/src/components/Form/src/types/form.ts b/src/components/Form/src/types/form.ts index 0445fdd2b..b077039d5 100644 --- a/src/components/Form/src/types/form.ts +++ b/src/components/Form/src/types/form.ts @@ -41,7 +41,7 @@ export interface FormActionType { validateFields: (nameList?: NamePath[]) => Promise; validate: (nameList?: NamePath[] | false) => Promise; scrollToField: (name: NamePath, options?: ScrollOptions) => Promise; - resetDefaultField:(name?: NamePath[]) => void; + resetDefaultField: (name?: NamePath[]) => void; } export type RegisterFn = (formInstance: FormActionType) => void; @@ -167,8 +167,16 @@ interface BaseFormSchema { // Required required?: boolean | ((renderCallbackParams: RenderCallbackParams) => boolean); - suffix?: string | number | VNode | ((renderCallbackParams: RenderCallbackParams) => string | VNode | number) - prefix?: string | number | VNode | ((renderCallbackParams: RenderCallbackParams) => string | VNode | number) + suffix?: + | string + | number + | VNode + | ((renderCallbackParams: RenderCallbackParams) => string | VNode | number); + prefix?: + | string + | number + | VNode + | ((renderCallbackParams: RenderCallbackParams) => string | VNode | number); // Validation rules rules?: Rule[]; // Check whether the information is added to the label diff --git a/src/views/demo/editor/code/Editor.vue b/src/views/demo/editor/code/Editor.vue index 6d2171eed..0ba67ca1d 100644 --- a/src/views/demo/editor/code/Editor.vue +++ b/src/views/demo/editor/code/Editor.vue @@ -18,6 +18,7 @@ import { useMessage } from '@/hooks/web/useMessage'; import { PageWrapper } from '@/components/Page'; import { CodeEditor, MODE } from '@/components/CodeEditor'; + const schemas: FormSchema[] = [ { field: 'title', diff --git a/src/views/demo/editor/code/index.vue b/src/views/demo/editor/code/index.vue index b5c39667e..d001c6888 100644 --- a/src/views/demo/editor/code/index.vue +++ b/src/views/demo/editor/code/index.vue @@ -66,11 +66,11 @@ value.value = jsonData; return; } - if (mode === MODE.HTML) { + if (mode === MODE.HTMLMIXED) { value.value = htmlData; return; } - if (mode === MODE.JS) { + if (mode === MODE.JAVASCRIPT) { value.value = jsData; return; }