From 03a6d711c31b4857a1f0a6931c2a857a60d0abf2 Mon Sep 17 00:00:00 2001 From: jackycheng <> Date: Fri, 27 Dec 2024 15:15:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/layouts/HeaderOnly.tsx | 4 ++-- src/layout/layouts/HeaderSider.tsx | 7 ++++--- src/layout/layouts/SiderOnly.tsx | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/layout/layouts/HeaderOnly.tsx b/src/layout/layouts/HeaderOnly.tsx index a57d8d5..945a569 100644 --- a/src/layout/layouts/HeaderOnly.tsx +++ b/src/layout/layouts/HeaderOnly.tsx @@ -1,7 +1,6 @@ import { Theme } from '@/app/enum'; import { routerConfig } from '@/router'; import { Layout, Menu, MenuProps } from '@df/toco-ui'; -import { SelectInfo } from 'rc-menu/lib/interface'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { Outlet, useMatches, useNavigate } from 'react-router-dom'; import { LayoutProps } from '.'; @@ -26,7 +25,8 @@ const HeaderOnly: React.FC = (props) => { }, []); const onKeyChange = useCallback( - (info: SelectInfo) => { + (...args: Parameters['onSelect']>) => { + const info = args[0]; const keys = info.keyPath; setSelectedKeys(info.keyPath); navigate(keys.reverse().join('/')); diff --git a/src/layout/layouts/HeaderSider.tsx b/src/layout/layouts/HeaderSider.tsx index ecb3844..b5ce273 100644 --- a/src/layout/layouts/HeaderSider.tsx +++ b/src/layout/layouts/HeaderSider.tsx @@ -1,7 +1,6 @@ import { Theme } from '@/app/enum'; import { routerConfig } from '@/router'; import { Layout, Menu, MenuProps } from '@df/toco-ui'; -import { SelectInfo } from 'rc-menu/lib/interface'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { Outlet, useMatches, useNavigate } from 'react-router-dom'; import { LayoutProps } from '.'; @@ -37,7 +36,8 @@ const HeaderSider: React.FC = (props) => { }, []); const onHeaderKeyChange = useCallback( - (info: SelectInfo) => { + (...args: Parameters['onSelect']>) => { + const info = args[0]; setHeaderKey(info.key); navigate(info.key); }, @@ -50,7 +50,8 @@ const HeaderSider: React.FC = (props) => { }, [headerKey]); const onSiderKeyChange = useCallback( - (info: SelectInfo) => { + (...args: Parameters['onSelect']>) => { + const info = args[0]; const keys = info.keyPath; setSiderSelectedKeys(info.keyPath); const parts = [headerKey, ...keys]; diff --git a/src/layout/layouts/SiderOnly.tsx b/src/layout/layouts/SiderOnly.tsx index e9bd270..1da6479 100644 --- a/src/layout/layouts/SiderOnly.tsx +++ b/src/layout/layouts/SiderOnly.tsx @@ -1,7 +1,6 @@ import { Theme } from '@/app/enum'; import { routerConfig } from '@/router'; import { Layout, Menu, MenuProps } from '@df/toco-ui'; -import { SelectInfo } from 'rc-menu/lib/interface'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { Outlet, useMatches, useNavigate } from 'react-router-dom'; import { LayoutProps } from '.'; @@ -34,7 +33,8 @@ const SiderOnly: React.FC = (props) => { }, []); const onKeyChange = useCallback( - (info: SelectInfo) => { + (...args: Parameters['onSelect']>) => { + const info = args[0]; const keys = info.keyPath; setSelectedKeys(info.keyPath); navigate(keys.reverse().join('/'));