From 3f79f315508aa147f38f627055f73184bc8864ee Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Thu, 22 Oct 2020 23:40:28 +0800
Subject: [PATCH 01/14] =?UTF-8?q?IPTV=E8=BD=AC=E7=A7=BB=E6=80=BB=E9=A2=91?=
 =?UTF-8?q?=E9=81=93=E6=95=B0=E5=88=B0=E8=A1=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

这PR也太好混了吧
---
 src/components/IPTV.vue | 80 +++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 39 deletions(-)

diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index de81686..628386d 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -3,7 +3,6 @@
     <div class="listpage-content">
       <div class="listpage-header" v-show="!eableBatchEdit">
         <el-switch v-model="eableBatchEdit" active-text="批处理分组"></el-switch>
-        <el-button type="text">总频道数:{{iptvList.length}}</el-button>
         <el-button @click.stop="exportChannels" type="text">导出</el-button>
         <el-button @click.stop="importChannels" type="text">导入</el-button>
         <el-button @click.stop="removeAllChannels" type="text">清空</el-button>
@@ -16,45 +15,48 @@
       </div>
       <div class="listpage-body" id="iptv-table">
         <el-table
-              :data="filteredTableData"
-              row-key="id"
-              @row-click="playEvent"
-              @selection-change="handleSelectionChange">
-              <el-table-column
-                type="selection"
-                v-if="eableBatchEdit">
-              </el-table-column>
-              <el-table-column
-                prop="name"
-                label="频道名">
-                <template #header>
-                  <el-input
-                  placeholder="搜索"
-                  size="mini"
-                  v-model.trim="searchTxt">
-                  <i slot="prefix" class="el-input__icon el-icon-search"></i>
-                  </el-input>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="group"
-                label="分组"
-                :filters="getFilters"
-                :filter-method="filterHandle"
-                filter-placement="bottom-end">
-                <template slot-scope="scope">
-                  <el-button type="text">{{scope.row.group}}</el-button>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="操作"
-                header-align="center"
+          :data="filteredTableData"
+          row-key="id"
+          @row-click="playEvent"
+          @selection-change="handleSelectionChange">
+          <el-table-column
+            type="selection"
+            v-if="eableBatchEdit">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="频道名">
+            <template #header>
+              <el-input
+              placeholder="搜索"
+              size="mini"
+              v-model.trim="searchTxt">
+              <i slot="prefix" class="el-input__icon el-icon-search"></i>
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="group"
+            label="分组"
+            :filters="getFilters"
+            :filter-method="filterHandle"
+            filter-placement="bottom-end">
+            <template slot-scope="scope">
+              <el-button type="text">{{scope.row.group}}</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            header-align="center"
             align="right">
-                <template slot-scope="scope">
-                  <el-button @click.stop="moveToTopEvent(scope.row)" type="text">置顶</el-button>
-                  <el-button @click.stop="removeEvent(scope.row)" type="text">删除</el-button>
-                </template>
-              </el-table-column>
+            <template #header>
+              <span>总频道数:{{ iptvList.length }}</span>
+            </template>
+            <template slot-scope="scope">
+              <el-button @click.stop="moveToTopEvent(scope.row)" type="text">置顶</el-button>
+              <el-button @click.stop="removeEvent(scope.row)" type="text">删除</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
     </div>

From 79932a74bc8cbac35b043b1908401b88710e4134 Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Thu, 22 Oct 2020 23:48:19 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E5=9B=BA=E5=AE=9AIPTV=E5=92=8C=E6=BA=90?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=A1=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EditSites.vue | 1 +
 src/components/IPTV.vue      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index 035919b..7cb06a9 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -17,6 +17,7 @@
       </div>
       <div class="listpage-body" id="sites-table">
         <el-table
+          height="100%"
           size="mini"
           :data="sites"
           row-key="id"
diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index 628386d..fc13c7d 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -15,6 +15,7 @@
       </div>
       <div class="listpage-body" id="iptv-table">
         <el-table
+          height="100%"
           :data="filteredTableData"
           row-key="id"
           @row-click="playEvent"

From c708292051ae0163bf815fb71128f88a0bb0119c Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Fri, 23 Oct 2020 00:02:18 +0800
Subject: [PATCH 03/14] =?UTF-8?q?IPTV=E5=8F=98=E6=9B=B4=E5=88=86=E7=A7=9F?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=BC=80=E5=85=B3=E6=97=B6=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B0=E9=A1=B6=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IPTV.vue | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index fc13c7d..4446d72 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -1,20 +1,21 @@
 <template>
   <div class="listpage" id="IPTV">
     <div class="listpage-content">
