test/element
1
0
Fork 0
mirror of https://gitee.com/ElemeFE/element.git synced 2024-11-30 03:07:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix overwritten warn in Vue 2.1.8, fixed #2040 (#2047)

Browse Source 
* Fix overwritten warn in Vue 2.1.8, fixed #2040

* Fix dropdown-menu

* Fix placement again

* fix test
This commit is contained in:
cinwell.li 2016-12-29 10:41:19 +08:00 committed by FuryBean
parent ea9e5ed462
commit 47e75ad051
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/date-picker/src/picker.vue
View File

@ -202,7 +202,6 @@ export default {
default: 'left'
},
value: {},
haveTrigger: {},
pickerOptions: {}
},

6
packages/dropdown/src/dropdown-menu.vue
View File

@ -26,9 +26,9 @@
this.referenceElm = this.$parent.$el;
},
computed: {
placement() {
return `bottom-${this.$parent.menuAlign}`;
watch: {
'$parent.menuAlign'(val) {
this.currentPlacement = `bottom-${val}`;
}
}
};

1
packages/rate/src/main.vue
View File

@ -33,7 +33,6 @@
return {
classMap: {},
colorMap: {},
classes: null,
pointerAtLeftHalf: false,
currentValue: this.value,
hoverIndex: -1

8
src/utils/vue-popper.js
View File

@ -46,7 +46,8 @@ export default {
data() {
return {
showPopper: false
showPopper: false,
currentPlacement: ''
};
},
@ -68,7 +69,8 @@ export default {
methods: {
createPopper() {
if (this.$isServer) return;
if (!/^(top|bottom|left|right)(-start|-end)?$/g.test(this.placement)) {
this.currentPlacement = this.currentPlacement || this.placement;
if (!/^(top|bottom|left|right)(-start|-end)?$/g.test(this.currentPlacement)) {
return;
}
@ -88,7 +90,7 @@ export default {
this.popperJS.destroy();
}
options.placement = this.placement;
options.placement = this.currentPlacement;
options.offset = this.offset;
this.popperJS = new PopperJS(reference, popper, options);
this.popperJS.onCreate(_ => {