({
// 更新内部状态
setInternalPagination(newPagination);
-
- // 通知父组件分页变化
- onPageChange?.(page);
-
+
// 同步到URL(标记为用户操作)
updateUrl(filters, newPagination, 'user');
+ // 通知父组件分页变化
+ onPageChange?.(page);
}, [internalPagination, filters, onPageChange, updateUrl]);
const handleSizeChange = useCallback((size: number) => {
diff --git a/src/components/layouts/SideBar/SideBarOld.tsx b/src/components/layouts/SideBar/SideBarOld.tsx
index b34fdfb..32fd3e7 100644
--- a/src/components/layouts/SideBar/SideBarOld.tsx
+++ b/src/components/layouts/SideBar/SideBarOld.tsx
@@ -10,7 +10,7 @@ import { cn } from '@/lib/utils';
interface NavItem {
title: string;
url: string;
- icon: string;
+ icon: React.ReactNode;
items?: {
title: string;
url: string;
@@ -35,7 +35,7 @@ const defaultSideBarData: SideBarData = {
{
title: "租户管理",
url: "/central-config/tenant",
- icon: "🏢",
+ icon: "🏢" as React.ReactNode,
items: [
{
title: "企业审核",
@@ -62,7 +62,7 @@ const defaultSideBarData: SideBarData = {
{
title: "用户管理",
url: "/central-config/user",
- icon: "👥",
+ icon: "👥" as React.ReactNode,
items: [
{
title: "员工管理",
@@ -89,7 +89,7 @@ const defaultSideBarData: SideBarData = {
{
title: "系统参数",
url: "/central-config/system",
- icon: "🔧",
+ icon: "🔧" as React.ReactNode,
items: [
{
title: "系统设置",
@@ -111,7 +111,7 @@ const defaultSideBarData: SideBarData = {
{
title: "系统监控",
url: "/central-config/monitor",
- icon: "📈",
+ icon: "📈" as React.ReactNode,
items: [
{
title: "登录日志",
@@ -138,7 +138,7 @@ const defaultSideBarData: SideBarData = {
{
title: "消息中心",
url: "/central-config/message",
- icon: "📨",
+ icon: "📨" as React.ReactNode,
items: [
{
title: "消息发送",
diff --git a/src/components/layouts/components/UserProfile.tsx b/src/components/layouts/components/UserProfile.tsx
index 85f7e67..af86913 100644
--- a/src/components/layouts/components/UserProfile.tsx
+++ b/src/components/layouts/components/UserProfile.tsx
@@ -57,7 +57,7 @@ export function UserProfile({ onProfileClick }: UserProfileProps) {
手机号:
{user?.phone}
- {user?.enterpriseName && (
+ {/* {user?.enterpriseName && (
所属企业:
@@ -76,7 +76,7 @@ export function UserProfile({ onProfileClick }: UserProfileProps) {
上次登录:
{user?.lastLoginTime}
- )}
+ )} */}