From 166bd542d771adf62fe2cbd95586e7ada64ee682 Mon Sep 17 00:00:00 2001
From: unknown <zheng_z@azut.cn>
Date: Fri, 13 Nov 2020 14:20:10 +0800
Subject: [PATCH] workspace update

---
 src/services/system.js                        |   2 +-
 .../workspace/components/file-item.vue        |  82 ++++---
 src/views/main_web/workspace/helper.js        |  41 ++--
 src/views/main_web/workspace/service.js       |   1 -
 .../main_web/workspace/workspace.new.vue      | 219 +++++++-----------
 5 files changed, 154 insertions(+), 191 deletions(-)

diff --git a/src/services/system.js b/src/services/system.js
index 8ab0451b..8977f5bb 100644
--- a/src/services/system.js
+++ b/src/services/system.js
@@ -138,7 +138,7 @@ const system = {
         FolderId: folderId,
         // 所处文件夹层级，拼接符：_
         FolderLevelId: levelId,
-        // Id: 0,
+        Id: `upload:${`${Math.random()}`.slice(2, 8)}`,
         // IpfsCid: hash,
         // IsShowRecycle: 0,
         // Milestone: 0,
diff --git a/src/views/main_web/workspace/components/file-item.vue b/src/views/main_web/workspace/components/file-item.vue
index abd2199a..c2c023f1 100644
--- a/src/views/main_web/workspace/components/file-item.vue
+++ b/src/views/main_web/workspace/components/file-item.vue
@@ -13,7 +13,7 @@
             v-if="!oneOf(file.extension, imgExtensionList)"
             class="defultImage-mid"
             :class="`${file.extension}-mid ${
-              isClient && ((isInWorkFolder && !localFileIsLatest) || (!isInWorkFolder && !fileInLocal)) ? 'toumin' : ''
+              fileIsLoading || otherUserIsWorking || showDownloadMask ? 'toumin' : ''
             }`"
             @contextmenu.prevent.stop="rightShowMenu($event, file, 1)"
           />
@@ -21,9 +21,7 @@
           <div
             v-else
             class="defultImage-mid img_bg-mid"
-            :class="
-              isClient && ((isInWorkFolder && !localFileIsLatest) || (!isInWorkFolder && !fileInLocal)) ? 'toumin' : ''
-            "
+            :class=" fileIsLoading || otherUserIsWorking || showDownloadMask  ? 'toumin' : ''"
             @contextmenu.prevent.stop="rightShowMenu($event, file, 1)"
           >
             <div class="file_Im gbox-mid">
@@ -46,20 +44,20 @@
               @contextmenu.prevent.stop="rightShowMenu($event, file, 1)"
               class="downloadIcon"
               @click="clientDownLoad(file, 1)"
-              v-if="((isInWorkFolder && !localFileIsLatest) || (!isInWorkFolder && !fileInLocal)) && !fileIsLoading"
+              v-if="showDownloadMask"
             >
               <div class="readytodownload-icon"><img src="/static/img/download.svg" alt class="imgjuzhong" /></div>
             </div>
             <!-- 下载中 状态蒙板 -->
             <div
               class="downloadIcon"
-              v-if="file.downloadStatus === DownloadStatus.DOWNLOADING"
+              v-if="loadingState.type === DOWNLOADING"
             >
               <div class="progress-circle">
                 <LottieSvg class="bg-pic" :width="40" :height="40" path="static/img/lottie.download.svg.json" />
                 <el-progress :width="45" :height="45"  
                 type="circle" :show-text="false"
-                :percentage="file.loadProgress" :stroke-width="3" color="rgb(140, 0, 255)">
+                :percentage="loadingState.loadProgress" :stroke-width="3" color="rgb(140, 0, 255)">
                 </el-progress>
               </div>
             </div>
@@ -67,18 +65,18 @@
             <div
               @contextmenu.prevent.stop="rightShowMenu($event, file, 1)"
               class="downloadIcon"
-              v-if="file.downloadStatus === DownloadStatus.UPLOADING"
+              v-if="loadingState.type === UPLOADING"
             >
               <div class="progress-circle">
                 <img class="bg-pic" src="/static/img/upload.png" alt="" :style="{ width: '24px' }" >
                 <el-progress :width="45" :height="45"  
                 type="circle" :show-text="false"
-                :percentage="file.loadProgress" :stroke-width="3" color="rgb(140, 0, 255)">
+                :percentage="loadingState.loadProgress" :stroke-width="3" color="rgb(140, 0, 255)">
                 </el-progress>
               </div>
               <!-- <span class="spanjuzhong">
                 <i class="el-icon-loading largeicon"></i>
-                <div class="minifont">上传中 {{file.loadProgress}}</div>
+                <div class="minifont">上传中 {{loadingState.loadProgress}}</div>
               </span> -->
             </div>
 
@@ -92,7 +90,7 @@
                 <img src="/static/img/警示.svg" alt
                   class="have-modified-icon"
                   title="文件已经被修改 点击进行文件更新"
-                  @click="updateFileWorkStatus(file, 1, '文件已更新', 1)"
+                  @click="commitFile(file)"
                 />
               </div>
               <!-- 蓝色更新图标 协同文件列表中当本地文件和云端文件不同时 出现 -->
@@ -110,7 +108,7 @@
               </div>
               <!-- 绿色钩 -->
               <div
-                v-if="isInWorkFolder && file.workStatus === FileWorkStatus.NOT_WORKING"
+                v-if="isInWorkFolder && !isWorking"
                 class="yijianxietong isonselect"
               >
                 <i
@@ -135,7 +133,7 @@
                   @click.native="fileClick(file)"
                   v-if="
                     isClient &&
-                    file.downloadStatus == DownloadStatus.DOWNLOADED
+                    fileInLocal
                   "
                 >
                   <span>打开</span>
@@ -164,6 +162,8 @@
             {{ file.version }}
           </span>
           <span v-if="!isInWorkFolder" class="yiyunwenjian_infodesc">{{file.nodeName}}</span>
+          <span class="yiyunwenjian_infodesc">{{loadingState.loadProgress}}</span>
+          
         </div>
       </div>
     </el-tooltip>
@@ -173,10 +173,12 @@
 <script>
 import system from "@/services/system";
 import LottieSvg from '@/components/lottieSvg';
-import { FileWorkStatus, DownloadStatus } from '../helper';
+import { FileWorkStatus, LoadingEnum } from '../helper';
 
 const imgExtensionList = ["jpg", "png", "bmp", "gif", "jpeg"];
 const oneOf = (target, list) => list.indexOf(target) !== -1
+const { DOWNLOADING, UPLOADING } = LoadingEnum;
+const { WORKING, NOT_WORKING } = FileWorkStatus;
 
 export default {
   components: {
@@ -192,7 +194,6 @@ export default {
       default: () => () => {}
     },
     clientDownLoad: Function,
-    setFileStatus: Function,
     nodeFolder: {
       type: Object,
       default: () => ({}),
@@ -201,45 +202,74 @@ export default {
       type: Object,
       default: () => ({}),
     },
-    updateFileWorkStatus: Function,
+    commitFile: Function,
+    localFileHashMap: {
+      type: Object,
+      default: () => ({}),
+    },
+    loadingState: {
+      type: Object,
+      default: () => ({}),
+    }
   },
   data() {
     return {
       isClient: system.isClient,
       currentUserId: sessionStorage.userId,
-      FileWorkStatus,
-      DownloadStatus,
+      WORKING, NOT_WORKING,
+      DOWNLOADING,
+      UPLOADING,
       imgExtensionList
     };
   },
   computed: {
+    fileStoreKey() {
+      const { nodeName, extension, archName } = this.file;
+      const folderName = nodeName || this.nodeFolder.folderName;
+      return `${folderName}\\${archName}${extension ? `.${extension}` : ''}`;
+    },
     isInWorkFolder() {
-      const { file, nodeFolder, currentFolder } = this;
+      const { file, currentFolder } = this;
       return file.folderId === currentFolder.id;
     },
+    localIpfsCid() {
+      console.log(this.localFileHashMap, this.fileStoreKey, this.localFileHashMap[this.fileStoreKey]);
+      return this.localFileHashMap[this.fileStoreKey];
+    },
     isWorking() {
-      return this.file.workStatus === FileWorkStatus.WORKING;
+      return this.file.workStatus === WORKING;
+    },
+    // 判断显示待下载的图层
+    showDownloadMask() {
+      if(this.fileIsLoading) return false;
+      if(!this.fileInLocal) return true;
+      if(this.isInWorkFolder) { // 当前工作节点下 其他人更新过的文件
+        return (this.fileIsDifferent && this.file.modifyUserId !== this.currentUserId);
+      }
+      return false;
     },
     fileIsDifferent() {
-      const { localIpfsCid, ipfsCid } = this.file;
+      const { ipfsCid } = this.file;
+      const localIpfsCid = this.localIpfsCid;
       return localIpfsCid && localIpfsCid !== ipfsCid;
     },
     localFileIsLatest() {
-      const { localIpfsCid, ipfsCid } = this.file;
+      const { ipfsCid } = this.file;
+      const localIpfsCid = this.localIpfsCid;
+      console.log(localIpfsCid, ipfsCid);
       return localIpfsCid && localIpfsCid === ipfsCid;
     },
     fileIsLoading() {
-      const file = this.file;
-      return file.downloadStatus === DownloadStatus.UPLOADING || file.downloadStatus === DownloadStatus.DOWNLOADING;
+      return this.loadingState.type === UPLOADING || this.loadingState.type === DOWNLOADING;
     },
     // 本地是否有文件
     fileInLocal() {
-      return !!this.file.localIpfsCid;
+      return !!this.localIpfsCid;
     },
     // 其他人员正在修改
     otherUserIsWorking() {
       const { modifyUserId, workStatus } = this.file;
-      return workStatus === FileWorkStatus.WORKING && modifyUserId !== this.currentUserId;
+      return workStatus === WORKING && modifyUserId !== this.currentUserId;
     }
   },
   methods: {
diff --git a/src/views/main_web/workspace/helper.js b/src/views/main_web/workspace/helper.js
index 4fd70a93..5ce95d1b 100644
--- a/src/views/main_web/workspace/helper.js
+++ b/src/views/main_web/workspace/helper.js
@@ -1,3 +1,6 @@
+/**
+ * todo 已废弃
+ */
 export const DownloadStatus = {
   /**
    * 未下载
@@ -20,7 +23,16 @@ export const DownloadStatus = {
    */
   DIFF: 4,
 }
-export const FileLoadStatus = DownloadStatus;
+export const LoadingEnum = {
+  /**
+   * 正在下载
+   */
+  DOWNLOADING: 100,
+  /**
+   * 上传中
+   */
+  UPLOADING: 101,
+};
 /**
  * 文件工作状态 
  */
@@ -40,31 +52,4 @@ export const FileStatus = {
    * 协同中: 2
    */
   SHARING: 2,
-}
-
-/**
- * 注入文件的本地状态
- * PS： 该方法会生成新的数组引用
- * @param {*} fileList 文件列表
- * @param {*} localFileHash 本地文件存储表： { [fileRelativePath]: ipfsCid }
- * @param {*} fileLoadingHash 文件上传/下载进度表: { [fileId]: { loadProgress, downloadStatus } }
- * @return Array<file>
- */
-export function injectionFileLocalStatus(fileList, localFileHash, fileLoadingHash, folderMap) {
-  return fileList.map(file => {
-    const { archName, extension, folderId, nodeName } = file;
-    const folderName = nodeName || (folderMap[folderId] || {}).folderName;
-    const fileKey = `${folderName}\\${archName}${extension ? `.${extension}`:''}`;
-
-    // 注入loadProgress 和 loadStatus属性
-    Object.assign(file, fileLoadingHash[file.id] || {});
-    // 1. 本地没文件：UNDOWNLOAD, DOWNLOADING,
-    // 写入本地ipfsCid, 会有undefined值
-    file.localIpfsCid = localFileHash[fileKey];
-    if(file.localIpfsCid === file.ipfsCid) {
-      file.downloadStatus = FileLoadStatus.DOWNLOADED;
-      delete fileLoadingHash[file.id];
-    }
-    return file;
-  });
 }
\ No newline at end of file
diff --git a/src/views/main_web/workspace/service.js b/src/views/main_web/workspace/service.js
index ce48b97e..e7f9baa8 100644
--- a/src/views/main_web/workspace/service.js
+++ b/src/views/main_web/workspace/service.js
@@ -26,7 +26,6 @@ export async function fetchFolderFileList(folderId, userId, commonFolderId) {
   const data = res.Data || {};
   const injectFileBasicValue = upperCaseFile => {
     const file = firstCharToLowerCase(upperCaseFile);
-    file.downloadStatus = DownloadStatus.UNDOWNLOAD;
     return file;
   }
   const outputObj = {
diff --git a/src/views/main_web/workspace/workspace.new.vue b/src/views/main_web/workspace/workspace.new.vue
index 7e1472fb..e01bcf99 100644
--- a/src/views/main_web/workspace/workspace.new.vue
+++ b/src/views/main_web/workspace/workspace.new.vue
@@ -69,13 +69,14 @@
                     <FileItem
                       class="lisy-group-item"
                       v-for="file in uploadFileList"
-                      :key="file.id || file.archName"
+                      :key="file.id"
                       :file="file"
                       :clientDownLoad="clientDownLoad"
-                      :setFileStatus="setFileStatus"
                       :showFileMilestone="showFileMilestone"
                       :nodeFolder="currentNodeFolder"
                       :currentFolder="currentFolder"
+                      :localFileHashMap="localFileHashMap"
+                      :loadingState="localFileLoadStateMap[file.id]"
                     />
                   </div>
                   <draggable
@@ -92,12 +93,13 @@
                       :key="file.id"
                       :file="file"
                       :clientDownLoad="clientDownLoad"
-                      :setFileStatus="setFileStatus"
                       :showFileMilestone="showFileMilestone"
                       :nodeFolder="currentNodeFolder"
                       :currentFolder="currentFolder"
-                      :updateFileWorkStatus="updateFileWorkStatus"
+                      :commitFile="commitFile"
                       @dblclick.native="fileClick(file)"
+                      :localFileHashMap="localFileHashMap"
+                      :loadingState="localFileLoadStateMap[file.id]"
                     />
                   </draggable>
                   <!--显示文件夹组 -->
@@ -174,11 +176,12 @@
                       :key="file.id"
                       :file="file"
                       :clientDownLoad="clientDownLoad"
-                      :setFileStatus="setFileStatus"
                       :showFileMilestone="showFileMilestone"
                       :nodeFolder="currentNodeFolder"
                       :currentFolder="currentFolder"
                       @dblclick.native="fileClick(file)"
+                      :localFileHashMap="localFileHashMap"
+                      :loadingState="localFileLoadStateMap[file.id]"
                     />
                   </div>
                 </div>
@@ -263,11 +266,13 @@ import * as services from './service';
 import { firstCharToLowerCase, firstCharToUpperCase, notify } from '@/utils/tool';
 import FileItem from './components/file-item';
 import FolderItem from './components/folder-item';
-import { FileWorkStatus, DownloadStatus, injectionFileLocalStatus } from './helper';
+import { FileWorkStatus, injectionFileLocalStatus, LoadingEnum } from './helper';
 
 const $ = window.jQuery;
 const Velocity = window.Velocity;
 Vue.use(vuetify);
+const { DOWNLOADING, UPLOADING } = LoadingEnum;
+const { WORKING, NOT_WORKING } = FileWorkStatus;
 
 const initialTempFile = (folderGroupID, folderGroupName) => ({
   archID: null,
@@ -304,7 +309,7 @@ const initialFolderData = () =>({
   ModifyTime:"",
 });
 
-const fileIsDownloaded = file => file.downloadStatus === DownloadStatus.DOWNLOADED;
+// const fileIsDownloaded = file => file.downloadStatus === DownloadStatus.DOWNLOADED;
 
 export default {
   components: {
@@ -338,9 +343,7 @@ export default {
       localWorkspacePrefix: '', // 本地工作目录前缀
       socketIns: null, // 监听文件变化的socket实例
       timerIns: null, // 文件定时任务实例
-      fileDownloadStatusHash: {}, // 文件上传/下载状态存储
       folderMap: {}, // 文件夹id哈希： { [folderId]: folder } 
-      fileLocalStateMap: {}, // 本地网关文件通信数据缓存: { [fileId]: {  } }
 
       breadcrumbFolderList: [], // 面包屑导航对应的文件夹队列
       uploadFileList: [], // 上传文件的队列
@@ -350,6 +353,20 @@ export default {
 
       neibianju: "neibianju", // 协作文件槽样式
       showadow: false,
+      localFileHashMap: {}, // { `${节点名称}\\${文件名称}.${文件扩展名}`: `${ipfsCid}` }
+      /**
+       * 文件本地加载状态表
+       * 格式: {
+       *  [file.id]: {
+       *    type: DOWNLOADING | UPLOADING
+       *    loadProgress: number | string
+       *    loadSize: number | string
+       *    totalSize: number | string
+       *    unit: string
+       *  }
+       * }
+       */
+      localFileLoadStateMap: {},
     };
   },
   mounted: function () {
@@ -364,7 +381,7 @@ export default {
       this.onSocketFileChangeDetected.bind(this), (localWorkspacePrefix) => { this.localWorkspacePrefix = localWorkspacePrefix;},
       errorEvent => { notify.error('本地网关通讯失败'); }
     );
-    this.intervalTask();
+    // this.intervalTask();
   },
   destroyed: function () {
     window.removeEventListener("scroll", this.onscroll);
@@ -437,33 +454,26 @@ export default {
          * }
          */
         const hash = JSON.parse(data);
-        this.fileDownloadStatusHash = hash;
-        this.refreshFileStatus();
+        this.localFileHashMap = hash;
       }catch(e) {
         console.log('socket file change message error:', e);
       }
       // console.log('socket file change message detected:', args);
     },
-    refreshFileStatus(){
-      const fileStatusHash = this.fileDownloadStatusHash;
-      const stateMap = this.fileLocalStateMap;
-      const folderMap = this.folderMap;
-      this.workFileList = injectionFileLocalStatus(this.workFileList, fileStatusHash, stateMap, folderMap);
-      this.cooperationFileList = injectionFileLocalStatus(this.cooperationFileList, fileStatusHash, stateMap, folderMap);
+    addLocalFileRecord(fileStoreKey, ipfsCid) {
+      // this.localFileHashMap[fileStoreKey] = ipfsCid;
+      this.localFileHashMap = { ...this.localFileHashMap, [fileStoreKey]: ipfsCid };
     },
-    updateFileLoadState(file, progress, type){
-      const stateMap = this.fileLocalStateMap;
+    updateFileLoadState(fileId, type, loadProgress = 0, loadSize, totalSize, unit){
       const updateState = {
-        loadProgress: progress,
-        downloadStatus: type === 'download' ? DownloadStatus.DOWNLOADING : DownloadStatus.UPLOADING,
-      };
-      this.fileLocalStateMap = { ...stateMap, [file.id]: updateState };
-      this.refreshFileStatus();
+        type, loadProgress, loadSize, totalSize, unit
+      }
+      this.localFileLoadStateMap = { ...this.localFileLoadStateMap, [fileId]: updateState };
     },
     removeFileLoadingState(fileId) {
-      delete this.fileLocalStateMap[fileId];
-      this.fileLocalStateMap = {...this.fileLocalStateMap};
-      this.refreshFileStatus();
+      console.log(`going to remove file: ${fileId}`)
+      // todo 待确认
+      delete this.localFileLoadStateMap[fileId];
     },
     /* 工作链API */
     /**
@@ -576,22 +586,21 @@ export default {
       // todo 接口去除公共文件夹配置
       const folderResInfo = await services.fetchFolderFileList(currentFolder.id, userId, currentFolder.id);
       if(!folderResInfo) return;
-      this.workFileList = injectionFileLocalStatus(
-        folderResInfo.myFile.concat(folderResInfo.workFile),
-        this.fileDownloadStatusHash,
-        this.fileLocalStateMap,
-        this.folderMap,
-      );
+      this.workFileList = folderResInfo.myFile.concat(folderResInfo.workFile);
       this.resolveUploadFileList(this.workFileList);
       this.workSubFolderList = folderResInfo.folder;
-      this.cooperationFileList = injectionFileLocalStatus(
-        folderResInfo.coordinationFiles,
-        this.fileDownloadStatusHash,
-        this.fileLocalStateMap,
-        this.folderMap,
-      );
+      this.cooperationFileList = folderResInfo.coordinationFiles;
       this.resolveUploadFileList(this.cooperationFileList);
     },
+    /**
+     * 去掉上传队列中已经上传成功的文件
+     */
+    resolveUploadFileList(fileList) {
+      this.uploadFileList = this.uploadFileList.filter(uploadFile => {
+        const targetFile = fileList.find(iFile => iFile.archName === uploadFile.archName && iFile.extension === uploadFile.extension);
+        return !targetFile;
+      });
+    },
     /**
      * 点击确定 保存文件夹组
      */
@@ -650,15 +659,6 @@ export default {
       // 重置面包屑导航数组
       this.breadcrumbFolderList = this.breadcrumbFolderList.slice(0, breadFolderIdx + 1);
     },
-    /**
-     * 去掉上传队列中已经上传成功的文件
-     */
-    resolveUploadFileList(fileList) {
-      this.uploadFileList = this.uploadFileList.filter(uploadFile => {
-        const targetFile = fileList.find(iFile => iFile.archName === uploadFile.archName && iFile.extension === uploadFile.extension);
-        return !targetFile;
-      });
-    },
     /**
      * 客户端上传文件
      */
@@ -672,43 +672,29 @@ export default {
           const {ArchName, IpfsCid, Extension} = file;
           // 注入到文件下载检测表中
           const key = `${folderName}\\${ArchName}${Extension ? `.${Extension}`: ''}`;
-          this.fileDownloadStatusHash[key] = IpfsCid;
-          this.refreshFileStatus();
+          this.addLocalFileRecord(key, IpfsCid);
+          this.removeFileLoadingState(file.Id);
           this.fetchFolderFiles();
         },
-        (progressData, uploadFile) => { // onLoading
-          const { process, hash } = progressData;
-          const updateState = {
-            loadProgress: process,
-            downloadStatus: DownloadStatus.UPLOADING,
-          };
-          if(uploadFile.Id) { // 若为同名覆盖
-            const stateMap = this.fileLocalStateMap;
-            stateMap[uploadFile.Id] = updateState;
-            this.refreshFileStatus();
+        (progressData, upperUploadFile) => { // onLoading
+          const { process, hash, size, currentSize, unit } = progressData;
+          const uploadFile = firstCharToLowerCase(upperUploadFile);
+          this.updateFileLoadState(uploadFile.id, UPLOADING, process, currentSize, size, unit);
+          // 覆盖已有的同名文件
+          if(uploadFile.id.indexOf('upload:') === -1) {
             return;
           }
-          const targetFile = this.uploadFileList.find(iFile => iFile.archName === uploadFile.ArchName && iFile.extension === uploadFile.Extension);
-          if(targetFile) {
-            const shadowFile = firstCharToLowerCase({ ...targetFile, ...updateState });
-            this.uploadFileList = this.uploadFileList.map(iFile => {
-              if(iFile.archName === shadowFile.archName && iFile.extension === shadowFile.extension) {
-                return shadowFile;
-              }
-              return iFile;
-            });
-            return;
+          // 插入上传队列
+          if(!this.uploadFileList.find(f => f === uploadFile)) {
+            this.uploadFileList.push(uploadFile);
           }
-          this.uploadFileList.push(firstCharToLowerCase({ ...uploadFile, ...updateState }));
-          // console.log(this.uploadFileList);
         },
       );
     },
     /**
      * 客户端下载方法
-     * type ：1 为文件，2位协作文件
      */
-    clientDownLoad: function (file, type) {
+    clientDownLoad: function (file) {
       if(!this.isClient) return;
       console.log('下载的文件对象', file);
       const { ipfsCid, archName: fileName, extension, folderId, nodeName } = file;
@@ -716,28 +702,22 @@ export default {
       // const { levelId } = folderMap[folderId] || {};
       const nodeFolderName = nodeName || this.currentNodeFolder.folderName;
       const extensionedFileName = `${fileName}${extension ? `.${extension}`:''}`;
-      const copyFile = { ...file };
+      const fileStoreKey = `${nodeFolderName}\\${extensionedFileName}`;
       const errorHandler = () => {
         notify.error('文件下载失败');
-        Object.assign(file, copyFile);
-        delete this.fileLocalStateMap[file.id];
-        this.refreshFileStatus();
+        this.removeFileLoadingState(file.id);
       }
-      this.updateFileLoadState(file, 0, 'download');
+      this.updateFileLoadState(file.id, DOWNLOADING, 0);
       system.downloadFile(ipfsCid, sessionStorage.projName, extensionedFileName, nodeFolderName, (resMessage, socketIns) => {
         console.log('receive download file message:', resMessage, socketIns);
         // {"size":"11","currentSize":"11","unit":"B","process":100,"hash":""}
         try {
-          const { process } = JSON.parse(resMessage.data);
+          const { process, hash } = JSON.parse(resMessage.data);
           if(resMessage.data === '-1') { throw 'download failed'; }
-          this.updateFileLoadState(file, process, 'download');
+          this.updateFileLoadState(file.id, DOWNLOADING, process);
           if(process !== 100) return;
-          // file.downloadStatus = 2;
-          // file.isDownload = true;
-          // 注入到文件下载检测表中
-          const key = `${nodeFolderName}\\${extensionedFileName}`;
-          this.fileDownloadStatusHash[key] = ipfsCid;
-          this.refreshFileStatus();
+          this.addLocalFileRecord(fileStoreKey, ipfsCid);
+          this.removeFileLoadingState(file.id);
           notify.success(`文件:${fileName} 下载完成`);
           // this.$forceUpdate();
         } catch (e) {
@@ -757,65 +737,33 @@ export default {
       system.openFolder(path);
     },
     /**
-     * 更改文件状态
-     */
-    async setFileStatus(file, state, message, type) {
-      if(state === 2 || state === 1) {//2代表是开启协同  1代表取消协同
-        let params = {
-          FolderId: file.folderId,
-          FileId: file.id,
-          UserId: this.userId,
-          FileStatus: state
-        }
-        try {
-          const res = await services.fileCoordinationChange(params);
-          if(res.Code === 0) {
-            notify.success(res.Msg);
-            this.fetchFolderFiles();
-          } else {
-            notify.info(res.Msg);
-            return;
-          }
-        } catch(err) {
-          console.log(err);
-        }
-      }
-    },
-    /**
-     * 更新文件
+     * 提交本地文件
      */
-    async updateFileWorkStatus(file, nextWorkStatus, message) {
-      if(!this.isClient || (nextWorkStatus === FileWorkStatus.WORKING && file.workStatus === FileWorkStatus.NOT_WORKING)) {
-        const resFlag = await services.changeFileWorkStatus(file.id, nextWorkStatus);
-        if(resFlag.Code !== 0) return;
-        notify.success(message);
-        this.$forceUpdate();
-        return;
-      }
-      // 仅当文件从工作中变成非工作状态时执行下面的代码
-      // todo 获取文件最新的hash并更新文件
+    async commitFile(file) {
+      if(!this.isClient) return;
       const { folderName, levelId, id: folderId } = this.currentNodeFolder;
       const { archName, extension, id: fileId } = file;
-      this.updateFileLoadState(file, 0, 'upload');
+      this.updateFileLoadState(fileId, UPLOADING, 0);
       // const fileList = this.currentPageType === 0 ? this.folderFileList.listMyFiles : this.folderFileList.listOtherFiles;
       const fileKey = `${folderName}\\${archName}${extension ? `.${extension}`:''}`;
-      this.fileDownloadStatusHash[fileId] = `${file.localIpfsCid}--upload`;
-      this.refreshFileStatus();
       system.updateFile(
         file, this.localWorkspacePrefix,
         this.projectName, folderName,
         async (fileNewState) => {
-          const resFlag = await services.changeFileWorkStatus(file.id, nextWorkStatus);
+          const resFlag = await services.changeFileWorkStatus(file.id, 1);
           if(resFlag.Code !== 0) return;
-          notify.success(message);
+          notify.success('文件已更新');
           const {IpfsCid} = fileNewState;
           // 注入到文件下载检测表中
-          this.fileDownloadStatusHash[fileKey] = IpfsCid;
+          // 同时更新文件队列中file对象的ipfsCid属性这样才能在下次刷新前使文件的记录保持一致
+          file.ipfsCid = IpfsCid;
+          file.workStatus = NOT_WORKING;
+          this.addLocalFileRecord(fileKey, IpfsCid);
           this.removeFileLoadingState(fileId);
         },
         (progressData) => {
-          const { process, hash } = progressData;
-          this.updateFileLoadState(file, process, 'upload');
+          const { process, hash, size, currentSize, unit } = progressData;
+          this.updateFileLoadState(fileId, UPLOADING, process, currentSize, size, unit);
         },
       );
     },
@@ -824,11 +772,12 @@ export default {
      */
     fileClick: async function (file) {
       if(!this.isClient) return;
-      if(!fileIsDownloaded(file)) return;
-      const { archName, extension, id: fileId, nodeName  } = file;
+      const { archName, extension, id: fileId, nodeName } = file;
       const folderName = nodeName || this.currentFolder.folderName;
       const localWorkspacePrefix = this.localWorkspacePrefix;
-      const filePath = `${localWorkspacePrefix}\\${folderName}\\${archName}${extension ? `.${extension}` : ''}`;
+      const fileStoreKey = `${folderName}\\${archName}${extension ? `.${extension}` : ''}`;
+      if(!this.localFileHashMap[fileStoreKey]) return;
+      const filePath = `${localWorkspacePrefix}\\${fileStoreKey}`;
       const isCooperationFile = !!nodeName;
       if(!isCooperationFile && (file.workStatus === 2 && sessionStorage.userId !== file.modifyUserId)) {
         notify.warning('文件正在工作编辑中，请耐心等待');