diff --git a/apps/vue/src/components/Form/src/hooks/useFormEvents.ts b/apps/vue/src/components/Form/src/hooks/useFormEvents.ts index 0841f8169..b50cedd5b 100644 --- a/apps/vue/src/components/Form/src/hooks/useFormEvents.ts +++ b/apps/vue/src/components/Form/src/hooks/useFormEvents.ts @@ -77,11 +77,6 @@ export function useFormEvents({ const hasKey = Reflect.has(values, key); value = handleInputNumberValue(schema?.component, value); - const { componentProps } = schema || {}; - let _props = componentProps as any; - if (typeof componentProps === 'function') { - _props = _props({ formModel: unref(formModel) }); - } // 0| '' is allow if (hasKey && fields.includes(key)) { // time type @@ -91,20 +86,17 @@ export function useFormEvents({ for (const ele of value) { arr.push(ele ? dateUtil(ele) : null); } - unref(formModel)[key] = arr; + formModel[key] = arr; } else { const { componentProps } = schema || {}; let _props = componentProps as any; if (typeof componentProps === 'function') { _props = _props({ formModel }); } - unref(formModel)[key] = value ? (_props?.valueFormat ? value : dateUtil(value)) : null; + formModel[key] = value ? (_props?.valueFormat ? value : dateUtil(value)) : null; } } else { - unref(formModel)[key] = value; - } - if (_props?.onChange) { - _props?.onChange(value); + formModel[key] = value; } validKeys.push(key); } else { @@ -112,14 +104,14 @@ export function useFormEvents({ try { const value = nestKey.split('.').reduce((out, item) => out[item], values); if (isDef(value)) { - unref(formModel)[nestKey] = unref(value); + formModel[nestKey] = value; validKeys.push(nestKey); } } catch (e) { // key not exist if (isDef(defaultValueRef.value[nestKey])) { //formModel[nestKey] = defaultValueRef.value[nestKey]; - unref(formModel)[nestKey] = cloneDeep(unref(defaultValueRef.value[nestKey])); + formModel[nestKey] = cloneDeep(defaultValueRef.value[nestKey]); } } }); diff --git a/apps/vue/src/views/localization/texts/components/TextModal.vue b/apps/vue/src/views/localization/texts/components/TextModal.vue index 09c0a2295..b5277ce87 100644 --- a/apps/vue/src/views/localization/texts/components/TextModal.vue +++ b/apps/vue/src/views/localization/texts/components/TextModal.vue @@ -47,7 +47,7 @@ resultField: 'items', labelField: 'uiCultureName', valueField: 'cultureName', - onSelect: (key) => { + onChange: (key) => { // 当文化变更时,检查键值是否有目标值 const model = unref(modelRef); if (model?.key) {