From f52aa95e9aaa8184937804a1714866a49588d37d Mon Sep 17 00:00:00 2001
From: unknown <zheng_z@azut.cn>
Date: Tue, 3 Nov 2020 16:30:04 +0800
Subject: [PATCH] update

---
 src/services/system.js                         | 6 +++---
 src/views/components_web/distWork/distWork.vue | 4 ++--
 vue.config.js                                  | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/services/system.js b/src/services/system.js
index 449fc897..6f3443d5 100644
--- a/src/services/system.js
+++ b/src/services/system.js
@@ -51,10 +51,10 @@ const system = {
    * todo
    * 通知系统进入当前的工作空间
    */
-  entryProject: safeCall((projectId, userId, fileChangeHandler) => {
+  entryProject: safeCall((projName, userId, fileChangeHandler) => {
     const socket = io('init');
     socket.on('open', () => {
-      socket.send([projectId, userId].join('|'));
+      socket.send([userId, projName].join('|'));
       socket.close();
     });
     const watchSocket = io('subscriptionFileChange');
@@ -115,7 +115,7 @@ const system = {
         socket.close();
         // {"size":"88.69","currentSize":"88.69","unit":"KiB","process":100,"hash":""}
         // {"size":"","currentSize":"","unit":"","process":100,"hash":"QmPJ9i4z5UdoQpLH1DrkhZiTZra2rGicXiPabiLw4LvTmX"}
-        const maybeFile = fileList.find(iFile => `${iFile.archName}${iFile.extension ? `.${iFile.extension}` : ''}`);
+        const maybeFile = fileList.find(iFile => `${iFile.archName}${iFile.extension ? `.${iFile.extension}` : ''}` === fileName);
         if(maybeFile) { // 更新同名文件
           const copyFile = firstCharToUpperCase({ ...maybeFile, ipfsCid: hash, ModifyUserId: sessionStorage.userId });
 
diff --git a/src/views/components_web/distWork/distWork.vue b/src/views/components_web/distWork/distWork.vue
index c34fbb35..b36ffeb1 100644
--- a/src/views/components_web/distWork/distWork.vue
+++ b/src/views/components_web/distWork/distWork.vue
@@ -1647,8 +1647,8 @@ function mergeFolderList(plainFolderList, userHash) {
     const folder = firstCharToLowerCase(upperFolder);
     hash[folder.id] = folder;
     folder.listChildren = [];
-    folder.listUser = folder.oldGeneralId.split(',').filter(a => a);
-    folder.manageUser = (folder.oldManager === '0' ? '' : folder.oldManager).split(',').filter(a => a);
+    folder.listUser = folder.oldGeneralId.split(',').filter(a => a).map(id => userHash[id]);
+    folder.manageUser = (folder.oldManager === '0' ? '' : folder.oldManager).split(',').filter(a => a).map(id => userHash[id]);
     const parentFolderId = folder.superId;
     // headList.push(folder);
     if(parentFolderId === rootFolderId) {
diff --git a/vue.config.js b/vue.config.js
index cfbb10c3..2f10d833 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,7 +24,6 @@ module.exports = {
           NODE_ENV: '"development"',
           API_HOST: '"/api/"',
           // API_HOST: '"http://47.104.91.134:9000/api/"',
-          IS_CLIENT: false,
         }
       }),
     ],
@@ -33,7 +32,6 @@ module.exports = {
         '/api/pms': {
           // target: 'http://47.104.91.134:8089',
           target:'http://10.240.33.159:8089',
-
           changeOrigin: true,
           secure: false,
         },