github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-13 03:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2025-08-08 12:45:07 +08:00
parent b34fabab54
commit 00b34fda42
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
resources/assets/js/components/MicroApps/index.vue
View File

@ -491,7 +491,7 @@ export default {
*/ */
closeByName(name) { closeByName(name) {
try { try {
this.$refs[`ref-${name}`][0].onClose() this.$refs[`ref-${name}`][0].attemptClose()
} catch (e) { } catch (e) {
this.closeMicroApp(name) this.closeMicroApp(name)
} }
@ -543,7 +543,7 @@ export default {
*/ */
onBeforeClose(name) { onBeforeClose(name) {
return new Promise(resolve => { return new Promise(resolve => {
const onClose = () => { const handleClose = () => {
if ($A.isSubElectron) { if ($A.isSubElectron) {
$A.Electron.sendMessage('windowDestroy'); $A.Electron.sendMessage('windowDestroy');
} else { } else {
@ -554,7 +554,7 @@ export default {
const app = this.microApps.find(item => item.name == name); const app = this.microApps.find(item => item.name == name);
if (!app) { if (!app) {
// 如果应用不存在，则直接关闭 // 如果应用不存在，则直接关闭
onClose() handleClose()
return return
} }
@ -562,10 +562,10 @@ export default {
const before = app.onBeforeClose(); const before = app.onBeforeClose();
if (before && before.then) { if (before && before.then) {
before.then(() => { before.then(() => {
onClose() handleClose()
}); });
} else { } else {
onClose() handleClose()
} }
return return
} }
@ -575,7 +575,7 @@ export default {
if ($A.leftExists(name, 'appstore')) { if ($A.leftExists(name, 'appstore')) {
this.$store.dispatch("updateMicroAppsStatus"); this.$store.dispatch("updateMicroAppsStatus");
} }
onClose() handleClose()
} }
}) })
}) })

4
resources/assets/js/components/MicroApps/modal.vue
View File

@ -17,7 +17,7 @@
</svg> </svg>
</div> </div>
<div class="micro-modal-capsule-line"></div> <div class="micro-modal-capsule-line"></div>
<div class="micro-modal-capsule-item" @click="onCapsuleClose"> <div class="micro-modal-capsule-item" @click="attemptClose">
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9 16C12.866 16 16 12.866 16 9C16 5.13401 12.866 2 9 2C5.13401 2 2 5.13401 2 9C2 12.866 5.13401 16 9 16Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/> <path d="M9 16C12.866 16 16 12.866 16 9C16 5.13401 12.866 2 9 2C5.13401 2 2 5.13401 2 9C2 12.866 5.13401 16 9 16Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M9 12C10.6569 12 12 10.6569 12 9C12 7.34315 10.6569 6 9 6C7.34315 6 6 7.34315 6 9C6 10.6569 7.34315 12 9 12Z" fill="currentColor"/> <path d="M9 12C10.6569 12 12 10.6569 12 9C12 7.34315 10.6569 6 9 6C7.34315 6 6 7.34315 6 9C6 10.6569 7.34315 12 9 12Z" fill="currentColor"/>
@ -204,7 +204,7 @@ export default {
}) })
}, },
onCapsuleClose() { attemptClose() {
if (!this.beforeClose) { if (!this.beforeClose) {
return this.handleClose(); return this.handleClose();
} }