From 450d70c954d0630d8d70e4b0cc483e4b50160230 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 23 May 2022 10:41:44 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E5=91=BD=E4=BB=A4=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ShareCenterPage.vue | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/pages/ShareCenterPage.vue b/src/pages/ShareCenterPage.vue
index 3d79023..bed717d 100644
--- a/src/pages/ShareCenterPage.vue
+++ b/src/pages/ShareCenterPage.vue
@@ -141,6 +141,7 @@ export default {
       releaseRepo: "fofolee/qcreleases",
       commandTypes: commandTypes,
       platform: window.processPlatform,
+      errCommandsCount: 0,
     };
   },
   computed: {
@@ -151,9 +152,11 @@ export default {
       return this.commands.length === this.currentPageCounts ? false : true;
     },
     currentPageCounts() {
-      return this.currentPage === this.maxPages
-        ? this.matchedCommands.length % this.perPage
-        : this.perPage;
+      return (
+        (this.currentPage === this.maxPages
+          ? this.matchedCommands.length % this.perPage
+          : this.perPage) - this.errCommandsCount
+      );
     },
   },
   mounted() {
@@ -166,6 +169,7 @@ export default {
   },
   methods: {
     fetchCommandDetails(page) {
+      this.errCommandsCount = 0;
       this.commands = [];
       this.matchedCommands
         .slice((page - 1) * this.perPage, page * this.perPage)
@@ -176,6 +180,10 @@ export default {
             item.last_editor.name,
             item.last_editor.id
           ).then((command) => {
+            if (!command) {
+              this.errCommandsCount++;
+              return;
+            }
             this.commands.push(command);
           });
         });
@@ -212,9 +220,14 @@ export default {
       let res = await window.yuQueClient(
         `repos/${this.releaseRepo}/docs/${id}?raw=1`
       );
-      let command = JSON.parse(
-        res.data?.data.body.match(/```json([\s\S]*)```/)?.[1]
-      );
+      let command;
+      try {
+        command = JSON.parse(
+          res.data?.data.body.match(/```json([\s\S]*)```/)?.[1]
+        );
+      } catch (error) {
+        console.log("parseErr", command, error);
+      }
       if (!command) return;
       Object.assign(command, { authorName, updateTime, authorId });
       localStorage.setItem(id, JSON.stringify(command));

From 93963f047320eaa8efb405c74b2d4cdfdf2eec5d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 23 May 2022 10:49:28 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ShareCenterPage.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/pages/ShareCenterPage.vue b/src/pages/ShareCenterPage.vue
index bed717d..c079a2a 100644
--- a/src/pages/ShareCenterPage.vue
+++ b/src/pages/ShareCenterPage.vue
@@ -184,7 +184,9 @@ export default {
               this.errCommandsCount++;
               return;
             }
-            this.commands.push(command);
+            command.updated
+              ? this.commands.unshift(command.data)
+              : this.commands.push(command.data);
           });
         });
     },
