From e0ecd0ad0ad814e0c454578e46a6d0f8129daaa6 Mon Sep 17 00:00:00 2001
From: Pang <aipaw@live.cn>
Date: Tue, 15 Aug 2023 09:57:09 +0800
Subject: [PATCH] no message

---
 .../pages/manage/components/ProjectPanel.vue  | 36 ++++++++++---------
 resources/assets/js/store/actions.js          |  6 +++-
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue
index 9f76c0f6e..4adc46079 100644
--- a/resources/assets/js/pages/manage/components/ProjectPanel.vue
+++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue
@@ -831,26 +831,28 @@ export default {
             }
             //
             const {project_user} = this.projectData;
-            const userItems = project_user.map((item, index) => {
-                const userInfo = cacheUserBasic.find(({userid}) => userid === item.userid) || {}
-                const length = allTask.filter(({task_user, complete_at}) => {
-                    if (!this.projectData.cacheParameter.completedTask) {
-                        if (complete_at) {
-                            return false;
+            if ($A.isArray(project_user)) {
+                const userItems = project_user.map((item, index) => {
+                    const userInfo = cacheUserBasic.find(({userid}) => userid === item.userid) || {}
+                    const length = allTask.filter(({task_user, complete_at}) => {
+                        if (!this.projectData.cacheParameter.completedTask) {
+                            if (complete_at) {
+                                return false;
+                            }
                         }
+                        return task_user.find(({userid, owner}) => userid === item.userid && owner);
+                    }).length
+                    return {
+                        value: `user:${userInfo.userid}`,
+                        label: `${userInfo.nickname} (${length})`,
+                        class: `user-${index}`,
+                        userid: userInfo.userid || 0,
+                        length,
                     }
-                    return task_user.find(({userid, owner}) => userid === item.userid && owner);
-                }).length
-                return {
-                    value: `user:${userInfo.userid}`,
-                    label: `${userInfo.nickname} (${length})`,
-                    class: `user-${index}`,
-                    userid: userInfo.userid || 0,
-                    length,
+                }).filter(({userid, length}) => userid > 0 && length > 0)
+                if (userItems.length > 0) {
+                    list.push(...userItems)
                 }
-            }).filter(({userid, length}) => userid > 0 && length > 0)
-            if (userItems.length > 0) {
-                list.push(...userItems)
             }
             //
             return list
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index b574eb75c..b40e8c1d5 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -130,7 +130,8 @@ export default {
         }
         if (params.encrypt) {
             const userAgent = window.navigator.userAgent;
-            if (/Windows NT 5.1|Windows XP/.test(userAgent)
+            if (window.systemInfo.debug === "yes"
+                || /Windows NT 5.1|Windows XP/.test(userAgent)
                 || userAgent.indexOf("Windows NT 6.0") !== -1
                 || userAgent.indexOf("Windows NT 6.1") !== -1
                 || userAgent.indexOf("Windows NT 6.2") !== -1) {
@@ -3094,6 +3095,9 @@ export default {
             wgLog && console.log("[WS] Open", e, $A.formatDate())
             state.wsOpenNum++;
             //
+            if (window.systemInfo.debug === "yes") {
+                return  // 测试环境不发送加密信息
+            }
             dispatch("websocketSend", {
                 type: 'encrypt',
                 data: {