From 6250e085a4302c7abaf2e2bfe7387b723904e9ce Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 15 May 2022 14:44:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E8=AF=BB=E5=8F=96feature?=
 =?UTF-8?q?=E5=92=8Ccommand?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ConfigurationPage.vue | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index b5ddd6c..f682752 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -224,7 +224,7 @@ export default {
       lastTag: "",
       activatedQuickCommandFeatureCodes: [],
       activatedQuickPanels: [],
-      allQuickCommands: [],
+      allQuickCommands: {},
       commandSearchKeyword: "",
       isCommandEditorShow: false,
       commandEditorAction: {},
@@ -317,25 +317,15 @@ export default {
         else this.editCommand(JSON.parse(this.$root.enterData.payload));
         this.$router.push("/configuration");
       }
-      // 已启用的 features
-      let activatedFeatures = this.getActivatedFeatures();
-      // 已启用的命令的 featureCode
-      this.activatedQuickCommandFeatureCodes =
-        activatedFeatures.quickcommand.map((f) => f.code);
-      // 已启用的面板
-      this.activatedQuickPanels = activatedFeatures.quickpanels;
-      // 所有的快捷命令
-      this.allQuickCommands = this.getAllQuickCommands();
-      this.importDefaultCommands();
       if (this.$route.params.tags) {
         this.currentTag = window.hexDecode(this.$route.params.tags);
         this.commandCardStyle = "mini";
       }
+      // 异步读取
+      setTimeout(this.getActivatedFeatures, 0);
+      setTimeout(this.getAllQuickCommands, 0);
     },
     importDefaultCommands() {
-      for (var code of Object.keys(defaultCommands)) {
-        this.$root.utools.putDB(defaultCommands[code], "qc_" + code);
-      }
       Object.assign(this.allQuickCommands, defaultCommands);
     },
     // 获取所有已启用的命令的 features 以及面板名称
@@ -348,18 +338,17 @@ export default {
           ? quickpanels.push(window.hexDecode(x.code.slice(6)))
           : currentFts.push(x)
       );
-      return {
-        quickcommand: currentFts,
-        quickpanels: quickpanels,
-      };
+      this.activatedQuickCommandFeatureCodes = currentFts.map((f) => f.code);
+      // 已启用的面板
+      this.activatedQuickPanels = quickpanels;
     },
     // 获取所有的快捷命令（导出的格式）
     getAllQuickCommands() {
-      let allQcs = {};
+      this.allQuickCommands = {};
       this.$root.utools
         .getDocs("qc_")
-        .forEach((x) => (allQcs[x.data.features.code] = x.data));
-      return allQcs;
+        .forEach((x) => (this.allQuickCommands[x.data.features.code] = x.data));
+      this.importDefaultCommands();
     },
     // 监听命令变更事件
     commandChanged(event) {