From dd2c1c186d4a610aa9a3788f09811303ee5c94a5 Mon Sep 17 00:00:00 2001
From: Dan <novel-web@novelweb.cn>
Date: Wed, 14 Jul 2021 17:56:06 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=9F=B3=E4=B9=90=E6=96=87=E4=BB=B6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8Bicon=E8=AF=86=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/utils.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index d9bbccf..cfdf389 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -165,6 +165,8 @@ const typeToSvg = {
   'application/rdf+xml': 'file',
   'video/x-ms-wvx': 'file',
   'audio/mpeg': 'file-list-audio',
+  'audio/mp3': 'file-list-audio',
+  'audio/x-m4a': 'file-list-audio',
   'video/x-ms-wmv': 'file-list-video',
   'application/vnd.oasis.opendocument.text': 'file',
   'application/x-bcpio': 'file',
-- 
Gitee


From af0b8c57549c20915b793c843d3c8c66f26e6edc Mon Sep 17 00:00:00 2001
From: Dan <novel-web@novelweb.cn>
Date: Thu, 15 Jul 2021 10:39:55 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=B9sh=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=E7=9A=84icon?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/utils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index cfdf389..7bc5f3f 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -61,6 +61,7 @@ const typeToSvg = {
   'audio/amr': 'file-list-audio',
   'application/mathml+xml': 'file',
   'text/html': 'file-list-html',
+  'text/x-sh': 'file-list-html',
   'message/rfc822': 'file-list-html',
   'multipart/related': 'file-list-html',
   'application/x-iso9660-image': 'file-list-cd',
-- 
Gitee


From bc4eae39c392902babe24f9feb1bbf45dc3d861e Mon Sep 17 00:00:00 2001
From: Dan <novel-web@novelweb.cn>
Date: Tue, 20 Jul 2021 16:38:21 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E6=97=B6=E4=B8=8B=E8=BD=BD=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=BC=B9=E5=87=BA=E7=99=BB=E5=BD=95model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/file/index.vue       | 57 ++++++++++++++++++++++++++--
 src/views/login/index.vue      | 17 ++++++++-
 src/views/share/share-list.vue | 68 +++++++++++++++++++++++++++++++---
 3 files changed, 133 insertions(+), 9 deletions(-)

diff --git a/src/views/file/index.vue b/src/views/file/index.vue
index 04cdf91..78618f7 100644
--- a/src/views/file/index.vue
+++ b/src/views/file/index.vue
@@ -91,12 +91,19 @@
       </div>
     </div>
 
+    <!-- 登录页的Dialog弹窗 -->
+    <el-dialog :visible.sync="login.show"
+               customClass="loginDialog" :before-close="closeLoginModel">
+      <loginPanel :hopRouting="false" @loginSuccessfully="loginSuccessfully"></loginPanel>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import {storageUnitConversion, timeDifference, mimeTypes, fileCategory, downloadByUrl} from '@/utils/utils'
 import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
+import loginPanel from '@/views/login/index'
 import previewVideo from 'vue-dplayer'
 import 'vue-dplayer/dist/vue-dplayer.css'
 import cookies from 'js-cookie'
@@ -120,7 +127,7 @@ export default {
     }
   },
   components: {
-    ElImageViewer, previewVideo
+    ElImageViewer, previewVideo, loginPanel
   },
   data () {
     return {
@@ -174,6 +181,15 @@ export default {
             downloadUrl: ''
           }
         }
+      },
+      // 当前登录页弹窗model
+      login: {
+        // 是否显示(文件下载、转存时校验当前登录状态)
+        show: false,
+        // 弹窗model关闭后执行的方法名称
+        method: '',
+        // 弹窗model关闭后执行的方法所对应的参数
+        parameter: ''
       }
     }
   },
