blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-08-20 10:59:46 +08:00
Code Issues Projects Releases Wiki Activity

fix(Popup): overlay z-index

Browse Source
This commit is contained in:
chenjiahan 2020-07-26 15:45:48 +08:00
parent 9fa7a258d7
commit 5db6e380fe
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mixins/popup/index.js
View File

@ -46,6 +46,7 @@ export function PopupMixin(options = {}) {
data() { data() {
return { return {
inited: this.show, inited: this.show,
currentZIndex: null,
}; };
}, },
@ -199,7 +200,7 @@ export function PopupMixin(options = {}) {
}, },
updateZIndex(value = 0) { updateZIndex(value = 0) {
this.$refs.root.style.zIndex = ++context.zIndex + value; this.currentZIndex = ++context.zIndex + value;
}, },
}, },
}; };

14
src/popup/index.js
View File

@ -61,7 +61,13 @@ export default createComponent({
methods: { methods: {
genOverlay() { genOverlay() {
if (this.overlay) { if (this.overlay) {
return <Overlay show={this.show} onClick={this.onClickOverlay} />; return (
<Overlay
show={this.show}
zIndex={this.currentZIndex}
onClick={this.onClickOverlay}
/>
);
} }
}, },
@ -73,7 +79,10 @@ export default createComponent({
this.transition || this.transition ||
(isCenter ? 'van-fade' : `van-popup-slide-${position}`); (isCenter ? 'van-fade' : `van-popup-slide-${position}`);
const style = {}; const style = {
zIndex: this.currentZIndex,
};
if (isDef(duration)) { if (isDef(duration)) {
const key = isCenter ? 'animationDuration' : 'transitionDuration'; const key = isCenter ? 'animationDuration' : 'transitionDuration';
style[key] = `${duration}s`; style[key] = `${duration}s`;
@ -88,7 +97,6 @@ export default createComponent({
{this.shouldRender ? ( {this.shouldRender ? (
<div <div
vShow={this.show} vShow={this.show}
ref="root"
style={style} style={style}
class={bem({ class={bem({
round, round,