From bc7d869a3b81fdce95e231439ddc16dbe3b901cb Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Thu, 18 Aug 2022 16:46:52 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E6=90=9C=E7=B4=A2=E6=A1=86=E7=9A=84=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=20#18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cpns/ClipSearch.vue         |  4 ++++
 src/style/cpns/clip-search.less | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/cpns/ClipSearch.vue b/src/cpns/ClipSearch.vue
index 7dc8048..95e5705 100644
--- a/src/cpns/ClipSearch.vue
+++ b/src/cpns/ClipSearch.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="clip-search">
     <input v-model="filterText" type="text" placeholder="🔍 检索剪贴板历史" />
+    <span v-show="filterText" @click="clear" class="clip-search-suffix">✖</span>
   </div>
 </template>
 
@@ -16,11 +17,14 @@ const filterText = ref('')
 const emit = defineEmits(['update:modelValue'])
 // filterText变了 通知父组件修改 modelValue的值
 watch(filterText, (val) => emit('update:modelValue', val))
+
 // modelValue变了 更新 filterText的值
 watch(
   () => props.modelValue,
   (val) => (filterText.value = val)
 )
+
+const clear = () => emit('update:modelValue', '')
 </script>
 
 <style lang="less" scoped>
diff --git a/src/style/cpns/clip-search.less b/src/style/cpns/clip-search.less
index 0338c49..60c8171 100644
--- a/src/style/cpns/clip-search.less
+++ b/src/style/cpns/clip-search.less
@@ -18,4 +18,20 @@
       color: @text-color-lighter;
     }
   }
+  .clip-search-suffix {
+    text-align: center;
+    position: absolute;
+    right: 20px;
+    top: 18px;
+    font-size: 13px;
+    padding: 2px;
+    width: 20px;
+    height: 20px;
+    background-color: @nav-bg-color;
+    border-radius: 20px;
+    cursor: pointer;
+    &:hover {
+      background-color: @nav-hover-bg-color;
+    }
+  }
 }

From 5c1ce3140af19759161b555fd379924d2afe956e Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Thu, 18 Aug 2022 16:47:33 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E5=86=85=E6=8C=89=E4=B8=8BESC=E7=9A=84=E5=8A=9F=E8=83=BD=20?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=E5=AE=8C=E6=95=B4=E6=95=B0=E6=8D=AE=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88&=E6=B8=85=E7=A9=BA=E6=90=9C=E7=B4=A2=E6=A1=86=20#16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cpns/ClipFullData.vue | 13 +++++++++++++
 src/views/Main.vue        |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/cpns/ClipFullData.vue b/src/cpns/ClipFullData.vue
index 59df571..d260fcb 100644
--- a/src/cpns/ClipFullData.vue
+++ b/src/cpns/ClipFullData.vue
@@ -16,6 +16,7 @@
 
 <script setup>
 import FileList from './FileList.vue'
