diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 150912463..742a0df06 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -159,7 +159,7 @@ v-for="(item, key) in projectLists" :key="key" :class="classNameProject(item)" - @click="toggleRoute('project/' + item.id)" + @click="toggleRoute('project', {projectId: item.id})" @contextmenu.prevent.stop="handleRightClick($event, item)">
@@ -710,15 +710,16 @@ export default { this.$store.dispatch("setTheme", mode) }, - toggleRoute(path) { + toggleRoute(path, params) { this.show768Menu = false; - if (path === 'file' && $A.getStorageInt("file::pid") > 0) { - path += `/${$A.getStorageInt("file::pid")}` + let location = {name: 'manage-' + path, params: params || {}}; + if (path === 'file' && $A.getStorageInt("file::folderId") > 0) { + location.params.folderId = $A.getStorageInt("file::folderId") } if (path === 'messenger' && $A.getStorageInt("messenger::dialogId") > 0) { - path += `/${$A.getStorageInt("messenger::dialogId")}` + location.params.dialogId = $A.getStorageInt("messenger::dialogId") } - this.goForward({path: '/manage/' + path}); + this.goForward(location); }, toggleOpenMenu(id) { @@ -767,7 +768,7 @@ export default { return; } if (this.menu.findIndex((m) => m.path == path) > -1) { - this.toggleRoute('setting/' + path); + this.toggleRoute('setting-' + path); } }, @@ -812,7 +813,7 @@ export default { this.addShow = false; this.$refs.addProject.resetFields(); this.$store.dispatch("saveProject", data); - this.toggleRoute('project/' + data.id) + this.toggleRoute('project', {projectId: data.id}) }).catch(({msg}) => { $A.modalError(msg); this.loadIng--; diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 6004a1428..91fafc3dd 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -466,7 +466,7 @@ export default { if (!this.dialogData.group_info) { return; } - this.goForward({path: '/manage/project/' + this.dialogData.group_info.id}); + this.goForward({name: 'manage-project', params: {projectId:this.dialogData.group_info.id}}); }, openTask() { diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index c565aafa3..5f46e62fe 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -844,7 +844,7 @@ export default { this.$store.dispatch("getFiles", this.pid).then(() => { this.loadIng--; this.openFileJudge() - $A.setStorage("file::pid", this.pid) + $A.setStorage("file::folderId", this.pid) }).catch(({msg}) => { this.loadIng--; $A.modalError({ @@ -899,7 +899,7 @@ export default { browseFolder(id) { if (id > 0) { - this.goForward({params: {folderId: id, fileId: null}}); + this.goForward({name: 'manage-file', params: {folderId: id, fileId: null}}); } else { this.goForward({name: 'manage-file'}); } @@ -907,7 +907,7 @@ export default { browseFile(id) { if (id > 0) { - this.goForward({params: {folderId: this.pid, fileId: id}}); + this.goForward({name: 'manage-file', params: {folderId: this.pid, fileId: id}}); } else { this.browseFolder(this.pid); } diff --git a/resources/assets/js/pages/manage/project.vue b/resources/assets/js/pages/manage/project.vue index d2daea9b2..ad74a4db2 100644 --- a/resources/assets/js/pages/manage/project.vue +++ b/resources/assets/js/pages/manage/project.vue @@ -57,7 +57,7 @@ export default { onOk: () => { const project = this.cacheProjects.find(({id}) => id); if (project) { - $A.goForward({path: '/manage/project/' + project.id}); + $A.goForward({name: 'manage-project', params: {projectId: project.id}}); } else { $A.goForward({name: 'manage-dashboard'}); } diff --git a/resources/assets/js/pages/manage/projectInvite.vue b/resources/assets/js/pages/manage/projectInvite.vue index 0f60a3820..9efc69cab 100644 --- a/resources/assets/js/pages/manage/projectInvite.vue +++ b/resources/assets/js/pages/manage/projectInvite.vue @@ -103,7 +103,7 @@ export default { goProject() { this.$nextTick(() => { - this.goForward({path: '/manage/project/' + this.project.id}); + $A.goForward({name: 'manage-project', params: {projectId: this.project.id}}); }) } } diff --git a/resources/assets/js/pages/manage/setting/index.vue b/resources/assets/js/pages/manage/setting/index.vue index e0b67ae22..6f4c10a5f 100644 --- a/resources/assets/js/pages/manage/setting/index.vue +++ b/resources/assets/js/pages/manage/setting/index.vue @@ -95,7 +95,7 @@ export default { return; } this.show768Menu = false; - this.goForward({path: '/manage/setting/' + path}); + this.goForward({name: 'manage-setting-' + path}); }, classNameRoute(path, divided) { diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 0bbfb5c30..20e0c59f1 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -644,7 +644,7 @@ export default { if (ids.includes(state.projectId)) { const project = state.cacheProjects.find(({id}) => id && id != project_id); if (project) { - $A.goForward({path: '/manage/project/' + project.id}); + $A.goForward({name: 'manage-project', params: {projectId: project.id}}); } else { $A.goForward({name: 'manage-dashboard'}); }