add download task component

vueJs/src/lang/en.ts

@@ -494,11 +494,17 @@ export default {
     file: '文件',
     fileType: '{exten}文件',
     size: '大小',
+    progress: '进度',
+    begin: '开始',
+    remove: '移除',
     root: '文件系统',
     download: '下载文件',
+    bacthDownload: '批量下载',
+    downloadTask: '下载任务',
     upload: '上传文件',
     deleteFolder: '删除目录',
     deleteFile: '删除文件',
+    bacthDelete: '批量删除',
     addFile: '添加文件',
     addFolder: '添加目录',
     uploadError: '上传失败',

vueJs/src/lang/zh.ts

@@ -498,11 +498,17 @@ export default {
     file: '文件',
     fileType: '{exten}文件',
     size: '大小',
+    progress: '进度',
+    begin: '开始',
+    remove: '移除',
     root: '文件系统',
     download: '下载文件',
+    bacthDownload: '批量下载',
+    downloadTask: '下载任务',
     upload: '上传文件',
     deleteFolder: '删除目录',
     deleteFile: '删除文件',
+    bacthDelete: '批量删除',
     addFile: '添加文件',
     addFolder: '添加目录',
     uploadError: '上传失败',

vueJs/src/views/file-management/components/FileDownloadForm.vue

@@ -0,0 +1,165 @@
+<template>
+  <el-dialog
+    v-el-draggable-dialog
+    width="800px"
+    :visible="showDialog"
+    :title="$t('fileSystem.downloadTask')"
+    @close="onFormClosed"
+  >
+    <el-table
+      :data="files"
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column
+        prop="name"
+        :label="$t('fileSystem.name')"
+        width="180"
+      />
+      <el-table-column
+        prop="size"
+        :label="$t('fileSystem.size')"
+        width="180"
+      />
+      <el-table-column
+        :label="$t('fileSystem.progress')"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <el-progress
+            :text-inside="true"
+            :stroke-width="26"
+            :status="downloadStatus(scope.row)"
+            :percentage="downloadProgress(scope.row)"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('global.operaActions')"
+        align="center"
+        width="250px"
+      >
+        <template slot-scope="{row}">
+          <el-button
+            size="mini"
+            type="success"
+            icon="el-icon-caret-right"
+            @click="handleDownloadFile(row)"
+          >
+            {{ $t('fileSystem.begin') }}
+          </el-button>
+          <el-button
+            size="mini"
+            type="danger"
+            icon="el-icon-delete"
+            @click="handleRemoveFile(row)"
+          >
+            {{ $t('fileSystem.remove') }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop } from 'vue-property-decorator'
+import FileSystemService from '@/api/filemanagement'
+
+export class FileInfo {
+  name!: string
+  path!: string
+  size!: number
+  progress!: number
+  pause!: boolean
+  blobs = new Array<BlobPart>()
+  type!: string
+}
+
+@Component({
+  name: 'FileDownloadForm'
+})
+export default class FileDownloadForm extends Vue {
+  @Prop({ default: false })
+  private showDialog!: boolean
+
+  @Prop({ default: '' })
+  private files!: FileInfo[]
+
+  get downloadProgress() {
+    return (fileInfo: FileInfo) => {
+      return Math.round(fileInfo.progress / fileInfo.size * 10000) / 100
+    }
+  }
+
+  get downloadStatus() {
+    return (fileInfo: FileInfo) => {
+      const progress = Math.round(fileInfo.progress / fileInfo.size * 10000) / 100
+      if (progress >= 50 && progress < 100) {
+        return 'warning'
+      }
+      if (progress >= 100) {
+        return 'success'
+      }
+    }
+  }
+
+  private handleRemoveFile(fileInfo: FileInfo) {
+    fileInfo.pause = true
+    fileInfo.blobs.length = 0
+    this.$emit('onFileRemoved', fileInfo)
+  }
+
+  private handleDownloadFile(fileInfo: FileInfo) {
+    fileInfo.pause = false
+    if (fileInfo.progress >= 100) {
+      this.downloadBlob(fileInfo)
+    } else {
+      this.downlodFile(fileInfo, (downloadSize: number) => {
+        if (downloadSize >= fileInfo.size) {
+          this.$emit('onFileDownloaded', fileInfo)
+        }
+      })
+    }
+  }
+
+  private downlodFile(fileInfo: FileInfo, callback: Function) {
+    if (fileInfo.pause) {
+      return
+    }
+    FileSystemService.downlodFle(fileInfo.name, fileInfo.path, fileInfo.progress).then((res: any) => {
+      fileInfo.type = res.headers['content-type']
+      // 获取当前下载字节大小
+      const downloadByte = res.data.size
+      // 当前下载分块入栈
+      fileInfo.blobs.push(res.data)
+      fileInfo.progress += downloadByte
+      if (fileInfo.size > fileInfo.progress) {
+        this.downlodFile(fileInfo, callback)
+      } else {
+        // 合并下载文件
+        this.downloadBlob(fileInfo)
+        // 下载完成后的回调
+        callback(fileInfo.size)
+      }
+    }).catch(() => {
+      callback(fileInfo.size)
+    })
+  }
+
+  private downloadBlob(fileInfo: FileInfo) {
+    const url = window.URL.createObjectURL(new Blob(fileInfo.blobs, { type: fileInfo.type }))
+    const link = document.createElement('a')
+    link.style.display = 'none'
+    link.href = url
+    link.setAttribute('download', fileInfo.name)
+    document.body.appendChild(link)
+    link.click()
+    URL.revokeObjectURL(url)
+  }
+
+  private onFormClosed() {
+    this.$emit('closed')
+  }
+}
+</script>

vueJs/src/views/file-management/index.vue

@@ -1,13 +1,6 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-page-header
-        @back="handleGoToLastFolder"
-      >
-        <template
-          slot="content"
-          class="file-system-page"
-        >
       <el-breadcrumb
         ref="fileSystemBreadCrumb"
         separator-class="el-icon-arrow-right"
@@ -21,8 +14,6 @@
           {{ fileRoot }}
         </el-breadcrumb-item>
       </el-breadcrumb>
-        </template>
-      </el-page-header>
     </div>
 
     <el-table
@@ -34,7 +25,6 @@
       fit
       highlight-current-row
       style="width: 100%;"
-      :row-class-name="tableRowClassName"
       @row-click="onRowClick"
       @row-dblclick="onRowDoubleClick"
       @contextmenu.native="onContextMenu"
@@ -171,6 +161,13 @@
         @onFileUploaded="onFileUploaded"
       />
     </el-dialog>
+
+    <file-download-form
+      :show-dialog="showDownloadDialog"
+      :files="downloadFiles"
+      @closed="showDownloadDialog=false"
+      @onFileRemoved="onFileRemoved"
+    />
   </div>
 </template>
 
@@ -181,6 +178,7 @@ import { Vue } from 'vue-property-decorator'
 import DataListMiXin from '@/mixins/DataListMiXin'
 import Component, { mixins } from 'vue-class-component'
 import FileUploadForm from './components/FileUploadForm.vue'
+import FileDownloadForm, { FileInfo } from './components/FileDownloadForm.vue'
 import Pagination from '@/components/Pagination/index.vue'
 import FileSystemService, { FileSystemGetByPaged, FileSystemType } from '@/api/filemanagement'
 
@@ -193,7 +191,8 @@ const $contextmenu = Vue.prototype.$contextmenu
   name: 'FileManagement',
   components: {
     Pagination,
-    FileUploadForm
+    FileUploadForm,
+    FileDownloadForm
   },
   filters: {
     dateTimeFilter(datetime: string) {
@@ -256,6 +255,9 @@ export default class extends mixins(DataListMiXin) {
   private lastFilePath = ''
   private fileSystemRoot = new Array<string>()
 
+  private showDownloadDialog = false
+  private downloadFiles = new Array<FileInfo>()
+
   public dataFilter = new FileSystemGetByPaged()
 
   mounted() {
@@ -332,42 +334,20 @@ export default class extends mixins(DataListMiXin) {
   }
 
   private handleDownloadFile(path: string, fileName: string, size: number) {
-    this.downloading = true
-    const blobs = new Array<BlobPart>()
-    this.downlodFile(path, fileName, size, 0, blobs,
-      (downloadSize: number) => {
-        if (downloadSize >= size) {
-          this.downloading = false
-          // 释放空间
-          blobs.length = 0
+    if (!this.downloadFiles.some(x => x.name === fileName && x.path === path)) {
+      const file = new FileInfo()
+      file.name = fileName
+      file.path = path
+      file.size = size
+      file.progress = 0
+      this.downloadFiles.push(file)
     }
-      })
+    this.showDownloadDialog = true
   }
 
-  private downlodFile(path: string, fileName: string, size: number, currentByte: number, blobs: BlobPart[], callback: Function) {
-    FileSystemService.downlodFle(fileName, path, currentByte).then((res: any) => {
-      // 获取当前下载字节大小
-      const downloadByte = res.data.size
-      // 当前下载分块入栈
-      blobs.push(res.data)
-      currentByte += downloadByte
-      if (size > currentByte) {
-        this.downlodFile(path, fileName, size, currentByte, blobs, callback)
-      } else {
-        // 合并下载文件
-        const url = window.URL.createObjectURL(new Blob(blobs, { type: res.headers['content-type'] }))
-        const link = document.createElement('a')
-        link.style.display = 'none'
-        link.href = url
-        link.setAttribute('download', fileName)
-        document.body.appendChild(link)
-        link.click()
-        // 下载完成后的回调
-        callback(size)
-      }
-    }).catch(() => {
-      callback(size)
-    })
+  private onFileRemoved(fileInfo: FileInfo) {
+    const index = this.downloadFiles.findIndex(x => x.path === fileInfo.path && x.name === fileInfo.name)
+    this.downloadFiles.splice(index, 1)
   }
 
   private onRowClick(row: any) {
@@ -449,6 +429,37 @@ export default class extends mixins(DataListMiXin) {
             }
             this.lastFilePath = path
             this.showFileUploadDialog = true
+          },
+          divided: true
+        },
+        {
+          label: this.$t('fileSystem.bacthDownload'),
+          disabled: !checkPermission(['AbpFileManagement.FileSystem.FileManager.Download']),
+          onClick: () => {
+            const table = this.$refs.fileSystemTable as any
+            // 过滤未添加到下载列表的文件
+            const selectFiles = table.selection.filter((x: any) => x.type === 1 && !this.downloadFiles.some(f => f.name === x.name && f.path === x.path))
+            // 格式化文件列表别添加到下载列表
+            this.downloadFiles.push(...selectFiles.map((f: any) => {
+              const file = new FileInfo()
+              file.name = f.name
+              file.path = f.parent
+              file.size = f.size
+              file.progress = 0
+              return file
+            }))
+            // 显示下载列表
+            this.showDownloadDialog = true
+          }
+        },
+        {
+          label: this.$t('fileSystem.bacthDelete'),
+          disabled: true, // !checkPermission(['AbpFileManagement.FileSystem.FileManager.Delete']),
+          onClick: () => {
+            // 未公布批量删除接口
+            // const table = this.$refs.fileSystemTable as any
+            // 过滤类型为文件的选中项
+            // const selectFiles = table.selection.filter((x: any) => x.type === 1)
           }
         }
       ],