github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-01-13 09:48:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2022-04-12 14:50:19 +08:00
parent 17dc434350
commit 91c62ee55e
11 changed files with 58 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/assets/js/components/UserAvatar.vue
View File

@ -212,8 +212,9 @@
},
openDialog() {
this.goForward({name: 'manage-messenger'});
this.$store.dispatch("openDialogUserid", this.userid).catch(() => {})
this.$store.dispatch("openDialogUserid", this.userid).then(({data}) => {
this.goForward({name: 'manage-messenger', params: {id: data.id}});
});
}
}
};

16
resources/assets/js/pages/manage.vue
View File

@ -485,7 +485,6 @@ export default {
'taskId',
'wsOpenNum',
'columnTemplate',
'dialogOpenId',
'themeMode',
'themeList',
@ -713,8 +712,11 @@ export default {
toggleRoute(path) {
this.show768Menu = false;
if (path === 'file' && $A.getStorageInt("filePid") > 0) {
path += `/${$A.getStorageInt("filePid")}`
if (path === 'file' && $A.getStorageInt("file::pid") > 0) {
path += `/${$A.getStorageInt("file::pid")}`
}
if (path === 'messenger' && $A.getStorageInt("messenger::dialogId") > 0) {
path += `/${$A.getStorageInt("messenger::dialogId")}`
}
this.goForward({path: '/manage/' + path});
},
@ -874,7 +876,7 @@ export default {
if (!this.natificationReady) {
return;
}
if (!this.natificationHidden && this.routePath == "/manage/messenger" && this.dialogOpenId == data.dialog_id) {
if (!this.natificationHidden && $A.leftExists(this.routePath, "/manage/messenger") && this.$route.params.id == data.dialog_id) {
return;
}
//
@ -1003,10 +1005,10 @@ export default {
if (!$A.isJson(data)) {
return;
}
this.goForward({name: 'manage-messenger'});
if (data.dialog_id) {
$A.setStorage("messenger::dialogId", data.dialog_id)
this.$store.state.dialogOpenId = data.dialog_id;
this.goForward({name: 'manage-messenger', params: {id: data.dialog_id}});
} else {
this.goForward({name: 'manage-messenger'});
}
}
},

4
resources/assets/js/pages/manage/calendar.vue
View File

@ -181,9 +181,7 @@ export default {
if (num <= 1) return
this.wsOpenTimeout && clearTimeout(this.wsOpenTimeout)
this.wsOpenTimeout = setTimeout(() => {
if (this.$route.name == 'manage-calendar') {
this.setRenderRange();
}
this.$route.name == 'manage-calendar' && this.setRenderRange();
}, 5000)
}
},

2
resources/assets/js/pages/manage/components/DialogWrapper.vue
View File

@ -270,7 +270,7 @@ export default {
wsOpenNum(num) {
if (num <= 1) return
this.$store.dispatch("getDialogMsgs", this.dialogId);
this.$store.dispatch("getDialogMsgs", this.dialogId).catch(_ => {});
}
},

4
resources/assets/js/pages/manage/components/TaskDetail.vue
View File

@ -1104,9 +1104,7 @@ export default {
};
this.msgFile = [];
this.msgText = "";
this.goForward({name: 'manage-messenger', query: {_: $A.randomString(6)}});
$A.setStorage("messenger::dialogId", data.dialog_id)
this.$store.state.dialogOpenId = data.dialog_id;
this.goForward({name: 'manage-messenger', params: {id: data.dialog_id}});
this.$store.dispatch('openTask', 0);
} else {
this.sendDialogMsg();

21
resources/assets/js/pages/manage/file.vue
View File

@ -513,19 +513,13 @@ export default {
...mapState(['userId', 'userToken', 'userIsAdmin', 'userInfo', 'files', 'wsOpenNum']),
pid() {
let {pid} = this.$route.params;
if (!/^\d+$/.test(pid)) {
pid = 0
}
return parseInt(pid);
const {pid} = this.$route.params;
return parseInt(this.$route.name === 'manage-file' && /^\d+$/.test(pid) ? pid : 0);
},
fid() {
let {fid} = this.$route.params;
if (!/^\d+$/.test(fid)) {
fid = 0
}
return parseInt(fid);
const {fid} = this.$route.params;
return parseInt(this.$route.name === 'manage-file' && /^\d+$/.test(fid) ? fid : 0);
},
actionUrl() {
@ -850,7 +844,7 @@ export default {
this.$store.dispatch("getFiles", this.pid).then(() => {
this.loadIng--;
this.openFileJudge()
$A.setStorage("filePid", this.pid)
$A.setStorage("file::pid", this.pid)
}).catch(({msg}) => {
this.loadIng--;
$A.modalError({
@ -920,6 +914,11 @@ export default {
},
openFileJudge() {
if (this.$route.name !== 'manage-file') {
this.fileShow = false;
this.imageShow = false;
return;
}
if (this.fid <= 0) {
this.fileShow = false;
this.imageShow = false;

45
resources/assets/js/pages/manage/messenger.vue
View File

@ -39,7 +39,7 @@
operate: dialog.id == topOperateItem.id && topOperateVisible,
completed: $A.dialogCompleted(dialog)
}"
@click="openDialog(dialog, true)"
@click="openDialog(dialog.id)"
@contextmenu.prevent.stop="handleRightClick($event, dialog)">
<template v-if="dialog.type=='group'">
<i v-if="dialog.group_type=='project'" class="taskfont icon-avatar project">&#xe6f9;</i>
@ -113,7 +113,7 @@
<div class="msg-dialog-bg-text">{{$L('选择一个会话开始聊天')}}</div>
</div>
<DialogWrapper v-if="dialogId > 0" :dialogId="dialogId" @on-active="scrollIntoActive">
<div slot="inputBefore" class="dialog-back" @click="closeDialog">
<div slot="inputBefore" class="dialog-back" @click="openDialog(0)">
<Icon type="md-arrow-back" />
</div>
</DialogWrapper>
@ -141,7 +141,6 @@ export default {
],
dialogActive: '',
dialogKey: '',
dialogId: 0,
contactsKey: '',
contactsLoad: 0,
@ -156,12 +155,13 @@ export default {
}
},
activated() {
this.openDialogStorage();
},
computed: {
...mapState(['userId', 'cacheDialogs', 'dialogOpenId']),
...mapState(['userId', 'cacheDialogs']),
dialogId() {
const {id} = this.$route.params;
return parseInt(this.$route.name == 'manage-messenger' && /^\d+$/.test(id) ? id : 0);
},
dialogList() {
const {dialogActive, dialogKey} = this;
@ -253,11 +253,7 @@ export default {
}
},
dialogId(id) {
$A.setStorage("messenger::dialogId", id);
this.$store.state.dialogOpenId = id;
},
dialogOpenId(id) {
if (id > 0) this.dialogId = id;
this.$route.name == 'manage-messenger' && $A.setStorage("messenger::dialogId", id);
},
contactsKey(val) {
setTimeout(() => {
@ -299,27 +295,18 @@ export default {
this.dialogActive = type
},
closeDialog() {
this.dialogId = 0;
},
openDialog(dialog, smooth) {
this.dialogId = dialog.id;
this.scrollIntoActive(smooth);
},
openDialogStorage() {
this.dialogId = $A.getStorageInt("messenger::dialogId")
if (this.dialogId > 0) {
const dialog = this.cacheDialogs.find(({id}) => id === this.dialogId);
dialog && this.openDialog(dialog, false);
openDialog(id) {
if (id > 0) {
this.goForward({name: 'manage-messenger', params: {id}});
} else {
this.goForward({name: 'manage-messenger'});
}
},
openContacts(user) {
this.tabActive = 'dialog';
this.$store.dispatch("openDialogUserid", user.userid).then(() => {
this.scrollIntoActive()
this.$store.dispatch("openDialogUserid", user.userid).then(({data}) => {
this.goForward({name: 'manage-messenger', params: {id: data.id}});
});
},

40
resources/assets/js/pages/manage/project.vue
View File

@ -11,15 +11,6 @@ import ProjectList from "./components/ProjectList";
import ProjectDialog from "./components/ProjectDialog";
export default {
components: {ProjectDialog, ProjectList},
data() {
return {
project_id: 0,
}
},
mounted() {
this.project_id = $A.runNum(this.$route.params.id);
},
deactivated() {
this.$store.dispatch("forgetTaskCompleteTemp", true);
@ -28,37 +19,38 @@ export default {
computed: {
...mapState(['cacheProjects', 'wsOpenNum']),
...mapGetters(['projectParameter']),
projectId() {
const {id} = this.$route.params;
return parseInt(this.$route.name == 'manage-project' && /^\d+$/.test(id) ? id : 0);
}
},
watch: {
'$route' ({params}) {
this.project_id = $A.runNum(params.id);
},
project_id() {
this.getProjectData();
projectId: {
handler() {
this.getProjectData();
},
immediate: true
},
wsOpenNum(num) {
if (num <= 1) return
this.wsOpenTimeout && clearTimeout(this.wsOpenTimeout)
this.wsOpenTimeout = setTimeout(() => {
if (this.$route.name == 'manage-project') {
this.getProjectData();
}
this.$route.name == 'manage-project' && this.getProjectData();
}, 5000)
}
},
methods: {
getProjectData() {
let id = this.project_id;
if (id <= 0) return;
if (this.projectId <= 0) return;
setTimeout(() => {
this.$store.state.projectId = $A.runNum(id);
this.$store.dispatch("getProjectOne", id).then(() => {
this.$store.dispatch("getColumns", id).catch(() => {});
this.$store.dispatch("getTaskForProject", id).catch(() => {})
this.$store.state.projectId = $A.runNum(this.projectId);
this.$store.dispatch("getProjectOne", this.projectId).then(() => {
this.$store.dispatch("getColumns", this.projectId).catch(() => {});
this.$store.dispatch("getTaskForProject", this.projectId).catch(() => {})
}).catch(({msg}) => {
$A.modalWarning({
content: msg,

2
resources/assets/js/routes.js vendored
View File

@ -24,7 +24,7 @@ export default [
},
{
name: 'manage-messenger',
path: 'messenger',
path: 'messenger/:id?',
component: () => import('./pages/manage/messenger.vue'),
},
{

3
resources/assets/js/store/actions.js vendored
View File

@ -1933,7 +1933,6 @@ export default {
reject({msg: 'Parameter error'});
return;
}
state.dialogOpenId = 0; // 先重置dialogOpenId，否者无法重复打开相同对话
dispatch("call", {
url: 'dialog/open/user',
data: {
@ -1941,8 +1940,6 @@ export default {
},
}).then(result => {
dispatch("saveDialog", result.data);
$A.setStorage("messenger::dialogId", result.data.id);
state.dialogOpenId = result.data.id;
resolve(result);
}).catch(e => {
console.warn(e);

1
resources/assets/js/store/state.js vendored
View File

@ -58,7 +58,6 @@ const stateData = {
// 会话聊天
dialogMsgs: [],
dialogOpenId: 0,
// 文件
files: [],