From 468d420ab0be98be251056d87d53dccd4533f266 Mon Sep 17 00:00:00 2001
From: kim131 <1035828775@qq.com>
Date: Wed, 13 Jan 2021 17:26:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=8D=E5=AD=97=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E5=AF=BC=E8=87=B4=20=E5=B7=A5=E4=BD=9C=E6=8C=87?=
 =?UTF-8?q?=E6=B4=BE=E4=BA=BA=E5=91=98=E6=A0=B7=E5=BC=8F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=90=88=E7=90=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projDetail/components/people-item.vue     | 19 +++++++++++++-----
 .../workspace/components/workLine.vue         | 14 ++-----------
 .../main_web/workspace/workspace.new.vue      | 20 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/views/components_web/projDetail/components/people-item.vue b/src/views/components_web/projDetail/components/people-item.vue
index fcb15b95..676b1edd 100644
--- a/src/views/components_web/projDetail/components/people-item.vue
+++ b/src/views/components_web/projDetail/components/people-item.vue
@@ -1,10 +1,13 @@
 <template>
-  <div class="people-item">
+  <div class="people-item"  :title="user.cnName">
     <div class="people-wrap" :class="{'rt-0': isShowManagerMark}">
-      <div class="people" :class="{'manager-mark': isShowManagerMark }">
-        <img class="proj-avatarface"  v-if="Object.keys(user).length > 0"
-          :src="user.headImgUrl | resolveAvator" alt/>
-        <div class="add-btn" v-else-if="!isShowEmptyAvatar">
+      <div class="people">
+        <img v-if="Object.keys(user).length > 0" 
+             class="proj-avatarface"
+             :class="{'manager-mark': isShowManagerMark }"
+             :src="user.headImgUrl | resolveAvator" alt
+        />
+        <div v-else-if="!isShowEmptyAvatar" class="add-btn">
           <i class="el-icon-plus proj-avatarface"></i>
         </div>
         <img v-else src="/static/img/暂无2.svg" alt="" class="proj-avatarface empty">
@@ -77,6 +80,7 @@
     top: 4px;
     border-radius: 50%;
     margin: 0 auto;
+    width: 100%;
   }
   .people-item .people {
     border-radius: 50%;
@@ -106,6 +110,11 @@
   .people-name {
     position: relative;
     width: 100%;
+
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+
     height: 16px;
     line-height: 16px;
     color: rgba(17, 19, 21, 100);
diff --git a/src/views/main_web/workspace/components/workLine.vue b/src/views/main_web/workspace/components/workLine.vue
index 145d099a..a5db0fff 100644
--- a/src/views/main_web/workspace/components/workLine.vue
+++ b/src/views/main_web/workspace/components/workLine.vue
@@ -242,7 +242,7 @@
                           </div>
                       </button>
                     </template>
-                    <div class="has-next-node" v-if="totalNodeNum - nowFolderIndex > 2 && isCalcuteExchangeNode"></div>
+                    <div class="has-next-node" v-if="totalNodeNum - nowFolderIndex > 2 && isCalcuteExchangeNode && totalNodeNum > 5 "></div>
                   </div>
                   <!-- <i
                     class="icon font_family icon-icon_shezhi-jihuo rota90 workbtn workderct"
@@ -416,19 +416,9 @@ export default {
         this.listUserFolders.forEach(item=>{
         Res.Data.forEach(item2=>{
           if(item.nodeId==item2.PermCode&&item2.Permission==1&&item.nodeId!=item2.SysCode){
-            // const isExists1 = item.listsShareFrom[1].find(i => i.nodeId == item2.SysCode);
-
-            // console.log('isExists1', isExists1)
-            // if(!isExists1) {
               item.listsShareFrom[1].push(temp[item2.SysCode]);
-            // }
           }else if(item.nodeId==item2.SysCode&&item2.Permission==1&&item.nodeId!=item2.PermCode){
-            // const isExists2 = item.listsShareFrom[0].find(i => i.nodeId == item2.PermCode);
-            // console.log('isExists2', isExists2)
-            // if(!isExists2) {
-               item.listsShareFrom[0].push(temp[item2.PermCode]);
-            // }
-           
+              item.listsShareFrom[0].push(temp[item2.PermCode]);
           }
         }  
         )       
diff --git a/src/views/main_web/workspace/workspace.new.vue b/src/views/main_web/workspace/workspace.new.vue
index b4b88a50..17714c1f 100644
--- a/src/views/main_web/workspace/workspace.new.vue
+++ b/src/views/main_web/workspace/workspace.new.vue
@@ -500,6 +500,7 @@ import vuetify from "vuetify";
 import system from '@/services/system';
 import { queryAllTemplateNodeModelFile } from '@/services/template.js';
 import * as services from './service';
+import * as tempalteService from '@/services/template.js';
 import { firstCharToLowerCase, firstCharToUpperCase, notify } from '@/utils/tool';
 import FileItem from './components/file-item';
 import FolderItem from './components/folder-item';
@@ -646,6 +647,8 @@ export default {
 
       isAllFileLoaded: false,//当前工作节点下的文件状态是否都加载完毕
       hackWorkLine: null,
+
+      nestNodeList: [],//嵌套的模板数组
     };
   },
   mounted: function () {
@@ -711,6 +714,21 @@ export default {
     }
   },
   methods: {
+    // // 先根据项目的模板id 查询出嵌套模板数组
+    // async getNestTemplates(templateId) {
+    //     const res = await tempalteService.queryNestTemplateByTemplateId(templateId);
+    //     this.nestNodeList = res.Data || [];
+    // },
+    // // 根据id判断是否是被嵌套的节点
+    // isNest(id){
+    //   let len = this.nestNodeList.length;
+    //   for(let i = 0;i < len;i++){
+    //     if(this.nestNodeList[i].ParentNodeId == id){
+    //       return true;
+    //     }
+    //   }
+    //   return false;
+    // },
     // 搜索框字数超出35个字
     maxTextLengthArrived() {
       this.$notify({
@@ -802,7 +820,7 @@ export default {
       "modifyUserId":this.userId,
       "modifyTime":time,
       "isShowRecycle":0,
-      "relativePath":""}
+      "relativePath":this.currentFolder.folderPath}
 
       const addFileRes = await services.addFile(file);