3.10 工程代码同步master

src/layouts/BasicLayout.tsx

@@ -2,28 +2,104 @@ import ProLayout, {
   MenuDataItem,
   BasicLayoutProps as ProLayoutProps,
   Settings,
-  DefaultFooter,
 } from '@ant-design/pro-layout';
-import React, { useEffect, useMemo, useRef } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Link, useIntl, connect, Dispatch, history } from 'umi';
-import { Result, Button } from 'antd';
+import { Result, Button, message } from 'antd';
 import Authorized from '@/utils/Authorized';
 import RightContent from '@/components/GlobalHeader/RightContent';
 import { ConnectState } from '@/models/connect';
 import { getMatchMenu } from '@umijs/route-utils';
+import { getMenu } from './services'
 import logo from '../assets/logo.svg';
-import { getDictionaries } from './BasDicData';
-
+import { getSessionRoleData } from '@/utils/session';
 
+import {
+  HomeOutlined,
+  DesktopOutlined,
+  NotificationOutlined,
+  BookOutlined,
+  ProfileOutlined,
+  CommentOutlined,
+  MacCommandOutlined,
+  ProjectOutlined,
+  PartitionOutlined,
+  PayCircleOutlined,
+  ContactsOutlined,
+  WalletOutlined,
+  AppstoreOutlined,
+  ShopOutlined,
+} from '@ant-design/icons';
+import { getAuthority } from '@/utils/authority';
+import { JumpToOutside } from '@/utils/CommonUtils';
 
+const menuImgList = [
+  {
+    key: 'HomeOutlined',
+    value: <HomeOutlined />
+  },
+  {
+    key: 'ContactsOutlined',
+    value: <ContactsOutlined />
+  },
+  {
+    key: 'DesktopOutlined',
+    value: <DesktopOutlined />
+  },
+  {
+    key: 'NotificationOutlined',
+    value: <NotificationOutlined />
+  },
+  {
+    key: 'BookOutlined',
+    value: <BookOutlined />
+  },
+  {
+    key: 'ProfileOutlined',
+    value: <ProfileOutlined />
+  },
+  {
+    key: 'CommentOutlined',
+    value: <CommentOutlined />
+  },
+  {
+    key: 'MacCommandOutlined',
+    value: <MacCommandOutlined />
+  },
+  {
+    key: 'ProjectOutlined',
+    value: <ProjectOutlined />
+  },
+  {
+    key: 'PartitionOutlined',
+    value: <PartitionOutlined />
+  },
+  {
+    key: 'PayCircleOutlined',
+    value: <PayCircleOutlined />
+  },
+  {
+    key: 'WalletOutlined',
+    value: <WalletOutlined />
+  },
+  {
+    key: 'AppstoreOutlined',
+    value: <AppstoreOutlined />
+  },
+  {
+    key: 'ShopOutlined',
+    value: <ShopOutlined />
+  },
+]
 const noMatch = (
   <Result
     status={403}
     title="403"
-    subTitle="Sorry, you are not authorized to access this page."
+    subTitle="对不起，您没有访问本页面的权限。"
     extra={
       <Button type="primary">
-        <Link to="/user/login">Go Login</Link>
+        {/* <Link to="/user/login">Go Login</Link> */}
+        <Link to="/usercooper/login">登录</Link>
       </Button>
     }
   />
@@ -44,10 +120,6 @@ export type BasicLayoutContext = { [K in 'location']: BasicLayoutProps[K] } & {
     [path: string]: MenuDataItem;
   };
 };
-/**
- * use Authorized check all menu item
- */
-
 const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] =>
   menuList.map((item) => {
     const localItem = {
@@ -56,33 +128,6 @@ const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] =>
     };
     return Authorized.check(item.authority, localItem, null) as MenuDataItem;
   });
-
-// const defaultFooterDom = (
-//   <DefaultFooter
-//     copyright={`${new Date().getFullYear()} 中国联通系统集成吉林分公司`}
-//     links={[
-//       {
-//         key: 'Ant Design Pro',
-//         title: 'Ant Design Pro',
-//         href: 'https://pro.ant.design',
-//         blankTarget: true,
-//       },
-//       {
-//         key: 'github',
-//         title: <GithubOutlined />,
-//         href: 'https://github.com/ant-design/ant-design-pro',
-//         blankTarget: true,
-//       },
-//       {
-//         key: 'Ant Design',
-//         title: 'Ant Design',
-//         href: 'https://ant.design',
-//         blankTarget: true,
-//       },
-//     ]}
-//   />
-// );
-
 const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
   const {
     dispatch,
@@ -92,30 +137,41 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
       pathname: '/',
     },
   } = props;
-
-  useEffect(() => {
-    getDictionaries().then(res => {
-      if(res.code == 200) {
-        const DicData = res.data;
-        const DicDataSearch: any = sessionStorage.setItem('DicData', JSON.stringify(DicData));
-        return DicDataSearch;
-
-      }
-    })  
-  }, []);  
+  const [menuData, setMenuData] = React.useState<any>();
+  const [menuShow, setmenuShow] = React.useState<any>(false);
   const menuDataRef = useRef<MenuDataItem[]>([]);
