From 924fd439d975f16985393cc3ad9e821bb9d4b432 Mon Sep 17 00:00:00 2001 From: haiyangcui Date: Mon, 26 Oct 2020 16:37:44 +0100 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E5=85=A5=E6=94=B6?= =?UTF-8?q?=E8=97=8F,=E6=94=AF=E6=8C=81=E4=B8=80=E6=AC=A1=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=A4=9A=E4=B8=AA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Star.vue | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/components/Star.vue b/src/components/Star.vue index 4df29dd..f75435b 100644 --- a/src/components/Star.vue +++ b/src/components/Star.vue @@ -340,19 +340,33 @@ export default { } remote.dialog.showOpenDialog(options).then(result => { if (!result.canceled) { + var starList = this.list result.filePaths.forEach(file => { var str = fs.readFileSync(file) const json = JSON.parse(str) json.forEach(ele => { - if (ele.site === undefined) { - ele.site = this.sites.find(x => x.key === ele.key) + const starExists = starList.includes(x => x.key === ele.key && x.ids === ele.ids) + if (!starExists) { + var doc = { + key: ele.key, + ids: ele.ids, + site: ele.site === undefined ? ele.site = this.sites.find(x => x.key === ele.key) : ele.site, + name: ele.name, + type: ele.type, + year: ele.year, + note: ele.note, + index: ele.index, + last: ele.last, + hasUpdate: ele.hasUpdate + } + starList.push(doc) } }) - star.bulkAdd(json).then(e => { - this.getFavorites() - }) }) - this.$message.success('导入收藏成功') + star.clear().then(star.bulkAdd(starList).then(res => { + this.getFavorites() + this.$message.success('导入收藏成功') + })) } }).catch(err => { this.$message.error(err)