@@ -222,8 +238,15 @@ export default {
       // 获取cookie缓存中的用户信息
       let token = cookies.get('userInfo')
       if (token === undefined) {
-        // 如果在未登录的情况下使用，则跳转登录页面
-        this.$router.push({name: 'login'})
+        // 如果在未登录的情况下使用，则打开登录页面弹窗
+        this.login = {
+          // 是否显示(文件下载、转存时校验当前登录状态)
+          show: true,
+          // 弹窗model关闭后执行的方法名称
+          method: 'doubleClick',
+          // 弹窗model关闭后执行的方法所对应的参数
+          parameter: item
+        }
         return
       }
       let userInfo = JSON.parse(token)
@@ -478,6 +501,34 @@ export default {
       this.$refs.previewVideo.dp.pause()
       // 跳转到视频指定的时间
       this.$refs.previewVideo.dp.seek(0)
+    },
+    /**
+     * 关闭登录页面model
+     * @param done 是否完成
+     */
+    closeLoginModel: function (done) {
+      if (done !== false) {
+        this.login = {
+          // 是否显示(文件下载、转存时校验当前登录状态)
+          show: false,
+          // 弹窗model关闭后执行的方法名称
+          method: '',
+          // 弹窗model关闭后执行的方法所对应的参数
+          parameter: ''
+        }
+      }
+    },
+    /**
+     * 登录model登录成功后的跳转
+     */
+    loginSuccessfully: function () {
+      this.login.show = false
+      this[this.login.method](this.login.parameter)
+      this.login = {
+        show: false,
+        method: '',
+        parameter: ''
+      }
     }
   }
 }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 6756f70..211f691 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -54,10 +54,20 @@
 import {validWeChatId, validEmail, validUsername} from '@/utils/validate'
 import {login} from '@/api/login'
 import {asyncRoutes} from '@/router/routers'
+import {resetRouter} from '@/router/index'
 import cookies from 'js-cookie'
 
 export default {
   name: 'login',
+  props: {
+    // 登录成功后是否进行路由跳转(默认跳转home路由)
+    hopRouting: {
+      type: Boolean,
+      default () {
+        return true
+      }
+    }
+  },
   data () {
     // 用户名校验
     const validateUsername = (rule, value, callback) => {
@@ -136,9 +146,14 @@ export default {
               localStorage.setItem('username', this.form.username)
               localStorage.setItem('password', this.form.password)
               localStorage.setItem('userEmail', response.data.userInfo.userEmail)
+              // 先重置路由
+              resetRouter()
               // 动态添加路由数据
               this.$router.addRoutes(asyncRoutes)
-              this.$router.push({name: 'home'})
+              this.$emit('loginSuccessfully')
+              if (this.hopRouting) {
+                this.$router.push({name: 'home'})
+              }
             }
           }).catch((err) => {
             console.log(err)
diff --git a/src/views/share/share-list.vue b/src/views/share/share-list.vue
index 9f3aea0..4f8acb4 100644
--- a/src/views/share/share-list.vue
+++ b/src/views/share/share-list.vue
@@ -41,11 +41,18 @@
                @card-close="cardClose" @card-confirm="cardConfirm"
                @card-folder-previous="cardFolderPrevious" @card-folder-next="cardFolderNext"></file-card>
 
+    <!-- 登录页的Dialog弹窗 -->
+    <el-dialog :visible.sync="login.show"
+               customClass="loginDialog" :before-close="closeLoginModel">
+      <loginPanel :hopRouting="false" @loginSuccessfully="loginSuccessfully"></loginPanel>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import filePanel from '@/views/file/index'
+import loginPanel from '@/views/login/index'
 import {copyFile} from '@/api/file'
 import {search} from '@/api/share'
 import fileCard from '@/components/fileCard/fileCard'
@@ -87,7 +94,7 @@ export default {
     }
   },
   components: {
-    filePanel, fileCard
+    filePanel, fileCard, loginPanel
   },
   data () {
     return {
@@ -113,6 +120,15 @@ export default {
           userFileName: '/',
           userFileId: 0
         }]
+      },
+      // 当前登录页弹窗model
+      login: {
+        // 是否显示(文件下载、转存时校验当前登录状态)
+        show: false,
+        // 弹窗model关闭后执行的方法名称
+        method: '',
+        // 弹窗model关闭后执行的方法所对应的参数
+        parameter: ''
       }
     }
   },
