commit:同步2.2版本

This commit is contained in:
Jerry
2022-01-23 21:00:54 +08:00
parent ff7e52eedb
commit 35ac62e4d2
1201 changed files with 16301 additions and 161770 deletions

View File

@@ -83,7 +83,7 @@ export default {
getCurrentColumnId: (state) => {
return state.currentColumnId;
},
getMessageList: (state) => {
return state.messageList;
getMessageCount: (state) => {
return state.messageCount;
}
}

View File

@@ -158,10 +158,14 @@ export default {
if (setObjectToSessionStorage('currentColumnId', columnId)) state.currentColumnId = columnId;
if (setObjectToSessionStorage('currentMenuId', null)) state.currentMenuId = null;
},
setHeadImage: (state, imageHeaderUrl) => {
if (state.userInfo) state.userInfo.headImageUrl = imageHeaderUrl;
},
setMessageTimer: (state, timerHandler) => {
state.messageTimer = timerHandler;
},
setMessageList: (state, messageList) => {
state.messageList = messageList;
setMessageCount: (state, messageCount) => {
if (messageCount) messageCount.totalCount = messageCount.copyMessageCount + messageCount.remindingMessageCount;
state.messageCount = messageCount;
}
}

View File

@@ -28,5 +28,5 @@ export default {
currentColumnId: getObjectFromSessionStorage('currentColumnId', undefined),
// 消息列表
messageTimeer: null,
messageList: []
messageCount: []
}

View File

@@ -27,6 +27,22 @@ function initUserInfo (userInfo) {
userInfo.permCodeSet = new Set(userInfo.permCodeList);
}
if (userInfo != null && userInfo.headImageUrl != null && userInfo.headImageUrl !== '') {
try {
userInfo.headImageUrl = JSON.parse(userInfo.headImageUrl);
if (Array.isArray(userInfo.headImageUrl)) {
userInfo.headImageUrl = userInfo.headImageUrl[0];
} else {
userInfo.headImageUrl = null;
}
} catch (e) {
console.error('解析头像数据失败!', e);
userInfo.headImageUrl = null;
}
} else {
if (userInfo) userInfo.headImageUrl = null;
}
return userInfo;
}