fix(web): model logo; BasicAuthLayout fix
This commit is contained in:
@@ -2,10 +2,10 @@
|
|||||||
* @Author: ZhaoYing
|
* @Author: ZhaoYing
|
||||||
* @Date: 2026-02-02 15:12:42
|
* @Date: 2026-02-02 15:12:42
|
||||||
* @Last Modified by: ZhaoYing
|
* @Last Modified by: ZhaoYing
|
||||||
* @Last Modified time: 2026-02-04 14:06:28
|
* @Last Modified time: 2026-02-28 17:28:41
|
||||||
*/
|
*/
|
||||||
/**
|
/**
|
||||||
* BasicLayout Component
|
* BasicAuthLayout Component
|
||||||
*
|
*
|
||||||
* A minimal layout wrapper that provides:
|
* A minimal layout wrapper that provides:
|
||||||
* - User information initialization
|
* - User information initialization
|
||||||
@@ -26,12 +26,12 @@ import { useUser } from '@/store/user';
|
|||||||
* Basic layout component for pages without navigation UI.
|
* Basic layout component for pages without navigation UI.
|
||||||
* Fetches user info and storage type on mount, then renders child routes.
|
* Fetches user info and storage type on mount, then renders child routes.
|
||||||
*/
|
*/
|
||||||
const BasicLayout: FC = () => {
|
const BasicAuthLayout: FC = () => {
|
||||||
const { getUserInfo } = useUser();
|
const { getUserInfo } = useUser();
|
||||||
|
|
||||||
// Fetch user information and storage type on component mount
|
// Fetch user information and storage type on component mount
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
getUserInfo();
|
getUserInfo(undefined, true); // Pass true to skip navigation jump
|
||||||
}, [getUserInfo]);
|
}, [getUserInfo]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -42,4 +42,4 @@ const BasicLayout: FC = () => {
|
|||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
|
||||||
export default BasicLayout;
|
export default BasicAuthLayout;
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
* @Author: ZhaoYing
|
* @Author: ZhaoYing
|
||||||
* @Date: 2026-02-02 16:33:54
|
* @Date: 2026-02-02 16:33:54
|
||||||
* @Last Modified by: ZhaoYing
|
* @Last Modified by: ZhaoYing
|
||||||
* @Last Modified time: 2026-02-04 18:30:10
|
* @Last Modified time: 2026-02-28 17:21:20
|
||||||
*/
|
*/
|
||||||
/**
|
/**
|
||||||
* User Store
|
* User Store
|
||||||
@@ -44,7 +44,7 @@ export interface UserState {
|
|||||||
/** Update login information */
|
/** Update login information */
|
||||||
updateLoginInfo: (values: LoginInfo) => void;
|
updateLoginInfo: (values: LoginInfo) => void;
|
||||||
/** Get user information */
|
/** Get user information */
|
||||||
getUserInfo: (flag?: boolean) => void;
|
getUserInfo: (flag?: boolean, notNeedJump?: boolean) => void;
|
||||||
/** Clear user information */
|
/** Clear user information */
|
||||||
clearUserInfo: () => void;
|
clearUserInfo: () => void;
|
||||||
/** Logout user */
|
/** Logout user */
|
||||||
@@ -73,13 +73,13 @@ export const useUser = create<UserState>((set, get) => ({
|
|||||||
cookieUtils.set('refreshToken', values.refresh_token);
|
cookieUtils.set('refreshToken', values.refresh_token);
|
||||||
set({ loginInfo: values });
|
set({ loginInfo: values });
|
||||||
},
|
},
|
||||||
getUserInfo: async (flag?: boolean) => {
|
getUserInfo: async (flag?: boolean, notNeedJump?: boolean) => {
|
||||||
if (!cookieUtils.get('authToken')) {
|
if (!cookieUtils.get('authToken')) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const { checkJump } = get()
|
const { checkJump } = get()
|
||||||
const localUser = JSON.parse(localStorage.getItem('user') || '{}') as User;
|
const localUser = JSON.parse(localStorage.getItem('user') || '{}') as User;
|
||||||
if (localUser.id) {
|
if (localUser.id && !notNeedJump) {
|
||||||
checkJump()
|
checkJump()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* @Author: ZhaoYing
|
* @Author: ZhaoYing
|
||||||
* @Date: 2026-02-03 16:49:28
|
* @Date: 2026-02-03 16:49:28
|
||||||
* @Last Modified by: ZhaoYing
|
* @Last Modified by: ZhaoYing
|
||||||
* @Last Modified time: 2026-02-03 16:49:28
|
* @Last Modified time: 2026-02-28 17:24:05
|
||||||
*/
|
*/
|
||||||
/**
|
/**
|
||||||
* Custom Model Modal
|
* Custom Model Modal
|
||||||
@@ -50,7 +50,7 @@ const CustomModelModal = forwardRef<CustomModelModalRef, CustomModelModalProps>(
|
|||||||
setModel(model);
|
setModel(model);
|
||||||
form.setFieldsValue({
|
form.setFieldsValue({
|
||||||
...model,
|
...model,
|
||||||
logo: model.logo ? { url: model.logo, uid: model.logo, status: 'done', name: 'logo' } : undefined
|
logo: model.logo && model.logo.startsWith('http') ? { url: model.logo, uid: model.logo, status: 'done', name: 'logo' } : undefined
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
setIsEdit(false);
|
setIsEdit(false);
|
||||||
|
|||||||
Reference in New Issue
Block a user