From 30c7034d63afaeaaff275bb0896a306c141fff4f Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Sun, 19 Apr 2020 12:04:17 +0800
Subject: [PATCH] =?UTF-8?q?*=E4=BF=AE=E6=94=B9iconFile=20src=20=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=20*=E4=BF=AE=E6=94=B9audioPreview=20*=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9showFile=20*=E4=BF=AE=E6=94=B9SimTextPreview?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Icon/IconFile.vue          | 12 ++++++++----
 src/components/ShowFile/ShowFile.vue      | 10 +++++-----
 src/components/preview/AudioPreview.vue   |  7 +++----
 src/components/preview/SimTextPreview.vue |  4 ++--
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/components/Icon/IconFile.vue b/src/components/Icon/IconFile.vue
index a434855..66c637e 100644
--- a/src/components/Icon/IconFile.vue
+++ b/src/components/Icon/IconFile.vue
@@ -17,13 +17,13 @@
     <svg-icon v-if="item.isFolder" icon-class="folder"/>
     <svg-icon v-else-if="item.contentType.indexOf('video') > -1" icon-class="video"/>
     <div v-else-if="item.contentType.indexOf('audio') > -1">
-      <div v-if="item.music.coverBase64 !== null">
-        <el-image v-if="grid" :style="{'width':details?'110px':'80px','height':details?'110px':'80px'}" fit="contain" :src="'data:image/png;base64,'+item.music.coverBase64">
+      <div v-if="item.music.name !== null">
+        <el-image v-if="grid" :style="{'width':details?'110px':'80px','height':details?'110px':'80px'}" fit="contain" :src="item.fileId ? (audioCoverUrl+item.fileId) : (audioCoverUrl+item.id)">
         <div slot="error" class="image-slot">
           <svg-icon icon-class="loading-image-error"/>
         </div>
       </el-image>
-      <el-avatar v-if="!grid" shape="square" :src="'data:image/png;base64,'+item.music.coverBase64"></el-avatar>
+      <el-avatar v-if="!grid" shape="square" :src="item.fileId ? (audioCoverUrl+item.fileId) : (audioCoverUrl+item.id)"></el-avatar>
       </div>
       <svg-icon v-else icon-class="audio"/>
     </div>
@@ -35,7 +35,7 @@
         </div>
       </el-image>
 
-      <el-avatar v-if="!grid" shape="square" :src="item.fileId ? (imageUrl+item.fileId) : ('data:image/png;base64,'+item.content)"></el-avatar>
+      <el-avatar v-if="!grid" shape="square" :src="item.fileId ? (imageUrl+item.fileId) : (imageUrl+item.id)"></el-avatar>
     </div>
     <!--<svg-icon v-else-if="item.contentType.indexOf('application/pdf') > -1" icon-class="file-pdf"/>-->
     <!--<svg-icon v-else-if="item.contentType.indexOf('word') > -1" icon-class="file-word"/>-->
@@ -53,6 +53,10 @@
         type: String,
         default: ''
       },
