admin/django-vue3-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
liqiang
2025-06-15 17:55:24 +08:00
parent 8ea49866bc f8c8f2963b
commit 82a0ef612a
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/dvadmin/system/management/commands/generate_init_json.py
View File

@@ -29,7 +29,7 @@ class Command(BaseCommand):
def serializer_data(self, serializer, query_set: QuerySet): def serializer_data(self, serializer, query_set: QuerySet):
serializer = serializer(query_set, many=True) serializer = serializer(query_set, many=True)
data = json.loads(json.dumps(serializer.data, ensure_ascii=False)) data = json.loads(json.dumps(serializer.data, ensure_ascii=False))
with open(os.path.join(BASE_DIR, f'init_{query_set.model._meta.model_name}.json'), 'w') as f: with open(os.path.join(BASE_DIR, f'init_{query_set.model._meta.model_name}.json'), 'w',encoding='utf-8') as f:
json.dump(data, f, indent=4, ensure_ascii=False) json.dump(data, f, indent=4, ensure_ascii=False)
return return

2
web/src/layout/navMenu/horizontal.vue
View File

@@ -93,7 +93,7 @@ const initElMenuOffsetLeft = () => {
nextTick(() => { nextTick(() => {
let els = <HTMLElement>document.querySelector('.el-menu.el-menu--horizontal li.is-active'); let els = <HTMLElement>document.querySelector('.el-menu.el-menu--horizontal li.is-active');
if (!els) return false; if (!els) return false;
elMenuHorizontalScrollRef.value.$refs.wrapRef.scrollLeft = els.offsetLeft; // elMenuHorizontalScrollRef.value.$refs.wrapRef.scrollLeft = els.offsetLeft;
}); });
}; };
// 路由过滤递归函数 // 路由过滤递归函数

1
web/src/stores/interface/index.ts
View File

@@ -6,6 +6,7 @@ import {useFrontendMenuStore} from "/@/stores/frontendMenu";
// 用户信息 // 用户信息
export interface UserInfosState { export interface UserInfosState {
id:'',
avatar: string; avatar: string;
username: string; username: string;
name: string; name: string;

4
web/src/stores/userInfo.ts
View File

@@ -12,6 +12,7 @@ import headerImage from '/@/assets/img/headerImage.png';
export const useUserInfo = defineStore('userInfo', { export const useUserInfo = defineStore('userInfo', {
state: (): UserInfosStates => ({ state: (): UserInfosStates => ({
userInfos: { userInfos: {
id:'',
avatar: '', avatar: '',
username: '', username: '',
name: '', name: '',
@@ -37,6 +38,7 @@ export const useUserInfo = defineStore('userInfo', {
this.userInfos.pwd_change_count = count; this.userInfos.pwd_change_count = count;
}, },
async updateUserInfos(userInfos:any) { async updateUserInfos(userInfos:any) {
this.userInfos.id = userInfos.id;
this.userInfos.username = userInfos.name; this.userInfos.username = userInfos.name;
this.userInfos.avatar = userInfos.avatar; this.userInfos.avatar = userInfos.avatar;
this.userInfos.name = userInfos.name; this.userInfos.name = userInfos.name;
@@ -54,6 +56,7 @@ export const useUserInfo = defineStore('userInfo', {
this.userInfos = Session.get('userInfo'); this.userInfos = Session.get('userInfo');
} else { } else {
let userInfos: any = await this.getApiUserInfo(); let userInfos: any = await this.getApiUserInfo();
this.userInfos.id = userInfos.id;
this.userInfos.username = userInfos.data.name; this.userInfos.username = userInfos.data.name;
this.userInfos.avatar = userInfos.data.avatar; this.userInfos.avatar = userInfos.data.avatar;
this.userInfos.name = userInfos.data.name; this.userInfos.name = userInfos.data.name;
@@ -74,6 +77,7 @@ export const useUserInfo = defineStore('userInfo', {
url: '/api/system/user/user_info/', url: '/api/system/user/user_info/',
method: 'get', method: 'get',
}).then((res:any)=>{ }).then((res:any)=>{
this.userInfos.id = res.data.id;
this.userInfos.username = res.data.name; this.userInfos.username = res.data.name;
this.userInfos.avatar = (res.data.avatar && getBaseURL(res.data.avatar)) || headerImage; this.userInfos.avatar = (res.data.avatar && getBaseURL(res.data.avatar)) || headerImage;
this.userInfos.name = res.data.name; this.userInfos.name = res.data.name;