From 04452fe65976668d0cd6be952b9a90578f02694e Mon Sep 17 00:00:00 2001
From: 07akioni <07akioni2@gmail.com>
Date: Fri, 18 Oct 2019 11:24:13 +0800
Subject: [PATCH] feat(popselect): update position & slot name change

---
 packages/common/Popselect/src/PopselectPanel.vue | 3 +++
 packages/common/Popselect/src/main.vue           | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/common/Popselect/src/PopselectPanel.vue b/packages/common/Popselect/src/PopselectPanel.vue
index eaea65d20..96a51f38d 100644
--- a/packages/common/Popselect/src/PopselectPanel.vue
+++ b/packages/common/Popselect/src/PopselectPanel.vue
@@ -95,6 +95,9 @@ export default {
           this.controller && this.controller.hide()
         }
       }
+      this.$nextTick().then(() => {
+        this.controller.updatePosition()
+      })
     }
   }
 }
diff --git a/packages/common/Popselect/src/main.vue b/packages/common/Popselect/src/main.vue
index 2ff98e3d1..67384a884 100644
--- a/packages/common/Popselect/src/main.vue
+++ b/packages/common/Popselect/src/main.vue
@@ -49,6 +49,7 @@ export default {
   },
   render (h, context) {
     const slots = context.scopedSlots
+    const activator = slots.activator || slots.default
     const controller = context.props.controller || {}
     return h(
       NPopover, {
@@ -57,7 +58,7 @@ export default {
           controller
         },
         scopedSlots: {
-          activator: () => slots.activator(),
+          activator: () => activator(),
           default: () => h(NPopselectPanel, {
             props: {
               ...context.props,