fix: menu close bug

This commit is contained in:
hlw 2020-07-26 18:39:27 +08:00
parent 3151c4fe99
commit 33252765a4
3 changed files with 39 additions and 15 deletions

View File

@ -1,12 +1,12 @@
<template> <template>
<ul v-show="value" id="menu" class="menu" :style="`left: ${left}px;top: ${top}px;`"> <ul v-show="value" id="menu" class="menu" :style="`left: ${left}px;top: ${top}px;`">
<li v-for="item of list" :key="item.key" class="menu_item"> <li v-for="item of list" :key="item.key" class="menu_item" @mousedown="onMouseDown(item.key)">
<el-upload v-if="item.key === 'insertPic'" action="" class="li__upload" <el-upload v-if="item.key === 'insertPic'" action="" class="li__upload"
:show-file-list="false" :multiple="true" accept=".jpg,.jpeg,.png,.gif" name="file" :show-file-list="false" :multiple="true" accept=".jpg,.jpeg,.png,.gif" name="file"
:before-upload="beforeUpload"> :before-upload="beforeUpload">
<span>{{item.text}}</span> <button class="btn-upload">{{item.text}}</button>
</el-upload> </el-upload>
<span v-else @click="$emit('menuTick', item.key)">{{item.text}}</span> <span v-else>{{item.text}}</span>
</li> </li>
</ul> </ul>
</template> </template>
@ -70,6 +70,14 @@ export default {
}); });
return false; return false;
}, },
onMouseDown(key){
if (key == 'insertPic') {
document.querySelector('.li__upload button').click()
} else {
this.$emit('menuTick', key)
}
this.$emit('closeMenu',false)
}
}, },
} }
</script> </script>
@ -98,12 +106,22 @@ export default {
color: white; color: white;
background: rgb(139, 146, 148); background: rgb(139, 146, 148);
} }
span { span,.btn-upload {
text-align: center; text-align: center;
display: inline-block; display: inline-block;
padding: 4px 0; padding: 4px 0;
width: 100%; width: 100%;
} }
.btn-upload {
margin: 0;
border:none;
outline: none;
background: transparent;
}
.btn-upload:hover {
color: white;
background: rgb(139, 146, 148);
}
/deep/ .el-upload { /deep/ .el-upload {
width: 100%; width: 100%;
} }

View File

@ -98,16 +98,6 @@ const mutations = {
state.editor.setValue(doc) state.editor.setValue(doc)
} }
state.editor.on('mousedown', function() {
state.rightClickMenuVisible = false
});
state.editor.on('blur', function() {
state.rightClickMenuVisible = false
});
state.editor.on('scroll', function() {
state.rightClickMenuVisible = false
});
}, },
initCssEditorEntity(state) { initCssEditorEntity(state) {
state.cssEditor = CodeMirror.fromTextArea( state.cssEditor = CodeMirror.fromTextArea(

View File

@ -57,6 +57,7 @@
:left="mouseLeft" :left="mouseLeft"
:top="mouseTop" :top="mouseTop"
@menuTick="onMenuEvent" @menuTick="onMenuEvent"
@closeMenu="closeRightClickMenu"
/> />
</div> </div>
</template> </template>
@ -158,6 +159,18 @@ export default {
} }
} }
}); });
this.editor.on('mousedown', () => {
this.$store.commit('setRightClickMenuVisible', false);
});
this.editor.on('blur', () => {
//!mousedown
this.$store.commit('setRightClickMenuVisible', false);
});
this.editor.on('scroll', () => {
this.$store.commit('setRightClickMenuVisible', false);
});
}, },
initCssEditor() { initCssEditor() {
this.initCssEditorEntity(); this.initCssEditorEntity();
@ -269,6 +282,9 @@ export default {
this.mouseTop = e.clientY + 10; this.mouseTop = e.clientY + 10;
this.$store.commit('setRightClickMenuVisible', true); this.$store.commit('setRightClickMenuVisible', true);
}, },
closeRightClickMenu(){
this.$store.commit('setRightClickMenuVisible', false);
},
onMenuEvent(type, info = {}) { onMenuEvent(type, info = {}) {
switch (type) { switch (type) {
case 'pageReset': case 'pageReset':