From e1c80636ba1ddbd9e590b37a9558ad764b1896e7 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 8 Mar 2022 19:32:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9C=80=E5=90=8E=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=8A=A0=E5=85=A5=E7=9A=84=E6=88=90=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/manage/components/ProjectList.vue   | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index d491177d2..13cbd25c9 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -16,17 +16,15 @@
                                     <p>{{$L('项目负责人')}}</p>
                                 </UserAvatar>
                             </li>
-                            <template v-if="projectUser.length > 0 && windowWidth > 980">
-                                <template v-for="(item, index) in projectUser"  v-if="index < projectUserShowNum">
-                                    <li v-if="index + 1 == projectUserShowNum && projectUser.length > projectUserShowNum" class="more">
-                                        <ETooltip :content="$L('共' + (projectUser.length + 1) + '个成员')">
-                                            <Icon type="ios-more"/>
-                                        </ETooltip>
-                                    </li>
-                                    <li>
-                                        <UserAvatar :userid="item.userid" :size="36" :borderWitdh="2" :openDelay="0"/>
-                                    </li>
-                                </template>
+                            <template v-if="windowWidth > 980 && projectUser.length > 0" v-for="item in projectUser">
+                                <li v-if="item.userid === -1" class="more">
+                                    <ETooltip :content="$L('共' + (item.count + 1) + '个成员')">
+                                        <Icon type="ios-more"/>
+                                    </ETooltip>
+                                </li>
+                                <li v-else>
+                                    <UserAvatar :userid="item.userid" :size="36" :borderWitdh="2" :openDelay="0"/>
+                                </li>
                             </template>
                         </ul>
                     </li>
@@ -590,15 +588,22 @@ export default {
         },
 
         projectUser() {
-            const {projectData} = this;
+            const {projectData, windowWidth} = this;
             if (!projectData.project_user) {
                 return [];
             }
-            return projectData.project_user.filter(({userid}) => userid != projectData.owner_userid)
-        },
-
-        projectUserShowNum() {
-            return this.windowWidth > 1200 ? 8 : 3;
+            let max = windowWidth > 1200 ? 8 : 3
+            let list = projectData.project_user.filter(({userid}) => userid != projectData.owner_userid)
+            if (list.length <= max) {
+                return list
+            }
+            let array = list.slice(0, max - 1);
+            array.push({
+                userid: -1,
+                count: list.length
+            })
+            array.push(list[list.length - 1])
+            return array;
         },
 
         allTask() {