update views/disk

src/views/disk/DiskAlbumIndex.vue

@@ -66,6 +66,7 @@
 
     <el-dialog
       :visible.sync="showCreateAlbumDialog"
+      width="100%"
       center
     >
       <div>

src/views/disk/DiskFile.vue

@@ -145,7 +145,7 @@
             文件
           </el-col>
           <el-col v-else-if="fileType === 1006" :md="12">
-            <iframe :src="getPdfUrl(fileDetail.url)" width="100%" height="480px"></iframe>
+            <iframe :src="getPdfUrl(fileDetail.url)" width="100%" height="480px" />
           </el-col>
           <el-col v-else :md="12">
             未知文件类型
@@ -155,18 +155,11 @@
     </el-dialog>
     <el-dialog
       :visible.sync="showCreateFolderDialog"
-      width="30%"
+      width="100%"
       center
     >
       <div>
         <el-form ref="createFolderForm" :model="createFolderForm">
-          <el-form-item label="当前文件夹" label-width="120px" prop="title">
-            <el-input
-              v-model="createFolderForm.parentPath"
-              style="margin-left: 5px"
-              readonly
-            />
-          </el-form-item>
           <el-form-item label="新文件夹名" label-width="120px" prop="title">
             <el-input
               v-model="createFolderForm.folderName"
@@ -191,18 +184,10 @@
       :visible.sync="showUploadDialog"
       :before-close="handleUploadClose"
       :close-on-click-modal="false"
-      width="50%"
+      width="100%"
       center
     >
       <div>
-        <el-card style="padding: 5px;">
-          <div slot="header" class="clearfix">
-            <span>选择文件目录</span>
-          </div>
-          <div class="text item">
-            <el-tree :data="folderTree" :props="defaultProps" @node-click="handleUploadNodeClick"/>
-          </div>
-        </el-card>
         <uploader
           v-if="options !== null"
           style="padding: 5px;"
@@ -220,6 +205,11 @@
           </uploader-drop>
           <uploader-list />
         </uploader>
+        <el-button
+          style="padding: 5px;"
+          type="primary"
+          @click="onUploadComplete"
+        >完成上传</el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -261,7 +251,7 @@
             <span>目录树</span>
           </div>
           <div class="text item">
-            <el-tree :data="folderTree" :props="defaultProps" @node-click="handleNodeClick"/>
+            <el-tree :data="folderTree" :props="defaultProps" @node-click="handleNodeClick" />
           </div>
         </el-card>
         <el-button
@@ -296,6 +286,7 @@ export default {
       pageSize: 10,
       totalSize: 0,
       dataList: [],
+      currentPid: '0',
       // 对话框被选中的文件
       selectedTable: [],
       inputData: '',
@@ -312,7 +303,7 @@ export default {
       // ****************************************************************************************************************
       showCreateFolderDialog: false,
       createFolderForm: {
-        parentPath: '/',
+        pid: '0',
         folderName: null
       },
       // ****************************************************************************************************************
@@ -363,12 +354,6 @@ export default {
         this.$message.warning('上传的文件应小于 20GB')
         return
       }
-
-      if (this.uploadForm.pid === null) {
-        this.$message.warning('请先选择文件目录')
-        return
-      }
-
       file.pause()
       hashFile(file.file).then(result => {
         this.startUpload(result.sha256sum, file)
@@ -383,8 +368,8 @@ export default {
     onFileSuccess(rootFile, file, response, chunk) {
       const resp = JSON.parse(response)
       if (resp.code === 0) {
+        this.uploadForm.pid = this.currentPid
         this.uploadForm.uploadId = resp.data.uploadId
-        // this.uploadForm.uploadIds.push((resp.data.uploadId))
         addFile(this.uploadForm).then(resp0 => {
           this.$message.info(resp0.msg)
         }).catch(error => {
@@ -407,21 +392,13 @@ export default {
         duration: 3000
       })
     },
+    onUploadComplete() {
+      this.showUploadDialog = false
+    },
     handleUploadClose() {
       this.showUploadDialog = false
-      this.folderTree = []
     },
     onClickUpload() {
-      getFolderTree().then(resp => {
-        if (resp.code === 0) {
-          this.folderTree = resp.data
-        } else {
-          this.$message.error(resp.msg)
-        }
-      }).catch(error => {
-        this.$message.error(error.message)
-      })
-
       getDiskChannelInfo().then(resp => {
         if (resp.code === 0) {
           const respData = resp.data
@@ -525,6 +502,7 @@ export default {
     },
     createFolder() {
       this.showCreateFolderDialog = false
+      this.createFolderForm.pid = this.currentPid
       createFolder(this.createFolderForm).then(resp => {
         if (resp.code === 0) {
           this.$router.go(0)
@@ -549,6 +527,7 @@ export default {
           const respData = resp.data
           const namePathList = respData.namePathList
           const pageList = respData.pageList
+          this.currentPid = respData.currentPid
 
           this.dataList = pageList.list
           this.totalSize = pageList.totalSize
@@ -615,10 +594,6 @@ export default {
       this.moveFileForm.pid = data.fileId
       this.$message.info('移动文件到 ' + data.label + ' 目录')
     },
-    handleUploadNodeClick(data) {
-      this.uploadForm.pid = data.fileId
-      this.$message.info('上传文件到 ' + data.label + ' 目录')
-    },
     onMoveToFolder() {
       moveFile(this.moveFileForm).then(resp => {
         this.$message.info(resp.msg)