diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss
index 775edea..649b081 100644
--- a/src/assets/scss/style.scss
+++ b/src/assets/scss/style.scss
@@ -146,6 +146,23 @@
         cursor: pointer;
       }
     }
+    .el-autocomplete{
+      .el-input-group__prepend{
+        border: none;
+        .el-select{
+          width: 100px;
+          .el-input, .el-input__inner{
+            width: 100%;
+          }
+        }
+      }
+      .el-input .el-input__inner{
+        width: 200px;
+      }
+      .el-input-group__append{
+        border: none;
+      }
+    }
     .is-loading:before {
       background-color: none !important;
     }
@@ -372,4 +389,4 @@
       box-shadow: 0em -3em 0 0, 2em -2em 0 -1em, 3em 0 0 -1em, 2em 2em 0 -1em, 0 3em 0 -1em, -2em 2em 0 0, -3em 0em 0 0, -2em -2em 0 0.2em;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/components/Film.vue b/src/components/Film.vue
index 93ae7ec..bde93a8 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -17,15 +17,27 @@
           :value="item.name">
         </el-option>
       </el-select>
-      <div class="zy-select" @mouseleave="show.search = false">
-        <div class="vs-input" @click="show.search = true"><input v-model.trim="searchTxt" type="text" placeholder="搜索" @keyup.enter="searchEvent(searchTxt)"></div>
-        <div class="vs-options" v-show="show.search">
-          <ul class="zy-scroll" style="max-height: 600px">
-            <li v-for="(i, j) in searchList" :key="j" @click="searchEvent(i.keywords)">{{i.keywords}}</li>
-            <li v-show="searchList.length >= 1" @click="clearSearch">清空历史记录</li>
-          </ul>
-        </div>
-      </div>
+      <el-autocomplete
+        clearable
+        size="small"
+        v-model.trim="searchTxt"
+        value-key="keywords"
+        :fetch-suggestions="querySearch"
+        placeholder="搜索"
+        @keyup.enter.native="searchAndRecord"
+        @select="searchEvent"
+        @change="searchChangeEvent">
+        <el-select v-model="searchGroup" slot="prepend" default-first-option placeholder="请选择" @change="searchEvent">
+          <el-option
+            v-for="item in searchGroups"
+            :key="item"
+            :label="item"
+            :value="item">
+          </el-option>
+        </el-select>
+        <!--方便触屏-->
+        <el-button slot="append" icon="el-icon-search" @click.stop="searchEvent" />
+      </el-autocomplete>
     </div>
     <div class="listpage-body" id="film-body" infinite-wrapper>
       <div class="show-picture" v-if="setting.view === 'picture' && !show.find">
@@ -119,19 +131,21 @@
             </template>
           </el-table-column>
           <infinite-loading
-              slot="append"
-              :identifier="infiniteId"
-              @infinite="infiniteHandler"
-              force-use-infinite-wrapper=".el-table__body-wrapper">
-              <div slot="no-more">数据量过少时请重复操作一次，以防网站抽风</div>
+            slot="append"
+            :identifier="infiniteId"
+            @infinite="infiniteHandler"
+            force-use-infinite-wrapper=".el-table__body-wrapper">
+            <div slot="no-more">数据量过少时请重复操作一次，以防网站抽风</div>
           </infinite-loading>
         </el-table>
       </div>
       <div class="show-table" v-show="show.find">
         <el-table size="mini"
+          ref="searchResultTable"
           :data="searchContents.filter(res => !setting.excludeR18Films || (res.type !== undefined && !containsR18Keywords(res.type)))"
           height="100%"
           :empty-text="statusText"
+          @filter-change="filterChange"
           @row-click="(row) => detailEvent(row.site, row)"
           style="width: 100%">
           <el-table-column
@@ -140,7 +154,11 @@
             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)"
+            :filters="getFilters('siteName')"
+            :filter-method="(value, row, column) => { this.currentColumn = column; return value === row.site.name }"
             prop="site"
             label="源站"
             width="120">
