diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue index f54edb4..5a26856 100644 --- a/src/components/ShowFile/ShowFile.vue +++ b/src/components/ShowFile/ShowFile.vue @@ -766,10 +766,7 @@

确定删除所选的{{selectFileList.length}}个文件?

- - - - +
@@ -778,7 +775,7 @@
取 消 彻底删除 - 移至回收站 + 移至回收站
@@ -794,7 +791,7 @@

所选目录已存在下列文件

- + 取 消 @@ -1505,7 +1502,12 @@ export default { this.fileList[index].updateDate = fileDoc.updateDate } } - const isCurrentPath = (this.path + '/') === fileDoc + let thisPath = this.path + if (this.listModeSearchOpenDir) { + const row = this.pathList[this.pathList.length - 1] + thisPath = `${row.row.path}${row.folder}` + } + const isCurrentPath = (thisPath + '/') === fileDoc if ('deleteFile' === url && (isCurrentPath || this.$route.path.startsWith('/recently'))) { this.getFileListEnter() } @@ -1516,18 +1518,18 @@ export default { if (fileDoc && fileDoc.name) { this.onCreateFilename = fileDoc.name } - if (!this.path) { - this.path = '' + if (!thisPath) { + thisPath = '' } if (fileDoc) { if (fileDoc.$set) { let path = fileDoc.$set.path path = path.replace(/\\/g, '/') - if (this.path + '/' === path) { + if (thisPath + '/' === path) { this.getFileListEnter() } } else { - if (this.path + '/' === fileDoc.path) { + if (thisPath + '/' === fileDoc.path) { this.getFileListEnter() } } @@ -4630,9 +4632,13 @@ export default { display: table-cell !important; } } +.dialog-file-list { + padding: 10px 0; +} .delete-attention { padding: 10px 10px; border-radius: 4px; + margin-bottom: 10px; .el-checkbox { color: #606266; font-weight: 500; diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue index 80c6489..0432741 100755 --- a/src/components/SimpleUploader/globalUploader.vue +++ b/src/components/SimpleUploader/globalUploader.vue @@ -310,7 +310,7 @@ export default { currentDirectory: this.$route.query.path || '/', username: this.$store.state.user.name, userId: this.$store.state.user.userId, - folder: this.$route.query.folder + folder: this.$route.query.searchOpenFolder || this.$route.query.folder } }, isPath(str) { @@ -400,17 +400,17 @@ export default { this.uploader.resume() }) }, - setPageTitle() { + setPageTitle(netSpeed) { if (this.process === -10 || this.process === 100 || this.fileListLength === 0) { document.title = `${this.$route.meta.title}` } else { - document.title = `${this.process}% | ${this.$route.meta.title}` + document.title = `${this.process}% | ${netSpeed}` } }, onFileProgress(rootFile, file, chunk) { this.netSpeed = formatNetSpeed(file.currentSpeed, false) this.process = Math.trunc(window.uploader.progress() * 100) - this.setPageTitle() + this.setPageTitle(this.netSpeed) if (rootFile.isFolder && this.process < 100) { this.statusSet(rootFile.id, 'progress', formatNetSpeed(file.currentSpeed, true)) }