From cfd7f2f8847a13d83b96f6538838c65e874d2dc7 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 8 Apr 2022 10:26:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/preload.js                         | 3 +--
 src/App.vue                               | 1 +
 src/boot/global.js                        | 4 ++--
 src/components/CommandEditor.vue          | 2 +-
 src/components/MonocaEditor.vue           | 2 +-
 src/js/{ => common}/importAll.js          | 0
 src/js/{ => common}/quickcommandParser.js | 0
 src/js/options/commandTypes.js            | 4 ++++
 src/js/options/outputTypes.js             | 6 +++++-
 src/js/options/specialVars.js             | 4 ++++
 src/js/utools.js                          | 5 ++---
 src/pages/ConfigurationPage.vue           | 4 ++--
 12 files changed, 23 insertions(+), 12 deletions(-)
 rename src/js/{ => common}/importAll.js (100%)
 rename src/js/{ => common}/quickcommandParser.js (100%)

diff --git a/public/preload.js b/public/preload.js
index 2d62525..d373ed8 100644
--- a/public/preload.js
+++ b/public/preload.js
@@ -419,7 +419,6 @@ getuToolsLite = () => {
     delete utoolsLite.removeFeature
     delete utoolsLite.setFeature
     delete utoolsLite.onDbPull
-    delete utoolsLite.getFeatures
     // 支付相关接口
     delete utoolsLite.fetchUserServerTemporaryToken
     delete utoolsLite.getUserServerTemporaryToken
@@ -840,4 +839,4 @@ runCodeFile = (cmd, option, terminal, callback) => {
     //     let stderr = err_chunks.join("");
     //     callback(stdout, stderr)
     // })
-}
\ No newline at end of file
+}
diff --git a/src/App.vue b/src/App.vue
index 617e564..9c269f5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -19,6 +19,7 @@ export default defineComponent({
   },
   methods: {
     init() {
+      window.utools = window.getuToolsLite()
       // 版本检测
       const requiredVersion = "2.6.1";
       let version = utools.getAppVersion();
diff --git a/src/boot/global.js b/src/boot/global.js
index 7afc139..05438c2 100644
--- a/src/boot/global.js
+++ b/src/boot/global.js
@@ -24,10 +24,10 @@ utools.onPluginOut(() => {
 
 // "async" is optional;
 // more info on params: https://v2.quasar.dev/quasar-cli/boot-files
-export default boot(async({
+export default boot(async ({
     app
 }) => {
     app.config.globalProperties.$utools = UTOOLS
     app.config.globalProperties.$programmings = programmings
     app.config.globalProperties.$profile = defaultProfile
-})
\ No newline at end of file
+})
diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index a1c8135..204c204 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -357,7 +357,7 @@ export default {
       cmd = await this.replaceTempInputVals(cmd);
       let terminal = false;
       let raw = true;
-      switch (this.$refs.menu.currentCommand.output) {
+      switch (this.$refs.menu?.currentCommand.output) {
         case "html":
           raw = false;
           break;
diff --git a/src/components/MonocaEditor.vue b/src/components/MonocaEditor.vue
index b52386f..a018385 100644
--- a/src/components/MonocaEditor.vue
+++ b/src/components/MonocaEditor.vue
@@ -5,7 +5,7 @@
 <script>
 import * as monaco from "monaco-editor";
 import { toRaw } from "vue";
-import importAll from "../js/importAll.js";
+import importAll from "../js/common/importAll.js";
 
 // 批量导入声明文件
 let apis = importAll(
diff --git a/src/js/importAll.js b/src/js/common/importAll.js
similarity index 100%
rename from src/js/importAll.js
rename to src/js/common/importAll.js
diff --git a/src/js/quickcommandParser.js b/src/js/common/quickcommandParser.js
similarity index 100%
rename from src/js/quickcommandParser.js
rename to src/js/common/quickcommandParser.js
diff --git a/src/js/options/commandTypes.js b/src/js/options/commandTypes.js
index 9e2488b..9d76da8 100644
--- a/src/js/options/commandTypes.js
+++ b/src/js/options/commandTypes.js
@@ -1,3 +1,7 @@
+/**
+ * 所有的匹配类型
+ */
+
 const commandTypes = {
     key: {
         name: "key",
diff --git a/src/js/options/outputTypes.js b/src/js/options/outputTypes.js
index 3087c1a..64cb23e 100644
--- a/src/js/options/outputTypes.js
+++ b/src/js/options/outputTypes.js
@@ -1,3 +1,7 @@
+/**
+ * 所有的输出类型
+ */
+
 const outputTypes = {
     ignore: {
         name: "ignore",
@@ -41,4 +45,4 @@ const outputTypes = {
     },
 };
 
-export default outputTypes
\ No newline at end of file
+export default outputTypes
diff --git a/src/js/options/specialVars.js b/src/js/options/specialVars.js
index c219b07..27deb32 100644
--- a/src/js/options/specialVars.js
+++ b/src/js/options/specialVars.js
@@ -1,3 +1,7 @@
+/**
+ * 所有的特殊变量
+ */
+
 const specialVars = {
     LocalId: {
         name: "LocalId",
diff --git a/src/js/utools.js b/src/js/utools.js
index 0451111..a8cc88e 100644
--- a/src/js/utools.js
+++ b/src/js/utools.js
@@ -1,11 +1,10 @@
 /**
  * 阉割utools，同时返回一个满血版的UTOOLS
  * 防止输出html输出时，通过script标签调用utools执行危险函数
-*/
+ */
 
 // 禁用危险函数
 let whole = window.utools
-if (!utools.isDev()) window.utools = window.getuToolsLite()
 
 // 数据库前缀
 const DBPRE = {
@@ -47,5 +46,5 @@ export default {
     putDB,
     delDB,
     getDocs,
-    DBPRE
+    DBPRE,
 }
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index ad8fae3..7d7c128 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -191,11 +191,11 @@
 </template>
 
 <script>
-import quickcommandParser from "../js/quickcommandParser.js";
+import quickcommandParser from "../js/common/quickcommandParser.js";
 import CommandCard from "components/CommandCard";
 import CommandEditor from "components/CommandEditor.vue";
 import ConfigurationMenu from "components/ConfigurationMenu.vue";
-import importAll from "../js/importAll.js";
+import importAll from "../js/common/importAll.js";
 
 // 默认命令
 let defaultCommands = importAll(require.context("../json/", false, /\.json$/));