From 20a6da49440c1dda175b7bf238bc176a504b619e Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 23 Dec 2021 21:49:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E9=94=AE=E5=85=B3=E9=97=AD=E4=BE=A7=E6=BB=91=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/App.vue                   |  6 +++++-
 .../assets/js/components/DrawerOverlay.vue    | 19 +++++++++++++++++++
 resources/assets/js/store/state.js            |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index 006b3b712..c23957932 100755
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -53,7 +53,7 @@ export default {
     },
 
     computed: {
-        ...mapState(['taskId']),
+        ...mapState(['taskId', 'cacheDrawerOverlay']),
     },
 
     watch: {
@@ -181,6 +181,10 @@ export default {
                 if (this.$Modal.removeLast()) {
                     return;
                 }
+                if (this.cacheDrawerOverlay.length > 0) {
+                    this.cacheDrawerOverlay[this.cacheDrawerOverlay.length - 1].close();
+                    return;
+                }
                 ipcRenderer.send('windowHidden');
             })
         }
diff --git a/resources/assets/js/components/DrawerOverlay.vue b/resources/assets/js/components/DrawerOverlay.vue
index 3ccdabf1e..4d85ee42b 100644
--- a/resources/assets/js/components/DrawerOverlay.vue
+++ b/resources/assets/js/components/DrawerOverlay.vue
@@ -15,6 +15,8 @@
 </template>
 
 <script>
+    import state from "../store/state";
+
     export default {
         name: 'DrawerOverlay',
         props: {
@@ -74,6 +76,23 @@
             }
         },
 
+        watch: {
+            value(val) {
+                if (this._uid) {
+                    const index =  this.$store.state.cacheDrawerOverlay.findIndex(({_uid}) => _uid === this._uid);
+                    if (val && index === -1) {
+                        this.$store.state.cacheDrawerOverlay.push({
+                            _uid: this._uid,
+                            close: this.close
+                        });
+                    }
+                    if (!val && index > -1) {
+                        this.$store.state.cacheDrawerOverlay.splice(index, 1);
+                    }
+                }
+            }
+        },
+
         methods: {
             mask () {
                 if (this.maskClosable) {
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index cf3452a01..496f22be4 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -255,6 +255,7 @@ state.windowMax768 = window.innerWidth <= 768;
 
 // 数据缓存
 state.cacheLoading = {};
+state.cacheDrawerOverlay = [];
 // User
 state.cacheUserActive = {};
 state.cacheUserWait = [];