v2.3.8

添加搜索所有资源功能

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "2.3.5",
+  "version": "2.3.8",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

src/assets/scss/style.scss

@@ -78,7 +78,20 @@
     }
   }
 }
-
+.zy-checkbox{
+  position: relative;
+  display: flex;
+  width: 200px;
+  height: 30px;
+  vertical-align: middle;
+  align-items: center;
+  .search-all-check-input{
+    cursor: pointer;
+  }
+}
+.zy-highlighted{
+  color: var(--highlight-color);
+}
 // table
 .zy-table{
   display: flex;
@@ -152,7 +165,6 @@
     }
   }
 }
-
 // scroll
 .zy-scroll{
   &::-webkit-scrollbar{
@@ -168,7 +180,6 @@
     position: absolute;
   }
 }
-
 // loading
 .zy-loading{
   width: 100%;

src/assets/scss/theme.scss

@@ -1,4 +1,6 @@
 :root{
+  // general
+  --highlight-color: #38dd77;
   // light
   --l-c-0: #823aa0;
   --l-c-1: #823aa011;

src/assets/scss/theme/dark.scss

@@ -32,6 +32,10 @@
       }
     }
   }
+  .zy-checkbox{
+    color: var(--d-fc-1);
+    transition: all 0.3s cubic-bezier(.25,.8,.25,1);
+  }
   .zy-table{
     color: var(--d-fc-2);
     .tHeader{

src/assets/scss/theme/green.scss

@@ -32,6 +32,9 @@
       }
     }
   }
+  .zy-checkbox{
+    color: var(--g-fc-1);
+  }
   .zy-table{
     color: var(--g-fc-2);
     .tHeader{

src/assets/scss/theme/light.scss

@@ -32,6 +32,9 @@
       }
     }
   }
+  .zy-checkbox{
+    color: var(--l-fc-1);
+  }
   .zy-table{
     color: var(--l-fc-2);
     .tHeader{

src/assets/scss/theme/pink.scss

@@ -32,6 +32,9 @@
       }
     }
   }
