From b643fe56d5840ff3dd128f53ced7fae7542d78a9 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Fri, 4 Apr 2025 08:08:01 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/components/RightBottom.vue | 6 +++--- resources/assets/js/pages/login.vue | 2 +- resources/assets/js/pages/manage/approve/details.vue | 4 ++-- resources/assets/js/pages/manage/calendar.vue | 2 +- .../js/pages/manage/components/DialogWrapper.vue | 11 ++++++++--- .../js/pages/manage/components/ProjectPanel.vue | 4 ++-- .../js/pages/manage/components/ReportReceive.vue | 3 +++ .../assets/js/pages/manage/components/TaskDetail.vue | 2 +- resources/assets/js/pages/manage/file.vue | 6 +++--- resources/assets/js/pages/manage/messenger.vue | 2 +- resources/assets/js/pages/manage/project.vue | 2 +- resources/assets/js/store/actions.js | 9 +++++---- .../assets/sass/pages/components/dialog-modal.scss | 8 +++++++- .../assets/sass/pages/components/dialog-wrapper.scss | 4 ++-- 14 files changed, 40 insertions(+), 25 deletions(-) diff --git a/resources/assets/js/components/RightBottom.vue b/resources/assets/js/components/RightBottom.vue index ab9233821..5837726d2 100644 --- a/resources/assets/js/components/RightBottom.vue +++ b/resources/assets/js/components/RightBottom.vue @@ -93,15 +93,15 @@ export default { computed: { showSSO() { - return this.$isSoftware && ['login'].includes(this.$route.name) + return this.$isSoftware && ['login'].includes(this.routeName) }, showDown() { - return !this.$isEEUiApp && !this.windowTouch && ['login', 'index', 'manage-dashboard'].includes(this.$route.name) + return !this.$isEEUiApp && !this.windowTouch && ['login', 'index', 'manage-dashboard'].includes(this.routeName) }, showPrivacy() { - return $A.isDooServer() && this.$isEEUiApp && ['login'].includes(this.$route.name) + return $A.isDooServer() && this.$isEEUiApp && ['login'].includes(this.routeName) } }, diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue index 5f63e9cb7..c6ec3f273 100644 --- a/resources/assets/js/pages/login.vue +++ b/resources/assets/js/pages/login.vue @@ -366,7 +366,7 @@ export default { }, qrcodeStatus() { - if (this.$route.name !== 'login' || this.loginMode != 'qrcode') { + if (this.routeName !== 'login' || this.loginMode != 'qrcode') { return; } if (this.qrcodeLoad) { diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue index f4930c8e7..15a528b1b 100644 --- a/resources/assets/js/pages/manage/approve/details.vue +++ b/resources/assets/js/pages/manage/approve/details.vue @@ -381,7 +381,7 @@ export default { } }).then(({msg}) => { $A.messageSuccess(msg); - if (this.$route.name == 'manage-approve-details' || this.$route.name == 'manage-messenger') { + if (this.routeName == 'manage-approve-details' || this.routeName == 'manage-messenger') { this.getInfo() } else { this.$emit('approve') @@ -411,7 +411,7 @@ export default { }).then(({msg}) => { $A.messageSuccess(msg); resolve(); - if (this.$route.name == 'manage-approve-details' || this.$route.name == 'manage-messenger') { + if (this.routeName == 'manage-approve-details' || this.routeName == 'manage-messenger') { this.getInfo() } else { this.$emit('revocation') diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue index fece5c940..696627c62 100644 --- a/resources/assets/js/pages/manage/calendar.vue +++ b/resources/assets/js/pages/manage/calendar.vue @@ -188,7 +188,7 @@ export default { if (num <= 1) return this.wsTimer && clearTimeout(this.wsTimer) this.wsTimer = setTimeout(() => { - this.$route.name == 'manage-calendar' && this.setDateRangeText(); + this.routeName == 'manage-calendar' && this.setDateRangeText(); }, 5000) } }, diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index dca10956f..7b895c75c 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -2648,7 +2648,8 @@ export default { onDialogMenu(cmd) { switch (cmd) { case "single": - this.$store.dispatch('openDialog', {dialog_id: this.dialogData.id}); + this.$store.dispatch('openDialog', {dialog_id: this.dialogData.id, single: true}); + this.routeName !== 'manage-messenger' && this.$store.dispatch('openDialog', 0); break; case "searchMsg": @@ -3000,9 +3001,13 @@ export default { }, handleBack() { + if ($A.isSubElectron) { + window.close() + return + } const {name, params} = this.$store.state.routeHistoryLast; - if (name === this.$route.name && /^\d+$/.test(params.dialogId)) { - this.goForward({name: this.$route.name}); + if (name === this.routeName && /^\d+$/.test(params.dialogId)) { + this.goForward({name: this.routeName}); } else { this.goBack(); } diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue index b2b18d610..eee50dbb7 100644 --- a/resources/assets/js/pages/manage/components/ProjectPanel.vue +++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue @@ -1717,8 +1717,8 @@ export default { onBack() { const {name, params} = this.$store.state.routeHistoryLast; - if (name === this.$route.name && /^\d+$/.test(params.projectId)) { - this.goForward({name: this.$route.name, params: {projectId: 'all'}}); + if (name === this.routeName && /^\d+$/.test(params.projectId)) { + this.goForward({name: this.routeName, params: {projectId: 'all'}}); } else { this.goBack(); } diff --git a/resources/assets/js/pages/manage/components/ReportReceive.vue b/resources/assets/js/pages/manage/components/ReportReceive.vue index 3d706e3d2..0151ca703 100644 --- a/resources/assets/js/pages/manage/components/ReportReceive.vue +++ b/resources/assets/js/pages/manage/components/ReportReceive.vue @@ -378,6 +378,9 @@ export default { this.$store.dispatch("updateDialogLastMsg", data.msgs); $A.messageSuccess(msg); resolve(); + if (data.msgs.length > 0) { + this.$store.dispatch("openDialog", data.msgs[0].dialog_id); + } }).catch(({msg}) => { $A.modalError(msg); reject(); diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index f18198e31..7f15023c1 100755 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -1755,7 +1755,7 @@ export default { }, openNewWin() { - let config = { + const config = { title: this.taskDetail.name, titleFixed: true, parent: null, diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index 853377af6..0d60ac998 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -956,7 +956,7 @@ export default { if (num <= 1) return this.wsOpenTimeout && clearTimeout(this.wsOpenTimeout) this.wsOpenTimeout = setTimeout(() => { - this.$route.name == 'manage-file' && this.getFileList(); + this.routeName == 'manage-file' && this.getFileList(); }, 5000) }, @@ -975,7 +975,7 @@ export default { methods: { getFileList() { - if (this.$route.name !== 'manage-file') { + if (this.routeName !== 'manage-file') { return; } this.loadIng++; @@ -1076,7 +1076,7 @@ export default { }, openFileJudge() { - if (this.$route.name !== 'manage-file') { + if (this.routeName !== 'manage-file') { this.fileShow = false; return; } diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue index 7ab28de0b..e70e26355 100644 --- a/resources/assets/js/pages/manage/messenger.vue +++ b/resources/assets/js/pages/manage/messenger.vue @@ -1115,7 +1115,7 @@ export default { break; case 'single': - this.$store.dispatch('openDialog', this.operateItem.id); + this.$store.dispatch('openDialog', {dialog_id: this.operateItem.id, single: true}); break; case 'hide': diff --git a/resources/assets/js/pages/manage/project.vue b/resources/assets/js/pages/manage/project.vue index 61daa34c8..9d70f6389 100644 --- a/resources/assets/js/pages/manage/project.vue +++ b/resources/assets/js/pages/manage/project.vue @@ -37,7 +37,7 @@ export default { if (num <= 1) return this.wsOpenTimeout && clearTimeout(this.wsOpenTimeout) this.wsOpenTimeout = setTimeout(() => { - this.$route.name == 'manage-project' && this.getProjectData(); + this.routeName == 'manage-project' && this.getProjectData(); }, 5000) } }, diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index c5e903605..e37bafbed 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -3031,15 +3031,16 @@ export default { */ openDialog({state, dispatch}, dialogId) { return new Promise(async (resolve, reject) => { - let singleWindow = state.routeName !== 'manage-messenger', - searchMsgId = 0, - dialogMsgId = 0; + let singleWindow, + searchMsgId, + dialogMsgId; if ($A.isJson(dialogId)) { - singleWindow = singleWindow || !!dialogId.single; + singleWindow = dialogId.single; searchMsgId = dialogId.search_msg_id; dialogMsgId = dialogId.dialog_msg_id; dialogId = dialogId.dialog_id; } + singleWindow = typeof singleWindow === "boolean" ? singleWindow : $A.isSubElectron; searchMsgId = /^\d+$/.test(searchMsgId) ? parseInt(searchMsgId) : 0; dialogMsgId = /^\d+$/.test(dialogMsgId) ? parseInt(dialogMsgId) : 0; dialogId = /^\d+$/.test(dialogId) ? parseInt(dialogId) : 0; diff --git a/resources/assets/sass/pages/components/dialog-modal.scss b/resources/assets/sass/pages/components/dialog-modal.scss index 09320a75a..7f4b8e726 100644 --- a/resources/assets/sass/pages/components/dialog-modal.scss +++ b/resources/assets/sass/pages/components/dialog-modal.scss @@ -38,7 +38,7 @@ body { .ivu-modal { .ivu-modal-content { .ivu-modal-close { - top: 12px; + top: 11px; z-index: 2; } @@ -53,6 +53,12 @@ body { .nav-wrapper { padding: 0 20px; + &.completed { + &:after { + right: 102px; + } + } + .dialog-menu { margin-right: 18px; } diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index 79d672375..66c8ce8a1 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -100,7 +100,7 @@ pointer-events: none; position: absolute; top: 50%; - right: 52px; + right: 60px; transform: translateY(-50%); font-size: 40px; color: #19be6b; @@ -109,7 +109,7 @@ } .dialog-title { - padding-right: 52px; + padding-right: 60px; } }