Merge branch 'formily_next' of github.com:alibaba/formily into formil…

…y_next
alibaba · Jul 30, 2021 · 94890cb · 94890cb
2 parents d9b088e + 1036440
commit 94890cb
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/packages/element/src/__builtins__/shared/portal.ts b/packages/element/src/__builtins__/shared/portal.ts
@@ -1,4 +1,4 @@
-import { defineComponent, getCurrentInstance } from '@vue/composition-api'
+import { defineComponent, onBeforeUnmount } from '@vue/composition-api'
 import { h, Fragment } from '@formily/vue'
 export interface IPortalProps {
   id?: string | symbol
@@ -12,10 +12,19 @@ export const createPortalProvider = (id: string | symbol) => {
     props: {
       id: {
         type: [String, Symbol],
-        default: 'form-dialog',
+        default: id,
       },
     },
 
+    setup(props) {
+      onBeforeUnmount(() => {
+        const { id } = props
+        if (id && PortalMap.has(id)) {
+          PortalMap.delete(id)
+        }
+      })
+    },
+
     render() {
       const { id } = this
       if (id && !PortalMap.has(id)) {