study/ClipboardManager
1
0
Fork 0
mirror of https://github.com/ZiuChen/ClipboardManager.git synced 2025-06-07 22:04:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 收藏内容不再计入到条数限制中 不会被删除

Browse Source
This commit is contained in:
ZiuChen 2022-09-07 09:19:29 +08:00
parent 1820c4187f
commit cfd6585828
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
public/preload.js
View File

@ -37,10 +37,12 @@ class DB {
// 读取磁盘记录到内存 // 读取磁盘记录到内存
const dataBase = JSON.parse(data) const dataBase = JSON.parse(data)
this.dataBase = dataBase this.dataBase = dataBase
// 将超过14天的数据删除 // 将超过14天的数据删除 排除掉收藏
const now = new Date().getTime() const now = new Date().getTime()
const deleteTime = now - '\u0031\u0034' * '\u0032\u0034' * 60 * 60 * 1000 // unicode const deleteTime = now - '\u0031\u0034' * '\u0032\u0034' * 60 * 60 * 1000 // unicode
this.dataBase.data = this.dataBase.data.filter((item) => item.updateTime > deleteTime) this.dataBase.data = this.dataBase.data?.filter(
(item) => item.updateTime > deleteTime || item.collect
)
this.updateDataBaseLocal() this.updateDataBaseLocal()
} catch (err) { } catch (err) {
utools.showNotification('读取剪切板出错' + err) utools.showNotification('读取剪切板出错' + err)
@ -72,14 +74,16 @@ class DB {
addItem(cItem) { addItem(cItem) {
this.dataBase.data.unshift(cItem) this.dataBase.data.unshift(cItem)
this.updateDataBase() this.updateDataBase()
// unicode const exceedCount = this.dataBase.data.length - '\u0035\u0030\u0030'
if (this.dataBase.data.length > '\u0035\u0030\u0030') { if (exceedCount > 0) {
// 达到条数限制 // 达到条数限制 在收藏条数限制内遍历非收藏历史并删除
this.dataBase.data.pop() // 所有被移除的 item都存入tempList
// 仍然大于: 超出了不止一条 const tmpList = []
if (this.dataBase.data.length > '\u0035\u0030\u0030') { for (let i = 0; i < exceedCount; i++) {
this.dataBase.data = this.dataBase.data.splice(0, 499) const item = this.dataBase.data.pop()
tmpList.push(item)
} }
tmpList.forEach((item) => !item.collect || this.dataBase.data.push(item)) // 收藏内容 重新入栈
} }
this.updateDataBaseLocal() this.updateDataBaseLocal()
} }
@ -197,7 +201,7 @@ const focus = () => {
const toTop = () => (document.scrollingElement.scrollTop = 0) const toTop = () => (document.scrollingElement.scrollTop = 0)
const resetNav = () => document.querySelectorAll('.clip-switch-item')[0]?.click() const resetNav = () => document.querySelectorAll('.clip-switch-item')[0]?.click()
let timmer = watchClipboard(db, (item) => { watchClipboard(db, (item) => {
// 此函数不断执行 // 此函数不断执行
if (!item) return if (!item) return
if (db.updateItemViaId(item.id)) { if (db.updateItemViaId(item.id)) {