Popover: compatible with 2.6 new v-slot syntax (#20424)

985bd49f · iamkun · GitHub · c71ab0a1 · 985bd49f
Commit 985bd49f authored Nov 11, 2020 by iamkun Committed by GitHub Nov 11, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

packages/popover/src/main.vue packages/popover/src/main.vue +7 -5

No files found.
--- a/packages/popover/src/main.vue
+++ b/packages/popover/src/main.vue
@@ -18,7 +18,9 @@
        <slot>{{ content }}</slot>
      </div>
    </transition>
-    <slot name="reference"></slot>
+    <span class="el-popover__reference-wrapper" ref="wrapper" >
+      <slot name="reference"></slot>
+    </span>
  </span>
 </template>
 <script>
@@ -87,8 +89,8 @@ export default {
    let reference = this.referenceElm = this.reference || this.$refs.reference;
    const popper = this.popper || this.$refs.popper;
-    if (!reference && this.$slots.reference && this.$slots.reference[0]) {
+    if (!reference && this.$refs.wrapper.children) {
-      reference = this.referenceElm = this.$slots.reference[0].elm;
+      reference = this.referenceElm = this.$refs.wrapper.children[0];
    }
    // 可访问性
    if (reference) {
@@ -192,8 +194,8 @@ export default {
      let reference = this.reference || this.$refs.reference;
      const popper = this.popper || this.$refs.popper;
-      if (!reference && this.$slots.reference && this.$slots.reference[0]) {
+      if (!reference && this.$refs.wrapper.children) {
-        reference = this.referenceElm = this.$slots.reference[0].elm;
+        reference = this.referenceElm = this.$refs.wrapper.children[0];
      }
      if (!this.$el ||
        !reference ||