drip-public/iview
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'iview/2.0' into 2.0

Browse source
This commit is contained in:
jilen 2020-02-13 17:52:42 +08:00
commit 82f2344b2a
268 changed files with 8115 additions and 24590 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/components/poptip/poptip.vue
View file

@ -117,6 +117,11 @@
type: Boolean,
default: false,
},
// 3.4.0
disabled: {
type: Boolean,
default: false
}
},
data () {
return {
@ -186,6 +191,8 @@
},
methods: {
handleClick () {
if (this.disabled) return;
if (this.confirm) {
this.visible = !this.visible;
return true;
@ -215,6 +222,8 @@
}
},
handleFocus (fromInput = true) {
if (this.disabled) return;
if (this.trigger !== 'focus' || this.confirm || (this.isInput && !fromInput)) {
return false;
}
@ -227,6 +236,8 @@
this.visible = false;
},
handleMouseenter () {
if (this.disabled) return;
if (this.trigger !== 'hover' || this.confirm) {
return false;
}