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

---
 src/components/EditSites.vue | 38 +++++++++++++++++-------------------
 src/components/History.vue   |  4 ++--
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index 689ad8e..cb2919d 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -6,13 +6,12 @@
           <span class="btn" @click="exportSites">导出</span>
           <span class="btn" @click="importSites">导入</span>
           <span class="btn" @click="removeAllSites">清空</span>
-          <span class="btn" @click="resetSites">重置</span>
+          <span class="btn" @click="resetSitesEvent">重置</span>
        </div>
-      <div class="listpage-body" id="editSites-table">
+      <div class="listpage-body" id="sites-table">
         <el-table
               :data="sites"
               row-key="id"
-              @row-click="detailEvent"
               style="width: 100%">
               <el-table-column
                 prop="name"
@@ -229,12 +228,12 @@ export default {
       })
     },
     resetSitesEvent () {
-      this.resetSites(defaultSites)
+      sites.clear().then(sites.bulkAdd(defaultSites).then(this.getSites()))
       this.$message.success('重置源成功')
     },
     moveSiteToTop (i) {
       this.sites.sort(function (x, y) { return x.key === i.key ? -1 : y.key === i.key ? 1 : 0 })
-      this.resetSites(this.sites)
+      this.updateDatabase(this.sites)
     },
     resetId (inArray) {
       var id = 1
@@ -243,28 +242,27 @@ export default {
         id += 1
       })
     },
-    resetSites (newSites) {
-      this.resetId(newSites)
-      sites.clear().then(sites.bulkAdd(newSites).then(this.getSites()))
+    updateDatabase (data) {
+      sites.clear().then(res => {
+        var id = 1
+        data.forEach(ele => {
+          ele.id = id
+          id += 1
+        })
+        sites.bulkAdd(data)
+      })
     },
     removeAllSites () {
       sites.clear().then(this.getSites())
     },
     rowDrop () {
-      const tbody = document.getElementById('editSites-table').querySelector('.el-table__body-wrapper tbody')
-      var data = this.sites
+      const tbody = document.getElementById('sites-table').querySelector('.el-table__body-wrapper tbody')
+      const _this = this
       Sortable.create(tbody, {
         onEnd ({ newIndex, oldIndex }) {
-          const currRow = data.splice(oldIndex, 1)[0]
-          data.splice(newIndex, 0, currRow)
-          sites.clear().then(res => {
-            var id = data.length
-            data.forEach(element => {
-              element.id = id
-              sites.add(element)
-              id -= 1
-            })
-          })
+          const currRow = _this.sites.splice(oldIndex, 1)[0]
+          _this.sites.splice(newIndex, 0, currRow)
+          _this.updateDatabase(_this.sites)
         }
       })
     }
diff --git a/src/components/History.vue b/src/components/History.vue
index c36c35d..c2b01a7 100644
--- a/src/components/History.vue
+++ b/src/components/History.vue
@@ -5,7 +5,7 @@
           <span class="btn"></span>
           <span class="btn" @click="clearAllHistory">清空</span>
        </div>
-      <div class="listpage-body" id="list-table">
+      <div class="listpage-body" id="history-table">
         <el-table
               :data="history"
               row-key="id"
@@ -213,7 +213,7 @@ export default {
       })
     },
     rowDrop () {
-      const tbody = document.getElementById('list-table').querySelector('.el-table__body-wrapper tbody')
+      const tbody = document.getElementById('history-table').querySelector('.el-table__body-wrapper tbody')
       const _this = this
       Sortable.create(tbody, {
         onEnd ({ newIndex, oldIndex }) {