From 7ac63179eae124b8e1f79cce7eb8fedfbf745292 Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Thu, 18 Aug 2022 13:52:19 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E5=8C=B9=E9=85=8D=E6=8D=A2=E8=A1=8C?=
 =?UTF-8?q?=E7=AC=A6=E8=80=8C=E4=B8=8D=E6=98=AF=E5=8C=B9=E9=85=8D=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E5=8C=BA=E5=88=86=E8=B6=85=E9=95=BF=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?8=E8=A1=8C=EF=BC=889=E8=A1=8C=EF=BC=89=20#12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/cpns/ClipItemList.vue b/src/cpns/ClipItemList.vue
index 99ad371..1da4fe3 100644
--- a/src/cpns/ClipItemList.vue
+++ b/src/cpns/ClipItemList.vue
@@ -17,12 +17,12 @@
           <template v-if="item.type === 'text'">
             <div
               class="clip-data-status"
-              v-if="item.data.length >= 500"
+              v-if="item.data.split(`\n`).length - 1 > 8"
               @click.stop="handleDataClick(item)"
             >
               查看全部
             </div>
-            <div>{{ item.data.slice(0, 500).trim() }}</div>
+            <div>{{ item.data.split(`\n`).slice(0, 7).join(`\n`).trim() }}</div>
           </template>
           <template v-if="item.type === 'image'">
             <img class="clip-data-image" :src="item.data" alt="Image" />

From d132342f29c87be55e11aab45b775490c98eaca6 Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Thu, 18 Aug 2022 13:55:39 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20#12=20=E6=9C=80=E5=A4=9A=E8=83=BD?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA8=E8=A1=8C=E8=80=8C=E4=B8=8D=E6=98=AF7?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cpns/ClipItemList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cpns/ClipItemList.vue b/src/cpns/ClipItemList.vue
index 1da4fe3..e3ff187 100644
--- a/src/cpns/ClipItemList.vue
+++ b/src/cpns/ClipItemList.vue
@@ -22,7 +22,7 @@
             >
               查看全部
             </div>
-            <div>{{ item.data.split(`\n`).slice(0, 7).join(`\n`).trim() }}</div>
+            <div>{{ item.data.split(`\n`).slice(0, 8).join(`\n`).trim() }}</div>
           </template>
           <template v-if="item.type === 'image'">
             <img class="clip-data-image" :src="item.data" alt="Image" />

From 54a6c69a7a8ddf8e9bf5b3c171d277de7f9ef859 Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Thu, 18 Aug 2022 14:34:34 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E5=90=84=E4=B8=AAItem=E4=B9=8B?=
 =?UTF-8?q?=E9=97=B4=E5=88=86=E5=89=B2=E7=BA=BF=E5=9C=A8=E6=B7=B1=E8=89=B2?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=9A=84=E6=A0=B7=E5=BC=8F=20#6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cpns/ClipItemList.vue          |  2 +-
 src/style/cpns/clip-item-list.less | 22 ++++++++++++++--------
 src/views/Main.vue                 |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/cpns/ClipItemList.vue b/src/cpns/ClipItemList.vue
index e3ff187..b63f94b 100644
--- a/src/cpns/ClipItemList.vue
+++ b/src/cpns/ClipItemList.vue
@@ -26,7 +26,7 @@
           </template>
           <template v-if="item.type === 'image'">
             <img class="clip-data-image" :src="item.data" alt="Image" />
-            <div class="clip-data-status">{{ item.size }}</div>
+            <div class="clip-data-status image">{{ item.size }}</div>
           </template>
           <template v-if="item.type === 'file'">
             <div
diff --git a/src/style/cpns/clip-item-list.less b/src/style/cpns/clip-item-list.less
index c7e55c8..5e03586 100644
--- a/src/style/cpns/clip-item-list.less
+++ b/src/style/cpns/clip-item-list.less
@@ -4,13 +4,14 @@
     display: flex;
     justify-content: space-between;
     border: 0px solid @bg-color;
-    /* 有上边框占用px 但是不显示(与背景同色) */
-    border-width: 1px 0px 1px 0px;
-    border-color: @bg-color @bg-color #eee @bg-color;
+    margin: 0px 5px;
+    /* 占用px 但是不显示(与背景同色) */
+    border-width: 1px 1px 1px 1px;
+    border-color: @text-bg-color-lighter @bg-color @text-bg-color-lighter @bg-color;
     cursor: pointer;
     &.active {
       border: 0px solid @primary-color;
-      border-width: 1px 0px 1px 0px;
+      border-width: 1px 1px 1px 1px;
       background-color: @text-bg-color-lighter;
     }
     .clip-info {
@@ -46,19 +47,24 @@
         flex-direction: column;
         color: @text-color;
         img.clip-data-image {
+          // 此 class用于区分 file的 image
           max-height: 140px; // 比外框 max-height少一点 因为有 5px的边框
           max-width: 90%;
           padding: 5px;
-          background-color: @text-color-lighter;
+          background-color: @bg-color;
           border-radius: 5px;
         }
         .clip-data-status {
           position: absolute;
           width: fit-content;
-          color: @bg-color;
-          background-color: @text-color-lighter;
+          color: @text-color;
+          background-color: @primary-color-lighter;
           border-radius: 5px;
-          padding: 3px;
+          padding: 2px;
+          font-size: 13px;
+          &.image {
+            margin: 10px;
+          }
         }
       }
     }
