From 8af33ea66ac72de3535bbccd9a889caadd605c72 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Sun, 30 Mar 2025 09:12:38 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/pages/manage/components/DialogGroupInfo.vue | 2 +- .../assets/js/pages/manage/components/DialogWrapper.vue | 2 -- resources/assets/js/store/actions.js | 9 ++++++--- .../assets/sass/pages/components/project-panel.scss | 8 ++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/resources/assets/js/pages/manage/components/DialogGroupInfo.vue b/resources/assets/js/pages/manage/components/DialogGroupInfo.vue index 6b6f1adc9..143230ed3 100644 --- a/resources/assets/js/pages/manage/components/DialogGroupInfo.vue +++ b/resources/assets/js/pages/manage/components/DialogGroupInfo.vue @@ -284,7 +284,7 @@ export default { this.getDialogUser(); } else { this.$store.dispatch("forgetDialog", {id: this.dialogId}); - this.goForward({name: 'manage-messenger'}); + this.$emit("on-close") } }).catch(({msg}) => { reject(msg); diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 3f6204744..6c14e8152 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -2800,7 +2800,6 @@ export default { }).then(({msg}) => { resolve(msg); this.$store.dispatch("forgetDialog", {id: this.dialogId}); - this.goForward({name: 'manage-messenger'}); }).catch(({msg}) => { reject(msg); }); @@ -2823,7 +2822,6 @@ export default { }).then(({msg}) => { resolve(msg); this.$store.dispatch("forgetDialog", {id: this.dialogId}); - this.goForward({name: 'manage-messenger'}); }).catch(({msg}) => { reject(msg); }); diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 929732cfb..78c02a1fd 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -3026,11 +3026,11 @@ export default { */ openDialog({state, dispatch}, dialog_id) { return new Promise(async (resolve, reject) => { - let single_window = false + let single_window = $A.isSubElectron || (state.isModKey && $A.Electron) let search_msg_id; let dialog_msg_id; if ($A.isJson(dialog_id)) { - single_window = (dialog_id.single || dialog_id.single_window) && $A.Electron; + single_window = single_window || (dialog_id.single && $A.Electron); search_msg_id = dialog_id.search_msg_id; dialog_msg_id = dialog_id.dialog_msg_id; dialog_id = dialog_id.dialog_id; @@ -3051,7 +3051,7 @@ export default { } } // - if (single_window || $A.isSubElectron) { + if (single_window) { dispatch('openDialogNewWindow', dialog_id); resolve() return @@ -3139,6 +3139,9 @@ export default { // const ids = $A.isArray(data.id) ? data.id : [data.id]; ids.some(id => { + if ($A.isJson(id)) { + id = id.id + } const index = state.cacheDialogs.findIndex(dialog => dialog.id == id); if (index > -1) { dispatch("forgetDialogMsg", {id: state.dialogMsgs.filter(item => item.dialog_id == data.id).map(item => item.id)}) diff --git a/resources/assets/sass/pages/components/project-panel.scss b/resources/assets/sass/pages/components/project-panel.scss index 9e74c2d07..52a75c193 100644 --- a/resources/assets/sass/pages/components/project-panel.scss +++ b/resources/assets/sass/pages/components/project-panel.scss @@ -142,6 +142,11 @@ margin-right: 14px; opacity: 0.9; height: 30px; + .ivu-checkbox-wrapper { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } .ivu-checkbox-focus { box-shadow: none; } @@ -164,6 +169,9 @@ align-items: center; justify-content: center; cursor: pointer; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; &.start { background-color: rgba($flow-status-start-color, 0.1); border-color: rgba($flow-status-start-color, 0.1);