diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index ed0a334055d4f4901a696cc3de722b204b53375a..c3f744761c065328256902f1fb2bb1e279e9cd10 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -1,5 +1,9 @@ ## Wip +### ✨ Features + +- 表单项的`componentsProps`支持函数类型 + ### 🐛 Bug Fixes - 修复多个富文本编辑器只显示一个 diff --git a/src/components/Drawer/src/useDrawer.ts b/src/components/Drawer/src/useDrawer.ts index af52968de3f924578abba72f9a8885261817a721..02d4c1675b2611052cae0cabc95dcc182d4e915c 100644 --- a/src/components/Drawer/src/useDrawer.ts +++ b/src/components/Drawer/src/useDrawer.ts @@ -6,7 +6,16 @@ import type { UseDrawerInnerReturnType, } from './types'; -import { ref, getCurrentInstance, onUnmounted, unref, reactive, computed, watchEffect } from 'vue'; +import { + ref, + getCurrentInstance, + onUnmounted, + unref, + reactive, + computed, + watchEffect, + nextTick, +} from 'vue'; import { isProdMode } from '/@/utils/env'; import { isFunction } from '/@/utils/is'; @@ -94,7 +103,9 @@ export const useDrawerInner = (callbackFn?: Fn): UseDrawerInnerReturnType => { const data = dataTransferRef[unref(uidRef)]; if (!data) return; if (!callbackFn || !isFunction(callbackFn)) return; - callbackFn(data); + nextTick(() => { + callbackFn(data); + }); }); return [ diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue index 9440ab56387d8d394f0851e9f35306b26e1bc3fe..d48b3410367d8e251a36ff4e7d21aa8ef1e78b2a 100644 --- a/src/components/Form/src/BasicForm.vue +++ b/src/components/Form/src/BasicForm.vue @@ -4,6 +4,7 @@