From ca24afe4b2d24bf59d5ce402bc85e4b363fc7b72 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Feb 2025 23:19:19 +0800
Subject: [PATCH] =?UTF-8?q?runComposer=E8=87=AA=E5=8A=A8=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=9A=84=E5=91=BD=E4=BB=A4=E4=B9=9F=E8=BF=9B=E8=A1=8C=E7=AE=80?=
 =?UTF-8?q?=E5=8C=96=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                       |  7 +++-
 src/components/ComposerEditor.vue | 60 +++----------------------------
 src/js/commandManager.js          | 55 ++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 57 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 288e478..947306e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -132,10 +132,15 @@ export default defineComponent({
       // 退出时保存RunCode和RunComposer的命令
       if (!["code", "composer"].includes(this.$route.name)) return;
 
-      const currentCommand = window.lodashM.cloneDeep(
+      let currentCommand = window.lodashM.cloneDeep(
         this.commandManager.state.currentCommand
       );
 
+      if (this.$route.name === "composer") {
+        currentCommand =
+          this.commandManager.getLitedComposerCommand(currentCommand);
+      }
+
       dbManager.putDB(currentCommand, `cfg_${this.$route.name}History`);
 
       this.$router.push("/");
diff --git a/src/components/ComposerEditor.vue b/src/components/ComposerEditor.vue
index e5b46f6..2a4142b 100644
--- a/src/components/ComposerEditor.vue
+++ b/src/components/ComposerEditor.vue
@@ -13,7 +13,6 @@
 <script>
 import CommandComposer from "components/composer/CommandComposer.vue";
 import CommandRunResult from "components/CommandRunResult";
-import { findCommandByValue } from "js/composer/composerConfig";
 import { useCommandManager } from "js/commandManager.js";
 
 export default {
@@ -21,68 +20,17 @@ export default {
   setup() {
     const commandManager = useCommandManager();
 
-    const retoreToFullCommand = (command) => {
-      const newCommand = window.lodashM.cloneDeep(command);
-      const { flows } = newCommand;
-      if (!flows) return newCommand;
-      const newFlows = flows.map((flow) => ({
-        ...flow,
-        commands: flow.commands.map((cmd) => {
-          // 恢复所有属性
-          const command = findCommandByValue(cmd.value);
-          return {
-            ...command,
-            ...cmd,
-          };
-        }),
-      }));
-      return {
-        ...command,
-        flows: newFlows,
-      };
-    };
-
-    const getLitedComposerCommand = (command) => {
-      const { flows } = command;
-      if (!flows) return command;
-      const newFlows = flows.map((flow) => ({
-        ...flow,
-        commands: flow.commands.map((cmd) => {
-          const cmdCopy = { ...cmd };
-          // 移除不必要保存的属性
-          const uselessProps = [
-            "config",
-            "label",
-            "component",
-            "subCommands",
-            "outputs",
-            "options",
-            "icon",
-            "width",
-            "placeholder",
-            "summary",
-            "type",
-          ];
-          uselessProps.forEach((prop) => delete cmdCopy[prop]);
-          return cmdCopy;
-        }),
-      }));
-      return {
-        ...command,
-        flows: newFlows,
-      };
-    };
-
     const defaultCommand = commandManager.getDefaultCommand("quickcomposer");
 
     commandManager.state.currentCommand = {
       ...defaultCommand,
-      ...retoreToFullCommand(commandManager.state.currentCommand),
+      ...commandManager.getFullComposerCommand(
+        commandManager.state.currentCommand
+      ),
     };
 
     return {
       commandManager,
-      getLitedComposerCommand,
     };
   },
   emits: ["editorEvent"],
@@ -105,7 +53,7 @@ export default {
           return this.$emit(
             "editorEvent",
             "save",
-            this.getLitedComposerCommand(command)
+            this.commandManager.getLitedComposerCommand(command)
           );
       }
     },
diff --git a/src/js/commandManager.js b/src/js/commandManager.js
index 7a4b4b3..306cf22 100644
--- a/src/js/commandManager.js
+++ b/src/js/commandManager.js
@@ -3,6 +3,7 @@ import quickcommandParser from "js/common/quickcommandParser.js";
 import importAll from "js/common/importAll.js";
 import { utoolsFull, dbManager } from "js/utools.js";
 import { getUniqueId } from "js/common/uuid.js";
+import { findCommandByValue } from "js/composer/composerConfig";
 import programs from "js/options/programs.js";
 import outputTypes from "js/options/outputTypes.js";
 
@@ -287,6 +288,58 @@ export function useCommandManager() {
       : quickcommandCommand;
   };
 
+  const getFullComposerCommand = (command) => {
+    const newCommand = window.lodashM.cloneDeep(command);
+    const { flows } = newCommand;
+    if (!flows) return newCommand;
+    const newFlows = flows.map((flow) => ({
+      ...flow,
+      commands: flow.commands.map((cmd) => {
+        // 恢复所有属性
+        const command = findCommandByValue(cmd.value);
+        return {
+          ...command,
+          ...cmd,
+        };
+      }),
+    }));
+    return {
+      ...command,
+      flows: newFlows,
+    };
+  };
+
+  const getLitedComposerCommand = (command) => {
+    const { flows } = command;
+    if (!flows) return command;
+    const newFlows = flows.map((flow) => ({
+      ...flow,
+      commands: flow.commands.map((cmd) => {
+        const cmdCopy = { ...cmd };
+        // 移除不必要保存的属性
+        const uselessProps = [
+          "config",
+          "label",
+          "component",
+          "subCommands",
+          "outputs",
+          "options",
+          "icon",
+          "width",
+          "placeholder",
+          "summary",
+          "type",
+        ];
+        uselessProps.forEach((prop) => delete cmdCopy[prop]);
+        return cmdCopy;
+      }),
+    }));
+    return {
+      ...command,
+      flows: newFlows,
+    };
+  };
+
   return {
     state,
     getAllQuickCommands,
@@ -303,5 +356,7 @@ export function useCommandManager() {
     clearAllCommands,
     changeCurrentTag,
     getDefaultCommand,
+    getFullComposerCommand,
+    getLitedComposerCommand,
   };
 }