From 1b408555787903f9a7926040b17d56df21f841f6 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 8 May 2022 23:30:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E5=91=BD=E4=BB=A4=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E6=94=B9=E4=B8=BA=E5=86=85=E7=BD=AE=20feature?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/plugin.json                            |  10 ++-
 src/App.vue                                   |   4 +-
 src/assets/feature/api.png                    | Bin 3586 -> 0 bytes
 src/components/ConfigurationMenu.vue          |  72 ++++++++++++------
 src/js/options/defaultProfile.js              |   5 +-
 src/js/options/quickFeatures.js               |   7 --
 ...quickFeaturesPage.vue => FeaturesPage.vue} |   2 -
 .../ApiServer.vue => pages/ServerPage.vue}    |  34 +++++++--
 src/router/routes.js                          |  27 ++++---
 9 files changed, 105 insertions(+), 56 deletions(-)
 delete mode 100644 src/assets/feature/api.png
 rename src/pages/{quickFeaturesPage.vue => FeaturesPage.vue} (90%)
 rename src/{components/quickFeatures/ApiServer.vue => pages/ServerPage.vue} (72%)

diff --git a/plugin/plugin.json b/plugin/plugin.json
index 9b0e225..a244e4c 100644
--- a/plugin/plugin.json
+++ b/plugin/plugin.json
@@ -52,6 +52,14 @@
                 "分享中心",
                 "ShareCenter"
             ]
+        },
+        {
+            "code": "server",
+            "explain": "配置快捷命令后台服务",
+            "cmds": [
+                "快捷命令服务配置",
+                "quickcommandServer"
+            ]
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 1e529e4..69b2bef 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -83,8 +83,8 @@ export default defineComponent({
         this.runCronTask(featureCode, cronExp);
       });
       // 快捷命令服务
-      if (this.nativeProfile.apiServerStatus && this.profile.apiServerEnable) {
-        window.quickcommandHttpServer().run(this.profile.apiServerPort);
+      if (this.nativeProfile.serverStatus && this.profile.apiServerEnable) {
+        window.quickcommandHttpServer().run(this.nativeProfile.serverPort);
         console.log("Server Start...");
       }
     },
diff --git a/src/assets/feature/api.png b/src/assets/feature/api.png
deleted file mode 100644
index c4233973fa625c8f643e2262cc4fade9959635e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3586
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
IM6N<$f&!1hQ~&?~

diff --git a/src/components/ConfigurationMenu.vue b/src/components/ConfigurationMenu.vue
index 87777d6..44d1441 100644
--- a/src/components/ConfigurationMenu.vue
+++ b/src/components/ConfigurationMenu.vue
@@ -118,36 +118,57 @@
                   <q-item-section side>
                     <q-icon name="api" />
                   </q-item-section>
-                  <q-input
-                    dense
-                    prefix="开启快捷命令服务"
-                    suffix="端口"
-                    outlined
-                    v-model="$root.profile.apiServerPort"
-                    input-class="text-center"
-                    style="width: 280px"
-                    type="text"
-                  >
+                  <q-field dense outlined style="width: 280px">
+                    <template v-slot:control>
+                      <div
+                        class="self-center full-width no-outline"
+                        tabindex="0"
+                      >
+                        快捷命令服务
+                      </div>
+                    </template>
                     <template v-slot:append>
-                      <q-toggle
-                        @click="toggleFeature('apiServer')"
-                        v-model="$root.profile.apiServerEnable"
-                        checked-icon="check"
-                        color="primary"
+                      <q-btn
+                        flat
+                        @click="$router.push('server')"
+                        icon="open_in_new"
                       />
                     </template>
                     <q-tooltip
-                      >启用后，在主输入框输入「快捷命令服务」可以进入配置一个后台服务<br />
-                      通过本地监听{{
-                        $root.profile.apiServerPort
-                      }}端口的形式，接收用户传送过来的参数，然后根据参数执行不同的操作
+                      >通过本地监听
+                      {{ $root.nativeProfile.serverPort }}
+                      端口的形式，接收用户传送过来的参数，然后根据参数执行不同的操作
                       <br />
-                      本功能的意义在于，将 utools
-                      的接口暴露出来，可以通过命令行等外部途径 <br />
-                      直接启用 ubrowser 或者直接redirect 到相应的插件<br />
-                      需要配置插件跟随 utools 启动和保留后台
+                      需要配置插件跟随 utools 启动和保留后台<br />
+                      也可在主输入框通过关键字「快捷命令服务配置」进入
                     </q-tooltip>
-                  </q-input>
+                  </q-field>
+                </q-item>
+                <q-item>
+                  <q-item-section side>
+                    <q-icon name="code" />
+                  </q-item-section>
+                  <q-field dense outlined style="width: 280px">
+                    <template v-slot:control>
+                      <div
+                        class="self-center full-width no-outline"
+                        tabindex="0"
+                      >
+                        运行代码
+                      </div>
+                    </template>
+                    <template v-slot:append>
+                      <q-btn
+                        flat
+                        @click="$router.push('code')"
+                        icon="open_in_new"
+                      />
+                    </template>
+                    <q-tooltip
+                      >一个可以直接运行代码的代码编辑器<br />
+                      也可在主输入框输入关键字「RunCode」进入
+                    </q-tooltip>
+                  </q-field>
                 </q-item>
               </q-list>
             </q-menu>
@@ -384,6 +405,7 @@ export default {
       showAbout: false,
       showPanelConf: false,
       features: features,
+      redirect: utools.redirect,
     };
   },
   computed: {
@@ -457,7 +479,7 @@ export default {
         this.$root.utools.whole.setFeature(_.cloneDeep(this.features[type]));
       if (type === "apiServer" && !this.$root.profile.apiServerEnable) {
         window.quickcommandHttpServer().stop();
-        this.$root.nativeProfile.apiServerStatus = false;
+        this.$root.nativeProfile.serverStatus = false;
       }
     },
   },
