update

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 });
 

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) {

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,
         },