+import { onMounted } from 'vue'
 
 const props = defineProps({
   isShow: {
@@ -30,6 +31,18 @@ const props = defineProps({
 
 const emit = defineEmits(['onOverlayClick'])
 const onOverlayClick = () => emit('onOverlayClick')
+
+onMounted(() => {
+  document.addEventListener('keydown', (e) => {
+    const { key } = e
+    if (key === 'Escape' && props.fullData.data) {
+      // 有值时执行退出 Overlay
+      // TODO: 目前仅在 detach时有效 如何取消 utools的默认退出行为
+      emit('onOverlayClick')
+      e.stopPropagation()
+    }
+  })
+})
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/Main.vue b/src/views/Main.vue
index 9112ef6..1cff0cd 100644
--- a/src/views/Main.vue
+++ b/src/views/Main.vue
@@ -139,7 +139,10 @@ onMounted(() => {
     } else if (isSearch) {
       window.focus()
     } else if (isExit) {
-      filterText.value = ''
+      if (filterText.value) {
+        filterText.value = ''
+        e.stopPropagation()
+      }
     } else if (ctrlKey) {
     } else {
       window.focus() // 其他键盘事件 直接聚焦搜索框

From 29becf4a044f84d1e064e950a02a97e77b7db99a Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Thu, 18 Aug 2022 16:47:51 +0800
Subject: [PATCH 3/6] chore: add comment to style

---
 src/style/index.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/style/index.less b/src/style/index.less
index 21305ac..2565c65 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -1,4 +1,5 @@
 .import() {
+  /* 导入全部涉及到变量的样式文件 */
   @import (multiple) './cpns/clip-full-data.less';
   @import (multiple) './cpns/clip-item-list.less';
   @import (multiple) './cpns/clip-search.less';

From 54d83bce883f30f66c79472ed25512e052bd9c06 Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Fri, 19 Aug 2022 15:13:23 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A1=86=E8=A1=8C=E4=B8=BA=20=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E8=87=AA=E5=8A=A8=E9=80=89=E4=B8=AD=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A1=86=E5=85=A8=E9=83=A8=E6=96=87=E6=9C=AC=20#14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/preload.js         | 1 +
 src/cpns/ClipFullData.vue | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/preload.js b/public/preload.js
index d79bbde..2ebbf98 100644
--- a/public/preload.js
+++ b/public/preload.js
@@ -197,6 +197,7 @@ utools.onPluginEnter(() => {
     utools.copyText('ImageOverSized')
     globalOverSize = false
   }
+  document.querySelector('.clip-search input').select() // 进入插件将搜索框内容全选
   focus()
   toTop()
   resetNav()
diff --git a/src/cpns/ClipFullData.vue b/src/cpns/ClipFullData.vue
index d260fcb..7c109e6 100644
--- a/src/cpns/ClipFullData.vue
+++ b/src/cpns/ClipFullData.vue
@@ -37,7 +37,6 @@ onMounted(() => {
     const { key } = e
     if (key === 'Escape' && props.fullData.data) {
       // 有值时执行退出 Overlay
-      // TODO: 目前仅在 detach时有效 如何取消 utools的默认退出行为
       emit('onOverlayClick')
       e.stopPropagation()
     }

From db21fc94bef55d057194f779344f950afd502ac0 Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Fri, 19 Aug 2022 18:14:27 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20Mac=E4=B8=8B#13=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=8D=E7=8E=B0=20#23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Main.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/Main.vue b/src/views/Main.vue
index 1cff0cd..d64f4e8 100644
--- a/src/views/Main.vue
+++ b/src/views/Main.vue
@@ -123,7 +123,7 @@ onMounted(() => {
 
   // 监听键盘事件
   document.addEventListener('keydown', (e) => {
-    const { key, ctrlKey } = e
+    const { key, ctrlKey, metaKey } = e
     const isTab = key === 'Tab'
     const isSearch =
       key === '/' ||
@@ -143,7 +143,9 @@ onMounted(() => {
         filterText.value = ''
         e.stopPropagation()
       }
-    } else if (ctrlKey) {
+    } else if (ctrlKey || metaKey) {
+      // 仅有 Ctrl时 什么也不执行
+      // utools模拟执行粘贴时触发
     } else {
       window.focus() // 其他键盘事件 直接聚焦搜索框
     }

From a5ebdad58f0957af89c1c2a56b1f5834dbd49582 Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Fri, 19 Aug 2022 23:49:05 +0800
Subject: [PATCH 6/6] release: v1.1.4

---
 public/plugin.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/plugin.json b/public/plugin.json
index 51470b8..36b1d86 100644
--- a/public/plugin.json
+++ b/public/plugin.json
@@ -1,6 +1,6 @@
 {
-  "version": "1.1.2",
-  "pluginName": "剪贴板",
+  "version": "1.1.4",
+  "pluginName": "超级剪贴板",
   "description": "强大的剪贴板管理工具",
   "author": "ZiuChen",
   "homepage": "https://github.com/ZiuChen",