@@ -246,8 +262,15 @@ export default {
       // 获取cookie中缓存的用户信息
       let token = cookies.get('userInfo')
       if (token === undefined) {
-        // 如果在未登录的情况下使用，则跳转登录页面
-        this.$router.push({name: 'login'})
+        // 如果在未登录的情况下使用，则打开登录页面弹窗
+        this.login = {
+          // 是否显示(文件下载、转存时校验当前登录状态)
+          show: true,
+          // 弹窗model关闭后执行的方法名称
+          method: 'cardConfirm',
+          // 弹窗model关闭后执行的方法所对应的参数
+          parameter: currentlySelectedValue
+        }
         return
       }
 
@@ -318,8 +341,15 @@ export default {
       // 获取cookie中缓存的用户信息
       let token = cookies.get('userInfo')
       if (token === undefined) {
-        // 如果在未登录的情况下使用，则跳转登录页面
-        this.$router.push({name: 'login'})
+        // 如果在未登录的情况下使用，则打开登录页面弹窗
+        this.login = {
+          // 是否显示(文件下载、转存时校验当前登录状态)
+          show: true,
+          // 弹窗model关闭后执行的方法名称
+          method: 'saveToMine',
+          // 弹窗model关闭后执行的方法所对应的参数
+          parameter: ''
+        }
         return
       }
 
@@ -332,6 +362,34 @@ export default {
         userFileName: '/',
         userFileId: 0
       }]
+    },
+    /**
+     * 关闭登录页面model
+     * @param done 是否完成
+     */
+    closeLoginModel: function (done) {
+      if (done !== false) {
+        this.login = {
+          // 是否显示(文件下载、转存时校验当前登录状态)
+          show: false,
+          // 弹窗model关闭后执行的方法名称
+          method: '',
+          // 弹窗model关闭后执行的方法所对应的参数
+          parameter: ''
+        }
+      }
+    },
+    /**
+     * 登录model登录成功后的跳转
+     */
+    loginSuccessfully: function () {
+      this.login.show = false
+      this[this.login.method](this.login.parameter)
+      this.login = {
+        show: false,
+        method: '',
+        parameter: ''
+      }
     }
   }
 }
-- 
Gitee


From 11911dc63e0a9b6f371aba16b224ab76f8861919 Mon Sep 17 00:00:00 2001
From: Dan <novel-web@novelweb.cn>
Date: Wed, 21 Jul 2021 11:05:19 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97model=E6=89=8B=E6=9C=BA=E7=AB=AF=E7=9A=84?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/file/index.vue       | 201 ++++++++++++++++++++++++++++++++
 src/views/share/share-list.vue | 202 +++++++++++++++++++++++++++++++++
 2 files changed, 403 insertions(+)

diff --git a/src/views/file/index.vue b/src/views/file/index.vue
index 78618f7..76aaa88 100644
--- a/src/views/file/index.vue
+++ b/src/views/file/index.vue
@@ -797,6 +797,32 @@ p {
   top: 10%;
 }
 
+/deep/ .loginDialog {
+  max-width: 600px;
+  margin-top: 10%;
+}
+
+/deep/ .loginDialog > .el-dialog__header {
+  padding: 0;
+}
+
+/deep/ .loginDialog > .el-dialog__body {
+  padding: 1px;
+}
+
+/deep/ .loginDialog > .el-dialog__body > div > .login-box {
+  border: 0;
+  padding: 0;
+  box-shadow: none;
+  width: 86%;
+}
+
+@media (max-width: 780px) {
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    top: 5%;
+  }
+}
+
 @media (max-width: 769px) {
   #listing.list .item .name {
     width: 17em;
@@ -828,24 +854,199 @@ p {
   #listing.list .item .name {
     width: 15em;
   }
+
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 80%;
+    height: 60%;
+    left: 10%;
+    top: 10%;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 42%;
+    max-width: 16em;
+  }
+
+  /deep/ .el-dialog__headerbtn {
+    z-index: 999;
+    top: -32px;
+    right: -55px;
+  }
+}
+
+@media (max-width: 450px) and (min-height: 631px) {
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 49%;
+    max-width: 22em;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    height: 66%;
+    top: 9%;
+  }
 }
 
 @media (max-width: 415px) {
   #listing.list .item .name {
     width: 17em;
   }
+
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 80%;
+    height: 60%;
+    left: 10%;
+    top: 10%;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 45%;
+    max-width: 21em;
+  }
+
+  /deep/ .el-dialog__headerbtn {
+    z-index: 999;
+    top: -32px;
+    right: -55px;
+  }
+}
+
+@media (max-width: 412px) {
+  @media (min-height: 800px) {
+    /deep/ .loginDialog > .el-dialog__body > #login form {
+      top: 42%;
+      max-width: 21em;
+    }
+
+    /deep/ .loginDialog > .el-dialog__body > #login {
+      height: 54%;
+    }
+  }
+}
+
+@media (max-width: 380px) {
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 86%;
+    height: 62%;
+    left: 7%;
+    top: 8%;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 46%;
+    max-width: 16em;
+  }
 }
 
 @media (max-width: 376px) {
   #listing.list .item .name {
     width: 14em;
   }
