From 343224eb5ac29aa0b914e66f34b7a64ad2a46364 Mon Sep 17 00:00:00 2001
From: Ldc <ldc@vci.com>
Date: 星期一, 08 四月 2024 10:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/store/modules/user.js | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/Source/ProjectWeb/src/store/modules/user.js b/Source/ProjectWeb/src/store/modules/user.js
index 1a65fee..4f07444 100644
--- a/Source/ProjectWeb/src/store/modules/user.js
+++ b/Source/ProjectWeb/src/store/modules/user.js
@@ -27,10 +27,36 @@
} else {
ele[propsDefault.children].forEach(child => {
addPath(child);
- })
- }
+ });
+ }
}
+
+function updateCode(items) {
+ items.forEach(item => {
+ item.pathValue = item.path;
+ item.path = '/' + item.code;
+ item.query = {}; // 鍒濆鍖� item.query
+ item.query = queryStringToObject(item.pathValue)
+ console.log('item', item);
+ if (item.children && item.children.length > 0) {
+ updateCode(item.children);
+ }
+ });
+}
+function queryStringToObject(queryString) {
+ const index = queryString.indexOf('?');
+ if (index !== -1) {
+ queryString = queryString.substring(index + 1);
+ }
+ const params = new URLSearchParams(queryString);
+ const obj = {};
+ for (const [key, value] of params.entries()) {
+ obj[key] = value;
+ }
+ return obj;
+}
+
const user = {
state: {
@@ -48,9 +74,9 @@
//鏍规嵁鐢ㄦ埛鍚嶇櫥褰�
LoginByUsername({commit}, userInfo) {
return new Promise((resolve, reject) => {
- loginByUsername(userInfo.tenantId, userInfo.deptId, userInfo.roleId, userInfo.username, md5(userInfo.password), userInfo.type, userInfo.key, ).then(res => {
+ loginByUsername(userInfo.tenantId, userInfo.deptId, userInfo.roleId, userInfo.username, md5(userInfo.password), userInfo.type, userInfo.key,).then(res => {
const data = res.data;
- if(data.success){
+ if (data.success) {
debugger;
commit('SET_TOKEN', data.obj.sessionInfo.token);
commit('SET_REFRESH_TOKEN', data.obj.sessionInfo.token);
@@ -58,7 +84,7 @@
commit('SET_USER_INFO', data.obj.sessionInfo);
commit('DEL_ALL_TAG');
commit('CLEAR_LOCK');
- }else {
+ } else {
Message({
message: data.msg,
type: 'error'
@@ -86,7 +112,7 @@
//鏍规嵁绗笁鏂逛俊鎭櫥褰�
LoginBySocial({commit}, userInfo) {
return new Promise((resolve) => {
- loginBySocial(userInfo.tenantId, userInfo.source, userInfo.state).then(res => {
+ loginBySocial(userInfo.tenantId, userInfo.source, userInfo.state).then(res => {
const data = res.data;
if (data.error_description) {
Message({
@@ -208,10 +234,12 @@
let menu = deepClone(data);
menu.forEach(ele => {
addPath(ele, true);
+ updateCode([ele]);
});
+
commit('SET_MENU_ALL', menu)
commit('SET_MENU', menu)
- //dispatch('GetButtons');
+ //dispatch('GetButtons');s
resolve(menu)
})
})
@@ -245,15 +273,15 @@
}
})
state.menuAll = menu
- setStore({ name: 'menuAll', content: state.menuAll })
+ setStore({name: 'menuAll', content: state.menuAll})
},
SET_MENU_ALL_NULL: (state) => {
state.menuAll = []
- setStore({ name: 'menuAll', content: state.menuAll })
+ setStore({name: 'menuAll', content: state.menuAll})
},
SET_MENU: (state, menu) => {
state.menu = menu
- setStore({ name: 'menu', content: state.menu })
+ setStore({name: 'menu', content: state.menu})
},
SET_REFRESH_TOKEN: (state, refreshToken) => {
setRefreshToken(refreshToken)
--
Gitblit v1.9.3