no message

This commit is contained in:
kuaifan 2022-06-06 08:44:31 +08:00
parent 113c58a057
commit 34a1c97e6b
4 changed files with 29 additions and 6 deletions

View File

@ -515,6 +515,8 @@ export default {
'clientNewVersion', 'clientNewVersion',
'cacheTaskBrowse', 'cacheTaskBrowse',
'dialogModalId',
]), ]),
...mapGetters(['taskData', 'dashboardTask']), ...mapGetters(['taskData', 'dashboardTask']),
@ -927,7 +929,7 @@ export default {
} }
if (!this.natificationHidden if (!this.natificationHidden
&& this.routeName === 'manage-messenger' && this.routeName === 'manage-messenger'
&& this.$route.params.dialogId == data.dialog_id) { && (this.$route.params.dialogId == data.dialog_id || this.dialogModalId === data.dialog_id)) {
return; // return; //
} }
// //

View File

@ -8,9 +8,7 @@
:beforeClose="onBeforeClose" :beforeClose="onBeforeClose"
class-name="dialog-modal" class-name="dialog-modal"
fullscreen> fullscreen>
<transition name="mobile-dialog">
<DialogWrapper v-if="dialogModalId > 0" :dialogId="dialogModalId" :beforeBack="onBeforeClose"/> <DialogWrapper v-if="dialogModalId > 0" :dialogId="dialogModalId" :beforeBack="onBeforeClose"/>
</transition>
</Modal> </Modal>
</template> </template>
@ -66,8 +64,16 @@ export default {
this.show = id > 0; this.show = id > 0;
}, },
immediate: true immediate: true
},
windowLarge: {
handler(is) {
if (is && this.dialogModalId > 0) {
this.$store.state.dialogModalId = 0;
} }
}, },
immediate: true
},
},
methods: { methods: {
onBeforeClose() { onBeforeClose() {

View File

@ -6,7 +6,8 @@
:style="wrapperStyle" :style="wrapperStyle"
@drop.prevent="chatPasteDrag($event, 'drag')" @drop.prevent="chatPasteDrag($event, 'drag')"
@dragover.prevent="chatDragOver(true, $event)" @dragover.prevent="chatDragOver(true, $event)"
@dragleave.prevent="chatDragOver(false, $event)"> @dragleave.prevent="chatDragOver(false, $event)"
@touchmove="onTouchmove">
<!--顶部导航--> <!--顶部导航-->
<slot name="head"> <slot name="head">
<div class="dialog-nav" :class="{completed:$A.dialogCompleted(dialogData)}"> <div class="dialog-nav" :class="{completed:$A.dialogCompleted(dialogData)}">
@ -662,6 +663,12 @@ export default {
} }
}, },
onTouchmove(e) {
if (this.windowSmall && !this.$refs.scroller.$el.contains(e.target)) {
e.preventDefault();
}
},
pasteSend() { pasteSend() {
this.pasteFile.some(file => { this.pasteFile.some(file => {
this.$refs.chatUpload.upload(file) this.$refs.chatUpload.upload(file)

View File

@ -356,6 +356,14 @@ export default {
}, },
immediate: true immediate: true
}, },
windowSmall: {
handler(is) {
if (is && this.dialogId > 0) {
this.goForward({name: 'manage-messenger', params: {dialogId: 'dialog'}}, true);
}
},
immediate: true
},
}, },
methods: { methods: {