From 3a977a5a717c07fe9d7b6130b668feabc7c0d9a2 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Fri, 24 May 2024 10:12:12 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96grid=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E4=B8=8B=E7=9A=84=E6=96=87=E4=BB=B6=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Icon/IconFile.vue     | 15 +++++----------
 src/components/ShowFile/ShowFile.vue |  2 +-
 src/icons/svg/file-c.svg             |  1 +
 src/icons/svg/file-drawio.svg        | 10 +---------
 src/utils/file-type.js               |  2 ++
 5 files changed, 10 insertions(+), 20 deletions(-)
 create mode 100644 src/icons/svg/file-c.svg

diff --git a/src/components/Icon/IconFile.vue b/src/components/Icon/IconFile.vue
index 12a8035..0cb6174 100644
--- a/src/components/Icon/IconFile.vue
+++ b/src/components/Icon/IconFile.vue
@@ -1,5 +1,5 @@
 <template>
-  <span :style="{position: grid ? 'relative': 'unset'}">
+  <div :style="{position: grid ? 'relative': 'unset'}">
     <div v-if="item.isFavorite && !public">
         <div v-if="pc">
           <svg-icon v-if="!grid" class="pc list icon-favorite" icon-class="Favoritestarrate"/>
@@ -32,7 +32,7 @@
     </div>
     <div v-if="item.tags && item.tags.length > 0 && !public">
         <div v-if="pc">
-          <svg-icon v-if="grid" class="pc grid icon-tag" icon-class="tag2" :style="{left: 14 * index + 10 + 'px', color: tag.color}" v-for="(tag,index) in item.tags.slice(0, 3)" :key="tag.tagId"/>
+          <svg-icon v-if="grid" class="pc grid icon-tag" icon-class="tag2" :style="{left: 14 * index + 'px', color: tag.color}" v-for="(tag,index) in item.tags.slice(0, 3)" :key="tag.tagId"/>
           <!--     列表模式下只能显示一个标签     -->
           <svg-icon v-else class="pc list icon-tag" icon-class="tag2" :style="{color: tag.color}" v-for="tag in item.tags.slice(0, 1)" :key="tag.tagId"/>
         </div>
@@ -57,7 +57,7 @@
         <div v-if="grid && pc" class="grid-play-icon">
           <svg-icon icon-class="play1"/>
         </div>
-        <el-image lazy v-if="grid" :style="{'height':details?'110px':(gridWidth-35) + 'px'}" fit="contain"
+        <el-image lazy v-if="grid" :style="{'height':details?'110px':(gridWidth-50) + 'px'}" fit="contain"
                   :src="item.fileId ? (audioCoverUrl+item.fileId) : (audioCoverUrl+item.id)">
           <div slot="error" class="image-slot-error">
             <svg-icon icon-class="video"/>
@@ -75,7 +75,7 @@
     <div v-else-if="item.contentType && item.contentType.indexOf('audio') > -1">
       <div v-if="item.music !== undefined">
         <div v-if="item.music.name !== null">
-          <el-image v-if="grid" :style="{'height':details?'110px':(gridWidth-35) + 'px'}" fit="contain"
+          <el-image v-if="grid" :style="{'height':details?'110px':(gridWidth-50) + 'px'}" fit="contain"
                     :src="item.fileId ? (audioCoverUrl+item.fileId) : (audioCoverUrl+item.id)">
           <div slot="error" class="image-slot-error">
             <svg-icon icon-class="audio"/>
@@ -102,12 +102,8 @@
       <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"/>-->
-    <!--<svg-icon v-else-if="item.contentType.indexOf('zip') > -1" icon-class="zip"/>-->
-    <!--<svg-icon v-else-if="item.contentType.indexOf('excel') > -1" icon-class="file-excel"/>-->
     <svg-icon v-else :icon-class="findIconClass"/>
-  </span>
+  </div>
 </template>
 <script>
 import {iconClass} from '@/utils/file-type'
