From 1a7aaa8dff6a34618bc1fdfa6dfba4648a47e1f9 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Tue, 13 Oct 2020 21:44:24 +0200
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=BA=90=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=9F=E6=9C=89=E6=BA=90,=E4=BD=86?=
 =?UTF-8?q?=E4=BC=9A=E6=A3=80=E6=9F=A5=E6=BA=90=E6=98=AF=E5=90=A6=E6=9C=89?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D,=E4=B8=8D=E6=B7=BB=E5=8A=A0=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EditSites.vue | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index d5213eb..3cddf3c 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -68,7 +68,7 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import { sites, setting } from '../lib/dexie'
+import { sites } from '../lib/dexie'
 import draggable from 'vuedraggable'
 import { remote } from 'electron'
 import { sites as defaultSites } from '../lib/dexie/initData'
@@ -226,20 +226,18 @@ export default {
       }
       remote.dialog.showOpenDialog(options).then(result => {
         if (!result.canceled) {
-          sites.clear()
           result.filePaths.forEach(file => {
             var str = fs.readFileSync(file)
             const json = JSON.parse(str)
-            sites.bulkAdd(json).then(e => {
-              this.getSites()
-              this.d.site = json[0].key
-              setting.update(this.d).then(res => {
-                this.setting = this.d
-              })
+            json.forEach(ele => {
+              if (this.sites.filter(x => x.key === ele.key).length === 0 && this.sites.filter(x => x.name === ele.name && x.url === ele.url).length === 0) {
+                // 不含该key 同时也不含名字和url一样的
+                this.sites.push(ele)
+              }
             })
+            this.resetId(this.sites)
+            sites.clear().then(sites.bulkAdd(this.sites))
             this.$message.success('导入成功')
-          }).catch(err => {
-            this.$message.error(err)
           })
         }
       })