diff --git a/src/components/Form/src/hooks/useFormValues.ts b/src/components/Form/src/hooks/useFormValues.ts index a3ddabe4d..ca4cf3aa0 100644 --- a/src/components/Form/src/hooks/useFormValues.ts +++ b/src/components/Form/src/hooks/useFormValues.ts @@ -13,7 +13,7 @@ interface UseFormValuesContext { } /** - * @desription deconstruct array-link key. This method will mutate the target. + * @description deconstruct array-link key. This method will mutate the target. */ function tryDeconstructArray(key: string, value: any, target: Recordable) { const pattern = /^\[(.+)\]$/ @@ -31,7 +31,7 @@ function tryDeconstructArray(key: string, value: any, target: Recordable) { } /** - * @desription deconstruct object-link key. This method will mutate the target. + * @description deconstruct object-link key. This method will mutate the target. */ function tryDeconstructObject(key: string, value: any, target: Recordable) { const pattern = /^\{(.+)\}$/ @@ -122,10 +122,11 @@ export function useFormValues({ defaultValueRef, getSchema, formModel, getProps const { defaultValue, defaultValueObj } = item const fieldKeys = Object.keys(defaultValueObj || {}) if (fieldKeys.length) { + // eslint-disable-next-line array-callback-return fieldKeys.map((field) => { - obj[field] = defaultValueObj[field] + obj[field] = defaultValueObj![field] if (formModel[field] === undefined) - formModel[field] = defaultValueObj[field] + formModel[field] = defaultValueObj![field] }) } if (!isNullOrUnDef(defaultValue)) { diff --git a/src/components/FormDesign/src/components/VFormDesign/components/ComponentProps.vue b/src/components/FormDesign/src/components/VFormDesign/components/ComponentProps.vue index bcd8ad978..c4e537c55 100644 --- a/src/components/FormDesign/src/components/VFormDesign/components/ComponentProps.vue +++ b/src/components/FormDesign/src/components/VFormDesign/components/ComponentProps.vue @@ -128,14 +128,14 @@ export default defineComponent({ // 控制性的选项 const controlOptions = computed(() => { return allOptions.value.filter((item) => { - return item.category == 'control' + return item.category === 'control' }) }) // 非控制性选择 const inputOptions = computed(() => { return allOptions.value.filter((item) => { - return item.category == 'input' + return item.category === 'input' }) }) diff --git a/src/components/FormDesign/src/components/index.ts b/src/components/FormDesign/src/components/index.ts index ea8613b60..fb8b37041 100644 --- a/src/components/FormDesign/src/components/index.ts +++ b/src/components/FormDesign/src/components/index.ts @@ -1,6 +1,7 @@ import type { Component } from 'vue' import { Input, + // eslint-disable-next-line sort-imports Button, Select, Radio, diff --git a/src/components/FormDesign/src/hooks/useVFormMethods.ts b/src/components/FormDesign/src/hooks/useVFormMethods.ts index ec9f79296..3044fb23e 100644 --- a/src/components/FormDesign/src/hooks/useVFormMethods.ts +++ b/src/components/FormDesign/src/hooks/useVFormMethods.ts @@ -78,20 +78,6 @@ export function useVFormMethods( formItem[key] = value } - /** - * 设置表单项的props - * @param {string} field 需要设置的表单项field - * @param {string} key 需要设置的key - * @param value 需要设置的值 - */ - const setProps: ISetProps = (field, key, value) => { - const formItem = get(field) - if (formItem?.componentProps) { - ['options', 'treeData'].includes(key) && setValue(field, undefined) - - formItem.componentProps[key] = value - } - } /** * 设置字段的值,设置后触发校验 * @param {string} field 需要设置的字段 @@ -111,6 +97,20 @@ export function useVFormMethods( }) } } + /** + * 设置表单项的props + * @param {string} field 需要设置的表单项field + * @param {string} key 需要设置的key + * @param value 需要设置的值 + */ + const setProps: ISetProps = (field, key, value) => { + const formItem = get(field) + if (formItem?.componentProps) { + ['options', 'treeData'].includes(key) && setValue(field, undefined) + + formItem.componentProps[key] = value + } + } /** * 设置表单配置方法 * @param {string} key diff --git a/src/components/FormDesign/src/utils/index.ts b/src/components/FormDesign/src/utils/index.ts index 15f695362..ea3a56a4f 100644 --- a/src/components/FormDesign/src/utils/index.ts +++ b/src/components/FormDesign/src/utils/index.ts @@ -199,6 +199,7 @@ export function strToReg(rules: IValidationRule[]) { */ export function runCode(code: any): T { try { + // eslint-disable-next-line @typescript-eslint/no-implied-eval, no-new-func return new Function(`return ${code}`)() } catch { diff --git a/src/components/Table/src/components/editable/EditableCell.vue b/src/components/Table/src/components/editable/EditableCell.vue index 1bf72ea6d..827efe886 100644 --- a/src/components/Table/src/components/editable/EditableCell.vue +++ b/src/components/Table/src/components/editable/EditableCell.vue @@ -1,3 +1,4 @@ + +