-      <div class="listpage-header" v-show="!eableBatchEdit">
-        <el-switch v-model="eableBatchEdit" active-text="批处理分组"></el-switch>
+      <div class="listpage-header" v-show="!enableBatchEdit">
+        <el-switch v-model="enableBatchEdit" active-text="批处理分组"></el-switch>
         <el-button @click.stop="exportChannels" type="text">导出</el-button>
         <el-button @click.stop="importChannels" type="text">导入</el-button>
         <el-button @click.stop="removeAllChannels" type="text">清空</el-button>
         <el-button @click.stop="resetChannelsEvent" type="text">重置</el-button>
       </div>
-      <div class="listpage-header" v-show="eableBatchEdit">
-        <el-switch v-model="eableBatchEdit" active-text="批处理分组"></el-switch>
+      <div class="listpage-header" v-show="enableBatchEdit">
+        <el-switch v-model="enableBatchEdit" active-text="批处理分组"></el-switch>
         <el-input placeholder="新组名" v-model="batchGroupName"></el-input>
         <el-button type="primary" icon="el-icon-edit" @click.stop="saveBatchEdit">保存</el-button>
       </div>
       <div class="listpage-body" id="iptv-table">
         <el-table
+          ref="iptvTable"
           height="100%"
           :data="filteredTableData"
           row-key="id"
@@ -22,7 +23,7 @@
           @selection-change="handleSelectionChange">
           <el-table-column
             type="selection"
-            v-if="eableBatchEdit">
+            v-if="enableBatchEdit">
           </el-table-column>
           <el-table-column
             prop="name"
