github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 11:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Pang 2023-08-15 09:57:09 +08:00
parent e9e090fdf6
commit e0ecd0ad0a
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
resources/assets/js/pages/manage/components/ProjectPanel.vue
View File

@ -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

6
resources/assets/js/store/actions.js vendored
View File

@ -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: {