develop #30

Merged
zsq merged 33 commits from develop into main 2026-03-31 17:43:07 +08:00
Showing only changes of commit 17e2fca04b - Show all commits

View File

@ -1,10 +1,10 @@
import { useMyState } from '@/common';
import { CloseOutlined, ReloadOutlined } from '@ant-design/icons';
import { PageContainer, PageContainerProps } from '@ant-design/pro-components';
import { history, useLocation } from '@umijs/max';
import type { MenuProps } from 'antd';
import { Dropdown, message, Space, Tabs } from 'antd';
import React, { useCallback, useEffect, useRef, useState } from 'react';
import { useMyState } from '@/common';
import AvatarProps from './AvatarProps';
import './MyPageContainer.scss';
@ -362,26 +362,26 @@ export function MyPageContainer({
);
};
if (!enableTabs || tabs.length === 0) {
return (
<PageContainer
fixedHeader
// header={{
// title: title,
// style: { backgroundColor: '#FFF' },
// if (!enableTabs || tabs.length === 0) {
// return (
// <PageContainer
// fixedHeader
// // header={{
// // title: title,
// // style: { backgroundColor: '#FFF' },
// // }}
// token={{
// paddingBlockPageContainerContent: 0,
// paddingInlinePageContainerContent: 0,
// }}
token={{
paddingBlockPageContainerContent: 0,
paddingInlinePageContainerContent: 0,
}}
{...rest}
>
<Space direction="vertical" size="middle" style={{ width: '100%' }}>
{children}
</Space>
</PageContainer>
);
}
// {...rest}
// >
// <Space direction="vertical" size="middle" style={{ width: '100%' }}>
// {children}
// </Space>
// </PageContainer>
// );
// }
return (
<PageContainer
@ -408,11 +408,10 @@ export function MyPageContainer({
marginTop: 6,
marginBottom: 0,
}}
className="tabs-header-only"
/>
</div>
{/* 右侧:用户信息 */}
<div style={{ display: 'flex', alignItems: 'center', gap: '12px' }}>
<div style={{ display: 'flex', alignItems: 'center', gap: '12px', marginLeft: '24px' }}>
<Dropdown menu={{ items: userMenuItems }} placement="bottomRight">
<div style={{ cursor: 'pointer', display: 'flex', alignItems: 'center' }}>
<AvatarProps user={snap.session.user} />
@ -421,7 +420,7 @@ export function MyPageContainer({
</div>
</div>
),
style: { backgroundColor: '#FFF' },
style: { backgroundColor: '#FFF', padding: '0 24px !important' },
}}
token={{
paddingBlockPageContainerContent: 0,