fix(comp:modal): use destroy in onOk

IDuxFE · Mar 27, 2023 · b48ca8d · b48ca8d
1 parent 7f91513
commit b48ca8d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/packages/components/modal/src/Modal.tsx b/packages/components/modal/src/Modal.tsx
@@ -160,7 +160,6 @@ function useTrigger(props: ModalProps, setVisible: (value: boolean) => void) {
   const okLoading = ref(false)
   const ok = async (evt?: Event | unknown) => {
     let result = callEmit(props.onOk, evt)
-    callEmit(props.onAfterClose)
     if (isPromise(result)) {
       okLoading.value = true
       result = await result

diff --git a/packages/components/modal/src/ModalProvider.tsx b/packages/components/modal/src/ModalProvider.tsx
@@ -6,7 +6,7 @@
  */
 
 import type { ModalInstance, ModalOptions, ModalRef } from './types'
-import type { VKey } from '@idux/cdk/utils'
+import type { MaybeArray, VKey } from '@idux/cdk/utils'
 
 import { cloneVNode, defineComponent, isVNode, provide, shallowRef } from 'vue'
 
@@ -28,12 +28,20 @@ export default defineComponent({
     return () => {
       const children = modals.value.map(item => {
         // The default value for `visible`, onDestroy should not be passed in Modal
-        const { key, visible = true, destroyOnHide, onDestroy, content, contentProps, ...restProps } = item
+        const { key, visible = true, destroyOnHide, onDestroy, content, contentProps, onOk, ...restProps } = item
         const setRef = (instance: unknown) => setModalRef(key!, instance as ModalInstance | null)
         const onUpdateVisible = (visible: boolean) => update(key!, { visible })
-        const onAfterClose = destroyOnHide ? () => destroy(key!) : undefined
-        const mergedProps = { key, visible, ref: setRef, 'onUpdate:visible': onUpdateVisible, onAfterClose }
+        const _onOk: MaybeArray<(evt?: unknown) => unknown> = [
+          () => {
+            destroy(key!)
+          },
+        ]
 
+        if (onOk) {
+          Array.isArray(onOk) ? _onOk.unshift(...onOk) : _onOk.unshift(onOk)
+        }
+
+        const mergedProps = { key, visible, ref: setRef, 'onUpdate:visible': onUpdateVisible, onOk: _onOk }
         const contentNode = isVNode(content) ? cloneVNode(content, contentProps, true) : content
         return <Modal {...mergedProps} {...restProps} __content_node={contentNode} />
       })