From c76839509480f697a97f2f5ea51c4310eb2be341 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 10 Aug 2023 20:18:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9C=A8=E4=BB=BB=E5=8A=A1=E6=96=B0?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E4=BD=BF=E7=94=A8=E6=98=BE=E7=A4=BA=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=AA=97=E5=8F=A3=E9=94=99=E8=AF=AF=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/manage/components/DialogWrapper.vue | 5 +---- resources/assets/js/store/actions.js | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 875b57d45..55be9083c 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -2468,10 +2468,7 @@ export default { break; case 'filepos': - if (this.windowPortrait) { - this.$store.dispatch("openDialog", 0); - } - this.goForward({name: 'manage-file', params: value}); + this.$store.dispatch("filePos", value); break; case 'link': diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index f6358fa46..9626c3382 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -257,6 +257,7 @@ export default { } else { reject({ret: -1, data: {}, msg: "System error"}) } + console.error(xhr, status); } // WebSocket if (params.websocket === true) { @@ -410,6 +411,25 @@ export default { } }, + /** + * 显示文件(打开文件所在位置) + * @param state + * @param dispatch + * @param params + */ + filePos({state, dispatch}, params) { + if ($A.isSubElectron) { + $A.execMainDispatch("filePos", params) + $A.Electron.sendMessage('mainWindowActive'); + return + } + dispatch('openTask', 0) + if (state.windowPortrait) { + dispatch("openDialog", 0); + } + $A.goForward({name: 'manage-file', params}); + }, + /** * 切换面板变量 * @param state