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 = [];