github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Tooltip: fix content slot, fixed #2999 (#3002)

pull/3086/head
cinwell.li 2017-02-26 23:23:52 +08:00 committed by baiyaaaaa
parent d528498cd0
commit 1eaec019e3
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/tooltip/src/main.js
View File

@ -1,5 +1,6 @@
import Popper from 'element-ui/src/utils/vue-popper'; import Popper from 'element-ui/src/utils/vue-popper';
import debounce from 'throttle-debounce/debounce'; import debounce from 'throttle-debounce/debounce';
import { getFirstComponentChild } from 'element-ui/src/utils/vdom';
import Vue from 'vue'; import Vue from 'vue';
export default { export default {
@ -65,9 +66,10 @@ export default {
</div> </div>
</transition>); </transition>);
if (!this.$slots.default) return this.$slots.default; if (!this.$slots.default || !this.$slots.default.length) return this.$slots.default;
const vnode = this.$slots.default[0]; const vnode = getFirstComponentChild(this.$slots.default);
if (!vnode) return vnode;
const data = vnode.data = vnode.data || {}; const data = vnode.data = vnode.data || {};
const on = vnode.data.on = vnode.data.on || {}; const on = vnode.data.on = vnode.data.on || {};

7
src/utils/vdom.js
View File

@ -1,6 +1,9 @@
import Vue from 'vue'; import Vue from 'vue';
export function isVNode(node) { export function isVNode(node) {
if (!node || typeof node !== 'object') return false; return typeof node === 'object' && Vue.util.hasOwn(node, 'componentOptions');
return Vue.util.hasOwn(node, 'tag') && Vue.util.hasOwn(node, 'componentOptions'); };
export function getFirstComponentChild(children) {
return children && children.filter(c => c && c.tag)[0];
}; };