From 0ca153ac10a60fac2d1e8b8610af8e65fc5ffe00 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 8 Apr 2022 19:08:31 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                         |  9 +++++++--
 src/components/CommandRunResult.vue |  8 +++++++-
 src/pages/CommandPage.vue           | 29 ++++++++++++++++++++++++-----
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 9c269f5..3508930 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -19,7 +19,7 @@ export default defineComponent({
   },
   methods: {
     init() {
-      window.utools = window.getuToolsLite()
+      window.utools = window.getuToolsLite();
       // 版本检测
       const requiredVersion = "2.6.1";
       let version = utools.getAppVersion();
@@ -37,7 +37,12 @@ export default defineComponent({
         this.$q.dark.set(utools.isDarkColors());
         // 路由跳转
         quickcommand.enterData = enter;
-        this.$router.push(enter.code);
+        this.$router.push({
+          path: enter.code,
+          query: {
+            timestamp: new Date().getTime(),
+          },
+        });
       });
     },
   },
diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index a98c803..d312962 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -29,7 +29,10 @@
     </div>
     <div v-else>
       <q-card>
-        {{ action.data }}
+        <pre
+          :class="runResultStatus ? '' : 'text-red'"
+          v-html="runResult"
+        ></pre>
       </q-card>
     </div>
   </div>
@@ -48,6 +51,9 @@ export default {
   props: {
     action: Object,
   },
+  mounted() {
+    window.runResult = this;
+  },
   methods: {
     // 运行命令
     async runCurrentCommand(currentCommand) {
diff --git a/src/pages/CommandPage.vue b/src/pages/CommandPage.vue
index 5107dfb..248a256 100644
--- a/src/pages/CommandPage.vue
+++ b/src/pages/CommandPage.vue
@@ -1,22 +1,41 @@
 <template>
   <div>
-    <CommandRunResult :action="action"></CommandRunResult>
+    <CommandRunResult :action="action" ref="result"></CommandRunResult>
   </div>
 </template>
 
 <script>
-import CommandRunResult from "components/CommandRunResult.vue";
+import CommandRunResult from "components/CommandRunResult";
 
 export default {
-  component: { CommandRunResult },
+  components: { CommandRunResult },
   data() {
     return {
       action: {
         type: "fromUtools",
-        data: quickcommand.enterData,
+        data: {},
       },
     };
   },
-  mounted() {},
+  mounted() {
+    window.commandPage = this;
+    this.runCurrentCommand();
+  },
+  computed: {
+    featureCode() {
+      return this.$route.params.type + "_" + this.$route.params.uid;
+    },
+    currentCommand() {
+      return this.$utools.whole.db.get("qc_" + this.featureCode).data;
+    },
+  },
+  beforeRouteUpdate(to, from, next) {
+    this.runCurrentCommand();
+  },
+  methods: {
+    runCurrentCommand() {
+      this.$refs.result.runCurrentCommand(this.currentCommand);
+    },
+  },
 };
 </script>