-
   useEffect(() => {
-    if (dispatch) {
-      dispatch({
-        type: 'user/fetchCurrent',
-      });
+    if (getSessionRoleData()?.roleId) {
+      let params = {
+        roleIdList: [getSessionRoleData()?.roleId]
+      }
+      getMenu(params).then(res => {
+        if (res.code == 1) {
+          setMenuData(res.data || [])
+          setmenuShow(true)
+        } else {
+          message.error("数据错误请联系管理员")
+        }
+      })
     }
   }, []);
-  /**
-   * init variables
-   */
 
+  function menuICon(menuData: any) {
+    if (menuData != undefined && menuData != null && menuData.length > 0) {
+      let data: any[] = [...menuData]
+      let arr3 = data.map((item: any) => {
+        menuImgList.forEach((item3: any) => {
+          if (item.icon == item3.key) {
+            item.icon = item3.value
+          }
+        })
+        return item
+      })
+      return arr3
+    } else {
+      return []
+    }
+  }
   const handleMenuCollapse = (payload: boolean): void => {
     if (dispatch) {
       dispatch({
@@ -124,7 +180,6 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
       });
     }
   };
-  // get children authority
   const authorized = useMemo(
     () =>
       getMatchMenu(location.pathname || '/', menuDataRef.current).pop() || {
@@ -132,68 +187,60 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
       },
     [location.pathname],
   );
-
   const { formatMessage } = useIntl();
-
-  return (
-    <ProLayout
-      // menuHeaderRender={(logo, title) => (
-      //   <div
-      //     id="customize_menu_header"
-      //     onClick={() => {
-      //       window.open('https://remaxjs.org/');
-      //     }}
-      //   >
-      //     {logo}
-      //     {title}
-      //   </div>
-      // }
-      // title={中国联通电子招投标系统}
-      logo={logo}
-      formatMessage={formatMessage}
-      onCollapse={handleMenuCollapse}
-      onMenuHeaderClick={() => history.push('/')}
-      menuItemRender={(menuItemProps, defaultDom) => {
-        if (menuItemProps.isUrl || !menuItemProps.path) {
-          return defaultDom;
-        }
-        if(menuItemProps.projectType!=undefined){
-          menuItemProps.path = menuItemProps.path+`?projectType=${menuItemProps.projectType}`;
-        }
+  return menuShow ? (<ProLayout
+    menuDataRender={() => menuICon(menuData)}
+    logo={logo}
+    // formatMessage={formatMessage}
+    onCollapse={handleMenuCollapse}
+    onMenuHeaderClick={() => history.push('/')}
+    menuItemRender={(menuItemProps, defaultDom) => {
+      if (menuItemProps.isUrl || !menuItemProps.path) {
+        return defaultDom;
+      }
+      if (menuItemProps.projectType != undefined) {
+        menuItemProps.path = menuItemProps.path + `?projectType=${menuItemProps.projectType}`;
+      }
+      if (menuItemProps.frame && menuItemProps.frame == 'N') {
         return <Link to={menuItemProps.path}>{defaultDom}</Link>;
-      }}
-      breadcrumbRender={(routers = []) => [
-        {
-          path: '/',
-          breadcrumbName: formatMessage({ id: 'menu.home' }),
-        },
-        ...routers,
-      ]}
-      itemRender={(route, params, routes, paths) => {
-        const first = routes.indexOf(route) === 0;
-        return first ? (
-          <Link to={paths.join('/')}>{route.breadcrumbName}</Link>
-        ) : (
-          <span>{route.breadcrumbName}</span>
-        );
-      }}
-      //footerRender={() => defaultFooterDom}
-      menuDataRender={menuDataRender}
-      rightContentRender={() => <RightContent />}
-      postMenuData={(menuData) => {
-        menuDataRef.current = menuData || [];
-        return menuData || [];
-      }}
-      {...props}
-      {...settings}
-    >
-      <Authorized authority={authorized!.authority} noMatch={noMatch}>
+      } else if (menuItemProps.frame && menuItemProps.frame == 'Y') {
+        return <Link onClick={() => window.open(menuItemProps.path)} to="#">{defaultDom}</Link>;
+      } else if (menuItemProps.frame && menuItemProps.frame == 'S') {
+        return <Link onClick={() => window.open(menuItemProps.path + '&mall3_token=' + sessionStorage.getItem('Authorization'))} to="#">{defaultDom}</Link>;
+      } else {
+        return <Link to={menuItemProps.path}>{defaultDom}</Link>;
+      }
+    }}
+    breadcrumbRender={(routers = []) => [
+      {
+        path: '/',
+        breadcrumbName: formatMessage({ id: 'menu.home' }),
+      },
+      ...routers,
+    ]}
+    itemRender={(route, params, routes, paths) => {
+      const first = routes.indexOf(route) === 0;
+      return first ? (
+        <Link to={paths.join('/')}>{route.breadcrumbName}</Link>
+      ) : (
+        <span>{route.breadcrumbName}</span>
+      );
+    }}
+    rightContentRender={() => <RightContent />}
+    postMenuData={(menuData) => {
+      menuDataRef.current = menuData || [];
+      return menuData || [];
+    }}
+    {...props}
+    {...settings}
+  >
+    <Authorized authority={authorized!.authority} noMatch={noMatch}>
+      <div style={{ width: "100%" }}>
         {children}
-        
-      </Authorized>
-    </ProLayout>
-  );
-};
+      </div>
+    </Authorized>
+  </ProLayout>) : null
+}
 
 export default connect(({ global, settings }: ConnectState) => ({
   collapsed: global.collapsed,