@@ -216,7 +218,11 @@ export default {
     // 如果远端更新时间和本地相同则读取本地缓存，否则更新
     async getCommand(id, updateTime, authorName, authorId) {
       let localCache = JSON.parse(localStorage.getItem(id));
-      if (localCache?.updateTime === updateTime) return localCache;
+      if (localCache?.updateTime === updateTime)
+        return {
+          data: localCache,
+          updated: false,
+        };
       let res = await window.yuQueClient(
         `repos/${this.releaseRepo}/docs/${id}?raw=1`
       );
@@ -231,7 +237,10 @@ export default {
       if (!command) return;
       Object.assign(command, { authorName, updateTime, authorId });
       localStorage.setItem(id, JSON.stringify(command));
-      return command;
+      return {
+        data: command,
+        updated: true,
+      };
     },
     fetchCommands() {
       window.yuQueClient(`repos/${this.releaseRepo}/docs`).then((res) => {

From 4fefe53ed948a494a4152f49bb3fb6240c875f3a Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 24 May 2022 16:47:13 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=B2=A1=E6=9C=89=E5=8F=91=E9=80=81=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandSideBar.vue | 2 +-
 src/components/popup/UserData.vue | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/CommandSideBar.vue b/src/components/CommandSideBar.vue
index 1c0a1a8..7b0619d 100644
--- a/src/components/CommandSideBar.vue
+++ b/src/components/CommandSideBar.vue
@@ -270,7 +270,7 @@
       />
     </q-dialog>
     <q-dialog v-model="showUserData">
-      <UserData @insertText="insertSpecialVar" />
+      <UserData @insertText="insertSpecialVar" :showInsertBtn="true" />
     </q-dialog>
   </q-scroll-area>
 </template>
diff --git a/src/components/popup/UserData.vue b/src/components/popup/UserData.vue
index edbb7dc..e8c5437 100644
--- a/src/components/popup/UserData.vue
+++ b/src/components/popup/UserData.vue
@@ -18,7 +18,9 @@
         :placeholder="item.value || '本机未设置'"
       >
         <template v-slot:prepend>
-          <q-chip color="primary" dense>{{ item.id }}</q-chip>
+          <q-chip color="primary" text-color="white" dense>{{
+            item.id
+          }}</q-chip>
         </template>
         <template v-slot:append>
           <q-toggle

From 1770f277258d17c20d7b41a9bd5eac77df01fb08 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 24 May 2022 16:56:03 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dconsole.log(0)=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ResultArea.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ResultArea.vue b/src/components/ResultArea.vue
index 440034f..1cb841b 100644
--- a/src/components/ResultArea.vue
+++ b/src/components/ResultArea.vue
@@ -11,13 +11,13 @@
     ></iframe>
     <div
       v-else
-      v-show="!!runResult"
+      v-show="!!runResult.length"
       :class="{ 'text-red': !runResultStatus }"
       class="text q-px-md q-py-sm"
     >
       <div v-for="item in runResult" :key="item">
         <ObjectTree :obj="item" v-if="typeof item === 'object'" />
-        <pre class="result" v-text="item" v-else-if="!!item"></pre>
+        <pre class="result" v-text="item" v-else></pre>
       </div>
     </div>
   </div>

From 413d89183a762e2ee5706f966fa711ae43e4397d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 27 May 2022 08:54:29 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E3=80=81=E7=BD=91=E5=9D=80=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/quickFeatures/FavFile.vue | 2 +-
 src/components/quickFeatures/FavUrl.vue  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/quickFeatures/FavFile.vue b/src/components/quickFeatures/FavFile.vue
index d23acdc..c855161 100644
--- a/src/components/quickFeatures/FavFile.vue
+++ b/src/components/quickFeatures/FavFile.vue
@@ -2,7 +2,7 @@
 export default {
   mounted() {
     utools.setExpendHeight(0);
-    this.$root.payload.forEach((file) => {
+    this.$root.enterData.payload.forEach((file) => {
       let uid = this.getUid();
       let fileInfo = window.getFileInfo({
         type: "file",
diff --git a/src/components/quickFeatures/FavUrl.vue b/src/components/quickFeatures/FavUrl.vue
index 51ef660..57da8a7 100644
--- a/src/components/quickFeatures/FavUrl.vue
+++ b/src/components/quickFeatures/FavUrl.vue
@@ -24,7 +24,7 @@ export default {
       );
       url = choise.text + "://" + url;
     }
-    let title = this.$root.payload.title
+    let title = this.$root.enterData.payload.title
       .replace(/和另外 \d+ 个页面.*/, "")
       .replace(/[-|—] .*?[Edge|Firefox|Chrome].*/, "")
       .trim();
@@ -39,7 +39,7 @@ export default {
     let uid = this.getUid();
     let command = {
       features: {
-        explain: `访问${title}`,
+        explain: title,
         cmds: [title],
         platform: ["linux", "win32", "darwin"],
         code: `key_${uid}`,
@@ -51,7 +51,7 @@ export default {
     };
     try {
       let res = await quickcommand.downloadFile(iconUrl, iconPath);
-      if (res) command.features.icon = iconPath;
+      if (res) command.features.icon = window.getBase64Ico(iconPath);
     } catch (e) {}
     this.importCommand(command);
     utools.showNotification("操作成功！");

From b16e7d69a20e07667556b94e6a70257082f7275b Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 27 May 2022 09:12:50 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A9=BA=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ConfigurationMenu.vue | 3 +++
 src/pages/ConfigurationPage.vue      | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/ConfigurationMenu.vue b/src/components/ConfigurationMenu.vue
index b45e218..33a1a07 100644
--- a/src/components/ConfigurationMenu.vue
+++ b/src/components/ConfigurationMenu.vue
@@ -37,6 +37,7 @@
                     style="width: 280px"
                     autofocus
                     v-model="$root.profile.quickFileTag"
+                    @blur="$root.profile.quickFileTag || ($root.profile.quickFileTag = '文件')"
                     type="text"
                   >
                     <template v-slot:append>
@@ -68,6 +69,8 @@
                     input-class="text-center"
                     style="width: 280px"
                     v-model="$root.profile.quickUrlTag"
+                    @blur="$root.profile.quickUrlTag || ($root.profile.quickUrlTag = '网址')"
+
                     type="text"
                   >
                     <template v-slot:append>
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index 01f156d..7a7be05 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -289,7 +289,9 @@ export default {
     allQuickCommandTags() {
       let allTags = _.union(
         ...Object.values(this.allQuickCommands).map((x) => x.tags)
-      ).concat(["未分类", "来自分享"]);
+      )
+        .concat(["未分类", "来自分享"])
+        .filter((x) => x);
       if (this.commandSearchKeyword?.length > 1) allTags.push("搜索结果");
       return allTags;
     },

From dcb8529acb40f32510b3c7a994e2887dcb3cb372 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 27 May 2022 09:26:42 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E4=BA=ABbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/popup/ShareDialog.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/popup/ShareDialog.vue b/src/components/popup/ShareDialog.vue
index 5d67850..7aa88cd 100644
--- a/src/components/popup/ShareDialog.vue
+++ b/src/components/popup/ShareDialog.vue
@@ -84,12 +84,7 @@ export default {
   },
   computed: {
     disableShare() {
-      return (
-        this.shareLock ||
-        !this.yuQueInfo.yuQueToken ||
-        (this.yuQueInfo.authorId !== this.command.authorId &&
-          this.command.fromShare)
-      );
+      return this.shareLock || !this.yuQueInfo.yuQueToken;
     },
   },
   mounted() {

From f51eb9d8326404708e38b92cea2043d7f4185b7c Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 1 Jun 2022 10:27:31 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=8F=8D=E6=96=9C=E6=9D=A0=E6=9C=AA=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E8=BD=AC=E4=B9=89=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/options/specialVars.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/options/specialVars.js b/src/js/options/specialVars.js
index 399062e..731aa8b 100644
--- a/src/js/options/specialVars.js
+++ b/src/js/options/specialVars.js
@@ -4,7 +4,7 @@
 
 let escapeItem = item => {
     if (typeof item === 'number') return item
-    item = typeof item === 'object' ? JSON.stringify(item) : item.replace('\\', '\\\\')
+    item = typeof item === 'object' ? JSON.stringify(item) : item.replace(/\\/g, '\\\\')
     return item.replace('$', '$$$')
 }
 

From 827cd193a2634cc5413652a88e24fdf2852c7858 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 1 Jun 2022 10:27:54 +0800
Subject: [PATCH 09/10] =?UTF-8?q?showMessageBox=E6=B6=88=E6=81=AF=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E6=97=B6=E8=BF=9B=E8=A1=8C=E6=88=AA=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/quickcommandUI/QuickCommand.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/quickcommandUI/QuickCommand.vue b/src/components/quickcommandUI/QuickCommand.vue
index 5a72315..05be426 100644
--- a/src/components/quickcommandUI/QuickCommand.vue
+++ b/src/components/quickcommandUI/QuickCommand.vue
@@ -85,9 +85,11 @@ export default {
         }),
 
       showMessageBox: (message, icon = "success", time) => {
+        message = _.truncate(message, { length: 1200 });
         if (icon === "success") icon = "positive";
         if (icon === "error") icon = "negative";
-        if (!time) time = Math.max(message.toString().length * 120, 1000);
+        if (typeof time === "undefined")
+          time = Math.max(message.toString().length * 120, 1000);
         Notify.create({
           type: icon,
           message: message,

From 2008b0b00759717adf67ccc004a72cd1feda9a5a Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 5 Jun 2022 10:00:24 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E9=81=8D=E5=8E=86=E5=85=83=E7=B4=A0?=
 =?UTF-8?q?=E6=9D=A5=E7=A1=AE=E5=AE=9Aiframe=E7=9A=84=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ResultArea.vue | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/ResultArea.vue b/src/components/ResultArea.vue
index 1cb841b..7bbc178 100644
--- a/src/components/ResultArea.vue
+++ b/src/components/ResultArea.vue
@@ -86,7 +86,12 @@ export default {
         !utools.isDarkColors() || (cfw.document.body.style.color = "white");
         let clientHeight =
           cfw.document.documentElement.getBoundingClientRect().height;
-        this.frameHeight = clientHeight === 20 ? 0 : clientHeight;
+        clientHeight = clientHeight === 20 ? 0 : clientHeight;
+        this.frameHeight = Math.max(
+          // 当有绝对定位的元素时只能通过遍历获取高度
+          this.getMaxElHeight(cfw.document),
+          clientHeight
+        );
         this.$emit("frameLoad", this.frameHeight);
       };
     },
@@ -108,6 +113,14 @@ export default {
         onerror: (e) => showError(e),
       };
     },
+    getMaxElHeight(doc) {
+      let els = Array.prototype.slice.call(doc.body.getElementsByTagName("*"));
+      let elHeights = [];
+      for (let i = 0, l = els.length; i < l; i++) {
+        elHeights.push(els[i].scrollTop + els[i].offsetHeight);
+      }
+      return Math.max.apply(Math, elHeights);
+    },
   },
 };
 </script>