From 8e51084c6ae904c680a21c10bfa3cc95d9134261 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Thu, 31 Dec 2020 13:49:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=88=86=E8=BE=A8=E7=8E=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ShowFile/ShowFile.vue | 33 +++++++++++++++++++---------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 4618370..674dcbd 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -365,14 +365,16 @@
                                :grid="true"></icon-file>
                   </div>
                   <!--<el-tooltip effect="light" :content="item.name" placement="top">-->
-<!--                  <div v-if="queryFileType === 'image'" :class="{'grid-item-text': true, 'grid-item-text-image': queryFileType === 'image'}">{{ item.name }}>-->
-<!--                    {{ item.w + ' x ' + item.h }}-->
-<!--                  </div>-->
-                  <div
-                    :title="item.name"
-                    v-show="queryFileType === 'image' ? gridHoverItemIndex === index || selectRowData.includes(item) : true"
-                    :class="{'grid-item-text': true, 'grid-item-text-image': queryFileType === 'image'}">{{ item.name }}
-                  </div>
+                    <div v-show="item.w && item.h && queryFileType === 'image' ? gridHoverItemIndex === index || selectRowData.includes(item) : false"
+                    :class="{'grid-item-text': true, 'grid-item-text-image-size': queryFileType === 'image'}">
+                      {{ item.w + ' x ' + item.h }}
+                    </div>
+                    <div
+                      :title="item.name"
+                      v-show="queryFileType === 'image' ? gridHoverItemIndex === index || selectRowData.includes(item) : true"
+                      :class="{'grid-item-text': true, 'grid-item-text-image': queryFileType === 'image'}">
+                      {{ item.name }}
+                    </div>
                   <!--</el-tooltip>-->
                 </div>
               </van-grid-item>
@@ -410,6 +412,17 @@
         <el-form-item label="类型:" class="details-name">
           <span>{{ rowContextData.isFolder ? '文件夹' : rowContextData.contentType }}</span>
         </el-form-item>
+        <div v-if="rowContextData.music">
+          <el-form-item label="🎵 歌手:">
+            <span>{{ rowContextData.music.singer }}</span>
+          </el-form-item>
+          <el-form-item label="🎵 专辑:">
+            <span>{{ '《'+rowContextData.music.album+'》' }}</span>
+          </el-form-item>
+          <el-form-item label="🎵 歌名:">
+            <span>{{ '《'+rowContextData.music.songName+'》' }}</span>
+          </el-form-item>
+        </div>
         <el-form-item v-show="rowContextData.w && rowContextData.h" label="分辨率:" class="details-resolution">
           <span>{{ rowContextData.w + ' x ' + rowContextData.h }}</span>
         </el-form-item>
@@ -571,7 +584,7 @@ export default {
     },
     lessClientHeight: {
       type: Number,
-      default: 136,
+      default: 150,
     },
     showUploadButton: {
       type: Boolean,
@@ -766,7 +779,7 @@ export default {
       positionX: 0,
       positionY: 0,
       grid: this.defaultGrid,
-      vmode: 'list',
+      vmode:  this.defaultGrid ? 'grid' : 'list',
       gridColumnNum: -1,
       gridHoverItemIndex: -1,
       gridHoverIntermediate: -1,