From 3151b33a23ffb932ac5759d7cef2536a51a6652b Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Wed, 9 Sep 2020 17:34:23 +0200
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=BA=90=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8F=AF=E6=8B=96=E6=9B=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EditSites.vue | 37 +++++++++++++++++++++++++++++++-----
 src/components/Setting.vue   |  4 ++--
 src/lib/dexie/sites.js       |  5 ++++-
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index ba43b1b..e519281 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -14,10 +14,16 @@
         <div class="zy-table">
           <div class="tBody zy-scroll">
             <ul>
-              <li v-show="sites.length === 0">无数据</li>
-              <li v-for="(i, j) in sites" :key="j">
-                <span class="name">{{i.name}}</span>
-              </li>
+              <draggable v-model="sites" @change="listUpdatedEvent">
+                <transition-group>
+                  <li v-for="(i, j) in sites" :key="j">
+                    <span class="name">{{i.name}}</span>
+                    <span class="operate">
+                      <span class="btn" @click.stop="removeEvent(i)">删除</span>
+                    </span>
+                  </li>
+                </transition-group>
+              </draggable>
             </ul>
           </div>
         </div>
@@ -28,15 +34,18 @@
 <script>
 import { mapMutations } from 'vuex'
 import { sites } from '../lib/dexie'
+import draggable from 'vuedraggable'
 export default {
   name: 'editSites',
   data () {
-    this.$message.success('In editSites data')
     return {
       show: false,
       sites: []
     }
   },
+  components: {
+    draggable
+  },
   computed: {
     view: {
       get () {
@@ -64,6 +73,24 @@ export default {
       sites.all().then(res => {
         this.sites = res
       })
+    },
+    removeEvent (e) {
+      sites.remove(e.id).then(res => {
+        this.getSites()
+      }).catch(err => {
+        this.$message.warning('删除源失败, 错误信息: ' + err)
+      })
+    },
+    listUpdatedEvent () {
+      sites.clear().then(res1 => {
+        // 重新排序
+        var id = 1
+        this.sites.forEach(element => {
+          element.id = id
+          sites.add(element)
+          id += 1
+        })
+      })
     }
   },
   created () {
diff --git a/src/components/Setting.vue b/src/components/Setting.vue
index 171eb20..a6397e9 100644
--- a/src/components/Setting.vue
+++ b/src/components/Setting.vue
@@ -408,7 +408,7 @@ export default {
           result.filePaths.forEach(file => {
             var str = fs.readFileSync(file)
             const json = JSON.parse(str)
-            sites.add(json).then(e => {
+            sites.bulkAdd(json).then(e => {
               this.getSites()
               this.d.site = json[0].key
               setting.update(this.d).then(res => {
@@ -430,7 +430,7 @@ export default {
     },
     resetSites () {
       sites.clear()
-      sites.add(defaultSites).then(e => {
+      sites.bulkAdd(defaultSites).then(e => {
         this.getSites()
         this.d.site = defaultSites[0].key
         setting.update(this.d).then(res => {
diff --git a/src/lib/dexie/sites.js b/src/lib/dexie/sites.js
index b8e8ab7..4d84e64 100644
--- a/src/lib/dexie/sites.js
+++ b/src/lib/dexie/sites.js
@@ -7,10 +7,13 @@ export default {
   async clear () {
     return await sites.clear()
   },
-  async add (doc) {
+  async bulkAdd (doc) {
     return await sites.bulkAdd(doc)
   },
   async find (doc) {
     return await sites.get(doc)
+  },
+  async add (doc) {
+    return await sites.add(doc)
   }
 }