删除兼容性代码

Author: chenshuai2144

packages/layout/src/ProLayout.tsx

@@ -492,7 +492,7 @@ const BaseProLayout: React.FC<ProLayoutProps> = (props) => {
       setMenuLoading(true);
       const menuDataItems = await menu?.request?.(
         params || {},
-        route?.children || route?.routes || [],
+        route?.children || [],
       );
       setMenuLoading(false);
       return menuDataItems;
@@ -524,12 +524,12 @@ const BaseProLayout: React.FC<ProLayoutProps> = (props) => {
   }>(
     () =>
       getMenuData(
-        data || route?.children || route?.routes || [],
+        data || route?.children || [],
         menu,
         formatMessage,
         menuDataRender,
       ),
-    [formatMessage, menu, menuDataRender, data, route?.children, route?.routes],
+    [formatMessage, menu, menuDataRender, data, route?.children],
   );
 
   const { breadcrumb, breadcrumbMap, menuData = [] } = menuInfoData || {};

packages/layout/src/components/AppsLogoComponents/index.tsx

@@ -43,12 +43,7 @@ export const AppsLogoComponents: React.FC<{
   ) => void;
   prefixCls?: string;
 }> = (props) => {
-  const {
-    appList,
-    appListRender,
-    prefixCls = 'ant-pro',
-    onItemClick: itemClick,
-  } = props;
+  const { appList, appListRender, prefixCls, onItemClick: itemClick } = props;
   const ref = React.useRef<HTMLDivElement>(null);
   const popoverRef = React.useRef<HTMLSpanElement>(null);
   const baseClassName = `${prefixCls}-layout-apps`;
@@ -92,13 +87,7 @@ export const AppsLogoComponents: React.FC<{
 
   return wrapSSR(
     <>
-      <div
-        ref={ref}
-        onClick={(e) => {
-          e.stopPropagation();
-          e.preventDefault();
-        }}
-      />
+      <div ref={ref} />
       <Popover
         placement="bottomRight"
         trigger={['click']}

packages/layout/src/components/PageHeader/index.tsx

@@ -185,15 +185,6 @@ const PageHeader: React.FC<PageHeaderProps> = (props) => {
   const { wrapSSR, hashId } = useStyle(prefixCls);
 
   const getDefaultBreadcrumbDom = () => {
-    if (
-      breadcrumb &&
-      !(breadcrumb as BreadcrumbProps)?.items &&
-      (breadcrumb as unknown as BreadcrumbProps)?.routes
-    ) {
-      // @ts-ignore
-      breadcrumb.items = breadcrumb.routes;
-    }
-
     if ((breadcrumb as BreadcrumbProps)?.items) {
       return renderBreadcrumb(breadcrumb as BreadcrumbProps, prefixCls);
     }

packages/layout/src/components/SiderMenu/BaseMenu.tsx

@@ -211,7 +211,7 @@ class MenuUtil {
     const designToken = this.props.token;
 
     const name = this.getIntlName(item);
-    const children = item?.children || item?.routes;
+    const children = item?.children;
 
     const menuType = isGroup && level === 0 ? ('group' as const) : undefined;
 

packages/layout/src/demos/debug-demo.tsx

@@ -36,7 +36,7 @@ export default () => {
         header: {
           colorBgMenuItemSelected: 'rgba(82, 196, 26, 1)',
           colorTextMenuSelected: 'rgba(114, 46, 209, 1)',
-          colorBgHeader: 'rgba(255, 255, 255, 0.6)',
+          colorBgHeader: 'rgba(250, 173, 20, 1)',
           colorHeaderTitle: 'rgba(47, 84, 235, 1)',
           colorTextMenuActive: 'rgba(255, 255, 255, 1)',
           colorTextMenu: 'rgba(250, 84, 28, 1)',

packages/layout/src/utils/utils.ts

@@ -5,9 +5,9 @@ export const getOpenKeysFromMenuData = (menuData?: MenuDataItem[]) => {
     if (item.key) {
       pre.push(item.key);
     }
-    if (item.children || item.routes) {
+    if (item.children) {
       const newArray: string[] = pre.concat(
-        getOpenKeysFromMenuData(item.children || item.routes) || [],
+        getOpenKeysFromMenuData(item.children) || [],
       );
       return newArray;
     }
@@ -40,9 +40,6 @@ export function clearMenuItem(menusData: MenuDataItem[]): MenuDataItem[] {
     .map((item) => {
       const children: MenuDataItem[] = item.children || [];
       const finalItem = { ...item };
-      if (!finalItem.children && finalItem.routes) {
-        finalItem.children = finalItem.routes;
-      }
       if (!finalItem.name || finalItem.hideInMenu) {
         return null;
       }
@@ -59,7 +56,6 @@ export function clearMenuItem(menusData: MenuDataItem[]): MenuDataItem[] {
         // children 为空就直接删掉
         delete finalItem.children;
       }
-      delete finalItem.routes;
       return finalItem;
     })
     .filter((item) => item) as MenuDataItem[];