fix(form-dialog): correct typo in onOpened event and improve portal setup

docs/guide/form-dialog.md

@@ -42,7 +42,7 @@ type IFormDialogProps = Omit<DialogProps, 'title'> & {
   okText?: string | Component | VNode | (() => VNode)
   okButtonProps?: ButtonProps
   onOpen?: () => void
-  onOpend?: () => void
+  onOpened?: () => void
   onClose?: () => void
   onClosed?: () => void
   onCancel?: () => void

package.json

@@ -7,6 +7,9 @@
   "workspaces": [
     "packages/*"
   ],
+  "resolutions": {
+    "**/rollup-plugin-typescript2": "^0.31.0"
+  },
   "scripts": {
     "start": "vuepress dev docs",
     "build": "formily-tpl build",
@@ -105,5 +108,6 @@
   },
   "peerDependencies": {
     "vue": "^3.2.24"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

packages/components/src/__builtins__/shared/portal.ts

@@ -1,4 +1,4 @@
-import { defineComponent, onBeforeUnmount } from 'vue'
+import { defineComponent, getCurrentInstance, onBeforeUnmount } from 'vue'
 import { h, Fragment } from '@formily/vue'
 export interface IPortalProps {
   id?: string | symbol
@@ -16,22 +16,21 @@ export const createPortalProvider = (id: string | symbol) => {
       },
     },
 
-    setup(props) {
+    setup(props, { slots }) {
+      const { appContext } = getCurrentInstance()
+
+      if (props.id && !PortalMap.has(props.id)) {
+        PortalMap.set(props.id, appContext)
+      }
+
       onBeforeUnmount(() => {
         const { id } = props
         if (id && PortalMap.has(id)) {
           PortalMap.delete(id)
         }
       })
-    },
-
-    render() {
-      const { id } = this
-      if (id && !PortalMap.has(id)) {
-        PortalMap.set(id, this)
-      }
 
-      return h(Fragment, {}, this.$slots)
+      return () => h(Fragment, {}, slots)
     },
   })
 

packages/components/src/form-dialog/index.ts

@@ -19,12 +19,14 @@ import {
   Component,
   VNode,
   defineComponent,
+  nextTick,
   Teleport,
-  createApp,
+  createVNode,
   PropType,
   h,
   onMounted,
   ref,
+  render as vueRender,
 } from 'vue'
 import {
   isValidElement,
@@ -50,7 +52,7 @@ type IFormDialogProps = Omit<typeof ElDialogProps, 'title'> & {
   okButtonProps?: typeof ElButtonProps
   beforeClose?: (cb: Function) => void
   onOpen?: () => void
-  onOpend?: () => void
+  onOpened?: () => void
   onClose?: () => void
   onClosed?: () => void
   onCancel?: () => void
@@ -120,7 +122,6 @@ export function FormDialog(
     root: document.createElement('div'),
     form: null,
     promise: null,
-    app: null,
     instance: null,
     openMiddlewares: [],
     confirmMiddlewares: [],
@@ -134,8 +135,7 @@ export function FormDialog(
     ...props,
     onClosed: () => {
       props.onClosed?.()
-      env.app?.unmount?.()
-      env.app = null
+      vueRender(null, env.root)
       env.instance = null
       env.root?.parentNode?.removeChild(env.root)
       env.root = undefined
@@ -161,135 +161,137 @@ export function FormDialog(
   )
 
   const render = (visible = true, resolve?: () => any, reject?: () => any) => {
-    if (!env.instance) {
-      const ComponentConstructor = observer(
-        defineComponent({
-          props: { dialogProps: Object as PropType<typeof ElDialogProps> },
-          data() {
-            return {
-              visible: false,
-            }
-          },
-          render() {
-            const {
-              onClose,
-              onClosed,
-              onOpen,
-              onOpend,
-              onOK,
-              onCancel,
-              title,
-              footer,
-              okText,
-              cancelText,
-              okButtonProps,
-              cancelButtonProps,
-              ...dialogProps
-            } = this.dialogProps
-
-            return h(
-              ElDialog,
+    if (env.instance) {
+      env.instance.visible = visible
+      return
+    }
+
+    const ComponentConstructor = observer(
+      defineComponent({
+        props: { dialogProps: Object as PropType<typeof ElDialogProps> },
+        data() {
+          return {
+            visible: false,
+          }
+        },
+        render() {
+          const {
+            onClose,
+            onClosed,
+            onOpen,
+            onOpened,
+            onOK,
+            onCancel,
+            title,
+            footer,
+            okText,
+            cancelText,
+            okButtonProps,
+            cancelButtonProps,
+            ...dialogProps
+          } = this.dialogProps
+
+          const renderFooter = () => {
+            const FooterPortalTarget = h(
+              'span',
               {
-                class: [`${prefixCls}`],
-                ...dialogProps,
-                modelValue: this.visible,
-                'onUpdate:modelValue': (val) => {
-                  this.visible = val
-                },
-                onClose: () => {
-                  onClose?.()
-                },
-                onClosed: () => {
-                  onClosed?.()
-                },
-                onOpen: () => {
-                  onOpen?.()
-                },
-                onOpened: () => {
-                  onOpend?.()
-                },
+                id: PORTAL_TARGET_NAME,
               },
-              {
-                default: () =>
-                  h(FormProvider, { form: env.form }, () =>
-                    h(component, {}, {})
-                  ),
-                title: () =>
-                  h('div', {}, { default: () => resolveComponent(title) }),
-                footer: () =>
-                  h(
-                    'div',
-                    {},
-                    {
-                      default: () => {
-                        const FooterPortalTarget = h(
-                          'span',
-                          {
-                            id: PORTAL_TARGET_NAME,
-                          },
-                          {}
-                        )
-                        if (footer === null) {
-                          return [null, FooterPortalTarget]
-                        } else if (footer) {
-                          return [resolveComponent(footer), FooterPortalTarget]
-                        }
-
-                        return [
-                          h(
-                            ElButton,
-                            {
-                              ...cancelButtonProps,
-                              onClick: (e) => {
-                                onCancel?.(e)
-                                reject()
-                              },
-                            },
-                            {
-                              default: () =>
-                                resolveComponent(
-                                  cancelText || '取消'
-                                  // t('el.popconfirm.cancelButtonText')
-                                ),
-                            }
-                          ),
-                          h(
-                            ElButton,
-                            {
-                              type: 'primary',
-                              ...okButtonProps,
-                              loading: env.form.submitting,
-                              onClick: (e) => {
-                                onOK?.(e)
-                                resolve()
-                              },
-                            },
-                            {
-                              default: () =>
-                                resolveComponent(
-                                  okText || '确定'
-                                  // t('el.popconfirm.confirmButtonText')
-                                ),
-                            }
-                          ),
-                          FooterPortalTarget,
-                        ]
-                      },
-                    }
-                  ),
-              }
+              {}
             )
-          },
-        })
-      )
 
-      env.app = createApp(ComponentConstructor, {
-        dialogProps,
-        parent: getPortalContext(id as string | symbol),
+            if (footer === null) {
+              return [null, FooterPortalTarget]
+            }
+
+            if (footer) {
+              return [resolveComponent(footer), FooterPortalTarget]
+            }
+
+            return [
+              h(
+                ElButton,
+                {
+                  ...cancelButtonProps,
+                  onClick: () => {
+                    onCancel?.()
+                    reject()
+                  },
+                },
+                {
+                  default: () => resolveComponent(cancelText || '取消'),
+                }
+              ),
+              h(
+                ElButton,
+                {
+                  type: 'primary',
+                  ...okButtonProps,
+                  loading: env.form.submitting,
+                  onClick: () => {
+                    onOK?.()
+                    resolve()
+                  },
+                },
+                {
+                  default: () => resolveComponent(okText || '确定'),
+                }
+              ),
+              FooterPortalTarget,
+            ]
+          }
+
+          return h(
+            ElDialog,
+            {
+              class: [`${prefixCls}`],
+              ...dialogProps,
+              modelValue: this.visible,
+              'onUpdate:modelValue': (val) => {
+                this.visible = val
+              },
+              onClose,
+              onClosed,
+              onOpen,
+              onOpened,
+              title: isStr(title) ? title : undefined,
+            },
+            {
+              default: () =>
+                h(FormProvider, { form: env.form }, () => h(component, {}, {})),
+              header: !isStr(title)
+                ? (slotProps) =>
+                    h(
+                      'div',
+                      {},
+                      { default: () => resolveComponent(title, slotProps) }
+                    )
+                : undefined,
+              footer: () =>
+                h(
+                  'div',
+                  {},
+                  {
+                    default: renderFooter,
+                  }
+                ),
+            }
+          )
+        },
       })
-      env.instance = env.app.mount(env.root)
-    }
-    env.instance.visible = visible
+    )
+
+    const vnode = createVNode(ComponentConstructor, {
+      dialogProps: dialogProps,
+    })
+
+    vnode.appContext = getPortalContext(id as string | symbol)
+    vueRender(vnode, env.root)
+
+    nextTick(() => {
+      env.instance = vnode.component.proxy
+      env.instance.visible = visible
+    })
   }
 
   const formDialog = {