diff --git a/src/views/Main.vue b/src/views/Main.vue
index f7a6933..b3b39f7 100644
--- a/src/views/Main.vue
+++ b/src/views/Main.vue
@@ -168,7 +168,7 @@ onMounted(() => {
   }
 }
 .clip-break {
-  height: 55px;
+  height: 60px;
 }
 .clip-empty-status {
   height: 100%;

From b55b66271d006893919a8659917568c953ab2719 Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Thu, 18 Aug 2022 15:09:42 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=94=AE=E7=9B=98?=
 =?UTF-8?q?=E7=9B=91=E5=90=AC=E4=BA=8B=E4=BB=B6=E7=9A=84=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=20#13=20#15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cpns/ClipItemList.vue     | 8 +++++++-
 src/style/cpns/file-list.less | 3 ++-
 src/views/Main.vue            | 6 ++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/cpns/ClipItemList.vue b/src/cpns/ClipItemList.vue
index b63f94b..b1b0a3d 100644
--- a/src/cpns/ClipItemList.vue
+++ b/src/cpns/ClipItemList.vue
@@ -53,6 +53,10 @@ const props = defineProps({
   showList: {
     type: Array,
     required: true
+  },
+  fullData: {
+    type: Object,
+    required: true
   }
 })
 const emit = defineEmits(['onDataChange'])
@@ -104,7 +108,9 @@ onMounted(() => {
           ?.scrollIntoView({ block: 'nearest', inline: 'nearest' })
       }
     } else if (isCopy) {
-      window.copy(props.showList[activeIndex.value])
+      if (props.fullData.data === '') {
+        window.copy(props.showList[activeIndex.value])
+      }
     } else if (isEnter) {
       window.copy(props.showList[activeIndex.value])
       window.paste()
diff --git a/src/style/cpns/file-list.less b/src/style/cpns/file-list.less
index 973b073..20226ed 100644
--- a/src/style/cpns/file-list.less
+++ b/src/style/cpns/file-list.less
@@ -3,8 +3,9 @@
   justify-content: flex-start;
   align-items: center;
   cursor: pointer;
+  font-size: 13px;
   &:hover {
-    font-weight: 600;
+    text-decoration: underline;
     &::after {
       content: '📤';
     }
diff --git a/src/views/Main.vue b/src/views/Main.vue
index b3b39f7..9112ef6 100644
--- a/src/views/Main.vue
+++ b/src/views/Main.vue
@@ -4,7 +4,7 @@
     <ClipFullData
       :isShow="fullDataShow"
       :fullData="fullData"
-      @onOverlayClick="toggleFullData('')"
+      @onOverlayClick="toggleFullData({ type: 'text', data: '' })"
     ></ClipFullData>
     <ClipSwitch ref="ClipSwitchRef" @onNavClick="handleNavClick">
       <template #SidePanel>
@@ -13,7 +13,8 @@
     </ClipSwitch>
     <div class="clip-break"></div>
     <div class="clip-empty-status" v-if="showList.length === 0">📪 无记录</div>
-    <ClipItemList :showList="showList" @onDataChange="toggleFullData"> </ClipItemList>
+    <ClipItemList :showList="showList" :fullData="fullData" @onDataChange="toggleFullData">
+    </ClipItemList>
   </div>
 </template>
 
@@ -139,6 +140,7 @@ onMounted(() => {
       window.focus()
     } else if (isExit) {
       filterText.value = ''
+    } else if (ctrlKey) {
     } else {
       window.focus() // 其他键盘事件 直接聚焦搜索框
     }

From d5f5d123d559940bfbda71728c15d372e05d0c15 Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Thu, 18 Aug 2022 16:45:45 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20Mac=E4=B8=8B`Command+C`=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6=E4=B8=8D=E7=94=9F=E6=95=88=20#17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/cpns/ClipItemList.vue b/src/cpns/ClipItemList.vue
index b1b0a3d..86af6db 100644
--- a/src/cpns/ClipItemList.vue
+++ b/src/cpns/ClipItemList.vue
@@ -82,11 +82,11 @@ watch(
 onMounted(() => {
   // 监听键盘事件
   document.addEventListener('keydown', (e) => {
-    const { key, ctrlKey } = e
+    const { key, ctrlKey, metaKey } = e
     const isArrowUp = key === 'ArrowUp'
     const isArrowDown = key === 'ArrowDown'
     const isEnter = key === 'Enter'
-    const isCopy = ctrlKey && (key === 'C' || key === 'c')
+    const isCopy = (ctrlKey || metaKey) && (key === 'C' || key === 'c')
     if (isArrowUp) {
       if (activeIndex.value > 0) {
         activeIndex.value--

From 5b50a46cf4c12b955e0cd074f74358951ec657ec Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Fri, 19 Aug 2022 14:05:39 +0800
Subject: [PATCH 6/6] =?UTF-8?q?chore:=20=E6=8F=92=E4=BB=B6=E6=94=B9?=
 =?UTF-8?q?=E5=90=8D=20`=E8=B6=85=E7=BA=A7=E5=89=AA=E8=B4=B4=E6=9D=BF`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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