From b12cdf25d5168927f581c0847bc139b99bb3fa26 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Sun, 8 Nov 2020 12:28:12 +0100
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IPTV.vue |  7 +++----
 src/components/Star.vue | 14 ++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index 796da18..7ab2e90 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -56,9 +56,8 @@
             </template>
           </el-table-column>
           <el-table-column
-            sort-by="['group', 'name']"
             sortable
-            :sort-method="sortByGroup"
+            :sort-method="(a , b) => sortByLocaleCompare(a.group, b.group)"
             prop="group"
             label="分组"
             :filters="getFilters"
@@ -185,8 +184,8 @@ export default {
   },
   methods: {
     ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
-    sortByGroup (a, b) {
-      return a.group.localeCompare(b.group, 'zh')
+    sortByLocaleCompare (a, b) {
+      return a.localeCompare(b, 'zh')
     },
     selectionCellClick (selection, row) {
       if (this.shiftDown && this.selectionBegin !== '' && selection.includes(row)) {
diff --git a/src/components/Star.vue b/src/components/Star.vue
index bb883c7..ea72dd4 100644
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -17,7 +17,7 @@
         @sort-change="handleSortChange">
           <el-table-column
             sortable
-            :sort-method="sortByName"
+            :sort-method="(a , b) => sortByLocaleCompare(a.name, b.name)"
             prop="name"
             label="片名">
           </el-table-column>
@@ -30,9 +30,8 @@
             </template>
           </el-table-column>
           <el-table-column
-            :sort-by="['detail.type', 'name']"
             sortable
-            :sort-method="sortByType"
+            :sort-method="(a , b) => sortByLocaleCompare(a.detail.type, b.detail.type)"
             prop="detail.type"
             label="类型"
             width="100">
@@ -51,6 +50,8 @@
             label="备注">
           </el-table-column>
           <el-table-column v-if="list.some(e => e.rate)"
+            sortable
+            sort-by="rate"
             prop="rate"
             width="120"
             label="豆瓣评分">
@@ -206,11 +207,8 @@ export default {
     handleSortChange (column, prop, order) {
       this.updateDatabase()
     },
-    sortByName (a, b) {
-      return a.name.localeCompare(b.name, 'zh')
-    },
-    sortByType (a, b) {
-      return a.type.localeCompare(b.type)
+    sortByLocaleCompare (a, b) {
+      return a.localeCompare(b, 'zh')
     },
     detailEvent (e) {
       this.detail = {