diff --git a/docs/logo/assets/clipboard.png b/docs/logo/assets/clipboard.png new file mode 100644 index 0000000..24f396f Binary files /dev/null and b/docs/logo/assets/clipboard.png differ diff --git a/docs/logo/assets/clipboard.svg b/docs/logo/assets/clipboard.svg new file mode 100644 index 0000000..4aae34d --- /dev/null +++ b/docs/logo/assets/clipboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/docs/logo/assets/format-list-bulleted-type.png b/docs/logo/assets/format-list-bulleted-type.png new file mode 100644 index 0000000..60e5f87 Binary files /dev/null and b/docs/logo/assets/format-list-bulleted-type.png differ diff --git a/docs/logo/assets/format-list-bulleted-type.svg b/docs/logo/assets/format-list-bulleted-type.svg new file mode 100644 index 0000000..44cf9a0 --- /dev/null +++ b/docs/logo/assets/format-list-bulleted-type.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/docs/logo/logo-high.psd b/docs/logo/logo-high.psd new file mode 100644 index 0000000..23cd127 Binary files /dev/null and b/docs/logo/logo-high.psd differ diff --git a/docs/logo/logo-medium.psd b/docs/logo/logo-medium.psd new file mode 100644 index 0000000..0cca128 Binary files /dev/null and b/docs/logo/logo-medium.psd differ diff --git a/docs/logo/logo.psd b/docs/logo/logo-old.psd similarity index 100% rename from docs/logo/logo.psd rename to docs/logo/logo-old.psd diff --git a/docs/logo/logo.png b/docs/logo/logo.png index e775486..a5b0aff 100644 Binary files a/docs/logo/logo.png and b/docs/logo/logo.png differ diff --git a/public/logo.png b/public/logo.png index e775486..a5b0aff 100644 Binary files a/public/logo.png and b/public/logo.png differ diff --git a/public/plugin.json b/public/plugin.json index ab2465d..51470b8 100644 --- a/public/plugin.json +++ b/public/plugin.json @@ -1,5 +1,5 @@ { - "version": "1.1.1", + "version": "1.1.2", "pluginName": "剪贴板", "description": "强大的剪贴板管理工具", "author": "ZiuChen", diff --git a/public/preload.js b/public/preload.js index 632355e..d79bbde 100644 --- a/public/preload.js +++ b/public/preload.js @@ -88,12 +88,6 @@ class DB { this.updateDataBase() this.updateDataBaseLocal() } - filterDataBaseViaData(key) { - // 过滤展示数据 - const filterValue = key.toLowerCase() - const textItems = this.dataBase.data.filter((item) => item.type === 'text') - return textItems.filter((item) => item.data.toLowerCase().indexOf(filterValue) !== -1) - } filterDataBaseViaId(id) { return this.dataBase.data.filter((item) => item.id === id) } @@ -185,7 +179,6 @@ const copy = (item) => { utools.copyFile(paths) break } - utools.outPlugin() utools.hideMainWindow() } diff --git a/src/cpns/ClipItemList.vue b/src/cpns/ClipItemList.vue index be36b18..99ad371 100644 --- a/src/cpns/ClipItemList.vue +++ b/src/cpns/ClipItemList.vue @@ -22,10 +22,10 @@ > 查看全部 - {{ item.data.slice(0, 500).trim() }} +
{{ item.data.slice(0, 500).trim() }}
diff --git a/src/style/cpns/clip-item-list.less b/src/style/cpns/clip-item-list.less index df3bcd0..c7e55c8 100644 --- a/src/style/cpns/clip-item-list.less +++ b/src/style/cpns/clip-item-list.less @@ -45,16 +45,20 @@ white-space: pre-wrap; flex-direction: column; color: @text-color; - background-color: @bg-color; - img { - max-height: 150px; + img.clip-data-image { + max-height: 140px; // 比外框 max-height少一点 因为有 5px的边框 max-width: 90%; + padding: 5px; + background-color: @text-color-lighter; + border-radius: 5px; } .clip-data-status { position: absolute; width: fit-content; color: @bg-color; - background-color: @text-color; + background-color: @text-color-lighter; + border-radius: 5px; + padding: 3px; } } } diff --git a/src/views/Main.vue b/src/views/Main.vue index a0eb788..f7a6933 100644 --- a/src/views/Main.vue +++ b/src/views/Main.vue @@ -32,30 +32,16 @@ const showList = ref([]) // 展示的数据 const updateShowList = (type) => { // 更新显示列表 - if (type === 'all') { - if (filterText.value) { - // 有过滤词 则过滤掉图片 - showList.value = list.value - .filter((item) => item.type !== 'image') - .filter((item) => item.data.indexOf(filterText.value) !== -1) - .slice(0, GAP) - } else { - // 无过滤词 直接更新 - showList.value = list.value - .filter((item) => item.data.indexOf(filterText.value) !== -1) - .slice(0, GAP) - } - } else if (type === 'image') { - // 排除掉对图片 DataURL的筛选 - showList.value = list.value.filter((item) => item.type === type).slice(0, GAP) - } else { - // `file`类型 在stringify的data里搜 - // `text`类型 在data里搜 - showList.value = list.value - .filter((item) => item.type === type) - .filter((item) => item.data.indexOf(filterText.value) !== -1) - .slice(0, GAP) - } + showList.value = list.value + .filter((item) => (type === 'all' ? item : item.type === type)) // 是 all则返回所有 否则按照 type返回 + .filter((item) => (filterText.value ? item.type !== 'image' : item)) // 有过滤词 排除掉图片 DataURL + .filter( + (item) => + filterText.value + ? item.data.toLowerCase().indexOf(filterText.value.toLowerCase()) !== -1 // 有过滤词 不区分大小写检索 + : item // 无过滤词 返回全部 + ) + .slice(0, GAP) // 重新切分懒加载列表 window.toTop() }