diff --git a/src/js/options/defaultProfile.js b/src/js/options/defaultProfile.js
index d2f51d6..7468960 100644
--- a/src/js/options/defaultProfile.js
+++ b/src/js/options/defaultProfile.js
@@ -12,11 +12,10 @@ export default {
         quickUrlTag: "网址",
         pluNickNameEnable: false,
         pluNickNameTag: "别名",
-        apiServerEnable: false,
-        apiServerPort: 33442,
     },
     native: {
         crontabs: {},
-        apiServerStatus: false
+        serverPort: 33442,
+        serverStatus: false
     }
 }
\ No newline at end of file
diff --git a/src/js/options/quickFeatures.js b/src/js/options/quickFeatures.js
index f77a6f3..00a844e 100644
--- a/src/js/options/quickFeatures.js
+++ b/src/js/options/quickFeatures.js
@@ -42,13 +42,6 @@ const quickFeatures = {
         cmds: ["插件别名"],
         icon: require("../../assets/feature/plugin.png"),
         platform: ["win32", "darwin", "linux"],
-    },
-    apiServer: {
-        code: "feature_apiServer",
-        explain: "配置快捷命令后台服务",
-        cmds: ["快捷命令服务配置", "quickcommandServer"],
-        icon: require("../../assets/feature/api.png"),
-        platform: ["win32", "darwin", "linux"],
     }
 }
 
diff --git a/src/pages/quickFeaturesPage.vue b/src/pages/FeaturesPage.vue
similarity index 90%
rename from src/pages/quickFeaturesPage.vue
rename to src/pages/FeaturesPage.vue
index 52004a0..268c0a2 100644
--- a/src/pages/quickFeaturesPage.vue
+++ b/src/pages/FeaturesPage.vue
@@ -4,7 +4,6 @@
 
 <script>
 import PluginNickName from "components/quickFeatures/PluginNickName";
-import ApiServer from "components/quickFeatures/ApiServer";
 import FavFile from "components/quickFeatures/FavFile";
 import FavUrl from "components/quickFeatures/FavUrl";
 import { markRaw } from "vue";
@@ -12,7 +11,6 @@ import { markRaw } from "vue";
 export default {
   components: {
     pluNickName: markRaw(PluginNickName),
-    apiServer: markRaw(ApiServer),
     favFile: markRaw(FavFile),
     favUrl: markRaw(FavUrl),
   },
diff --git a/src/components/quickFeatures/ApiServer.vue b/src/pages/ServerPage.vue
similarity index 72%
rename from src/components/quickFeatures/ApiServer.vue
rename to src/pages/ServerPage.vue
index 494a08f..455cd08 100644
--- a/src/components/quickFeatures/ApiServer.vue
+++ b/src/pages/ServerPage.vue
@@ -28,10 +28,19 @@
         height: bottomHeight + 'px',
       }"
     >
