fix(comp:modal): update modal content with update doesn't work (#1270)

IDuxFE · Nov 15, 2022 · 38f130a · 38f130a
1 parent 6082a15
commit 38f130a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/packages/components/modal/src/ModalBody.tsx b/packages/components/modal/src/ModalBody.tsx
@@ -36,7 +36,7 @@ export default defineComponent({
 
     return () => {
       const prefixCls = `${mergedPrefixCls.value}-body`
-      const defaultNode = slots.default?.()
+      const defaultNode = slots.default?.() ?? props.__content_node
 
       if (isDefault.value) {
         return <div class={prefixCls}>{defaultNode}</div>

diff --git a/packages/components/modal/src/ModalProvider.tsx b/packages/components/modal/src/ModalProvider.tsx
@@ -35,11 +35,7 @@ export default defineComponent({
         const mergedProps = { key, visible, ref: setRef, 'onUpdate:visible': onUpdateVisible, onAfterClose }
 
         const contentNode = isVNode(content) ? cloneVNode(content, contentProps, true) : content
-        return (
-          <Modal {...mergedProps} {...restProps}>
-            {contentNode}
-          </Modal>
-        )
+        return <Modal {...mergedProps} {...restProps} __content_node={contentNode} />
       })
       return (
         <>

diff --git a/packages/components/modal/src/types.ts b/packages/components/modal/src/types.ts
@@ -103,10 +103,13 @@ export const modalProps = {
   onClose: [Function, Array] as PropType<MaybeArray<(evt?: Event | unknown) => void>>,
   onCancel: [Function, Array] as PropType<MaybeArray<(evt?: Event | unknown) => unknown>>,
   onOk: [Function, Array] as PropType<MaybeArray<(evt?: Event | unknown) => unknown>>,
+
+  // private
+  __content_node: [String, Object] as PropType<string | VNode>,
 } as const
 
 export type ModalProps = ExtractInnerPropTypes<typeof modalProps>
-export type ModalPublicProps = ExtractPublicPropTypes<typeof modalProps>
+export type ModalPublicProps = Omit<ExtractPublicPropTypes<typeof modalProps>, '__content_node'>
 export interface ModalBindings {
   open: () => void
   close: (evt?: Event | unknown) => Promise<void>