fix(pro:table): not working with customAdditional (#1004)

IDuxFE · Jul 8, 2022 · 036a691 · 036a691
1 parent f65ed17
commit 036a691
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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()