@@ -192,7 +188,6 @@ export default {
 }
 
 >>> .image-slot-error {
-  margin-top: 10px;
 }
 
 .icon-favorite {
diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 2760cf0..0d5e9ac 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -1207,7 +1207,7 @@ export default {
         if (item.isFolder || !this.grid) {
           return filename;
         }
-        const singleLine = item.contentType && item.contentType.indexOf('audio') > -1 || item.contentType.indexOf('video') > -1 || item.contentType.startsWith('image')
+        const singleLine = item.contentType && item.contentType.startsWith('image')
         const gridFilenameLength = singleLine ? 14 : 32
         // 分离文件名和后缀
         let parts = filename.split('.');
diff --git a/src/icons/svg/file-c.svg b/src/icons/svg/file-c.svg
new file mode 100644
index 0000000..d5ad767
--- /dev/null
+++ b/src/icons/svg/file-c.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1716514768273" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="40143" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M923.2 245.6L536.8 23.2c-6.4-4-15.2-5.6-24.8-5.6-9.6 0-18.4 2.4-24.8 5.6l-384 223.2c-13.6 8-23.2 28-23.2 43.2v445.6c0 8.8 1.6 19.2 8 28l854.4-496c-4.8-9.6-12-16.8-19.2-21.6z" fill="#659AD3" p-id="40144"></path><path d="M85.6 762.4c4 6.4 9.6 12 15.2 15.2l385.6 223.2c6.4 4 15.2 5.6 24.8 5.6 9.6 0 18.4-2.4 24.8-5.6l384-223.2c13.6-8 23.2-28 23.2-43.2V288.8c0-7.2-0.8-15.2-4.8-22.4l-852.8 496z" fill="#03599C" p-id="40145"></path><path d="M682.4 608.8C648.8 668 584.8 708 512 708c-108 0-196-88-196-196s88-196 196-196c72.8 0 136.8 40 170.4 100l104-60c-54.4-95.2-156.8-160-274.4-160-174.4 0-316 141.6-316 316s141.6 316 316 316c116.8 0 219.2-64 273.6-158.4l-103.2-60.8z" fill="#FFFFFF" p-id="40146"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/file-drawio.svg b/src/icons/svg/file-drawio.svg
index d35c24b..4cf7b8d 100644
--- a/src/icons/svg/file-drawio.svg
+++ b/src/icons/svg/file-drawio.svg
@@ -1,9 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated by Pixelmator Pro 2.4.5 -->
-<svg width="225" height="226" viewBox="0 0 225 226" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <path id="path12-" fill="#f08705" stroke="none" d="M 225 216.350235 C 225 221.804459 220.54454 226 215.392929 226 L 9.607054 226 C 4.17698 226 -0 221.524734 -0 216.350235 L -0 9.64975 C -0 4.195541 4.455445 0 9.607054 0 L 215.392929 0 C 220.823013 0 225 4.47525 225 9.64975 Z"/>
-    <g id="g16-">
-        <path id="path14" fill="#df6c0c" stroke="none" d="M 223.827332 216.317963 C 223.827332 221.709686 219.414902 225.857147 214.313034 225.857147 L 77.252174 225.857147 L 32.852173 180.64975 L 60.429813 135.442383 L 142.335403 33.414749 L 223.551544 117.331795 Z"/>
-    </g>
-    <path id="path18-" fill="#ffffff" stroke="none" d="M 183.977631 131.285706 L 160.536636 131.285706 L 135.716766 88.981567 C 141.2323 87.87558 145.368942 82.898605 145.368942 77.092163 L 145.368942 45.156693 C 145.368942 38.382477 139.991302 32.990784 133.234787 32.990784 L 91.868324 32.990784 C 85.111801 32.990784 79.734161 38.382477 79.734161 45.156693 L 79.734161 77.092163 C 79.734161 83.036865 83.870804 87.87558 89.248444 88.981567 L 64.428574 131.423965 L 40.987579 131.423965 C 34.231056 131.423965 28.853416 136.815674 28.853416 143.589859 L 28.853416 175.525345 C 28.853416 182.29953 34.231056 187.691254 40.987579 187.691254 L 82.354034 187.691254 C 89.110558 187.691254 94.488205 182.29953 94.488205 175.525345 L 94.488205 143.589859 C 94.488205 136.815674 89.110558 131.423965 82.354034 131.423965 L 78.355278 131.423965 L 102.899384 89.396317 L 122.065842 89.396317 L 146.747818 131.423965 L 142.611176 131.423965 C 135.85466 131.423965 130.47702 136.815674 130.47702 143.589859 L 130.47702 175.525345 C 130.47702 182.29953 135.85466 187.691254 142.611176 187.691254 L 183.977631 187.691254 C 190.734177 187.691254 196.111801 182.29953 196.111801 175.525345 L 196.111801 143.589859 C 196.111801 136.815674 190.734177 131.285706 183.977631 131.285706 Z"/>
-</svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1716513752181" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5501" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M918.853097 1009.422677H186.855099a32.343435 32.343435 0 0 1-32.172607-32.343435V46.920758c0-17.823055 14.52038-32.343435 32.172607-32.343435h558.208975l205.847746 226.460991v736.040928a31.887894 31.887894 0 0 1-32.172608 32.343435z" fill="#FFFFFF" p-id="5502"></path><path d="M751.555539 0H186.912042c-25.738086 0-46.636045 21.068787-46.636045 46.920758v930.158484c0 25.908914 20.897959 46.920758 46.692988 46.920758h731.82717c25.738086 0 46.692988-21.068787 46.692988-46.920758V235.40099L751.555539 0z m-8.085859 33.140633l180.963799 199.014625h-163.254629a17.879998 17.879998 0 0 1-17.652228-17.823055V33.140633z m175.383417 962.558861H186.855099a17.879998 17.879998 0 0 1-17.652227-17.823055V46.863816c0-9.680254 7.971974-17.766112 17.652227-17.766113h527.630763V213.535005c0 25.908914 20.897959 46.920758 46.692988 46.920759h176.066729v717.477618a18.620252 18.620252 0 0 1-18.506367 17.766112z" fill="#C0C0C0" p-id="5503"></path><path d="M88.230398 278.051048A32.457321 32.457321 0 0 0 58.449383 310.337541v467.499305c0 16.171718 12.071846 30.749041 28.926875 32.343435l488.226436 47.717956a31.774009 31.774009 0 0 0 35.361397-32.343435V259.430796a32.457321 32.457321 0 0 0-34.564199-32.343436l-488.169494 50.963688z" fill="#F5890D" p-id="5504"></path><path d="M335.019922 436.522493l-95.663683 189.73297-40.600122-20.49936 95.60674-189.73297 40.657065 20.49936zM383.307304 417.275872l81.598844 189.73297-41.852861 17.993883L341.454443 435.269755l41.852861-17.993883z" fill="#FFFFFF" p-id="5505"></path><path d="M283.942348 354.354223v74.708781h99.64967V354.354223H283.942348z" fill="#FFFFFF" p-id="5506"></path><path d="M255.471014 354.354223v74.708781q0 2.847133 0.569427 5.580381t1.651337 5.352611q1.024968 2.56242 2.619363 4.89707 1.537452 2.334649 3.530446 4.327642 1.992993 1.992993 4.327642 3.530446 2.277707 1.594395 4.89707 2.619363 2.619363 1.138853 5.352611 1.651337 2.733248 0.569427 5.523438 0.569427h99.64967q2.847133 0 5.580381-0.569427t5.352611-1.651337q2.56242-1.024968 4.897069-2.619363 2.334649-1.537452 4.327643-3.530446 1.992993-1.992993 3.530445-4.327642 1.594395-2.277707 2.619363-4.89707 1.138853-2.619363 1.651338-5.352611 0.569427-2.733248 0.569426-5.580381V354.354223q0-2.847133-0.569426-5.580381t-1.651338-5.295668q-1.024968-2.619363-2.619363-4.954012-1.537452-2.277707-3.530445-4.327643-1.992993-1.936051-4.327643-3.530445-2.277707-1.537452-4.897069-2.619363-2.619363-1.081911-5.352611-1.594395-2.733248-0.569427-5.580381-0.569427H283.942348q-2.790191 0-5.523438 0.569427t-5.352611 1.594395q-2.56242 1.081911-4.89707 2.619363-2.334649 1.594395-4.327642 3.530445-1.992993 1.992993-3.530446 4.327643-1.594395 2.334649-2.619363 4.954012-1.138853 2.56242-1.651337 5.295668-0.569427 2.790191-0.569427 5.580381z m56.942668 28.471334h42.707001v17.766113h-42.707001v-17.766113z" fill="#FFFFFF" p-id="5507"></path><path d="M161.629497 607.008842v74.765723h99.64967v-74.708781h-99.64967z" fill="#FFFFFF" p-id="5508"></path><path d="M133.158163 607.008842v74.765723q0 2.847133 0.569427 5.580381 0.512484 2.733248 1.594395 5.352611 1.081911 2.56242 2.619362 4.89707 1.537452 2.334649 3.530446 4.327642 1.992993 1.992993 4.327643 3.530446 2.277707 1.537452 4.897069 2.619363 2.619363 1.138853 5.352611 1.651337 2.790191 0.569427 5.580381 0.569427h99.64967q2.790191 0 5.523438-0.569427 2.790191-0.569427 5.352611-1.651337 2.619363-1.081911 4.954012-2.619363 2.277707-1.537452 4.2707-3.530446 1.992993-1.992993 3.530446-4.327642 1.594395-2.277707 2.676305-4.89707 1.081911-2.619363 1.594395-5.352611 0.569427-2.733248 0.569427-5.580381v-74.708781q0-2.847133-0.569427-5.580381t-1.594395-5.352611q-1.138853-2.56242-2.676305-4.897069-1.537452-2.277707-3.530446-4.327643-1.992993-1.992993-4.2707-3.530446-2.334649-1.537452-4.954012-2.619362-2.56242-1.081911-5.352611-1.651338-2.733248-0.569427-5.523438-0.569426h-99.64967q-2.847133 0-5.580381 0.569426t-5.352611 1.651338q-2.56242 1.081911-4.897069 2.619362-2.334649 1.537452-4.327643 3.530446-1.992993 1.992993-3.530446 4.327643-1.537452 2.277707-2.619362 4.897069-1.081911 2.619363-1.651338 5.352611-0.569427 2.790191-0.569426 5.580381z m56.942668 28.471334h42.707001v17.823055h-42.707001v-17.766113z" fill="#FFFFFF" p-id="5509"></path><path d="M406.710741 604.84502v74.765723h99.649669v-74.765723h-99.649669z" fill="#FFFFFF" p-id="5510"></path><path d="M378.239407 604.84502v74.765723q0 2.847133 0.569426 5.523439 0.512484 2.790191 1.594395 5.352611 1.024968 2.619363 2.619363 4.954012 1.537452 2.277707 3.530445 4.2707 1.992993 1.992993 4.327643 3.587388 2.277707 1.537452 4.89707 2.619363 2.619363 1.081911 5.35261 1.594395 2.733248 0.569427 5.580382 0.569427h99.649669q2.790191 0 5.523439-0.569427t5.352611-1.594395q2.56242-1.138853 4.897069-2.619363 2.334649-1.594395 4.327643-3.587388 1.992993-1.936051 3.530445-4.2707 1.594395-2.334649 2.619363-4.954012 1.138853-2.56242 1.651337-5.352611 0.569427-2.733248 0.569427-5.523439v-74.765723q0-2.790191-0.569427-5.523439-0.569427-2.790191-1.651337-5.35261-1.024968-2.619363-2.619363-4.89707-1.537452-2.334649-3.530445-4.327643-1.992993-1.992993-4.327643-3.530445-2.277707-1.594395-4.897069-2.676305-2.619363-1.024968-5.352611-1.594395-2.733248-0.569427-5.523439-0.569427h-99.649669q-2.847133 0-5.580382 0.569427t-5.35261 1.594395q-2.56242 1.138853-4.89707 2.676305-2.334649 1.537452-4.327643 3.530445-1.992993 1.992993-3.530445 4.327643-1.594395 2.277707-2.619363 4.89707-1.138853 2.56242-1.651337 5.35261-0.569427 2.733248-0.569427 5.523439z m56.942668 28.471334h42.707001v17.823055h-42.707001v-17.823055z" fill="#FFFFFF" p-id="5511"></path></svg>
\ No newline at end of file
diff --git a/src/utils/file-type.js b/src/utils/file-type.js
index ad1d1c2..b722322 100644
--- a/src/utils/file-type.js
+++ b/src/utils/file-type.js
@@ -25,6 +25,7 @@ export const lineWrapping = [
 
 export const iconClass = new Map()
 iconClass.set('php','file-php')
+iconClass.set('c','file-c')
 iconClass.set('js','file-js')
 iconClass.set('vue','file-vue')
 iconClass.set('xml','file-xml')
@@ -68,6 +69,7 @@ iconClass.set('iml','file-idea')
 iconClass.set('key','file-key')
 iconClass.set('pem','file-pem')
 iconClass.set('gz','file-gzip')
+iconClass.set('tar.gz','file-gzip')
 iconClass.set('json','file-json')
 iconClass.set('tar','file-tar')
 iconClass.set('sh','file-shell')