Skip to content

Tooltip: fix disabled tooltip affecting other instances #7198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Leopoldthecoder merged 1 commit into from
Sep 25, 2017
Merged

Tooltip: fix disabled tooltip affecting other instances #7198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions examples/components/side-nav.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@
line-height: 26px;
margin-top: 10px;
}

#code-sponsor-widget {
margin: 50px 0 0 -20px;
}
}
.nav-dropdown-list {
width: 120px;
Expand Down Expand Up @@ -165,6 +169,7 @@
</template>
</li>
</ul>
<div id="code-sponsor-widget"></div>
</div>
</template>
<script>
Expand Down
10 changes: 5 additions & 5 deletions examples/docs/zh-CN/table.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,8 @@
}
},

handleClick() {
console.log('click');
handleClick(row) {
console.log(row);
},

handleEdit(index, row) {
Expand Down Expand Up @@ -707,7 +707,7 @@
label="操作"
width="100">
<template scope="scope">
<el-button @click="handleClick" type="text" size="small">查看</el-button>
<el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
<el-button type="text" size="small">编辑</el-button>
</template>
</el-table-column>
Expand All @@ -717,8 +717,8 @@
<script>
export default {
methods: {
handleClick() {
console.log(1);
handleClick(row) {
console.log(row);
}
},

Expand Down
1 change: 1 addition & 0 deletions examples/index.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
</head>
<body>
<div id="app"></div><% if (process.env.NODE_ENV === 'production') { %>
<script src="https://app.codesponsor.io/scripts/qFcVkt4f3DQEg4zrwINGVg?theme=light&height=250&width=240"></script>
<script src="//cdn.jsdelivr.net/npm/vue@2.3.0/dist/vue.runtime.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/vue-router@2.1.1/dist/vue-router.min.js"></script><% } %>
</body>
Expand Down
31 changes: 22 additions & 9 deletions packages/tooltip/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ export default {

data() {
return {
timeoutPending: null,
handlerAdded: false
timeoutPending: null
};
},

Expand Down Expand Up @@ -94,11 +93,10 @@ export default {
const nativeOn = vnode.data.nativeOn = vnode.data.nativeOn || {};

data.staticClass = this.concatClass(data.staticClass, 'el-tooltip');
if (this.handlerAdded) return vnode;
on.mouseenter = this.addEventHandle(on.mouseenter, () => { this.setExpectedState(true); this.handleShowPopper(); });
on.mouseleave = this.addEventHandle(on.mouseleave, () => { this.setExpectedState(false); this.debounceClose(); });
nativeOn.mouseenter = this.addEventHandle(nativeOn.mouseenter, () => { this.setExpectedState(true); this.handleShowPopper(); });
nativeOn.mouseleave = this.addEventHandle(nativeOn.mouseleave, () => { this.setExpectedState(false); this.debounceClose(); });
on.mouseenter = this.addEventHandle(on.mouseenter, this.show);
on.mouseleave = this.addEventHandle(on.mouseleave, this.hide);
nativeOn.mouseenter = this.addEventHandle(nativeOn.mouseenter, this.show);
nativeOn.mouseleave = this.addEventHandle(nativeOn.mouseleave, this.hide);

return vnode;
},
Expand All @@ -108,9 +106,24 @@ export default {
},

methods: {
show() {
this.setExpectedState(true);
this.handleShowPopper();
},

hide() {
this.setExpectedState(false);
this.debounceClose();
},

addEventHandle(old, fn) {
this.handlerAdded = true;
return old ? Array.isArray(old) ? old.concat(fn) : [old, fn] : fn;
if (!old) {
return fn;
} else if (Array.isArray(old)) {
return old.indexOf(fn) > -1 ? old : old.concat(fn);
} else {
return old === fn ? old : [old, fn];
}
},

concatClass(a, b) {
Expand Down