diff --git a/resources/assets/js/components/UserAvatar.vue b/resources/assets/js/components/UserAvatar.vue
index 4679b5ceb..8f13111ce 100755
--- a/resources/assets/js/components/UserAvatar.vue
+++ b/resources/assets/js/components/UserAvatar.vue
@@ -213,7 +213,7 @@
openDialog() {
this.$store.dispatch("openDialogUserid", this.userid).then(({data}) => {
- this.goForward({name: 'manage-messenger', params: {id: data.id}});
+ this.goForward({name: 'manage-messenger', params: {dialogId: data.id}});
});
}
}
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index dcf76ceae..150912463 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -1006,7 +1006,7 @@ export default {
return;
}
if (data.dialog_id) {
- this.goForward({name: 'manage-messenger', params: {id: data.dialog_id}});
+ this.goForward({name: 'manage-messenger', params: {dialogId: data.dialog_id}});
} else {
this.goForward({name: 'manage-messenger'});
}
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index ab3e01728..599eae1bc 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -1104,7 +1104,7 @@ export default {
};
this.msgFile = [];
this.msgText = "";
- this.goForward({name: 'manage-messenger', params: {id: data.dialog_id}});
+ this.goForward({name: 'manage-messenger', params: {dialogId: data.dialog_id}});
this.$store.dispatch('openTask', 0);
} else {
this.sendDialogMsg();
diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue
index 4b65c1b15..c565aafa3 100644
--- a/resources/assets/js/pages/manage/file.vue
+++ b/resources/assets/js/pages/manage/file.vue
@@ -513,13 +513,13 @@ export default {
...mapState(['userId', 'userToken', 'userIsAdmin', 'userInfo', 'files', 'wsOpenNum']),
pid() {
- const {pid} = this.$route.params;
- return parseInt(this.$route.name === 'manage-file' && /^\d+$/.test(pid) ? pid : 0);
+ const {folderId} = this.$route.params;
+ return parseInt(/^\d+$/.test(folderId) ? folderId : 0);
},
fid() {
- const {fid} = this.$route.params;
- return parseInt(this.$route.name === 'manage-file' && /^\d+$/.test(fid) ? fid : 0);
+ const {fileId} = this.$route.params;
+ return parseInt(/^\d+$/.test(fileId) ? fileId : 0);
},
actionUrl() {
@@ -899,7 +899,7 @@ export default {
browseFolder(id) {
if (id > 0) {
- this.goForward({params: {pid: id, fid: undefined}});
+ this.goForward({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: {pid: this.pid, fid: id}});
+ this.goForward({params: {folderId: this.pid, fileId: id}});
} else {
this.browseFolder(this.pid);
}
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index b1e344d99..8989a8e00 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -159,8 +159,8 @@ export default {
...mapState(['userId', 'cacheDialogs']),
dialogId() {
- const {id} = this.$route.params;
- return parseInt(this.$route.name == 'manage-messenger' && /^\d+$/.test(id) ? id : 0);
+ const {dialogId} = this.$route.params;
+ return parseInt(/^\d+$/.test(dialogId) ? dialogId : 0);
},
dialogList() {
@@ -253,7 +253,10 @@ export default {
}
},
dialogId(id) {
- this.$route.name == 'manage-messenger' && $A.setStorage("messenger::dialogId", id);
+ if (id > 0) {
+ $A.setStorage("messenger::dialogId", id);
+ this.scrollIntoActive()
+ }
},
contactsKey(val) {
setTimeout(() => {
@@ -295,9 +298,9 @@ export default {
this.dialogActive = type
},
- openDialog(id) {
- if (id > 0) {
- this.goForward({name: 'manage-messenger', params: {id}});
+ openDialog(dialogId) {
+ if (dialogId > 0) {
+ this.goForward({name: 'manage-messenger', params: {dialogId}});
} else {
this.goForward({name: 'manage-messenger'});
}
@@ -306,7 +309,7 @@ export default {
openContacts(user) {
this.tabActive = 'dialog';
this.$store.dispatch("openDialogUserid", user.userid).then(({data}) => {
- this.goForward({name: 'manage-messenger', params: {id: data.id}});
+ this.openDialog(data.id)
});
},
@@ -417,13 +420,13 @@ export default {
return null;
},
- scrollIntoActive(smooth) {
+ scrollIntoActive() {
this.$nextTick(() => {
if (this.$refs.list) {
let active = this.$refs.list.querySelector(".active")
if (active) {
$A.scrollToView(active, {
- behavior: smooth === true ? 'smooth' : 'instant',
+ behavior: 'instant',
scrollMode: 'if-needed',
});
} else {
@@ -434,7 +437,7 @@ export default {
let active = this.$refs.list.querySelector(".active")
if (active) {
$A.scrollToView(active, {
- behavior: smooth === true ? 'smooth' : 'instant',
+ behavior: 'instant',
scrollMode: 'if-needed',
});
}
@@ -471,9 +474,7 @@ export default {
},
}).then(({data}) => {
this.$store.dispatch("saveDialog", data);
- this.$nextTick(() => {
- this.scrollIntoActive(false)
- });
+ this.$nextTick(this.scrollIntoActive);
}).catch(({msg}) => {
$A.modalError(msg);
});
diff --git a/resources/assets/js/pages/manage/project.vue b/resources/assets/js/pages/manage/project.vue
index 6d139a59d..d2daea9b2 100644
--- a/resources/assets/js/pages/manage/project.vue
+++ b/resources/assets/js/pages/manage/project.vue
@@ -21,8 +21,8 @@ export default {
...mapGetters(['projectParameter']),
projectId() {
- const {id} = this.$route.params;
- return parseInt(this.$route.name == 'manage-project' && /^\d+$/.test(id) ? id : 0);
+ const {projectId} = this.$route.params;
+ return parseInt(/^\d+$/.test(projectId) ? projectId : 0);
}
},
diff --git a/resources/assets/js/pages/single/file.vue b/resources/assets/js/pages/single/file.vue
index 742dd1b54..c9cd10bd1 100644
--- a/resources/assets/js/pages/single/file.vue
+++ b/resources/assets/js/pages/single/file.vue
@@ -48,12 +48,12 @@ export default {
},
methods: {
getInfo() {
- let id = this.$route.params.id;
- let data = {id};
- if (/^\d+$/.test(id)) {
+ let {codeOrFileId} = this.$route.params;
+ let data = {id: codeOrFileId};
+ if (/^\d+$/.test(codeOrFileId)) {
this.code = null;
- } else if (id) {
- this.code = id;
+ } else if (codeOrFileId) {
+ this.code = codeOrFileId;
} else {
return;
}
diff --git a/resources/assets/js/pages/single/fileMsg.vue b/resources/assets/js/pages/single/fileMsg.vue
index 3887e8409..801f9d639 100644
--- a/resources/assets/js/pages/single/fileMsg.vue
+++ b/resources/assets/js/pages/single/fileMsg.vue
@@ -89,7 +89,8 @@ export default {
},
computed: {
msgId() {
- return $A.runNum(this.$route.params.id);
+ const {msgId} = this.$route.params;
+ return parseInt(/^\d+$/.test(msgId) ? msgId : 0);
},
title() {
diff --git a/resources/assets/js/pages/single/fileTask.vue b/resources/assets/js/pages/single/fileTask.vue
index 52a200bfd..f3659bf16 100644
--- a/resources/assets/js/pages/single/fileTask.vue
+++ b/resources/assets/js/pages/single/fileTask.vue
@@ -89,7 +89,8 @@ export default {
},
computed: {
fileId() {
- return $A.runNum(this.$route.params.id);
+ const {fileId} = this.$route.params;
+ return parseInt(/^\d+$/.test(fileId) ? fileId : 0);
},
title() {
diff --git a/resources/assets/js/pages/single/reportDetail.vue b/resources/assets/js/pages/single/reportDetail.vue
index e9871ace9..80438419a 100644
--- a/resources/assets/js/pages/single/reportDetail.vue
+++ b/resources/assets/js/pages/single/reportDetail.vue
@@ -22,8 +22,14 @@ export default {
detailData: {},
};
},
+ computed: {
+ reportDetailId() {
+ const {reportDetailId} = this.$route.params;
+ return parseInt(/^\d+$/.test(reportDetailId) ? reportDetailId : 0);
+ },
+ },
watch: {
- '$route': {
+ reportDetailId: {
handler() {
this.getDetail();
},
@@ -32,10 +38,13 @@ export default {
},
methods: {
getDetail() {
+ if (this.reportDetailId <= 0) {
+ return;
+ }
this.$store.dispatch("call", {
url: 'report/detail',
data: {
- id: $A.runNum(this.$route.params.id),
+ id: this.reportDetailId,
},
}).then(({data}) => {
this.detailData = data;
diff --git a/resources/assets/js/pages/single/reportEdit.vue b/resources/assets/js/pages/single/reportEdit.vue
index 8b9d0ce9e..5fd7e7d9b 100644
--- a/resources/assets/js/pages/single/reportEdit.vue
+++ b/resources/assets/js/pages/single/reportEdit.vue
@@ -1,7 +1,7 @@