From 036a6914c171600244f7b158b9574e9bc6a9ba88 Mon Sep 17 00:00:00 2001
From: danranVm <danranvm@gmail.com>
Date: Fri, 8 Jul 2022 10:44:31 +0800
Subject: [PATCH] fix(pro:table): not working with customAdditional (#1004)

---
 packages/components/notification/index.ts |  1 +
 packages/pro/table/src/ProTable.tsx       |  2 +-
 packages/site/src/App.vue                 | 10 ++++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/components/notification/index.ts b/packages/components/notification/index.ts
index 64b65d4fb..280e1f27a 100644
--- a/packages/components/notification/index.ts
+++ b/packages/components/notification/index.ts
@@ -24,5 +24,6 @@ export type {
   NotificationPlacement,
   NotificationRef,
   NotificationProviderRef,
+  NotificationProviderInstance,
   NotificationProviderComponent,
 } from './src/types'
diff --git a/packages/pro/table/src/ProTable.tsx b/packages/pro/table/src/ProTable.tsx
index b4e54f226..d58c48ca7 100644
--- a/packages/pro/table/src/ProTable.tsx
+++ b/packages/pro/table/src/ProTable.tsx
@@ -103,7 +103,7 @@ export default defineComponent({
       }
       const mergedCustomTag: TableCustomTag = {
         headCell: resizable ? ResizableHeadCell : undefined,
-        ...customAdditional,
+        ...customTag,
       }
 
       return (
diff --git a/packages/site/src/App.vue b/packages/site/src/App.vue
index ef9ef6052..748609289 100644
--- a/packages/site/src/App.vue
+++ b/packages/site/src/App.vue
@@ -1,8 +1,8 @@
 <template>
   <IxDrawerProvider ref="drawerProviderRef">
     <IxModalProvider ref="modalProviderRef">
-      <IxNotificationProvider>
-        <IxMessageProvider>
+      <IxNotificationProvider ref="notificationProviderRef">
+        <IxMessageProvider ref="messageProviderRef">
           <div class="root-wrapper">
             <LayoutHeader></LayoutHeader>
             <div v-if="page !== 'home'" class="main-wrapper">
@@ -63,17 +63,23 @@ import { useRoute, useRouter } from 'vue-router'
 
 import { useSharedBreakpoints } from '@idux/cdk/breakpoint'
 import { DrawerProviderInstance } from '@idux/components/drawer'
+import { MessageProviderInstance } from '@idux/components/message'
 import { ModalProviderInstance } from '@idux/components/modal'
+import { NotificationProviderInstance } from '@idux/components/notification'
 
 import { AppContext, appContextToken } from './context'
 
 const drawerProviderRef = ref<DrawerProviderInstance>()
 const modalProviderRef = ref<ModalProviderInstance>()
+const notificationProviderRef = ref<NotificationProviderInstance>()
+const messageProviderRef = ref<MessageProviderInstance>()
 
 const router = useRouter()
 router.afterEach(() => {
   drawerProviderRef.value?.destroyAll()
   modalProviderRef.value?.destroyAll()
+  notificationProviderRef.value?.destroyAll()
+  messageProviderRef.value?.destroyAll()
 })
 
 const route = useRoute()