From 4212cc681abcbe2d27bf6a8a655778b9e23795d8 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 8 Oct 2020 22:40:31 +0200
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0setting=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Film.vue    | 32 +++++++-------------------------
 src/components/Setting.vue | 13 +++++--------
 src/lib/dexie/dexie.js     |  2 +-
 src/lib/dexie/initData.js  |  8 ++++++--
 4 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/src/components/Film.vue b/src/components/Film.vue
index 1808d34..05f3fe9 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -189,12 +189,6 @@ export default {
     searchTxt () {
       this.searchChangeEvent()
     },
-    'setting.sitesList': {
-      handler (nv) {
-        this.getAllsites()
-      },
-      deep: true
-    },
     '$store.state.editSites.sites': function () {
       this.getAllsites()
     }
@@ -475,28 +469,16 @@ export default {
         }
       }
     },
-    getAllsites (nv) {
-      if (nv) {
-        sites.all().then(res => {
-          this.sites = res
-          for (const i of res) {
-            if (i.key === nv) {
-              this.site = i
-              this.siteClick(this.site)
-              return false
-            }
-          }
-        })
-      } else {
-        sites.all().then(res => {
-          this.sites = res
-          this.site = this.sites[0]
-          this.siteClick(this.site)
-        })
-      }
+    getAllsites () {
+      sites.all().then(res => {
+        this.sites = res
+        this.site = this.sites[0]
+        this.siteClick(this.site)
+      })
     }
   },
   created () {
+    this.getAllsites()
     this.getAllSearch()
   }
 }
diff --git a/src/components/Setting.vue b/src/components/Setting.vue
index a2af30f..5367999 100644
--- a/src/components/Setting.vue
+++ b/src/components/Setting.vue
@@ -197,18 +197,15 @@ export default {
       setting.find().then(res => {
         this.d = {
           id: res.id,
-          site: res.site,
           theme: res.theme,
           shortcut: res.shortcut,
           view: res.view,
-          searchAllSites: res.searchAllSites !== null ? res.searchAllSites : true,
           externalPlayer: res.externalPlayer,
-          editPlayerPath: false,
-          excludeRootClasses: res.excludeRootClasses !== null ? res.excludeRootClasses : true,
-          excludeR18Films: res.excludeR18Films !== null ? res.excludeR18Films : true,
-          forwardTimeInSec: res.forwardTimeInSec !== null ? res.forwardTimeInSec : 5
+          searchAllSites: res.searchAllSites,
+          excludeRootClasses: res.excludeRootClasses,
+          excludeR18Films: res.excludeR18Films,
+          forwardTimeInSec: res.forwardTimeInSec
         }
-        this.setting = this.d
       })
     },
     getSites () {
@@ -346,8 +343,8 @@ export default {
     }
   },
   created () {
-    this.getSetting()
     this.getSites()
+    this.getSetting()
     this.getShortcut()
     this.getFavorites()
     this.getLatestVersion()
diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js
index c6b13ac..d83609d 100644
--- a/src/lib/dexie/dexie.js
+++ b/src/lib/dexie/dexie.js
@@ -6,7 +6,7 @@ const db = new Dexie('zy')
 db.version(3).stores({
   search: '++id, keywords',
   iptvSearch: '++id, keywords',
-  setting: 'id, theme, site, shortcut, view',
+  setting: 'id, theme, site, shortcut, view, externalPlayer, searchAllSites, excludeRootClasses, excludeR18Films, forwardTimeInSec',
   shortcut: 'name, key, desc',
   star: '++id, site, ids, name, type, year, index',
   sites: '++id, key, name, json, xml, down, level',
diff --git a/src/lib/dexie/initData.js b/src/lib/dexie/initData.js
index ff6348a..3fb8e80 100644
--- a/src/lib/dexie/initData.js
+++ b/src/lib/dexie/initData.js
@@ -2,9 +2,13 @@ const setting = [
   {
     id: 0,
     theme: 'light',
-    site: 'zuidazy',
     shortcut: true,
-    view: 'picture'
+    view: 'picture',
+    externalPlayer: '',
+    searchAllSites: true,
+    excludeRootClasses: true,
+    excludeR18Films: true,
+    forwardTimeInSec: 5
   }
 ]