@@ -150,6 +168,8 @@
           </el-table-column>
           <el-table-column
             prop="type"
+            :filters="getFilters('type')"
+            :filter-method="(value, row, column) => { this.currentColumn = column; return value === row.type }"
             label="类型"
             width="100">
           </el-table-column>
@@ -160,18 +180,23 @@
               width="100">
           </el-table-column>
           <el-table-column
-              prop="area"
-              label="地区"
-              align="center"
-              width="100">
+            prop="area"
+            :filters="getFilters('area')"
+            :filter-method="(value, row, column) => { this.currentColumn = column; return value === row.area }"
+            label="地区"
+            align="center"
+            width="100">
           </el-table-column>
           <el-table-column
-              prop="lang"
-              label="语言"
-              align="center"
-              width="100">
+            :filters="getFilters('lang')"
+            :filter-method="(value, row, column) => { this.currentColumn = column; return value === row.lang }"
+            prop="lang"
+            label="语言"
+            align="center"
+            width="100">
           </el-table-column>
           <el-table-column
+            sortable
             prop="note"
             label="备注">
           </el-table-column>
@@ -194,7 +219,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'
@@ -208,7 +233,6 @@ export default {
         site: false,
         class: false,
         classList: false,
-        search: false,
         find: false
       },
       sites: [],
@@ -221,9 +245,13 @@ export default {
       list: [],
       statusText: ' ',
       infiniteId: +new Date(),
+      searchID: 0,
       searchList: [],
       searchTxt: '',
       searchContents: [],
+      currentColumn: '',
+      searchGroup: '',
+      searchGroups: [],
       // 福利片关键词
       r18KeyWords: ['伦理', '论理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番']
     }
@@ -265,8 +293,13 @@ export default {
         this.SET_SHARE(val)
       }
     },
