From 790c4a872cfe640cf2e33fb9f8d4c115c34f1620 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 8 Apr 2022 12:18:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=91=BD=E4=BB=A4=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=A8=A1=E5=9D=97=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandEditor.vue    | 122 ++++---------------------
 src/components/CommandRunResult.vue | 134 ++++++++++++++++++++++++++++
 src/pages/CommandPage.vue           |  21 +++--
 src/pages/QuickPanel.vue            |   5 --
 src/router/routes.js                |   2 +-
 5 files changed, 162 insertions(+), 122 deletions(-)
 create mode 100644 src/components/CommandRunResult.vue
 delete mode 100644 src/pages/QuickPanel.vue

diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index 204c204..d4b0314 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -144,40 +144,21 @@
         transition: '0.3s',
       }"
     />
-    <q-dialog v-model="isResultShow" @hide="runResult = ''" position="bottom">
-      <q-card style="width: 90vh">
-        <q-toolbar>
-          <q-avatar>
-            <q-icon
-              :class="runResultStatus ? 'text-green' : 'text-red'"
-              style="font-size: 30px"
-              :name="runResultStatus ? 'task_alt' : 'error'"
-            ></q-icon>
-          </q-avatar>
-          <q-toolbar-title
-            ><span class="text-weight-bold">运行结果</span></q-toolbar-title
-          >
-        </q-toolbar>
-        <q-card-section class="row items-center">
-          <pre
-            :class="runResultStatus ? '' : 'text-red'"
-            v-html="runResult"
-          ></pre>
-        </q-card-section>
-        <q-card-actions align="right">
-          <q-btn flat label="关闭" color="primary" v-close-popup />
-        </q-card-actions>
-      </q-card>
-    </q-dialog>
+    <!-- 运行结果 -->
+    <CommandRunResult
+      :action="runResultAction"
+      ref="result"
+    ></CommandRunResult>
   </div>
 </template>
 
 <script>
 import MonocaEditor from "components/MonocaEditor";
 import CommandMenu from "components/CommandMenu";
+import CommandRunResult from "components/CommandRunResult";
 
 export default {
-  components: { MonocaEditor, CommandMenu },
+  components: { MonocaEditor, CommandMenu, CommandRunResult },
   data() {
     return {
       programLanguages: Object.keys(this.$programmings),
@@ -198,14 +179,15 @@ export default {
           ext: "",
         },
       },
-      isResultShow: false,
-      runResult: "",
-      runResultStatus: true,
       resultMaxLength: 10000,
       showSidebar: this.action.type !== "run",
       isRunCodePage: this.action.type === "run",
       parent: this.$parent.$parent.$parent.$parent,
       commandString: this.$q.platform.is.mac ? "⌘" : "ctrl",
+      runResultAction: {
+        type: "inPlugin",
+        data: {},
+      },
     };
   },
   props: {
@@ -350,82 +332,6 @@ export default {
           this.matchLanguage(this.quickcommandInfo.customOptions.ext);
         });
     },