@@ -77,7 +78,7 @@ export default {
       iptvList: [],
       searchTxt: '',
       searchRecordList: [],
-      eableBatchEdit: false,
+      enableBatchEdit: false,
       batchGroupName: '',
       multipleSelection: [],
       show: {
@@ -130,10 +131,16 @@ export default {
       this.getChannels()
     },
     searchTxt () {
+    },
+    enableBatchEdit () {
+      this.backTop()
     }
   },
   methods: {
     ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
+    backTop () {
+      this.$refs.iptvTable.bodyWrapper.scrollTop = 0
+    },
     handleSelectionChange (rows) {
       this.multipleSelection = rows
     },

From 650c882f582a6bdde76f522843b559f29f0af29a Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Fri, 23 Oct 2020 12:20:17 +0200
Subject: [PATCH 04/14] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=87=AA=E9=80=89?=
 =?UTF-8?q?=E6=BA=90=E5=88=97=E7=9A=84=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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index f3f45cd..cee8f49 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -30,8 +30,6 @@
             label="资源名">
           </el-table-column>
           <el-table-column
-            :sort-by="['isActive', 'name']"
-            sortable
             prop="isActive"
             label="自选源">
             <template slot-scope="scope">
@@ -44,6 +42,8 @@
             </template>
           </el-table-column>
           <el-table-column
+            :sort-by="['group', 'name']"
+            sortable
             prop="group"
             label="分组"
             :filters="getFilters"

From 304b0d10b454446d54a8132fef727cf51e146dbd Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Fri, 23 Oct 2020 13:32:46 +0200
Subject: [PATCH 05/14] Fix typo

---
 src/components/EditSites.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index 7311c5a..df4af98 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -1,22 +1,23 @@
 <template>
   <div class="listpage" id="editSites">
     <div class="listpage-content">
-      <div class="listpage-header" v-show="!eableBatchEdit">
-        <el-switch v-model="eableBatchEdit" active-text="批处理分组">></el-switch>
+      <div class="listpage-header" v-show="!enableBatchEdit">
+        <el-switch v-model="enableBatchEdit" active-text="批处理分组">></el-switch>
         <el-button @click.stop="addSite" type="text">添加</el-button>
         <el-button @click.stop="exportSites" type="text">导出</el-button>
         <el-button @click.stop="importSites" type="text">导入</el-button>
         <el-button @click.stop="removeAllSites" type="text">清空</el-button>
         <el-button @click.stop="resetSitesEvent" type="text">重置</el-button>
       </div>
-      <div class="listpage-header" v-show="eableBatchEdit">
-        <el-switch v-model="eableBatchEdit" active-text="批处理分组"></el-switch>
+      <div class="listpage-header" v-show="enableBatchEdit">
+        <el-switch v-model="enableBatchEdit" active-text="批处理分组"></el-switch>
         <el-input placeholder="新组名" v-model="batchGroupName"></el-input>
         <el-switch v-model="batchIsActive" :active-value="1" :inactive-value="0" active-text="自选源"></el-switch>
         <el-button type="primary" icon="el-icon-edit" @click.stop="saveBatchEdit">保存</el-button>
       </div>
       <div class="listpage-body" id="sites-table">
         <el-table
+          ref="editSitesTable"
           height="100%"
           size="mini"
           :data="sites"
@@ -24,7 +25,7 @@
           @selection-change="handleSelectionChange">
           <el-table-column
             type="selection"
-            v-if="eableBatchEdit">
+            v-if="enableBatchEdit">
           </el-table-column>
           <el-table-column
             prop="name"
@@ -122,7 +123,7 @@ export default {
           { required: false, trigger: 'blur' }
         ]
       },
-      eableBatchEdit: false,
+      enableBatchEdit: false,
       batchGroupName: '',
       batchIsActive: 1,
       multipleSelection: []

From 1c9a84dbc69c0013f24ec96d87f6f1944678beab Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Fri, 23 Oct 2020 13:37:41 +0200
Subject: [PATCH 06/14] =?UTF-8?q?=E5=BC=80=E5=85=B3=E6=89=B9=E5=A4=84?=
 =?UTF-8?q?=E7=90=86,=E6=97=A0=E9=9C=80=E8=BF=94=E5=9B=9E=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=A1=B6=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IPTV.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index 4446d72..7da7607 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -131,16 +131,10 @@ export default {
       this.getChannels()
     },
     searchTxt () {
-    },
-    enableBatchEdit () {
-      this.backTop()
     }
   },
   methods: {
     ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
-    backTop () {
-      this.$refs.iptvTable.bodyWrapper.scrollTop = 0
-    },
     handleSelectionChange (rows) {
       this.multipleSelection = rows
     },

From a1423993c82e3110904aed28781122f60c9d89df Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Fri, 23 Oct 2020 15:14:12 +0200
Subject: [PATCH 07/14] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E8=A1=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/style.scss   | 1 +
 src/components/EditSites.vue | 4 +---
 src/components/History.vue   | 2 +-
 src/components/IPTV.vue      | 3 +--
 src/components/Star.vue      | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss
index edb3fd2..6dbcbe5 100644
--- a/src/assets/scss/style.scss
+++ b/src/assets/scss/style.scss
@@ -241,6 +241,7 @@
       }
       .el-table{
         height: 100%;
+        width: 100%;
         overflow-y: auto;
         font-size: 1rem;
       }
diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index df4af98..3273db5 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -18,10 +18,8 @@
       <div class="listpage-body" id="sites-table">
         <el-table
           ref="editSitesTable"
-          height="100%"
-          size="mini"
+          size="mini" fit height="100%" row-key="id"
           :data="sites"
-          row-key="id"
           @selection-change="handleSelectionChange">
           <el-table-column
             type="selection"
diff --git a/src/components/History.vue b/src/components/History.vue
index 035e046..181bacf 100644
--- a/src/components/History.vue
+++ b/src/components/History.vue
@@ -7,7 +7,7 @@
         <el-button @click.stop="clearAllHistory" type="text">清空</el-button>
       </div>
       <div class="listpage-body" id="history-table">
-        <el-table size="mini" fit :data="history" row-key="id" @row-click="detailEvent">
+        <el-table size="mini" fit height="100%" :data="history" row-key="id" @row-click="detailEvent">
           <el-table-column
             prop="name"
             label="片名">
diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index 7da7607..095f3fa 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -16,9 +16,8 @@
       <div class="listpage-body" id="iptv-table">
         <el-table
           ref="iptvTable"
-          height="100%"
+          size="mini" fit height="100%" row-key="id"
           :data="filteredTableData"
-          row-key="id"
           @row-click="playEvent"
           @selection-change="handleSelectionChange">
           <el-table-column
diff --git a/src/components/Star.vue b/src/components/Star.vue
index d12b4a9..6131a44 100644
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -8,7 +8,7 @@
         <el-button @click.stop="updateAllEvent" type="text">同步所有收藏</el-button>
       </div>
       <div class="listpage-body" id="star-table">
