module-menu 0.1.36 → 0.2.1

package/src/pages/ModuleMenu/index.jsx

@@ -2,27 +2,55 @@ import { useState, useEffect, useRef, useMemo } from 'react';
 import { Popconfirm, message, Popover } from 'antd';
 import { menuList as menuListInit, menuIconSrc, sysNameMap } from './constData';
 import HeaderDropdown from '../ModuleUser/HeaderDropdown';
+import Axios from '../util/axios';
+import _ from 'lodash';
 import './index.less';
 
-const ModuleMenu = ({ sysName }) => {
+const ModuleMenu = ({ sysName, stash }) => {
+  // stash = 'ii';
   const [sessionMenu, setsessionMenu] = useState([]);
   const [showMenuList, setshowMenuList] = useState(false);
   const [menuList, setMenuList] = useState([]);
+  const [menuListServer, setMenuListServer] = useState([]);
 
   useEffect(() => {
     let newSessionMenu = getSessionMenu();
     setsessionMenu(newSessionMenu);
     let newMenuList = getNewMenuList();
-    // let newMenuList = menuListInit;
     setMenuList(newMenuList);
   }, []);
 
-  const getSessionMenu = () => {
-    const menuObj = JSON.parse(sessionStorage.getItem('bigdata-menu'));
-    if (menuObj) {
-      return menuObj.content || [];
+  const getUserMenusList = async () => {
+    const res = await Axios(
+      'get',
+      '/admin-api/system/user/getUserMenusList',
+      '',
+      {},
+    );
+    let menuListServers = [];
+    if (res.data.code === 0) {
+      menuListServers =
+        res.data.data &&
+        res.data.data.map((item) => {
+          return {
+            ...item,
+            path: item.path.indexOf('/') !== -1 ? item.path : '/' + item.path,
+          };
+        });
+    }
+    return menuListServers;
+  };
+
+  const getSessionMenu = async () => {
+    if (!stash) {
+      const menuObj = JSON.parse(sessionStorage.getItem('bigdata-menu'));
+      if (menuObj) {
+        return menuObj.content || [];
+      }
+      return [];
+    } else {
+      return (await getUserMenusList()) || [];
     }
-    return [];
   };
 
   // 获取系统logo及title
@@ -36,39 +64,6 @@ const ModuleMenu = ({ sysName }) => {
     return logoAndTitle;
   };
 
-  /**
-   * 判断第三方服务是否有对应服务的菜单权限
-   * @param {*} authMenus
-   * @param {*} rootMenuPath
-   */
-  const judgeThirdPartyServiceIsHaveMenus = (authMenus, rootMenuPath) => {
-    let dsMenus = [];
-    if (
-      typeof authMenus !== 'undefined' &&
-      authMenus !== null &&
-      authMenus.length > 0
-    ) {
-      const rootMenus = authMenus.filter((item) => {
-        const { parentId, type, path } = item;
-        console.log('object', path, rootMenuPath);
-        if (parentId === -1 && type === '3' && path === rootMenuPath) {
-          return true;
-        }
-        return false;
-      });
-      if (
-        rootMenus &&
-        Object.keys(rootMenus).length > 0 &&
-        rootMenus[0].children
-      ) {
-        dsMenus = rootMenus[0].children;
-      }
-    }
-    if (!dsMenus || dsMenus.length === 0) {
-      return false;
-    }
-    return true;
-  };
   // 跳转各个模块
   const toModulePage = (nameStr) => {
     if (!sessionMenu || sessionMenu.length === 0) {
@@ -76,72 +71,54 @@ const ModuleMenu = ({ sysName }) => {
       message.warning('没有获取到菜单列表，请联系管理员添加权限');
       return;
     }
-    console.log('nameStr', nameStr);
     let thirdPartyServiceJumpPath = ''; // 第三方服务跳转路径
-    let thirdPartyServiceRootMenuPath = ''; // 第三方服务根菜单路径
     switch (nameStr) {
       case '数据集成':
         thirdPartyServiceJumpPath = '/datacollect/';
-        thirdPartyServiceRootMenuPath = '/datacollection';
         break;
       case '数据治理':
         thirdPartyServiceJumpPath = '/datamanage/';
-        thirdPartyServiceRootMenuPath = '/dataManager';
         break;
       case '元数据管理':
         thirdPartyServiceJumpPath = '/metadata/';
-        thirdPartyServiceRootMenuPath = '/metadata';
         break;
       case '数据质量':
         thirdPartyServiceJumpPath = '/quality/';
-        thirdPartyServiceRootMenuPath = '/quality/';
         break;
       case '离线开发':
         thirdPartyServiceJumpPath = '/datadev/';
-        thirdPartyServiceRootMenuPath = '/datadev/';
         break;
       case '实时开发':
         thirdPartyServiceJumpPath = '/dataanalytic/';
-        thirdPartyServiceRootMenuPath = '/dataanalytic';
         break;
       case '数据服务':
         thirdPartyServiceJumpPath = '/dataservice/';
-        thirdPartyServiceRootMenuPath = '/dataservice';
         break;
       case '数据资产':
         thirdPartyServiceJumpPath = '/dataasset/';
-        thirdPartyServiceRootMenuPath = '/dataasset';
         break;
       case '数据共享':
         thirdPartyServiceJumpPath = '/datasharing/';
-        thirdPartyServiceRootMenuPath = '/datasharing';
         break;
       case '运维中心':
         thirdPartyServiceJumpPath = '/operate/';
-        thirdPartyServiceRootMenuPath = '/operate';
         break;
       case '消息中心':
         thirdPartyServiceJumpPath = '/alert/';
-        thirdPartyServiceRootMenuPath = '/alert';
         break;
       case '数据安全':
         thirdPartyServiceJumpPath = '/datasecurity/';
-        thirdPartyServiceRootMenuPath = '/datasecurity';
+        break;
+      case '目录管理':
+        thirdPartyServiceJumpPath = '/admin-ui/catalog/menuClassify/list';
+        break;
+      case '资源管理':
+        thirdPartyServiceJumpPath = '/admin-ui/resource/tableResource/list';
         break;
       default:
         break;
     }
     // 判断第三方服务是否有对应服务的菜单权限
-    if (
-      !judgeThirdPartyServiceIsHaveMenus(
-        sessionMenu,
-        thirdPartyServiceRootMenuPath,
-      )
-    ) {
-      message.destroy();
-      message.warning('您没有权限，请联系管理员添加权限。');
-      return;
-    }
     window.location.href = thirdPartyServiceJumpPath;
   };
   // 跳转首页
@@ -152,7 +129,7 @@ const ModuleMenu = ({ sysName }) => {
   };
   const getNewMenuList = () => {
     const sessionMenu = getSessionMenu();
-    let newMenuList = [...menuListInit];
+    let newMenuList = _.cloneDeep(menuListInit(stash));
     if (sessionMenu) {
       const pathList = sessionMenu.map((item) => item.path);
       // 过滤掉没有权限的子菜单(PS：如果模块下面子菜单都没有，则不显示该模块)

package/src/pages/ModuleMenu/index.less

@@ -1,90 +1,109 @@
-.menu_list_content{
-border: 1px solid #E9E9E9;
-z-index: 2;
-float: left;
-position: fixed;
-top: 50px;
-left:0;
-background-color: #FFF;
-box-shadow: rgba(0, 0, 0, 0.2) 1px 2px 10px;
-padding-left: 35px;
-padding-bottom: 35px;
-}
-.cardLine{
-    padding: 5px 0px;
-}
-.textPad{
-    padding-left: 10px;
-}
-.leftMenu{
-    width: 100px;
-    float: left;
-    color: rgba(0, 0, 0, 0.85);
-    font-size: 16px;
-    cursor: pointer;
-    text-align: left;
-    font-weight: 400;
-}
-.rightMenu{
-    width: 460px;
-    float: left;
-    vertical-align: middle;
-    font-size: 14px;
-    color: rgba(0,0,0,0.65);
-    font-weight: 400;
-    margin-left: 15px;
-}
-.childMenu:hover{
-    cursor: pointer;
-    color: #4091F7;
-}
-.childMenu{
-    width: 29%;
-    display: inline-block;
-}
-.middle{
-    vertical-align: middle;
-}
-.middle:hover{
-    color: #4091F7;
-}
-.menuPopupAndTitle{
-    display: flex;
-    justify-content: flex-start;
-}
-.menuIcon{
-    text-align: center;
-    line-height: 49px;
-    display: inline-block;
-    cursor: pointer;
-    width: 60px;
-    height: 49px;
-    background-color: #4091F7;
-}
-.menuIcon_img{
-    height: 25px;
-    width: 25px;
-}
-.menu_title_content{
-    height: 32px;
-    margin: 0 0 0 12px;
-    font-weight: 600;
-    font-size: 18px;
-    line-height: 49px;
-    vertical-align: middle;
-    animation: pro-layout-title-hide .3s;
-}
-.menu_title_content_img{
-    height: 32px;
-    width: 32px;
-}
-.menu_title{
-    color: #1890ff;
-    height: 32px;
-    margin: 0 0 0 12px;
-    font-weight: 600;
-    font-size: 18px;
-    line-height: 32px;
-    vertical-align: middle;
-    animation: pro-layout-title-hide .3s;
-}
+.menu_list_content {
+  border: 1px solid #E9E9E9;
+  z-index: 2;
+  float: left;
+  position: fixed;
+  top: 50px;
+  left: 0;
+  background-color: #FFF;
+  box-shadow: rgba(0, 0, 0, 0.2) 1px 2px 10px;
+  padding-left: 35px;
+  padding-bottom: 35px;
+}
+
+.cardLine {
+  padding: 5px 0px;
+}
+
+.iconPad {
+  width: 16px;
+  height: 16px;
+}
+
+.textPad {
+  padding-left: 10px;
+}
+
+.leftMenu {
+  width: 100px;
+  float: left;
+  color: rgba(0, 0, 0, 0.85);
+  font-size: 16px;
+  cursor: pointer;
+  text-align: left;
+  font-weight: 400;
+}
+
+.rightMenu {
+  width: 460px;
+  float: left;
+  vertical-align: middle;
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.65);
+  font-weight: 400;
+  margin-left: 15px;
+}
+
+.childMenu:hover {
+  cursor: pointer;
+  color: #4091F7;
+}
+
+.childMenu {
+  width: 29%;
+  display: inline-block;
+}
+
+.middle {
+  vertical-align: middle;
+}
+
+.middle:hover {
+  color: #4091F7;
+}
+
+.menuPopupAndTitle {
+  display: flex;
+  justify-content: flex-start;
+}
+
+.menuIcon {
+  text-align: center;
+  line-height: 49px;
+  display: inline-block;
+  cursor: pointer;
+  width: 60px;
+  height: 49px;
+  background-color: #4091F7;
+}
+
+.menuIcon_img {
+  height: 25px;
+  width: 25px;
+}
+
+.menu_title_content {
+  height: 32px;
+  margin: 0 0 0 12px;
+  font-weight: 600;
+  font-size: 18px;
+  line-height: 49px;
+  vertical-align: middle;
+  animation: pro-layout-title-hide .3s;
+}
+
+.menu_title_content_img {
+  height: 32px;
+  width: 32px;
+}
+
+.menu_title {
+  color: #1890ff;
+  height: 32px;
+  margin: 0 0 0 12px;
+  font-weight: 600;
+  font-size: 18px;
+  line-height: 32px;
+  vertical-align: middle;
+  animation: pro-layout-title-hide .3s;
+}

package/src/pages/ModuleUser/index.jsx

@@ -1,5 +1,5 @@
-import React, { Component } from 'react';
-import { Popconfirm, message, Dropdown } from 'antd';
+import React, { Component, useEffect, useState } from 'react';
+import { Popconfirm, message, Dropdown, Button, Select } from 'antd';
 import { userMenuIcon } from './constData';
 import {
   HomeOutlined,
@@ -9,39 +9,67 @@ import {
 import { Spin, Menu, Avatar } from 'antd';
 import HeaderDropdown from './HeaderDropdown';
 import Axios from '../util/axios';
+import getStore, { getUserName } from '../util/userInfo';
 import './index.less';
-const ModuleUser = () => {
+// stash存在则为一体化，否则为轻量级
+const ModuleUser = ({ stash }) => {
+  const [tenantList, setTenantList] = useState([]);
+  useEffect(() => {
+    if (stash) {
+      getTenantList();
+    }
+  }, []);
   const handleClickmenu = (url) => {
     window.location.href = url;
   };
+
   const { PersonalCenterSrc, MessageCenterSrc, SystemManageSrc, LogoutSrc } =
     userMenuIcon;
-  const isHaveSystemManagementPermission = sessionStorage.getItem(
-    'bigdata-isHaveSystemManagementPermission',
-  );
-  const DEFAULT_LOGOUT_URL = '/#/login';
 
-  const getUserName = () => {
-    const userInfo = JSON.parse(
-      sessionStorage.getItem('bigdata-userInfo') || '{}',
-    );
-    if (
-      userInfo &&
-      userInfo.content &&
-      Object.keys(userInfo.content).length > 0 &&
-      userInfo.content.username
-    ) {
-      return userInfo.content.username;
-    }
-    return '';
+  const isHaveSystemManagementPermission = stash
+    ? true
+    : sessionStorage.getItem('bigdata-isHaveSystemManagementPermission');
+
+  const DEFAULT_LOGOUT_URL = !stash ? '/#/login' : '/admin-ui/login';
+
+  // 跳转服务门户
+  const jumpToExterHome = () => {
+    handleClickmenu('/dataadmin/#/index');
+  };
+
+  const curTenantId = stash ? getStore({ name: 'tenantId' }) : '';
+  const curTenantName = stash ? getStore({ name: 'tenantName' }) : '';
+
+  const getTenantList = () => {
+    Axios('get', '/admin-api/system/user/getUserTenant', '', {})
+      .then((res) => {
+        if (res.data.code === 0) {
+          let tenantLists =
+            res.data.data &&
+            res.data.data.map((item) => {
+              return {
+                id: item.id,
+                value: item.id,
+                label: item.name,
+              };
+            });
+          setTenantList(tenantLists || []);
+        }
+      })
+      .catch((e) => console.log('e', e));
   };
+
   // 退出登录
   const logout = () => {
-    Axios('delete', '/auth/token/logout', '', {})
+    const logoutUrl = !stash
+      ? '/auth/token/logout'
+      : '/admin-api/system/auth/logout';
+    const logouType = !stash ? 'delete' : 'post';
+    Axios(logouType, logoutUrl, '', {})
       .then(() => {
         console.log('退出登录接口调用成功');
-        // localStorage.clear();
-        // sessionStorage.clear();
+        localStorage.clear();
+        sessionStorage.clear();
         window.location.href = DEFAULT_LOGOUT_URL;
       })
       .catch((error) => {
@@ -49,11 +77,39 @@ const ModuleUser = () => {
         message.error('服务器错误，请稍后重试');
       });
   };
+
+  // 切换租户改缓存、调接口、刷界面
+  const handleChangeTenant = (e) => {
+    let token = getStore({ name: 'access_token' });
+    Axios(
+      'get',
+      `/admin-api/system/auth/setRedisTokenOfTenant?token=${token}&tenantId=${e}`,
+      '',
+      {},
+    )
+      .then((res) => {
+        if (res.data.code === 0) {
+          console.log('接口调用成功');
+          window.localStorage.setItem('curTenantId', e);
+          window.localStorage.setItem(
+            'curTenantName',
+            tenantList.find((item) => item.id === e)?.label,
+          );
+          window.location.reload();
+        } else {
+          message.warning(res.data.msg || '租户切换失败');
+        }
+      })
+      .catch((e) => console.log('e', e));
+  };
+
   const menu = (
     <Menu className="menu" selectedKeys={[]}>
       <Menu.Item
         key="personalCenter"
-        onClick={() => handleClickmenu('/#/info/index')}
+        onClick={() =>
+          handleClickmenu(!stash ? '/#/info/index' : '/admin-ui/user/profile')
+        }
       >
         <img
           src={PersonalCenterSrc}
@@ -65,7 +121,13 @@ const ModuleUser = () => {
       {isHaveSystemManagementPermission && (
         <Menu.Item
           key="systemManage"
-          onClick={() => handleClickmenu('/#/admin/user/index')}
+          onClick={() =>
+            handleClickmenu(
+              !stash
+                ? '/#/admin/user/index'
+                : '/admin-ui/bpm/manager/user-group',
+            )
+          }
         >
           <img
             src={SystemManageSrc}
@@ -85,8 +147,24 @@ const ModuleUser = () => {
       </Menu.Item>
     </Menu>
   );
+
   return (
     <div className="right">
+      {stash && [
+        <Button type="link" onClick={jumpToExterHome}>
+          服务门户
+        </Button>,
+        <Select
+          defaultValue={curTenantId}
+          className="right-select"
+          style={{
+            width: 150,
+            border: 'none',
+          }}
+          onChange={handleChangeTenant}
+          options={tenantList}
+        />,
+      ]}
       {getUserName() ? (
         <HeaderDropdown overlay={menu}>
           <span style={{ display: 'inline-block', marginLeft: '12px' }}>

package/src/pages/ModuleUser/index.less

@@ -1,42 +1,54 @@
 .right {
+  display: flex;
+  float: right;
+  height: 48px;
+  margin-left: auto;
+  overflow: hidden;
+  align-items: center;
+  padding-right: 30px;
+
+  .action {
     display: flex;
-    float: right;
-    height: 48px;
-    margin-left: auto;
-    overflow: hidden;
     align-items: center;
-    padding-right: 30px;
-    .action {
-      display: flex;
-      align-items: center;
-      height: 48px;
-      padding: 0 12px;
-      cursor: pointer;
-      transition: all 0.3s;
-      > span {
-        vertical-align: middle;
-      }
-    }
-    .search {
-      padding: 0 12px;
-      &:hover {
-        background: transparent;
-      }
+    height: 48px;
+    padding: 0 12px;
+    cursor: pointer;
+    transition: all 0.3s;
+
+    >span {
+      vertical-align: middle;
     }
-    .account {
-      .avatar {
-        margin-right: 8px;
-        // color: @primary-color;
-        vertical-align: top;
-        background: rgba(255, 255, 255, 0.85);
-      }
+  }
+
+  .search {
+    padding: 0 12px;
+
+    &:hover {
+      background: transparent;
     }
   }
-  .menu {
-    :global(.anticon) {
+
+  .account {
+    .avatar {
       margin-right: 8px;
+      // color: @primary-color;
+      vertical-align: top;
+      background: rgba(255, 255, 255, 0.85);
     }
-    :global(.ant-dropdown-menu-item) {
-      min-width: 160px;
-    }
-  }
+  }
+}
+
+:global(.right-select> .ant-select-selector) {
+  border: none !important;
+  box-shadow: none !important;
+}
+
+.menu {
+  :global(.anticon) {
+    margin-right: 8px;
+  }
+
+  :global(.ant-dropdown-menu-item) {
+    min-width: 160px;
+  }
+}