From 682c706618d3eb9313d495ee2cb9f8d54e459fd0 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Wed, 11 Nov 2020 21:40:51 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20"film=E9=A1=B5=E9=9D=A2el-table?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E7=94=B5=E5=BD=B1=E8=BF=BD=E5=89=A7=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Film.vue   | 52 +++++++++++++++++----------------------
 src/lib/dexie/dexie.js    |  2 +-
 src/lib/dexie/initData.js |  1 -
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/src/components/Film.vue b/src/components/Film.vue
index 7386c9e..b3bef9e 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -110,40 +110,37 @@
               align="center"
               width="100">
           </el-table-column>
-          <el-table-column v-if="setting.listViewMode === 'film'"
+          <el-table-column
               prop="area"
               label="地区"
               align="center"
               width="100">
           </el-table-column>
-          <el-table-column  v-if="setting.listViewMode === 'film'"
+          <el-table-column
               prop="lang"
               label="语言"
               align="center"
               width="100">
           </el-table-column>
-          <el-table-column  v-if="setting.listViewMode === 'tv'"
+          <el-table-column
+            prop="note"
+            label="备注"
+            width="120">
+          </el-table-column>
+          <el-table-column
               prop="last"
               label="最近更新"
               :formatter="dateFormat"
               align="center"
               width="120">
           </el-table-column>
-          <el-table-column
-            prop="note"
-            label="备注">
+          <el-table-column key="placeholder">
           </el-table-column>
           <el-table-column
             label="操作"
             header-align="center"
             align="right"
             width="200">
-            <template slot="header">
-              <el-select class="width100" v-model="setting.listViewMode" size="mini" default-first-option>
-                <el-option label="电影模式" value="film" />
-                <el-option label="追剧模式" value="tv" />
-              </el-select>
-            </template>
             <template slot-scope="scope">
               <el-button @click.stop="playEvent(site, scope.row)" type="text">播放</el-button>
               <el-button @click.stop="starEvent(site, scope.row)" type="text">收藏</el-button>
@@ -201,7 +198,7 @@
               align="center"
               width="100">
           </el-table-column>
-          <el-table-column  v-if="setting.listViewMode === 'film'"
+          <el-table-column
             prop="area"
             :filters="getFilters('area')"
             :filter-method="(value, row, column) => { this.currentColumn = column; return value === row.area }"
@@ -209,7 +206,7 @@
             align="center"
             width="100">
           </el-table-column>
-          <el-table-column  v-if="setting.listViewMode === 'film'"
+          <el-table-column
             :filters="getFilters('lang')"
             :filter-method="(value, row, column) => { this.currentColumn = column; return value === row.lang }"
             prop="lang"
@@ -217,30 +214,27 @@
             align="center"
             width="100">
           </el-table-column>
-          <el-table-column  v-if="setting.listViewMode === 'tv'" key="last"
-              sortable
-              prop="last"
-              label="最近更新"
-              :formatter="dateFormat"
-              align="center"
-              width="120">
-          </el-table-column>
           <el-table-column
             sortable
             prop="note"
-            label="备注">
+            label="备注"
+            width="120">
+          </el-table-column>
+          <el-table-column key="last"
+            sortable
+            prop="last"
+            label="最近更新"
+            :formatter="dateFormat"
+            align="center"
+            width="120">
+          </el-table-column>
+          <el-table-column key="placeholder">
           </el-table-column>
           <el-table-column
             label="操作"
             header-align="center"
             align="right"
             width="200">
-            <template #header>
-              <el-select v-model="setting.listViewMode" size="small" default-first-option>
-                <el-option label="电影模式" value="film" />
-                <el-option label="追剧模式" value="tv" />
-              </el-select>
-            </template>
             <template slot-scope="scope">
               <el-button @click.stop="playEvent(scope.row.site, scope.row)" type="text">播放</el-button>
               <el-button @click.stop="starEvent(scope.row.site, scope.row)" type="text">收藏</el-button>
diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js
index 3e50d28..79955a1 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, searchGroup, excludeRootClasses, excludeR18Films, forwardTimeInSec, listViewMode, starViewMode, recommandationViewMode, 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 fd125c2..341fa5b 100644
--- a/src/lib/dexie/initData.js
+++ b/src/lib/dexie/initData.js
@@ -4,7 +4,6 @@ const setting = [
     theme: 'light',
     shortcut: true,
     view: 'picture',
-    listViewMode: 'film',
     externalPlayer: '',
     searchGroup: '全部',
     excludeRootClasses: true,