2.4.0

package.json

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

src/assets/scss/style.scss

@@ -131,34 +131,36 @@
         cursor: pointer;
         span{
           display: flex;
-          width: 180px;
           font-size: 13px;
           height: 50px;
           line-height: 50px;
+          overflow: hidden;
+          margin-right: 5px;
           &.name{
             flex: 1;
-            padding-left: 15px;
-            overflow: hidden;
-            text-overflow: ellipsis;
+            min-width: 100px;
             white-space: nowrap;
-          }
-          &.note{
-            width: 180px;
+            margin-left: 10px;
           }
           &.type{
-            width: 120px;
-          }
-          &.last{
-            width: 160px;
+            width: 10%;
           }
           &.time{
-            width: 60px;
+            width: 10%;
           }
-          &.from{
-            width: 120px;
+          &.last{
+            width: 10%;
+          }
+          &.site{
+            width: 10%;
+          }
+          &.note{
+            width: 10%;
           }
           &.operate{
-            width: 170px;
+            .btn{
+              width: 40px;
+            }
           }
         }
       }

src/assets/scss/theme/dark.scss

@@ -290,7 +290,7 @@
         }
       }
     }
-    .view, .shortcut, .site{
+    .view, .search, .shortcut, .site{
       .title{
         color: var(--d-fc-1);
       }

src/assets/scss/theme/green.scss

@@ -289,7 +289,7 @@
         }
       }
     }
-    .view, .shortcut, .site{
+    .view, .search, .shortcut, .site{
       .title{
         color: var(--g-fc-1);
       }

src/assets/scss/theme/light.scss

@@ -289,7 +289,7 @@
         }
       }
     }
-    .view, .shortcut, .site{
+    .view, .search, .shortcut, .site{
       .title{
         color: var(--l-fc-1);
       }

src/assets/scss/theme/pink.scss

@@ -289,7 +289,7 @@
         }
       }
     }
-    .view, .shortcut, .site{
+    .view, .search, .shortcut, .site{
       .title{
         color: var(--p-fc-1);
       }

src/components/Detail.vue

@@ -131,7 +131,7 @@ export default {
       this.detail.show = false
     },
     starEvent () {
-      star.find({ key: this.detail.site.key, ids: this.info.id }).then(res => {
+      star.find({ key: this.detail.key, ids: this.info.id }).then(res => {
         if (res) {
           this.$message.info('已存在')
         } else {

src/components/Film.vue

@@ -9,7 +9,7 @@
           </ul>
         </div>
       </div>
-      <div class="zy-select" @mouseleave="show.classList = false" v-if="show.class">
+      <div class="zy-select" @mouseleave="show.classList = false" v-show="show.class">
         <div class="vs-placeholder" @click="show.classList = true">{{type.name}}</div>
         <div class="vs-options" v-show="show.classList">
           <ul class="zy-scroll" style="max-height: 600px;">
@@ -26,9 +26,6 @@
           </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">
@@ -84,12 +81,11 @@
       <div class="body-box" v-show="show.find">
         <div class="show-table">
           <div class="zy-table">
-            <div class="tBody">
+            <div class="tBody zy-scroll">
               <ul>
                 <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>
@@ -138,8 +134,7 @@ export default {
       infiniteId: +new Date(),
       searchList: [],
       searchTxt: '',
-      searchContents: [],
-      searchAllSites: false
+      searchContents: []
     }
   },
   components: {
@@ -205,7 +200,7 @@ export default {
       this.show.site = false
       this.show.class = false
       if (this.searchTxt.length > 0) {
-        this.searchEvent()
+        this.searchSingleSiteEvent(this.site, this.searchTxt)
       } else {
         this.classList = []
         this.type = {}
@@ -426,12 +421,15 @@ export default {
       }
     },
     searchEvent (wd) {
-      var sites = []
-      if (this.searchAllSites) {
-        sites.push(...this.sites)
+      if (this.setting.searchAllSites) {
+        this.searchAllSitesEvent(this.sites, wd)
       } else {
-        sites.push(this.site)
+        this.searchSingleSiteEvent(this.site, wd)
       }
+    },
+    searchSingleSiteEvent (site, wd) {
+      var sites = []
+      sites.push(this.site)
       this.searchAllSitesEvent(sites, wd)
     },
     clearSearch () {

src/components/History.vue

@@ -11,8 +11,8 @@
             <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">{{getSiteName(i.site)}}</span>
-              <span class="index">第{{i.index+1}}集</span>
-              <span class="operate" style="width: 220px">
+              <span class="note">第{{i.index+1}}集</span>
+              <span class="operate">
                 <span class="btn" @click.stop="playEvent(i)">播放</span>
                 <span class="btn" @click.stop="downloadEvent(i)">下载</span>
                 <span class="btn" @click.stop="removeHistoryItem(i)">删除</span>

src/components/Setting.vue

@@ -44,6 +44,12 @@
           </div>
         </div>
       </div>
+      <div class='search'>
+         <div class="title">搜索</div>
+         <div class="zy-checkbox">
+           <input type="checkbox" v-model="setting.searchAllSites" @change="updateSearchOption($event)"> 搜索所有资源
+         </div>
+      </div>
       <div class="site">
         <div class="title">源管理</div>
         <div class="site-box">
@@ -135,6 +141,7 @@ export default {
         site: '',
         theme: '',
         shortcut: true,
+        searchAllSites: true,
         view: 'picture'
       }
     }
@@ -161,7 +168,8 @@ export default {
           site: res.site,
           theme: res.theme,
           shortcut: res.shortcut,
-          view: res.view
+          view: res.view,
+          searchAllSites: res.searchAllSites
         }
         this.setting = this.d
       })
@@ -192,6 +200,12 @@ export default {
         this.show.site = false
       })
     },
+    updateSearchOption (e) {
+      this.d.searchAllSites = this.setting.searchAllSites
+      setting.update(this.d).then(res => {
+        this.setting = this.d
+      })
+    },
     expSites () {
       const arr = [...this.sitesList]
       const str = JSON.stringify(arr)
@@ -313,6 +327,11 @@ export default {
       }
     }
   }
+  .search{
+    width: 100%;
+    padding: 20px;
+    margin-top: 20px;
+  }
   .site{
     width: 100%;
     padding: 20px;
@@ -341,6 +360,7 @@ export default {
     margin-top: 20px;
     .theme-box{
       display: flex;
+      flex-wrap: wrap;
       justify-content: flex-start;
       margin-top: 10px;
       .theme-item{

src/components/Star.vue

@@ -11,9 +11,9 @@
               <span class="name">{{i.name}}</span>
               <span class="type">{{i.type}}</span>
               <span class="time">{{i.year}}</span>
-              <span class="from">{{i.site.name}}</span>
+              <span class="site">{{i.site.name}}</span>
               <span class="note">{{i.note}}</span>
-              <span class="operate" style="width: 220px">
+              <span class="operate">
                 <span class="btn" @click.stop="playEvent(i)">播放</span>
                 <span class="btn" @click.stop="deleteEvent(i)">删除</span>
                 <span class="btn" @click.stop="shareEvent(i)">分享</span>