+
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 86%;
+    height: 55%;
+    left: 7%;
+    top: 8%;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 41%;
+    max-width: 16em;
+  }
+}
+
+@media (max-width: 376px) and (min-height: 631px) {
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 46%;
+    max-width: 19em;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    height: 66%;
+  }
+}
+
+@media (max-width: 376px) and (min-height: 811px) {
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 40%;
+    max-width: 19em;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    height: 55%;
+  }
+}
+
+@media (max-width: 361px) {
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 86%;
+    height: 66%;
+    left: 7%;
+    top: 8%;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 46%;
+    max-width: 18em;
+  }
 }
 
 @media (max-width: 331px) {
   #listing.list .item .name {
     width: 10em;
   }
+
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 90%;
+    height: 50%;
+    left: 5%;
+    top: 10%;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 38%;
+    max-width: 16em;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login img {
+    margin-top: 3vh;
+  }
+}
+
+@media (max-width: 320px) {
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 90%;
+    height: 70%;
+    left: 5%;
+    top: 8%;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 47%;
+    max-width: 16em;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login img {
+    margin-top: 3vh;
+  }
+}
+
+@media (max-width: 320px) and (min-height: 650px) {
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 90%;
+    height: 58%;
+    left: 5%;
+    top: 8%;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 42%;
+    max-width: 16em;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login img {
+    margin-top: 3vh;
+  }
 }
 
 </style>
diff --git a/src/views/share/share-list.vue b/src/views/share/share-list.vue
index 4f8acb4..c4f6a69 100644
--- a/src/views/share/share-list.vue
+++ b/src/views/share/share-list.vue
@@ -480,6 +480,32 @@ main {
   display: none;
 }
 
+/deep/ .loginDialog {
+  max-width: 600px;
+  margin-top: 10%;
+}
+
+/deep/ .loginDialog > .el-dialog__header {
+  padding: 0;
+}
+
+/deep/ .loginDialog > .el-dialog__body {
+  padding: 1px;
+}
+
+/deep/ .loginDialog > .el-dialog__body > div > .login-box {
+  border: 0;
+  padding: 0;
+  box-shadow: none;
+  width: 86%;
+}
+
+@media (max-width: 780px) {
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    top: 5%;
+  }
+}
+
 @media screen and (max-width: 480px) {
   #code-button {
     display: none;
@@ -496,4 +522,180 @@ main {
     width: 12em;
   }
 }
+
+@media (max-width: 450px) {
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 80%;
+    height: 60%;
+    left: 10%;
+    top: 10%;
+  }
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 42%;
+    max-width: 16em;
+  }
+  /deep/ .el-dialog__headerbtn{
+    z-index: 999;
+    top: -32px;
+    right: -55px;
+  }
+}
+
+@media (max-width: 450px) and (min-height: 631px) {
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 49%;
+    max-width: 22em;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    height: 66%;
+    top: 9%;
+  }
+}
+
+@media (max-width: 415px) {
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 80%;
+    height: 60%;
+    left: 10%;
+    top: 10%;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 45%;
+    max-width: 21em;
+  }
+
+  /deep/ .el-dialog__headerbtn{
+    z-index: 999;
+    top: -32px;
+    right: -55px;
+  }
+}
+
+@media (max-width: 412px) {
+  @media (min-height: 800px) {
+    /deep/ .loginDialog > .el-dialog__body > #login form {
+      top: 42%;
+      max-width: 21em;
+    }
+
+    /deep/ .loginDialog > .el-dialog__body > #login {
+      height: 54%;
+    }
+  }
+}
+
+@media (max-width: 380px) {
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 86%;
+    height: 62%;
+    left: 7%;
+    top: 8%;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 46%;
+    max-width: 16em;
+  }
+}
+
+@media (max-width: 376px) {
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 86%;
+    height: 55%;
+    left: 7%;
+    top: 8%;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 41%;
+    max-width: 16em;
+  }
+}
+
+@media (max-width: 376px) and (min-height: 631px) {
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 46%;
+    max-width: 19em;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    height: 66%;
+  }
+}
+
+@media (max-width: 376px) and (min-height: 811px) {
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 40%;
+    max-width: 19em;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    height: 55%;
+  }
+}
+
+@media (max-width: 361px) {
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 86%;
+    height: 66%;
+    left: 7%;
+    top: 8%;
+  }
+
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 46%;
+    max-width: 18em;
+  }
+}
+
+@media (max-width: 330px) {
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 90%;
+    height: 50%;
+    left: 5%;
+    top: 10%;
+  }
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 38%;
+    max-width: 16em;
+  }
+  /deep/ .loginDialog > .el-dialog__body > #login img {
+    margin-top: 3vh;
+  }
+}
+
+@media (max-width: 320px) {
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 90%;
+    height: 70%;
+    left: 5%;
+    top: 8%;
+  }
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 47%;
+    max-width: 16em;
+  }
+  /deep/ .loginDialog > .el-dialog__body > #login img {
+    margin-top: 3vh;
+  }
+}
+
+@media (max-width: 320px) and (min-height: 650px) {
+  /deep/ .loginDialog > .el-dialog__body > #login {
+    width: 90%;
+    height: 58%;
+    left: 5%;
+    top: 8%;
+  }
+  /deep/ .loginDialog > .el-dialog__body > #login form {
+    top: 42%;
+    max-width: 16em;
+  }
+  /deep/ .loginDialog > .el-dialog__body > #login img {
+    margin-top: 3vh;
+  }
+}
+
 </style>
