From 688b3b09f50b673bc51b623ce43120e6ab51ec4d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 20 Apr 2022 15:20:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=20monaco=20=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandEditor.vue  | 8 --------
 src/components/CommandSideBar.vue | 2 +-
 src/components/MonacoEditor.vue   | 6 +++---
 src/pages/ConfigurationPage.vue   | 4 +---
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index 77affad..2e2841f 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -327,13 +327,6 @@ export default {
           this.matchLanguage(this.quickcommandInfo.customOptions.ext);
         });
     },
-    closeEditor() {
-      this.$refs.editor?.destoryEditor();
-      this.$emit("editorEvent", {
-        type: "close",
-        data: {},
-      });
-    },
     // 保存
     saveCurrentCommand() {
       let updatedData = this.$refs.sidebar?.SaveMenuData();
@@ -348,7 +341,6 @@ export default {
         type: "save",
         data: newQuickcommandInfo,
       });
-      this.closeEditor();
     },
     // 运行
     runCurrentCommand() {
diff --git a/src/components/CommandSideBar.vue b/src/components/CommandSideBar.vue
index 498f7d9..531631e 100644
--- a/src/components/CommandSideBar.vue
+++ b/src/components/CommandSideBar.vue
@@ -14,7 +14,7 @@
         color="grey"
         style="margin-right: 29px"
         icon="arrow_back_ios_new"
-        @click="$parent.closeEditor"
+        v-close-popup
       />
       <q-img
         class="commandLogo"
diff --git a/src/components/MonacoEditor.vue b/src/components/MonacoEditor.vue
index 0faa9bb..b1020b2 100644
--- a/src/components/MonacoEditor.vue
+++ b/src/components/MonacoEditor.vue
@@ -204,9 +204,6 @@ export default {
       };
       this.rawEditor.executeEdits("my-source", [op]);
     },
-    destoryEditor() {
-      this.rawEditor.dispose();
-    },
     listenEditorValue() {
       this.rawEditor.focus();
       this.rawEditor.onDidChangeModelContent(() => {
@@ -237,6 +234,9 @@ export default {
       );
     },
   },
+  beforeUnmount() {
+    this.rawEditor.dispose();
+  },
 };
 </script>
 
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index 74f3b72..1d7c117 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -576,11 +576,9 @@ export default {
     },
     editorEvent(event) {
       switch (event.type) {
-        case "close":
-          this.isCommandEditorShow = false;
-          return;
         case "save":
           this.saveCommand(event.data);
+          this.isCommandEditorShow = false;
         default:
           return;
       }