From f4396cb69f8c18b5e2e61bb257837e8e191c8af2 Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Mon, 9 Nov 2020 10:59:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=90=9C=E7=B4=A2=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Film.vue    | 21 +++++++++++++++------
 src/components/Setting.vue |  9 ++++-----
 src/lib/dexie/dexie.js     |  2 +-
 src/lib/dexie/initData.js  |  1 +
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/components/Film.vue b/src/components/Film.vue
index 6604267..03644bf 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -150,7 +150,9 @@
             prop="name"
             label="片名">
           </el-table-column>
-          <el-table-column
+          <el-table-column v-if="searchGroup !== '站内'"
+            sortable
+            :sort-method="(a , b) => sortByLocaleCompare(a.site.name, b.site.name)"
             prop="site"
             label="源站"
             width="120">
@@ -204,7 +206,7 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import { star, history, search, sites } from '../lib/dexie'
+import { star, history, search, sites, setting } from '../lib/dexie'
 import zy from '../lib/site/tools'
 import Waterfall from 'vue-waterfall-plugin'
 import InfiniteLoading from 'vue-infinite-loading'
@@ -560,8 +562,12 @@ export default {
     },
     searchEvent () {
       const wd = this.searchTxt
-      this.setting.searchAllSites = this.searchGroup === '全部'
-      if (this.setting.searchAllSites) {
+      if (this.setting.searchGroup !== this.searchGroup) {
+        this.setting.searchGroup = this.searchGroup
+        setting.update(this.setting)
+      }
+      if (!wd) return
+      if (this.searchGroup === '全部') {
         this.searchAllSitesEvent(this.sites, wd)
       } else {
         this.searchSingleSiteEvent(this.site, wd)
@@ -643,9 +649,12 @@ export default {
             this.selectedSiteName = this.sites[0].name
           }
         }
+        this.searchGroups = [...new Set(this.sites.map(site => site.group))]
+        this.searchGroups.unshift('站内')
+        this.searchGroups.push('全部')
+        this.searchGroup = this.setting.searchGroup
+        if (this.searchGroup === undefined) setting.find().then(res => { this.searchGroup = res.searchGroup })
       })
-      this.searchGroups = ['站内', '全部']
-      this.searchGroup = this.setting.searchAllSites ? '全部' : '站内'
     }
   },
   created () {
diff --git a/src/components/Setting.vue b/src/components/Setting.vue
index a8c921d..0e300df 100644
--- a/src/components/Setting.vue
+++ b/src/components/Setting.vue
@@ -243,6 +243,10 @@ export default {
       this.setting = this.d
       setting.update(this.d)
     },
+    toggleExcludeR18Films () {
+      this.d.excludeR18Films = !this.d.excludeR18Films
+      this.updateSettingEvent()
+    },
     toggleExcludeRootClasses () {
       this.d.excludeRootClasses = !this.d.excludeRootClasses
       this.updateSettingEvent()
@@ -450,11 +454,6 @@ export default {
       }
     }
   }
-  .search{
-    width: 100%;
-    padding: 20px;
-    margin-top: 20px;
-  }
   .site{
     width: 100%;
     padding: 20px;
diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js
index 44b89b4..c05ff56 100644
--- a/src/lib/dexie/dexie.js
+++ b/src/lib/dexie/dexie.js
@@ -6,7 +6,7 @@ const db = new Dexie('zy')
 db.version(4).stores({
   search: '++id, keywords',
   iptvSearch: '++id, keywords',
-  setting: 'id, theme, site, shortcut, view, externalPlayer, excludeRootClasses, excludeR18Films, forwardTimeInSec, starViewMode, recommendationViewMode, historyViewMode, password',
+  setting: 'id, theme, site, shortcut, view, externalPlayer, searchGroup, excludeRootClasses, excludeR18Films, forwardTimeInSec, starViewMode, recommandationViewMode, password',
   shortcut: 'name, key, desc',
   star: '++id, [key+ids], site, name, detail, index, rate, hasUpdate',
   recommendation: '++id, [key+ids], site, name, detail, index, rate, hasUpdate',
diff --git a/src/lib/dexie/initData.js b/src/lib/dexie/initData.js
index 7ad26ce..b1a32e9 100644
--- a/src/lib/dexie/initData.js
+++ b/src/lib/dexie/initData.js
@@ -5,6 +5,7 @@ const setting = [
     shortcut: true,
     view: 'picture',
     externalPlayer: '',
+    searchGroup: '站内',
     excludeRootClasses: true,
     excludeR18Films: true,
     forwardTimeInSec: 5,