-      <div class="q-gutter-xs">
+      <div class="q-gutter-xs flex items-center full-height content-center">
         <q-badge color="primary" dense square>POST</q-badge
         ><q-badge color="primary" dense square>GET</q-badge>
-        <span> http://127.0.0.1:{{ $root.profile.apiServerPort }} </span>
+        <span> http://127.0.0.1:</span>
+        <q-input
+          borderless
+          dense
+          v-model="$root.nativeProfile.serverPort"
+          style="width: 40px"
+          input-class="text-weight-bolder"
+          @blur="restartServer"
+          ><q-tooltip>点击修改端口</q-tooltip></q-input
+        >
         <span>的参数，均会作为本脚本里的变量 </span>
       </div>
       <q-btn-group unelevated>
@@ -51,7 +60,7 @@
             flat
             color="negative"
             icon="stop"
-            v-if="$root.nativeProfile.apiServerStatus"
+            v-if="$root.nativeProfile.serverStatus"
             @click="stopServer"
             label="停止服务"
           />
@@ -97,16 +106,29 @@ export default {
           "FBI WARNING"
         )
         .then(() => {
-          this.$root.nativeProfile.apiServerStatus = true;
-          window.quickcommandHttpServer().run(this.$root.profile.apiServerPort);
+          this.$root.nativeProfile.serverStatus = true;
+          window
+            .quickcommandHttpServer()
+            .run(this.$root.nativeProfile.serverPort);
           quickcommand.showMessageBox("启动服务成功！");
         });
     },
     stopServer() {
       window.quickcommandHttpServer().stop();
-      this.$root.nativeProfile.apiServerStatus = false;
+      this.$root.nativeProfile.serverStatus = false;
       quickcommand.showMessageBox("关闭服务成功！");
     },
+    restartServer() {
+      if (!this.$root.nativeProfile.serverPort)
+        this.$root.nativeProfile.serverPort = 33442;
+      if ((this.$root.nativeProfile.serverStatus = true)) {
+        window.quickcommandHttpServer().stop();
+        window
+          .quickcommandHttpServer()
+          .run(this.$root.nativeProfile.serverPort);
+        quickcommand.showMessageBox("服务已重启");
+      }
+    },
     saveCode() {
       clearTimeout(this.saveCodeTimer);
       this.saveCodeTimer = setTimeout(() => {
diff --git a/src/router/routes.js b/src/router/routes.js
index 950d27e..a699c1d 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -2,55 +2,62 @@ const routes = [{
         path: '/configuration',
         name: 'configuration',
         component: () =>
-            import('pages/ConfigurationPage.vue')
+            import ('pages/ConfigurationPage.vue')
     },
     {
         path: '/code',
         name: 'code',
         component: () =>
-            import('pages/RunCodePage.vue')
+            import ('pages/RunCodePage.vue')
     },
     {
         path: '/newcommand',
         name: 'newcommand',
         component: () =>
-            import('pages/ConfigurationPage.vue')
+            import ('pages/ConfigurationPage.vue')
     },
     {
         path: '/:type(default|files|img|key|regex|window|professional)_:uid(\\w+)',
         name: 'command',
         component: () =>
-            import('pages/CommandPage.vue')
+            import ('pages/CommandPage.vue')
     },
     {
         path: '/panel_:tags(\\w+)',
         name: 'panel',
         component: () =>
-            import('pages/ConfigurationPage.vue')
+            import ('pages/ConfigurationPage.vue')
     },
     {
         path: '/needupdate',
         name: 'needupdate',
         props: true,
         component: () =>
-            import('pages/updateWarningPage.vue')
+            import ('pages/updateWarningPage.vue')
     },
     {
         path: '/',
         name: 'loading',
         component: () =>
-            import('pages/LoadingPage.vue')
+            import ('pages/LoadingPage.vue')
     }, {
         path: '/share',
         name: 'share',
         component: () =>
-            import('pages/ShareCenterPage.vue')
+            import ('pages/ShareCenterPage.vue')
     },
     {
         path: '/feature_:featuretype(\\w+)',
         name: 'feature',
-        component: () => import('pages/quickFeaturesPage.vue')
+        component: () =>
+            import ('pages/FeaturesPage.vue')
+    },
+    {
+        path: '/server',
+        name: 'server',
+        component: () =>
+            import ('pages/ServerPage.vue')
     }
 ]
 
-export default routes
+export default routes
\ No newline at end of file