-- 
Gitee


From f08edbcffe0b89e52c3d74e921f1d88a7331bc67 Mon Sep 17 00:00:00 2001
From: Dan <novel-web@novelweb.cn>
Date: Wed, 21 Jul 2021 11:42:06 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97model=E9=92=88=E5=AF=B9=E5=AE=BD320=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/file/index.vue       | 4 ++--
 src/views/share/share-list.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/file/index.vue b/src/views/file/index.vue
index 76aaa88..d47d743 100644
--- a/src/views/file/index.vue
+++ b/src/views/file/index.vue
@@ -1013,7 +1013,7 @@ p {
   }
 }
 
-@media (max-width: 320px) {
+@media (max-width: 321px) {
   /deep/ .loginDialog > .el-dialog__body > #login {
     width: 90%;
     height: 70%;
@@ -1031,7 +1031,7 @@ p {
   }
 }
 
-@media (max-width: 320px) and (min-height: 650px) {
+@media (max-width: 321px) and (min-height: 650px) {
   /deep/ .loginDialog > .el-dialog__body > #login {
     width: 90%;
     height: 58%;
diff --git a/src/views/share/share-list.vue b/src/views/share/share-list.vue
index c4f6a69..1494605 100644
--- a/src/views/share/share-list.vue
+++ b/src/views/share/share-list.vue
@@ -666,7 +666,7 @@ main {
   }
 }
 
-@media (max-width: 320px) {
+@media (max-width: 321px) {
   /deep/ .loginDialog > .el-dialog__body > #login {
     width: 90%;
     height: 70%;
@@ -682,7 +682,7 @@ main {
   }
 }
 
-@media (max-width: 320px) and (min-height: 650px) {
+@media (max-width: 321px) and (min-height: 650px) {
   /deep/ .loginDialog > .el-dialog__body > #login {
     width: 90%;
     height: 58%;
-- 
Gitee


From feddb4a789bca92ec0205b91c3558b8d928e8722 Mon Sep 17 00:00:00 2001
From: Dan <novel-web@novelweb.cn>
Date: Wed, 21 Jul 2021 18:21:59 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B1=E8=B4=A5=E9=87=8D=E8=AF=95=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index a8da8d5..1c525b4 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1471,10 +1471,7 @@ export default {
       // 删除之前先暂停当前上传
       this.pause(file)
       // 删除 element 上传组件维护的上传列队
-      let uploadFiles = this.$refs.elementUpload.uploadFiles
-      let index = uploadFiles.findIndex(item => item.uid === file.uid)
-      uploadFiles.splice(index, 1)
-
+      this.$refs.elementUpload.handleRemove(file)
       // 删除当前上传列队中的文件数据
       this.uploadedFilesList.splice(this.uploadedFilesList.findIndex(item => item.uid === file.uid), 1)
     },
@@ -1482,6 +1479,17 @@ export default {
      * 上传重试事件
      */
     retry (file) {
+      // 先删除 element 上传组件维护的上传列队
+      this.$refs.elementUpload.handleRemove(file)
+      // 再 push 一条记录
+      this.$refs.elementUpload.uploadFiles.push({
+        status: 'ready',
+        name: file.name,
+        size: file.request.file.size,
+        percentage: 0,
+        uid: file.uid,
+        raw: file.request.file
+      })
       this.resume(file)
     },
     /**
-- 
Gitee