From 11559ca164a19ba4c5fc9e6bb351ec2fbca8d575 Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Sat, 7 Nov 2020 00:39:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=AB=99=E5=8F=8A=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E6=BA=90=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2"?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA"=E6=9B=BF=E6=8D=A2=E4=B8=BA=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EditSites.vue | 19 +++++++------------
 src/components/IPTV.vue      | 19 +++++++------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index 82adf18..922dc30 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -7,7 +7,6 @@
           <el-button @click="exportSites" icon="el-icon-upload2" >导出</el-button>
           <el-button @click="importSites" icon="el-icon-download">导入</el-button>
           <el-button @click="checkAllSite" icon="el-icon-refresh" :loading="checkAllSitesLoading">检测</el-button>
-          <el-button @click="removeAllSites" icon="el-icon-delete-solid">清空</el-button>
           <el-button @click="resetSitesEvent" icon="el-icon-refresh-left">重置</el-button>
     </div>
     <div class="listpage-header" v-show="enableBatchEdit">
@@ -15,6 +14,7 @@
           <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>
+          <el-button @click="removeSelectedSites" icon="el-icon-delete-solid">删除</el-button>
     </div>
     <div class="listpage-body" id="sites-body">
       <div class="show-table" id="sites-table">
@@ -33,6 +33,8 @@
           </el-table-column>
           <el-table-column
             prop="isActive"
+            :filters = "[{text:'启用', value: 1}, {text:'停用', value: 0}]"
+            :filter-method="(value, row) => value === row.isActive"
             label="启用">
             <template slot-scope="scope">
               <el-switch
@@ -47,7 +49,7 @@
             prop="group"
             label="分组"
             :filters="getFilters"
-            :filter-method="filterHandle"
+            :filter-method="(value, row) => value === row.group"
             filter-placement="bottom-end">
           </el-table-column>
           <el-table-column
@@ -189,9 +191,6 @@ export default {
         setting.update(res)
       })
     },
-    filterHandle (value, row) {
-      return row.group === value
-    },
     handleSelectionChange (rows) {
       this.multipleSelection = rows
     },
@@ -413,13 +412,9 @@ export default {
         sites.bulkAdd(this.sites).then(this.getSites())
       })
     },
-    removeAllSites () {
-      this.stopFlag = true
-      if (this.checkAllSitesLoading) {
-        this.$message.info('部分检测还未完全终止, 请稍等...')
-        return
-      }
-      sites.clear().then(this.getSites())
+    removeSelectedSites () {
+      this.multipleSelection.forEach(e => sites.remove(e.id))
+      this.getSites()
     },
     rowDrop () {
       if (this.checkAllSitesLoading) {
diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index f7d418d..782afaf 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -5,7 +5,6 @@
         <el-button @click.stop="exportChannels" icon="el-icon-upload2" >导出</el-button>
         <el-button @click.stop="importChannels" icon="el-icon-download">导入</el-button>
         <el-button @click="checkAllChannels" icon="el-icon-refresh" :loading="checkAllChannelsLoading">检测</el-button>
-        <el-button @click.stop="removeAllChannels" icon="el-icon-delete-solid">清空</el-button>
         <el-button @click.stop="resetChannelsEvent" icon="el-icon-refresh-left">重置</el-button>
     </div>
     <div class="listpage-header" id="iptv-header" v-show="enableBatchEdit">
@@ -13,6 +12,7 @@
         <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>
+        <el-button @click.stop="removeSelectedChannels" icon="el-icon-delete-solid">删除</el-button>
     </div>
     <div class="listpage-body" id="iptv-table">
       <div class="show-table" id="iptv-table">
@@ -42,6 +42,8 @@
           </el-table-column>
           <el-table-column
             prop="isActive"
+            :filters = "[{text:'启用', value: 1}, {text:'停用', value: 0}]"
+            :filter-method="(value, row) => value === row.isActive"
             label="启用">
             <template slot-scope="scope">
               <el-switch
@@ -59,7 +61,7 @@
             prop="group"
             label="分组"
             :filters="getFilters"
-            :filter-method="filterHandle"
+            :filter-method="(value, row) => value === row.group"
             filter-placement="bottom-end">
             <template slot-scope="scope">
               <el-button type="text">{{scope.row.group}}</el-button>
@@ -208,9 +210,6 @@ export default {
       this.video = { iptv: { name: e.name, url: e.url } }
       this.view = 'Play'
     },
-    filterHandle (value, row) {
-      return row.group === value
-    },
     containsearchTxt (i) {
       if (this.searchTxt) {
         return i.name.toLowerCase().includes(this.searchTxt.toLowerCase())
@@ -337,13 +336,9 @@ export default {
       }
       iptv.clear().then(iptv.bulkAdd(defaultChannels).then(this.getChannels()))
     },
-    removeAllChannels () {
-      this.stopFlag = true
-      if (this.checkAllChannelsLoading) {
-        this.$message.info('部分检测还未完全终止, 请稍等...')
-        return
-      }
-      iptv.clear().then(this.getChannels())
+    removeSelectedChannels () {
+      this.multipleSelection.forEach(e => iptv.remove(e.id))
+      this.getChannels()
     },
     getChannels () {
       iptv.all().then(res => {