-    setting () {
-      return this.$store.getters.getSetting
+    setting: {
+      get () {
+        return this.$store.getters.getSetting
+      },
+      set (val) {
+        this.SET_SETTING(val)
+      }
     },
     filterSettings () {
       return this.$store.getters.getSetting.excludeR18Films // 需要监听的数据
@@ -283,27 +316,57 @@ export default {
       this.changeView()
     },
     searchTxt () {
-      this.searchChangeEvent()
+      if (this.searchTxt === '清除历史记录...') {
+        this.clearSearchHistory()
+        this.searchTxt = ''
+        this.searchChangeEvent()
+      }
     },
     filterSettings () {
       this.siteClick(this.site.name)
     }
   },
   methods: {
-    ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
+    ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE', 'SET_SETTING']),
     sortByLocaleCompare (a, b) {
       return a.localeCompare(b, 'zh')
     },
+    dateFormat (row, column) { // 先留着，"最近更新"到底要不要？
+      var date = row[column.property]
+      if (date === undefined) {
+        return ''
+      }
+      return date.split(/\s/)[0]
+    },
+    getFilters (column) {
+      const searchContents = this.searchContents.filter(res => !this.setting.excludeR18Films || (res.type !== undefined && !this.containsR18Keywords(res.type)))
+      if (column === 'siteName') return [...new Set(searchContents.map(row => row.site.name))].map(e => { return { text: e, value: e } }) // 有方法合并这两行吗？
+      return [...new Set(searchContents.map(row => row[column]))].map(e => { return { text: e, value: e } })
+    },
+    filterChange (filters) {
+      // 一次只能一列
+      if (Object.values(filters)[0].length) {
+        const otherColumns = this.$refs.searchResultTable.columns.filter(col => col.id !== this.currentColumn.id)
+        otherColumns.forEach(col => { col.filterable = false })
+      } else {
+        this.$refs.searchResultTable.columns.forEach(col => { col.filterable = true })
+      }
+    },
     siteClick (siteName) {
       this.list = []
       this.site = this.sites.find(x => x.name === siteName)
-      this.classList = []
-      this.type = {}
-      this.searchTxt = ''
-      this.getClass().then(res => {
-        this.infiniteId += 1
-        this.classClick(this.classList[0].name)
-      })
+      if (this.searchTxt.length > 0 && this.searchGroup === '站内') {
+        this.searchEvent()
+      } else {
+        this.searchTxt = ''
+        this.show.find = false
+        this.classList = []
+        this.type = {}
+        this.getClass().then(res => {
+          this.infiniteId += 1
+          this.classClick(this.classList[0].name)
+        })
+      }
     },
     classClick (className) {
       this.show.classList = false
@@ -494,35 +557,70 @@ export default {
         }
       }
     },
-    getAllSearch () {
-      search.all().then(res => {
-        this.searchList = res.reverse()
-      })
+    querySearch (queryString, cb) {
+      if (this.searchList.length === 0) return
+      var searchList = this.searchList.slice(0, -1)
+      var results = queryString ? searchList.filter(this.createFilter(queryString)) : this.searchList
+      // 调用 callback 返回建议列表的数据
+      cb(results)
     },
-    searchEvent (wd) {
-      this.searchAllSitesEvent(this.sites, wd)
+    createFilter (queryString) {
+      return (item) => {
+        return (item.keywords.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+      }
     },
-    searchAllSitesEvent (sites, wd) {
-      this.searchTxt = wd
-      this.searchContents = []
-      this.pagecount = 0
-      this.show.search = false
-      this.show.find = true
-      this.statusText = ' '
+    addSearchRecord () {
+      const wd = this.searchTxt
       if (wd) {
         search.find({ keywords: wd }).then(res => {
           if (!res) {
             search.add({ keywords: wd })
           }
-          this.getAllSearch()
+          this.getSearchHistory()
         })
-        sites.forEach(site => {
+      }
+    },
+    clearSearchHistory () {
+      search.clear().then(res => {
+        this.getSearchHistory()
+      })
+    },
+    getSearchHistory () {
+      search.all().then(res => {
+        this.searchList = res.reverse()
+        this.searchList.push({ id: this.searchList.length + 1, keywords: '清除历史记录...' })
+      })
+    },
+    searchEvent () {
+      const wd = this.searchTxt
+      if (this.setting.searchGroup !== this.searchGroup) {
+        this.setting.searchGroup = this.searchGroup
+        setting.update(this.setting)
+      }
+      if (!wd) return
+      this.searchID += 1
+      var searchSites = []
+      if (this.searchGroup === '站内') searchSites.push(this.site)
+      if (this.searchGroup === '全部') searchSites = this.sites
+      if (!searchSites.length) {
+        searchSites = this.sites.filter(site => site.group === this.searchGroup)
+      }
+      this.searchContents = []
+      this.pagecount = 0
+      this.show.find = true
+      this.show.class = false
+      this.statusText = ' '
+      if (wd) {
+        searchSites.forEach(site => {
+          const id = this.searchID
           zy.search(site.key, wd).then(res => {
+            if (id !== this.searchID) return
             const type = Object.prototype.toString.call(res)
             if (type === '[object Array]') {
               res.forEach(element => {
                 zy.detail(site.key, element.id).then(detailRes => {
                   detailRes.site = site
+                  if (id !== this.searchID) return
                   this.searchContents.push(detailRes)
                   this.searchContents.sort(function (a, b) {
                     return a.site.id - b.site.id
@@ -534,6 +632,7 @@ export default {
             if (type === '[object Object]') {
               zy.detail(site.key, res.id).then(detailRes => {
                 detailRes.site = site
+                if (id !== this.searchID) return
                 this.searchContents.push(detailRes)
                 this.searchContents.sort(function (a, b) {
                   return a.site.id - b.site.id
@@ -543,24 +642,11 @@ export default {
             }
           })
         })
-      } else {
-        this.show.find = false
-        this.getClass().then(res => {
-          if (res) {
-            this.infiniteId += 1
-          }
-        })
       }
     },
-    searchSingleSiteEvent (site, wd) {
-      var sites = []
-      sites.push(this.site)
-      this.searchAllSitesEvent(sites, wd)
-    },
-    clearSearch () {
-      search.clear().then(res => {
-        this.getAllSearch()
-      })
+    searchAndRecord () {
+      this.addSearchRecord()
+      this.searchEvent()
     },
     searchChangeEvent () {
       if (this.searchTxt.length >= 1) {
@@ -571,6 +657,12 @@ export default {
         this.show.find = false
         if (this.setting.view === 'picture' && this.$refs.filmWaterfall) {
           this.$refs.filmWaterfall.refresh()
+        } else {
+          this.getClass().then(res => {
+            if (res) {
+              this.infiniteId += 1
+            }
+          })
         }
       }
     },
@@ -587,12 +679,18 @@ export default {
             this.selectedSiteName = this.sites[0].name
           }
         }
+        this.searchGroups = [...new Set(this.sites.map(site => site.group))]
+        if (this.searchGroups.length === 1) this.searchGroups = []
+        this.searchGroups.unshift('站内')
+        this.searchGroups.push('全部')
+        this.searchGroup = this.setting.searchGroup
+        if (this.searchGroup === undefined) setting.find().then(res => { this.searchGroup = res.searchGroup })
       })
     }
   },
   created () {
     this.getAllSites()
-    this.getAllSearch()
+    this.getSearchHistory()
   },
   mounted () {
     window.addEventListener('resize', () => {
diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index 77fbb9c..4f6372a 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -225,10 +225,6 @@ export default {
       this.updateDatabase()
     },
     playEvent (e) {
-      if (this.checkAllChannelsLoading) {
-        this.$message.info('正在检测, 请勿操作.')
-        return false
-      }
       this.video = { iptv: { name: e.name, url: e.url } }
       this.view = 'Play'
     },
diff --git a/src/components/Play.vue b/src/components/Play.vue
index c5a631f..f7b236f 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -107,7 +107,7 @@
           <span class="list-top-title" v-if="right.type === 'list'">播放列表</span>
           <span class="list-top-title" v-if="right.type === 'history'">历史记录</span>
           <span class="list-top-title" v-if="right.type === 'shortcut'">快捷键指南</span>
-          <span class="list-top-title" v-if="right.type === 'other'">其他源的视频</span>
+          <span class="list-top-title" v-if="right.type === 'other'">同组其他源的视频</span>
           <span class="list-top-close zy-svg" @click="closeListEvent">
             <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="closeIconTitle">
               <title id="closeIconTitle">关闭</title>
@@ -764,9 +764,10 @@ export default {
     },
     async getOtherSites () {
       this.right.other = []
+      const currentSite = await sites.find({ key: this.video.key })
       sites.all().then(sitesRes => {
         // 排除已关闭的源和当前源
-        for (const siteItem of sitesRes.filter(x => x.isActive && x.key !== this.video.key)) {
+        for (const siteItem of sitesRes.filter(x => x.isActive && x.group === currentSite.group && x.key !== this.video.key)) {
           zy.search(siteItem.key, this.name).then(searchRes => {
             const type = Object.prototype.toString.call(searchRes)
             if (type === '[object Array]') {
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..341fa5b 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,
diff --git a/src/lib/element/index.js b/src/lib/element/index.js
index 8bf727b..a4dce1e 100644
--- a/src/lib/element/index.js
+++ b/src/lib/element/index.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { Message, Button, Table, TableColumn, Tag, Input, Dialog, Form, FormItem, Switch, Select, Option, Checkbox } from 'element-ui'
+import { Message, Button, Table, TableColumn, Tag, Input, Dialog, Form, FormItem, Switch, Select, Option, Checkbox, Autocomplete } from 'element-ui'
 import Plugin from 'v-fit-columns'
 Vue.use(Button)
 Vue.use(Table)
@@ -14,4 +14,5 @@ Vue.use(Plugin)
 Vue.use(Select)
 Vue.use(Option)
 Vue.use(Checkbox)
+Vue.use(Autocomplete)
 Vue.prototype.$message = Message