diff --git a/resources/assets/js/components/DropdownMenu.vue b/resources/assets/js/components/DropdownMenu.vue index 447fa4253..70e30af70 100644 --- a/resources/assets/js/components/DropdownMenu.vue +++ b/resources/assets/js/components/DropdownMenu.vue @@ -58,9 +58,7 @@ export default { }, beforeDestroy() { - if (this.scrollTarget) { - this.scrollTarget.removeEventListener('scroll', this.handlerEventListeners); - } + this.removeEventListeners() }, computed: { @@ -117,6 +115,12 @@ export default { }; this.updatePopper(); }, + + visible(v) { + if (!v) { + this.removeEventListeners() + } + } }, methods: { @@ -161,6 +165,13 @@ export default { this.scrollTarget.addEventListener('scroll', this.handlerEventListeners); }, + removeEventListeners() { + if (this.scrollTarget) { + this.scrollTarget.removeEventListener('scroll', this.handlerEventListeners); + this.scrollTarget = null; + } + }, + handlerEventListeners(e) { if (!this.visible || !this.menuTarget) { return diff --git a/resources/assets/js/components/Mobile/Back.vue b/resources/assets/js/components/Mobile/Back.vue index f45f736da..053369503 100644 --- a/resources/assets/js/components/Mobile/Back.vue +++ b/resources/assets/js/components/Mobile/Back.vue @@ -146,6 +146,9 @@ export default { }, onBack() { + // 通用菜单 + this.$store.commit('menu/operation', {}) + // 微应用通知 let microAppIsAccept = false; microApp.setGlobalData({ @@ -161,10 +164,13 @@ export default { if (microAppIsAccept) { return; } - // + + // 移除模态框 if (this.$Modal.removeLast()) { return; } + + // 文件浏览器 if (this.routeName === 'manage-file') { if (this.fileFolderId > 0) { const file = this.fileLists.find(({id, permission}) => id == this.fileFolderId && permission > -1) @@ -181,6 +187,8 @@ export default { this.goForward({name: 'manage-application'}, true); return; } + + // 消息页搜索 if (this.routeName === 'manage-messenger') { if (this.$route.params.dialogAction === 'contacts') { if (this.messengerSearchKey.contacts) { diff --git a/resources/assets/js/store/mutations.js b/resources/assets/js/store/mutations.js index 5951f3301..e0978c39f 100644 --- a/resources/assets/js/store/mutations.js +++ b/resources/assets/js/store/mutations.js @@ -296,6 +296,6 @@ export default { // 通用菜单 'menu/operation': function(state, data) { - state.menuOperation = data + state.menuOperation = data || {} }, } diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index 39feed5ce..fb844fc11 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -374,7 +374,7 @@ left: 0; right: 0; bottom: 1px; - z-index: 2; + z-index: 3; background-color: #ffffff; display: flex; align-items: center; @@ -758,6 +758,10 @@ align-items: flex-start; position: relative; + p { + word-break: break-all; + } + a, img { -webkit-user-drag: none;