-        <el-table size="mini" fit :data="list" height="100%" row-key="id" :cell-class-name="checkUpdate" @row-click="detailEvent">
+        <el-table size="mini" fit height="100%" row-key="id" :data="list" :cell-class-name="checkUpdate" @row-click="detailEvent">
           <el-table-column
             sortable
             :sort-method="sortByName"

From 454d1921419bb094ed57b7ebb47dc1159a898867 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Fri, 23 Oct 2020 15:53:21 +0200
Subject: [PATCH 08/14] =?UTF-8?q?=E6=9B=B4=E5=A5=BD=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Star.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Star.vue b/src/components/Star.vue
index 6131a44..5b52c71 100644
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -130,7 +130,7 @@ export default {
   methods: {
     ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
     sortByName (a, b) {
-      return a.name.localeCompare(b.name)
+      return a.name.localeCompare(b.name, 'zh')
     },
     sortByType (a, b) {
       return a.type.localeCompare(b.type)

From 8ceffab2fe36b0a7c3f5a15553b76470267832a0 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Fri, 23 Oct 2020 16:42:31 +0200
Subject: [PATCH 09/14] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E9=87=8C=E6=B7=BB=E5=8A=A0=E2=80=9C=E6=BA=90=E7=AB=99=E2=80=9D?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Film.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Film.vue b/src/components/Film.vue
index 37c92ac..df348a4 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -87,6 +87,7 @@
               <ul>
                 <li v-for="(i, j) in searchContents" :key="j" @click="detailEvent(i.site, i)">
                   <span class="name">{{i.name}}</span>
+                  <span class="site">{{i.site.name}}</span>
                   <span class="type">{{i.type}}</span>
                   <span class="time">{{i.year}}</span>
                   <span class="note">{{i.note}}</span>

From a3ebba641ffedee959b4f8d1194a3418b28a4085 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Fri, 23 Oct 2020 22:29:40 +0200
Subject: [PATCH 10/14] =?UTF-8?q?=E6=BA=90=E7=AB=99=E7=BC=96=E8=BE=91,?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BC=96=E8=BE=91=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EditSites.vue | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index 3273db5..e654037 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -3,7 +3,7 @@
     <div class="listpage-content">
       <div class="listpage-header" v-show="!enableBatchEdit">
         <el-switch v-model="enableBatchEdit" active-text="批处理分组">></el-switch>
-        <el-button @click.stop="addSite" type="text">添加</el-button>
+        <el-button @click.stop="addSite" type="text">新增</el-button>
         <el-button @click.stop="exportSites" type="text">导出</el-button>
         <el-button @click.stop="importSites" type="text">导入</el-button>
         <el-button @click.stop="removeAllSites" type="text">清空</el-button>
@@ -67,7 +67,7 @@
     </div>
     <!-- 编辑页面 -->
     <div>
-      <el-dialog :visible.sync="dialogVisible" v-if='dialogVisible' :title="dialogType==='edit'?'编辑源':'添加源'" :append-to-body="true" @close="closeDialog">
+      <el-dialog :visible.sync="dialogVisible" v-if='dialogVisible' :title="dialogType==='edit'?'编辑源':'新增源'" :append-to-body="true" @close="closeDialog">
         <el-form :model="siteInfo" ref='siteInfo' label-width="75px" label-position="left" :rules="rules">
           <el-form-item label="源站名" prop='name'>
             <el-input v-model="siteInfo.name" placeholder="请输入源站名" />
@@ -78,6 +78,9 @@
           <el-form-item label="下载接口" prop='download'>
             <el-input v-model="siteInfo.download" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" placeholder="请输入Download接口地址，可以空着"/>
           </el-form-item>
+          <el-form-item label="分组" prop='group'>
+            <el-input v-model="siteInfo.group" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" placeholder="请输入分组"/>
+          </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
           <el-button @click="closeDialog">取消</el-button>
@@ -108,7 +111,9 @@ export default {
       siteInfo: {
         name: '',
         api: '',
-        download: ''
+        download: '',
+        group: '',
+        isActive: 1
       },
       rules: {
         name: [
@@ -188,7 +193,9 @@ export default {
       this.siteInfo = {
         name: '',
         api: '',
-        download: ''
+        download: '',
+        group: '',
+        isActive: 1
       }
     },
     editSite (siteInfo) {
@@ -229,7 +236,9 @@ export default {
         id: this.dialogType === 'edit' ? this.siteInfo.id : this.sites[this.sites.length - 1].id + 1,
         name: this.siteInfo.name,
         api: this.siteInfo.api,
-        download: this.siteInfo.download
+        download: this.siteInfo.download,
+        group: this.siteInfo.group,
+        isActive: this.siteInfo.isActive
       }
       const _hmt = window._hmt
       _hmt.push(['_trackEvent', 'site', 'add', `${this.siteInfo.name}: ${this.siteInfo.api}`])
@@ -238,9 +247,10 @@ export default {
         this.siteInfo = {
           name: '',
           api: '',
-          download: ''
+          download: '',
+          group: ''
         }
-        this.dialogType === 'edit' ? this.$message.success('修改成功！') : this.$message.success('添加新源成功！')
+        this.dialogType === 'edit' ? this.$message.success('修改成功！') : this.$message.success('新增源成功！')
         this.dialogVisible = false
         this.getSites()
       })

From 6f52d73d526a378f24ced964e9126c5d72575c25 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Fri, 23 Oct 2020 22:45:04 +0200
Subject: [PATCH 11/14] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E5=88=92=E8=BF=87?=
 =?UTF-8?q?=E7=9A=84=E8=A1=8C=E6=B7=BB=E5=8A=A0=E5=B0=91=E8=AE=B8=E6=94=BE?=
 =?UTF-8?q?=E5=A4=A7=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/style.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss
index 6dbcbe5..1bab294 100644
--- a/src/assets/scss/style.scss
+++ b/src/assets/scss/style.scss
@@ -251,6 +251,9 @@
       .el-table__body td,.el-table__body th{
         border-bottom: 1px solid;
       }
+      .el-table--enable-row-hover .el-table__body tr:hover>td{
+        transform: scale(1.02);
+      }
       .el-table .highlight{
         color: var(--highlight-color) !important;
       }

From 2e96812a1fc855be3a83ba1d707ec1af1e485f09 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Fri, 23 Oct 2020 23:23:25 +0200
Subject: [PATCH 12/14] =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=B8=80=E5=88=97?=
 =?UTF-8?q?=E7=9A=84=E8=A1=A8=E5=A4=B4=E5=90=91=E5=8F=B3=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EditSites.vue | 2 +-
 src/components/History.vue   | 2 +-
 src/components/IPTV.vue      | 2 +-
 src/components/Star.vue      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index e654037..e3559e2 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -55,7 +55,7 @@
           </el-table-column>
           <el-table-column
             label="操作"
-            header-align="center"
+            header-align="right"
             align="right">
             <template slot-scope="scope">
               <el-button size="mini" @click.stop="moveToTopEvent(scope.row)" type="text">置顶</el-button>
diff --git a/src/components/History.vue b/src/components/History.vue
index 181bacf..702ca89 100644
--- a/src/components/History.vue
+++ b/src/components/History.vue
@@ -30,7 +30,7 @@
           </el-table-column>
           <el-table-column
             label="操作"
-            header-align="center"
+            header-align="right"
             align="right">
             <template slot-scope="scope">
               <el-button @click.stop="playEvent(scope.row)" type="text">播放</el-button>
diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index 095f3fa..af18af4 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -48,7 +48,7 @@
           </el-table-column>
           <el-table-column
             label="操作"
-            header-align="center"
+            header-align="right"
             align="right">
             <template #header>
               <span>总频道数:{{ iptvList.length }}</span>
diff --git a/src/components/Star.vue b/src/components/Star.vue
index 5b52c71..d789803 100644
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -57,7 +57,7 @@
           </el-table-column>
           <el-table-column
             label="操作"
-            header-align="center"
+            header-align="right"
             align="right">
             <template slot-scope="scope">
               <el-button @click.stop="playEvent(scope.row)" type="text">播放</el-button>

From aa4583898a4cffb6190a2825a0513b881b1f342c Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Fri, 23 Oct 2020 23:31:01 +0200
Subject: [PATCH 13/14] =?UTF-8?q?=E7=BB=9F=E4=B8=80star=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=9A=84=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail.vue | 5 +++--
 src/components/Star.vue   | 9 ++++++---
 src/lib/dexie/dexie.js    | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/Detail.vue b/src/components/Detail.vue
index c26cd56..1f9c330 100644
--- a/src/components/Detail.vue
+++ b/src/components/Detail.vue
@@ -184,8 +184,9 @@ export default {
             name: this.info.name,
             type: this.info.type,
             year: this.info.year,
-            last: this.info.last,
-            note: this.info.note
+            note: this.info.note,
+            last: this.info.last
+
           }
           star.add(docs).then(res => {
             this.$message.success('收藏成功')
diff --git a/src/components/Star.vue b/src/components/Star.vue
index d789803..e829780 100644
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -201,14 +201,17 @@ export default {
     updateEvent (e) {
       zy.detail(e.key, e.ids).then(res => {
         var doc = {
-          key: e.key,
           id: e.id,
+          key: e.key,
           ids: res.id,
-          last: res.last,
+          site: res.site,
           name: res.name,
           type: res.type,
           year: res.year,
-          note: res.note
+          note: res.note,
+          index: res.index,
+          last: res.last,
+          hasUpdate: res.hasUpdate
         }
         star.get(e.id).then(resStar => {
           doc.hasUpdate = resStar.hasUpdate
diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js
index 7d29d15..204f367 100644
--- a/src/lib/dexie/dexie.js
+++ b/src/lib/dexie/dexie.js
@@ -8,7 +8,7 @@ db.version(3).stores({
   iptvSearch: '++id, keywords',
   setting: 'id, theme, site, shortcut, view, externalPlayer, searchAllSites, excludeRootClasses, excludeR18Films, forwardTimeInSec',
   shortcut: 'name, key, desc',
-  star: '++id, site, ids, name, type, year, index',
+  star: '++id, key, ids, site, name, type, year, note, index, last, hasUpdate',
   sites: '++id, key, name, api, download, isActive, group',
   history: '++id, site, ids, name, type, year, index, time',
   mini: 'id, site, ids, name, index, time',

From cc2dc19e3915e7ab3c0f22fdb2379eec5db7214f Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Fri, 23 Oct 2020 23:31:44 +0200
Subject: [PATCH 14/14] =?UTF-8?q?Revert=20"=E7=BB=9F=E4=B8=80star=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=BC=E5=BC=8F=E7=9A=84=E5=AE=9A=E4=B9=89"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit aa4583898a4cffb6190a2825a0513b881b1f342c.
---
 src/components/Detail.vue | 5 ++---
 src/components/Star.vue   | 9 +++------
 src/lib/dexie/dexie.js    | 2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/components/Detail.vue b/src/components/Detail.vue
index 1f9c330..c26cd56 100644
--- a/src/components/Detail.vue
+++ b/src/components/Detail.vue
@@ -184,9 +184,8 @@ export default {
             name: this.info.name,
             type: this.info.type,
             year: this.info.year,
-            note: this.info.note,
-            last: this.info.last
-
+            last: this.info.last,
+            note: this.info.note
           }
           star.add(docs).then(res => {
             this.$message.success('收藏成功')
diff --git a/src/components/Star.vue b/src/components/Star.vue
index e829780..d789803 100644
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -201,17 +201,14 @@ export default {
     updateEvent (e) {
       zy.detail(e.key, e.ids).then(res => {
         var doc = {
-          id: e.id,
           key: e.key,
+          id: e.id,
           ids: res.id,
-          site: res.site,
+          last: res.last,
           name: res.name,
           type: res.type,
           year: res.year,
-          note: res.note,
-          index: res.index,
-          last: res.last,
-          hasUpdate: res.hasUpdate
+          note: res.note
         }
         star.get(e.id).then(resStar => {
           doc.hasUpdate = resStar.hasUpdate
diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js
index 204f367..7d29d15 100644
--- a/src/lib/dexie/dexie.js
+++ b/src/lib/dexie/dexie.js
@@ -8,7 +8,7 @@ db.version(3).stores({
   iptvSearch: '++id, keywords',
   setting: 'id, theme, site, shortcut, view, externalPlayer, searchAllSites, excludeRootClasses, excludeR18Films, forwardTimeInSec',
   shortcut: 'name, key, desc',
-  star: '++id, key, ids, site, name, type, year, note, index, last, hasUpdate',
+  star: '++id, site, ids, name, type, year, index',
   sites: '++id, key, name, api, download, isActive, group',
   history: '++id, site, ids, name, type, year, index, time',
   mini: 'id, site, ids, name, index, time',