-    // 运行命令
-    async runCurrentCommand() {
-      let cmd = this.$refs.editor.getEditorValue();
-      cmd = window.special(cmd);
-      cmd = await this.replaceTempInputVals(cmd);
-      let terminal = false;
-      let raw = true;
-      switch (this.$refs.menu?.currentCommand.output) {
-        case "html":
-          raw = false;
-          break;
-        case "terminal":
-          terminal = true;
-          break;
-        case "ignore":
-          utools.hideMainWindow();
-          break;
-      }
-      if (this.quickcommandInfo.program === "quickcommand") {
-        window.runCodeInVm(cmd, (stdout, stderr) => {
-          if (stderr) return this.showRunResult(stderr, raw, false);
-          this.showRunResult(stdout, raw, true);
-        });
-      } else {
-        let option = this.$programmings[this.quickcommandInfo.program];
-        if (this.quickcommandInfo.program === "custom")
-          option = this.quickcommandInfo.customOptions;
-        option.scptarg = this.quickcommandInfo.scptarg;
-        option.charset = this.quickcommandInfo.charset;
-        window.runCodeFile(cmd, option, terminal, (stdout, stderr) => {
-          if (terminal) return;
-          if (stderr) return this.showRunResult(stderr, raw, false);
-          this.showRunResult(stdout, raw, true);
-        });
-      }
-    },
-    // 替换特殊变量
-    async replaceTempInputVals(cmd) {
-      let tempInputVals = [];
-      let needInputVal = [
-        "input",
-        "subinput",
-        "pwd",
-        "SelectFile",
-        "WindowInfo",
-        "MatchedFiles",
-      ];
-      needInputVal.forEach((x) => {
-        let m = cmd.match(new RegExp("{{" + x + ".*?}}", "g"));
-        m &&
-          m.forEach((y) => tempInputVals.includes(y) || tempInputVals.push(y));
-      });
-      if (!tempInputVals.length) return cmd;
-      let inputs = await quickcommand.showInputBox(
-        tempInputVals,
-        "需要临时为以下变量赋值"
-      );
-      tempInputVals.forEach((t, n) => {
-        cmd = cmd.replace(new RegExp(t, "g"), inputs[n]);
-      });
-      return cmd;
-    },
-    // 显示运行结果
-    showRunResult(content, raw, isSuccess) {
-      this.isResultShow = true;
-      this.runResultStatus = isSuccess;
-      let contlength = content.length;
-      if (contlength > this.resultMaxLength)
-        content =
-          content.slice(0, this.resultMaxLength - 100) +
-          `\n\n...\n${
-            contlength - this.resultMaxLength - 100
-          } 字省略\n...\n\n` +
-          content.slice(contlength - 100);
-      this.runResult += htmlEncode(content, raw);
-    },
     closeEditor() {
       this.$refs.editor?.destoryEditor();
       this.$emit("editorEvent", {
@@ -454,6 +360,12 @@ export default {
           ?.click();
       });
     },
+    // 运行
+    runCurrentCommand() {
+      this.quickcommandInfo.cmd = this.$refs.editor?.getEditorValue();
+      this.quickcommandInfo.output = this.$refs.menu?.currentCommand.output;
+      this.$refs.result.runCurrentCommand(this.quickcommandInfo);
+    },
   },
 };
 </script>
diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
new file mode 100644
index 0000000..a98c803
--- /dev/null
+++ b/src/components/CommandRunResult.vue
@@ -0,0 +1,134 @@
+<template>
+  <div>
+    <div v-if="action.type === 'inPlugin'">
+      <q-dialog v-model="isResultShow" @hide="runResult = ''" position="bottom">
+        <q-card style="width: 90vh">
+          <q-toolbar>
+            <q-avatar>
+              <q-icon
+                :class="runResultStatus ? 'text-green' : 'text-red'"
+                style="font-size: 30px"
+                :name="runResultStatus ? 'task_alt' : 'error'"
+              ></q-icon>
+            </q-avatar>
+            <q-toolbar-title
+              ><span class="text-weight-bold">运行结果</span></q-toolbar-title
+            >
+          </q-toolbar>
+          <q-card-section class="row items-center">
+            <pre
+              :class="runResultStatus ? '' : 'text-red'"
+              v-html="runResult"
+            ></pre>
+          </q-card-section>
+          <q-card-actions align="right">
+            <q-btn flat label="关闭" color="primary" v-close-popup />
+          </q-card-actions>
+        </q-card>
+      </q-dialog>
+    </div>
+    <div v-else>
+      <q-card>
+        {{ action.data }}
+      </q-card>
+    </div>
+  </div>
+</template>
+
+
+<script>
+export default {
+  data() {
+    return {
+      isResultShow: false,
+      runResult: "",
+      runResultStatus: true,
+    };
+  },
+  props: {
+    action: Object,
+  },
+  methods: {
+    // 运行命令
+    async runCurrentCommand(currentCommand) {
+      currentCommand.cmd = window.special(currentCommand.cmd);
+      currentCommand.cmd = await this.replaceTempInputVals(currentCommand.cmd);
+      let terminal = false;
+      let raw = true;
+      switch (currentCommand.output) {
+        case "html":
+          raw = false;
+          break;
+        case "terminal":
+          terminal = true;
+          break;
+        case "ignore":
+          utools.hideMainWindow();
+          break;
+      }
+      if (currentCommand.program === "quickcommand") {
+        window.runCodeInVm(currentCommand.cmd, (stdout, stderr) => {
+          if (stderr) return this.showRunResult(stderr, raw, false);
+          this.showRunResult(stdout, raw, true);
+        });
+      } else {
+        let option = this.$programmings[currentCommand.program];
+        if (currentCommand.program === "custom")
+          option = currentCommand.customOptions;
+        option.scptarg = currentCommand.scptarg;
+        option.charset = currentCommand.charset;
+        window.runCodeFile(
+          currentCommand.cmd,
+          option,
+          terminal,
+          (stdout, stderr) => {
+            if (terminal) return;
+            if (stderr) return this.showRunResult(stderr, raw, false);
+            this.showRunResult(stdout, raw, true);
+          }
+        );
+      }
+    },
+    // 替换特殊变量
+    async replaceTempInputVals(cmd) {
+      let tempInputVals = [];
+      let needInputVal = [
+        "input",
+        "subinput",
+        "pwd",
+        "SelectFile",
+        "WindowInfo",
+        "MatchedFiles",
+      ];
+      needInputVal.forEach((x) => {
+        let m = cmd.match(new RegExp("{{" + x + ".*?}}", "g"));
+        m &&
+          m.forEach((y) => tempInputVals.includes(y) || tempInputVals.push(y));
+      });
+      if (!tempInputVals.length) return cmd;
+      let inputs = await quickcommand.showInputBox(
+        tempInputVals,
+        "需要临时为以下变量赋值"
+      );
+      tempInputVals.forEach((t, n) => {
+        cmd = cmd.replace(new RegExp(t, "g"), inputs[n]);
+      });
+      return cmd;
+    },
+    // 显示运行结果
+    showRunResult(content, raw, isSuccess) {
+      this.isResultShow = true;
+      this.runResultStatus = isSuccess;
+      let contlength = content.length;
+      if (contlength > this.resultMaxLength)
+        content =
+          content.slice(0, this.resultMaxLength - 100) +
+          `\n\n...\n${
+            contlength - this.resultMaxLength - 100
+          } 字省略\n...\n\n` +
+          content.slice(contlength - 100);
+      this.runResult += htmlEncode(content, raw);
+    },
+  },
+};
+</script>
diff --git a/src/pages/CommandPage.vue b/src/pages/CommandPage.vue
index 174635a..5107dfb 100644
--- a/src/pages/CommandPage.vue
+++ b/src/pages/CommandPage.vue
@@ -1,23 +1,22 @@
 <template>
-  <div
-    :style="{
-      whiteSpace: 'pre',
-    }"
-  >
-    {{ enterData }}
+  <div>
+    <CommandRunResult :action="action"></CommandRunResult>
   </div>
 </template>
 
 <script>
+import CommandRunResult from "components/CommandRunResult.vue";
+
 export default {
+  component: { CommandRunResult },
   data() {
     return {
-      output: "",
-      enterData: "",
+      action: {
+        type: "fromUtools",
+        data: quickcommand.enterData,
+      },
     };
   },
-  mounted() {
-    this.enterData = quickcommand.enterData;
-  },
+  mounted() {},
 };
 </script>
diff --git a/src/pages/QuickPanel.vue b/src/pages/QuickPanel.vue
deleted file mode 100644
index 9df2fce..0000000
--- a/src/pages/QuickPanel.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
-    <div>
-        quickPanel
-    </div>
-</template>
diff --git a/src/router/routes.js b/src/router/routes.js
index 0b5923c..3b4491f 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -17,7 +17,7 @@ const routes = [
     },
     {
         path: '/panel_:tags(\\w+)',
-        component: () => import('pages/QuickPanel.vue')
+        component: () => import('pages/ConfigurationPage.vue')
     },
     {
         path: '/needupdate',