+      audioCoverUrl: {
+        type: String,
+        default: ''
+      },
       grid: {
         type: Boolean,
         default: false
diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 9ce9c7e..3bbce6f 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -194,7 +194,7 @@
             width="50"
           >
             <template slot-scope="scope">
-              <icon-file :item="scope.row" :image-url="imageUrl"></icon-file>
+              <icon-file :item="scope.row" :image-url="imageUrl" :audio-cover-url="audioCoverUrl"></icon-file>
             </template>
           </pl-table-column>
           <!--名称-->
@@ -327,7 +327,7 @@
                    @contextmenu.prevent="rowContextmenu(item)"
               >
                 <van-checkbox v-if="gridHoverItemIndex === index || selectRowData.includes(item)" class="grid-item-checkbox" :name="item" @click.stop="clickGridItemCheckBox(item,index)"/>
-                <div class="grid-item-icon"><icon-file :item="item" :image-url="imageUrl" :grid="true"></icon-file></div>
+                <div class="grid-item-icon"><icon-file :item="item" :image-url="imageUrl" :audio-cover-url="audioCoverUrl" :grid="true"></icon-file></div>
                 <!--<el-tooltip effect="light" :content="item.name" placement="top">-->
                   <span :title="item.name" class="grid-item-text">{{item.name}}</span>
                 <!--</el-tooltip>-->
@@ -356,7 +356,7 @@
       :title="rowContextData.name"
       :visible.sync="drawer">
       <div class="drawer-icon">
-        <icon-file class="drawer-icon-font" :grid="true" :details="true" :item="rowContextData" :image-url="imageUrl"></icon-file>
+        <icon-file class="drawer-icon-font" :grid="true" :details="true" :item="rowContextData" :image-url="imageUrl" :audio-cover-url="audioCoverUrl"></icon-file>
       </div>
       <el-form class="details-form">
         <el-form-item label="名称:">
@@ -516,7 +516,7 @@
     data() {
       return {
         imageUrl: process.env.VUE_APP_BASE_API + '/view/thumbnail?jmal-token=' + this.$store.state.user.token + '&id=',
-        // imageUrl: 'http://localhost:8088/view?username=' + this.$store.state.user.name + '&id=',
+        audioCoverUrl: process.env.VUE_APP_BASE_API + '/view/cover?jmal-token=' + this.$store.state.user.token + '&id=',
         fileMenuActive: '',
         path: this.$route.query.path,
         showNewFolder: false,
@@ -2230,7 +2230,7 @@
             // 音频文件
             // this.audioPreviewVisible = true
             // this.audioPreviewRow = row
-            Bus.$emit('onAddAudio',row)
+            Bus.$emit('onAddAudio',row, this.audioCoverUrl)
             return
           }
           if(row.contentType.includes('text')){
diff --git a/src/components/preview/AudioPreview.vue b/src/components/preview/AudioPreview.vue
index 1021b8f..944b7f3 100644
--- a/src/components/preview/AudioPreview.vue
+++ b/src/components/preview/AudioPreview.vue
@@ -24,7 +24,6 @@
 <script>
 import '@/utils/directives.js'
 import Bus from '@/assets/js/bus'
-import colorThief from '@/assets/js/color-thief.min.js'
 export default {
     name: 'AudioPreview',
     components: {
@@ -33,7 +32,7 @@ export default {
     },
     computed: {
     },
-    data($this) {
+    data() {
       return {
         transformX: (document.body.clientWidth-500)/2,
         transformY: 0,
@@ -47,7 +46,7 @@ export default {
       this.onPicClick = this.onPicClick.bind(this);
       let pic = document.querySelector('.aplayer-pic')
       pic.addEventListener('click', this.onPicClick);
-      Bus.$on('onAddAudio',newFile => {
+      Bus.$on('onAddAudio',(newFile,audioCoverUrl) => {
         this.show = true
         let url = process.env.VUE_APP_BASE_FILE_API + 'preview/' + newFile.name + '?jmal-token=' + this.$store.state.user.token + '&fileIds=' + newFile.id
         let music = newFile.music
@@ -58,7 +57,7 @@ export default {
           artist: music.songName ? music.singer : fileName,
           url: url,
           type: newFile.contentType,
-          cover: music.songName ? 'data:image/png;base64,'+music.coverBase64 :'',
+          cover: music.songName ? audioCoverUrl+newFile.id :'',
         }
         let musicIndex = this.audio.findIndex(item => item.id===newFile.id)
         if(musicIndex < 0){
diff --git a/src/components/preview/SimTextPreview.vue b/src/components/preview/SimTextPreview.vue
index 2b7c6f6..afa0ac4 100644
--- a/src/components/preview/SimTextPreview.vue
+++ b/src/components/preview/SimTextPreview.vue
@@ -73,7 +73,7 @@
       return{
         textPreviewVisible: false,
         transformX: (document.body.clientWidth-900)/2,
-        transformY: 150,
+        transformY: (document.body.clientHeight-640)/2,
         content: '',
         newContent: '',
         codeMode: 'javascript',
@@ -171,7 +171,7 @@
               type: 'success',
               duration : 1000
             });
-          })  
+          })
       },
       changePreviewMode() {
         this.previewMode = !this.previewMode