+  .zy-checkbox{
+    color: var(--p-fc-1);
+  }
   .zy-table{
     color: var(--p-fc-2);
     .tHeader{

src/components/Detail.vue

@@ -121,9 +121,9 @@ export default {
     playEvent (n) {
       history.find({ site: this.detail.key, ids: this.detail.info.id }).then(res => {
         if (res) {
-          this.video = { key: res.site, info: { id: res.ids, name: res.name, index: n } }
+          this.video = { key: res.site, info: { id: res.ids, name: res.name, index: n, site: this.detail.site } }
         } else {
-          this.video = { key: this.detail.key, info: { id: this.detail.info.id, name: this.detail.info.name, index: n } }
+          this.video = { key: this.detail.key, info: { id: this.detail.info.id, name: this.detail.info.name, index: n, site: this.detail.site } }
         }
       })
 
@@ -131,12 +131,13 @@ export default {
       this.detail.show = false
     },
     starEvent () {
-      star.find({ site: this.detail.key, ids: this.info.id }).then(res => {
+      star.find({ key: this.detail.site.key, ids: this.info.id }).then(res => {
         if (res) {
           this.$message.info('已存在')
         } else {
           const docs = {
-            site: this.detail.key,
+            key: this.detail.site.key,
+            site: this.detail.site,
             ids: this.info.id,
             name: this.info.name,
             type: this.info.type,

src/components/Film.vue

@@ -18,14 +18,17 @@
         </div>
       </div>
       <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"></div>
+        <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="searchClickEvent(i)">{{i.keywords}}</li>
+            <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>
+      <div class="zy-checkbox">
+        <input type="checkbox" v-model="searchAllSites" class="search-all-check-input" > 搜索所有资源
+      </div>
     </div>
     <div class="body zy-scroll" infinite-wrapper>
       <div class="body-box" v-show="!show.find">
@@ -37,16 +40,16 @@
             <template slot="item" slot-scope="props">
               <div class="card">
                 <div class="img">
-                  <img style="width: 100%" :src="props.data.pic" alt="" @load="$refs.waterfall.refresh()" @click="detailEvent(props.data)">
+                  <img style="width: 100%" :src="props.data.pic" alt="" @load="$refs.waterfall.refresh()" @click="detailEvent(site, props.data)">
                   <div class="operate">
                     <div class="operate-wrap">
-                      <span class="o-play" @click="playEvent(props.data)">播放</span>
-                      <span class="o-star" @click="starEvent(props.data)">收藏</span>
-                      <span class="o-share" @click="shareEvent(props.data)">分享</span>
+                      <span class="o-play" @click="playEvent(site, props.data)">播放</span>
+                      <span class="o-star" @click="starEvent(site, props.data)">收藏</span>
+                      <span class="o-share" @click="shareEvent(site, props.data)">分享</span>
                     </div>
                   </div>
                 </div>
-                <div class="name" @click="detailEvent(props.data)">{{props.data.name}}</div>
+                <div class="name" @click="detailEvent(site, props.data)">{{props.data.name}}</div>
                 <div class="info">
                   <span>{{props.data.year}}</span>
                   <span>{{props.data.type}}</span>
@@ -60,16 +63,16 @@
           <div class="zy-table">
             <div class="tBody">
               <ul>
-                <li v-for="(i, j) in list" :key="j" @click="detailEvent(i)">
+                <li v-for="(i, j) in list" :key="j" @click="detailEvent(site, i)">
                   <span class="name">{{i.name}}</span>
                   <span class="type">{{i.type}}</span>
                   <span class="time">{{i.year}}</span>
                   <span class="last">{{i.last}}</span>
                   <span class="operate">
-                    <span class="btn" @click.stop="playEvent(i)">播放</span>
-                    <span class="btn" @click.stop="starEvent(i)">收藏</span>
-                    <span class="btn" @click.stop="shareEvent(i)">分享</span>
-                    <span class="btn" @click.stop="downloadEvent(i)">下载</span>
+                    <span class="btn" @click.stop="playEvent(site, i)">播放</span>
+                    <span class="btn" @click.stop="starEvent(site, i)">收藏</span>
+                    <span class="btn" @click.stop="shareEvent(site, i)">分享</span>
+                    <span class="btn" @click.stop="downloadEvent(site, i)">下载</span>
                   </span>
                 </li>
               </ul>
@@ -83,16 +86,18 @@
           <div class="zy-table">
             <div class="tBody">
               <ul>
-                <li v-for="(i, j) in searchContents" :key="j" @click="detailEvent(i)">
+                <li v-for="(i, j) in searchContents" :key="j" @click="detailEvent(i.site, i)">
                   <span class="name">{{i.name}}</span>
                   <span class="type">{{i.type}}</span>
                   <span class="time">{{i.year}}</span>
                   <span class="last">{{i.last}}</span>
+                  <span class="site">{{i.site.name}}</span>
+                  <span class="note">{{i.note}}</span>
                   <span class="operate">
-                    <span class="btn" @click.stop="playEvent(i)">播放</span>
-                    <span class="btn" @click.stop="starEvent(i)">收藏</span>
-                    <span class="btn" @click.stop="shareEvent(i)">分享</span>
-                    <span class="btn" @click.stop="downloadEvent(i)">下载</span>
+                    <span class="btn" @click.stop="playEvent(i.site, i)">播放</span>
+                    <span class="btn" @click.stop="starEvent(i.site, i)">收藏</span>
+                    <span class="btn" @click.stop="shareEvent(i.site, i)">分享</span>
+                    <span class="btn" @click.stop="downloadEvent(i.site, i)">下载</span>
                   </span>
                 </li>
               </ul>
@@ -133,7 +138,8 @@ export default {
       infiniteId: +new Date(),
       searchList: [],
       searchTxt: '',
-      searchContents: []
+      searchContents: [],
+      searchAllSites: false
     }
   },
   components: {
@@ -275,30 +281,32 @@ export default {
         }
       })
     },
-    detailEvent (e) {
+    detailEvent (site, e) {
       this.detail = {
         show: true,
-        key: this.site.key,
+        key: site.key,
+        site: site,
         info: e
       }
     },
-    playEvent (e) {
-      history.find({ site: this.site.key, ids: e.id }).then(res => {
+    playEvent (site, e) {
+      history.find({ site: site.key, ids: e.id }).then(res => {
         if (res) {
-          this.video = { key: res.site, info: { id: res.ids, name: res.name, index: res.index } }
+          this.video = { key: res.site, info: { id: res.ids, name: res.name, index: res.index, site: site } }
         } else {
-          this.video = { key: this.site.key, info: { id: e.id, name: e.name, index: 0 } }
+          this.video = { key: site.key, info: { id: e.id, name: e.name, index: 0, site: site } }
         }
       })
       this.view = 'Play'
     },
-    starEvent (e) {
-      star.find({ site: this.site.key, ids: e.id }).then(res => {
+    starEvent (site, e) {
+      star.find({ key: site.key, ids: e.id }).then(res => {
         if (res) {
           this.$message.info('已存在')
         } else {
           const docs = {
-            site: this.site.key,
+            key: site.key,
+            site: site,
             ids: e.id,
             name: e.name,
             type: e.type,
@@ -314,15 +322,15 @@ export default {
         this.$message.warning('收藏失败')
       })
     },
-    shareEvent (e) {
+    shareEvent (site, e) {
       this.share = {
         show: true,
-        key: this.site.key,
+        key: site.key,
         info: e
       }
     },
-    downloadEvent (e) {
-      zy.download(this.site.key, e.id).then(res => {
+    downloadEvent (site, e) {
+      zy.download(site.key, e.id).then(res => {
         if (res.length > 0) {
           const text = res.dl.dd._t
           if (text) {
@@ -339,7 +347,7 @@ export default {
           }
         } else {
           let m3u8List = []
-          const dd = e.dl.dd
+          const dd = res.dl.dd
           const type = Object.prototype.toString.call(dd)
           if (type === '[object Array]') {
             for (const i of dd) {
@@ -377,8 +385,8 @@ export default {
         this.searchList = res.reverse()
       })
     },
-    searchEvent () {
-      const wd = this.searchTxt
+    searchAllSitesEvent (sites, wd) {
+      this.searchTxt = wd
       this.searchContents = []
       this.pagecount = 0
       this.show.search = false
@@ -390,18 +398,24 @@ export default {
           }
           this.getAllSearch()
         })
-        zy.search(this.site.key, wd).then(res => {
-          const type = Object.prototype.toString.call(res)
-          if (type === '[object Undefined]') {
-            this.$message.info('无搜索结果')
-          }
-          if (type === '[object Array]') {
-            this.searchContents.push(...res)
-          }
-          if (type === '[object Object]') {
-            this.searchContents.push(res)
-          }
-        })
+        sites.forEach(site =>
+          zy.search(site.key, wd).then(res => {
+            const type = Object.prototype.toString.call(res)
+            if (type === '[object Undefined]') {
+              this.$message.info(site.name + ' 无搜索结果')
+            }
+            if (type === '[object Array]') {
+              res.forEach(element => {
+                element.site = site
+                this.searchContents.push(element)
+              })
+            }
+            if (type === '[object Object]') {
+              res.site = site
+              this.searchContents.push(res)
+            }
+          })
+        )
       } else {
         this.show.find = false
         this.getClass().then(res => {
@@ -411,28 +425,14 @@ export default {
         })
       }
     },
-    searchClickEvent (e) {
-      this.searchContents = []
-      this.pagecount = 0
-      this.searchTxt = e.keywords
-      this.show.search = false
-      this.show.find = true
-      search.remove(e.id).then(res => {
-        search.add({ keywords: e.keywords })
-        this.getAllSearch()
-      })
-      zy.search(this.site.key, e.keywords).then(res => {
-        const type = Object.prototype.toString.call(res)
-        if (type === '[object Undefined]') {
-          this.$message.info('无搜索结果')
-        }
-        if (type === '[object Array]') {
-          this.searchContents.push(...res)
-        }
-        if (type === '[object Object]') {
-          this.searchContents.push(res)
-        }
-      })
+    searchEvent (wd) {
+      var sites = []
+      if (this.searchAllSites) {
+        sites.push(...this.sites)
+      } else {
+        sites.push(this.site)
+      }
+      this.searchAllSitesEvent(sites, wd)
     },
     clearSearch () {
       search.clear().then(res => {

src/components/History.vue

@@ -10,7 +10,7 @@
             <li v-show="this.history.length === 0">无数据</li>
             <li v-for="(i, j) in history" :key="j" @click="historyItemEvent(i)">
               <span class="name" @click.stop="playEvent(i)">{{i.name}}</span>
-              <span class="site">{{i.site}}</span>
+              <span class="site">{{getSiteName(i.site)}}</span>
               <span class="index">第{{i.index+1}}集</span>
               <span class="operate" style="width: 220px">
                 <span class="btn" @click.stop="playEvent(i)">播放</span>
@@ -26,14 +26,15 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import { history } from '../lib/dexie'
+import { history, sites } from '../lib/dexie'
 import zy from '../lib/site/tools'
 const { clipboard } = require('electron')
 export default {
   name: 'history',
   data () {
     return {
-      history: history
+      history: history,
+      sites: []
     }
   },
   computed: {
@@ -73,6 +74,7 @@ export default {
   watch: {
     view () {
       this.getAllhistory()
+      this.getAllsites()
     }
   },
   methods: {
@@ -135,6 +137,17 @@ export default {
         this.history = res.reverse()
       })
     },
+    getAllsites () {
+      sites.all().then(res => {
+        this.sites = res
+      })
+    },
+    getSiteName (key) {
+      var site = this.sites.find(e => e.key === key)
+      if (site) {
+        return site.name
+      }
+    },
     historyItemEvent (e) {
       this.video = {
         key: e.site,

src/components/Play.vue

@@ -461,15 +461,13 @@ export default {
     },
     starEvent () {
       const info = this.video.info
-      star.find({ site: this.video.key, ids: info.id }).then(res => {
+      star.find({ key: this.video.key, ids: info.id }).then(res => {
         if (res) {
-          star.remove(res.id).then(e => {
-            this.$message.info('取消收藏')
-            this.isStar = false
-          })
+          this.$message.info('已存在')
         } else {
           const docs = {
-            site: this.video.key,
+            key: this.video.key,
+            site: this.video.site,
             ids: info.id,
             name: info.name,
             type: info.type,

src/components/Star.vue

@@ -7,11 +7,11 @@
         </div>
         <div class="tBody zy-scroll">
           <ul>
-            <li v-for="(i, j) in list" :key="j" @click="detailEvent(i)">
+            <li v-for="(i, j) in list" :key="j" @click="detailEvent(i)" :class="[i.hasUpdate ? 'zy-highlighted': '']">
               <span class="name">{{i.name}}</span>
               <span class="type">{{i.type}}</span>
               <span class="time">{{i.year}}</span>
-              <span class="from">{{i.site}}</span>
+              <span class="from">{{i.site.name}}</span>
               <span class="note">{{i.note}}</span>
               <span class="operate" style="width: 220px">
                 <span class="btn" @click.stop="playEvent(i)">播放</span>
@@ -83,21 +83,23 @@ export default {
     detailEvent (e) {
       this.detail = {
         show: true,
-        key: e.site,
+        key: e.site.key,
         info: {
           id: e.ids,
           name: e.name
         }
       }
+      this.clearHasUpdateFlag(e)
     },
     playEvent (e) {
-      history.find({ site: e.site, ids: e.ids }).then(res => {
+      history.find({ site: e.site.key, ids: e.ids }).then(res => {
         if (res) {
-          this.video = { key: res.site, info: { id: res.ids, name: res.name, index: res.index } }
+          this.video = { key: res.site, info: { id: res.ids, name: res.name, index: res.index, site: e.site } }
         } else {
-          this.video = { key: e.site, info: { id: e.ids, name: e.name, index: 0 } }
+          this.video = { key: e.site.key, info: { id: e.ids, name: e.name, index: 0, site: e.site } }
         }
       })
+      this.clearHasUpdateFlag(e)
       this.view = 'Play'
     },
     deleteEvent (e) {
@@ -113,12 +115,19 @@ export default {
     shareEvent (e) {
       this.share = {
         show: true,
-        key: e.site,
+        key: e.site.key,
         info: e
       }
     },
+    clearHasUpdateFlag (e) {
+      star.find({ id: e.id }).then(res => {
+        res.hasUpdate = false
+        star.update(e.id, res)
+        this.getStarList()
+      })
+    },
     updateEvent (e) {
-      zy.detail(e.site, e.ids).then(res => {
+      zy.detail(e.site.key, e.ids).then(res => {
         if (e.last === res.last) {
           var msg = `同步"${e.name}"成功, 未查询到更新。`
           this.$message.info(msg)
@@ -131,7 +140,8 @@ export default {
             site: e.site,
             type: res.type,
             year: res.year,
-            note: res.note
+            note: res.note,
+            hasUpdate: true
           }
           star.update(e.id, doc).then(res => {
             var msg = `同步"${e.name}"成功, 检查到更新。`
@@ -150,7 +160,7 @@ export default {
       })
     },
     downloadEvent (e) {
-      zy.download(e.site, e.ids).then(res => {
+      zy.download(e.site.key, e.ids).then(res => {
         if (res) {
           const text = res.dl.dd._t
           if (text) {