Преглед на файлове

add isUrl judge (#4681)

如果是 url 不再需要将其放到 Link 中

close #4607
陈帅 преди 6 години
родител
ревизия
d5b504647d
променени са 2 файла, в които са добавени 10 реда и са изтрити 6 реда
  1. 1 1
      package.json
  2. 9 5
      src/layouts/BasicLayout.tsx

+ 1 - 1
package.json

@@ -54,7 +54,7 @@
     "not ie <= 10"
   ],
   "dependencies": {
-    "@ant-design/pro-layout": "^4.5.7",
+    "@ant-design/pro-layout": "^4.5.9",
     "@antv/data-set": "^0.10.2",
     "antd": "^3.20.0",
     "classnames": "^2.2.6",

+ 9 - 5
src/layouts/BasicLayout.tsx

@@ -16,15 +16,16 @@ import { formatMessage } from 'umi-plugin-react/locale';
 
 import Authorized from '@/utils/Authorized';
 import RightContent from '@/components/GlobalHeader/RightContent';
-import { ConnectProps, ConnectState } from '@/models/connect';
+import { ConnectState, Dispatch } from '@/models/connect';
 import { isAntDesignPro } from '@/utils/utils';
 import logo from '../assets/logo.svg';
 
-export interface BasicLayoutProps extends ProLayoutProps, Omit<ConnectProps, 'location'> {
+export interface BasicLayoutProps extends ProLayoutProps {
   breadcrumbNameMap: {
     [path: string]: MenuDataItem;
   };
   settings: Settings;
+  dispatch: Dispatch;
 }
 export type BasicLayoutContext = { [K in 'location']: BasicLayoutProps[K] } & {
   breadcrumbNameMap: {
@@ -100,9 +101,12 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
     <ProLayout
       logo={logo}
       onCollapse={handleMenuCollapse}
-      menuItemRender={(menuItemProps, defaultDom) => (
-        <Link to={menuItemProps.path}>{defaultDom}</Link>
-      )}
+      menuItemRender={(menuItemProps, defaultDom) => {
+        if (menuItemProps.isUrl) {
+          return defaultDom;
+        }
+        return <Link to={menuItemProps.path}>{defaultDom}</Link>;
+      }}
       breadcrumbRender={(routers = []) => [
         {
           path: '/',