module-menu 0.1.32 → 0.1.34

package/src/pages/ModuleMenu/index.less

@@ -1,90 +1,90 @@
-.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;
+}
+.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/HeaderDropdown.jsx

@@ -1,10 +1,10 @@
-import { Dropdown } from 'antd';
-import React from 'react';
-import classNames from 'classnames';
-import styles from './index.less';
-
-const HeaderDropdown = ({ overlayClassName: cls, ...restProps }) => (
-  <Dropdown overlayClassName={classNames(styles.container, cls)} {...restProps} />
-);
-
-export default HeaderDropdown;
+import { Dropdown } from 'antd';
+import React from 'react';
+import classNames from 'classnames';
+import styles from './index.less';
+
+const HeaderDropdown = ({ overlayClassName: cls, ...restProps }) => (
+  <Dropdown overlayClassName={classNames(styles.container, cls)} {...restProps} />
+);
+
+export default HeaderDropdown;

package/src/pages/ModuleUser/constData.jsx

@@ -1,11 +1,11 @@
-// 图标位置
-export const userMenuIcon = {
-    PersonalCenterSrc:require('../../assets/personalCenter.svg'),
-    MessageCenterSrc:require('../../assets/messageCenter.svg'),
-    SystemManageSrc:require('../../assets/systemManage.svg'),
-    LogoutSrc:require('../../assets/logout.png'),
-}
-export const PersonalCenterSrc = require('../../assets/personalCenter.svg');
-export const MessageCenterSrc = require('../../assets/messageCenter.svg');
-export const SystemManageSrc = require('../../assets/systemManage.svg');
+// 图标位置
+export const userMenuIcon = {
+    PersonalCenterSrc:require('../../assets/personalCenter.svg'),
+    MessageCenterSrc:require('../../assets/messageCenter.svg'),
+    SystemManageSrc:require('../../assets/systemManage.svg'),
+    LogoutSrc:require('../../assets/logout.png'),
+}
+export const PersonalCenterSrc = require('../../assets/personalCenter.svg');
+export const MessageCenterSrc = require('../../assets/messageCenter.svg');
+export const SystemManageSrc = require('../../assets/systemManage.svg');
 export const LogoutSrc = require('../../assets/logout.png');

package/src/pages/ModuleUser/index.less

@@ -1,42 +1,42 @@
-.right {
-    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;
-      }
-    }
-    .account {
-      .avatar {
-        margin-right: 8px;
-        // color: @primary-color;
-        vertical-align: top;
-        background: rgba(255, 255, 255, 0.85);
-      }
-    }
-  }
-  .menu {
-    :global(.anticon) {
-      margin-right: 8px;
-    }
-    :global(.ant-dropdown-menu-item) {
-      min-width: 160px;
-    }
+.right {
+    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;
+      }
+    }
+    .account {
+      .avatar {
+        margin-right: 8px;
+        // color: @primary-color;
+        vertical-align: top;
+        background: rgba(255, 255, 255, 0.85);
+      }
+    }
+  }
+  .menu {
+    :global(.anticon) {
+      margin-right: 8px;
+    }
+    :global(.ant-dropdown-menu-item) {
+      min-width: 160px;
+    }
   }

package/src/pages/util/axios.js

@@ -1,133 +1,133 @@
-import { message } from 'antd';
-import axios from 'axios';
-import baseCof from './config';
-import getStore from './userInfo';
-import { checkToken} from './permessionUtils';
-
-let tokenValue='7f288e2a-deb0-44fe-af72-7345ac8a6784';
-
-axios.interceptors.response.use(
-  (response) => {
-    if (response.status === 200) {
-      return response;
-    } else if (response.status === 401 || response.status === 302 || response.status === 403) {
-      if (process.env.NODE_ENV === 'production') {
-        tokenValue = getStore({ name: 'access_token' });
-      }
-      checkToken(tokenValue);
-    } else {
-      console.log('接口异常 response');
-      return Promise.reject('error');
-    }
-  },
-  (error) => {
-    console.log('error', error)
-    if (error.response) {
-      if (error.response.status === 401) {
-        if (process.env.NODE_ENV === 'production') {
-          tokenValue = getStore({ name: 'access_token' });
-        }
-        checkToken(tokenValue);
-      } else if (error.response.status === 403) {
-        // 提示无权限等
-      } else {
-        // 其他错误处理
-      }
-    }
-    return Promise.reject(error.response.data);
-  },
-);
-
-/** 全局请求拦截器 */
-axios.interceptors.request.use(
-  async (params) => {
-    // 生产环境，对接门户时，需要在请求头中设置token等信息
-    if (process.env.NODE_ENV === 'production') {
-      const TENANT_ID = getStore({ name: 'tenantId' }) || '1';
-      const isToken = (params.headers || {}).isToken === false;
-      const token = getStore({ name: 'access_token' });
-      if (!(token && !isToken) || !TENANT_ID) {
-        // 如果是调用退出登录接口，则不再执行退出登录逻辑，防止出现重复调用退出登录的循环
-        return params;
-      }
-      const headers = {
-        Authorization: `Bearer ${token}`,
-        TENANT_ID,
-      };
-      params.headers.common['Authorization'] = `Bearer ${token}`;
-      params.headers.common['TENANT-ID'] = TENANT_ID;
-      return params;
-    }
-    params.headers.common['Authorization'] = `Bearer ${tokenValue}`;
-    params.headers.common['TENANT-ID'] = '1';
-    return params;
-  },
-  function (error) {
-    // 对请求错误做些什么
-    return Promise.reject(error);
-  },
-);
-
-function Axios(method, api, params, map) {
-  // console.log(params)
-
-  let httpDefult;
-  // 几个外部特殊接口
-  // 退出登录
-  if(api === '/auth/token/logout'){
-    httpDefult = {
-      method: method,
-      url: `${baseCof.baseSever}${api}`,
-      params: params,
-      ...map,
-    };
-    console.log('httpDefult', httpDefult)
-  } else if (api === '/admin/social/logoutUri') {
-    httpDefult = {
-      method: method,
-      url: api,
-      params: params,
-      ...map,
-    };
-  }else if(api.search("check_token") !== -1){
-    httpDefult = {
-      method: method,
-      url: `${baseCof.baseSever}${api}`,
-      params: params,
-      ...map,
-    };
-  }else if (method === 'get') {
-    httpDefult = {
-      method: method,
-      url: `${baseCof.baseSever}${baseCof.basePath}${api}`,
-      params: params,
-      ...map,
-    };
-  } else if (method === 'post') {
-    httpDefult = {
-      method: method,
-      url: `${baseCof.baseSever}${baseCof.basePath}${api}`,
-      params: params,
-      ...map,
-    };
-  } else {
-    httpDefult = {
-      method: method,
-      url: `${baseCof.baseSever}${baseCof.basePath}${api}`,
-      params: params,
-      ...map,
-    };
-  }
-
-  return new Promise((resolve, reject) => {
-    axios(httpDefult)
-      .then((res) => {
-        resolve(res);
-      })
-      .catch((err) => {
-        reject(err);
-      });
-  });
-}
-
-export default Axios;
+import { message } from 'antd';
+import axios from 'axios';
+import baseCof from './config';
+import getStore from './userInfo';
+import { checkToken} from './permessionUtils';
+
+let tokenValue='7f288e2a-deb0-44fe-af72-7345ac8a6784';
+
+axios.interceptors.response.use(
+  (response) => {
+    if (response.status === 200) {
+      return response;
+    } else if (response.status === 401 || response.status === 302 || response.status === 403) {
+      if (process.env.NODE_ENV === 'production') {
+        tokenValue = getStore({ name: 'access_token' });
+      }
+      checkToken(tokenValue);
+    } else {
+      console.log('接口异常 response');
+      return Promise.reject('error');
+    }
+  },
+  (error) => {
+    console.log('error', error)
+    if (error.response) {
+      if (error.response.status === 401) {
+        if (process.env.NODE_ENV === 'production') {
+          tokenValue = getStore({ name: 'access_token' });
+        }
+        checkToken(tokenValue);
+      } else if (error.response.status === 403) {
+        // 提示无权限等
+      } else {
+        // 其他错误处理
+      }
+    }
+    return Promise.reject(error.response.data);
+  },
+);
+
+/** 全局请求拦截器 */
+axios.interceptors.request.use(
+  async (params) => {
+    // 生产环境，对接门户时，需要在请求头中设置token等信息
+    if (process.env.NODE_ENV === 'production') {
+      const TENANT_ID = getStore({ name: 'tenantId' }) || '1';
+      const isToken = (params.headers || {}).isToken === false;
+      const token = getStore({ name: 'access_token' });
+      if (!(token && !isToken) || !TENANT_ID) {
+        // 如果是调用退出登录接口，则不再执行退出登录逻辑，防止出现重复调用退出登录的循环
+        return params;
+      }
+      const headers = {
+        Authorization: `Bearer ${token}`,
+        TENANT_ID,
+      };
+      params.headers.common['Authorization'] = `Bearer ${token}`;
+      params.headers.common['TENANT-ID'] = TENANT_ID;
+      return params;
+    }
+    params.headers.common['Authorization'] = `Bearer ${tokenValue}`;
+    params.headers.common['TENANT-ID'] = '1';
+    return params;
+  },
+  function (error) {
+    // 对请求错误做些什么
+    return Promise.reject(error);
+  },
+);
+
+function Axios(method, api, params, map) {
+  // console.log(params)
+
+  let httpDefult;
+  // 几个外部特殊接口
+  // 退出登录
+  if(api === '/auth/token/logout'){
+    httpDefult = {
+      method: method,
+      url: `${baseCof.baseSever}${api}`,
+      params: params,
+      ...map,
+    };
+    console.log('httpDefult', httpDefult)
+  } else if (api === '/admin/social/logoutUri') {
+    httpDefult = {
+      method: method,
+      url: api,
+      params: params,
+      ...map,
+    };
+  }else if(api.search("check_token") !== -1){
+    httpDefult = {
+      method: method,
+      url: `${baseCof.baseSever}${api}`,
+      params: params,
+      ...map,
+    };
+  }else if (method === 'get') {
+    httpDefult = {
+      method: method,
+      url: `${baseCof.baseSever}${baseCof.basePath}${api}`,
+      params: params,
+      ...map,
+    };
+  } else if (method === 'post') {
+    httpDefult = {
+      method: method,
+      url: `${baseCof.baseSever}${baseCof.basePath}${api}`,
+      params: params,
+      ...map,
+    };
+  } else {
+    httpDefult = {
+      method: method,
+      url: `${baseCof.baseSever}${baseCof.basePath}${api}`,
+      params: params,
+      ...map,
+    };
+  }
+
+  return new Promise((resolve, reject) => {
+    axios(httpDefult)
+      .then((res) => {
+        resolve(res);
+      })
+      .catch((err) => {
+        reject(err);
+      });
+  });
+}
+
+export default Axios;

package/src/pages/util/config.js

@@ -1,10 +1,10 @@
-const address = window.location.hostname
-const port = window.location.port
-const baseCof = process.env.NODE_ENV === 'production' ?{
-  baseSever: `https://${address}:${port}`,
-  basePath: `/app/cmcc/data`,
-}:{
-    baseSever: 'http://localhost:8000',
-    basePath: '/cmcc/data',
-};                                                                                                                                                     
-export default baseCof;
+const address = window.location.hostname
+const port = window.location.port
+const baseCof = process.env.NODE_ENV === 'production' ?{
+  baseSever: `https://${address}:${port}`,
+  basePath: `/app/cmcc/data`,
+}:{
+    baseSever: 'http://localhost:8000',
+    basePath: '/cmcc/data',
+};                                                                                                                                                     
+export default baseCof;

package/src/pages/util/permessionUtils.js

@@ -1,33 +1,33 @@
-import Axios from './axios';
-import { message } from 'antd';
-
-const DEFAULT_LOGOUT_URL = '/#/login'
-// 退出登录
-export const logout = () => {
-  Axios('delete','/auth/token/logout', '', {} )
-    .then(() => {
-      // console.log('退出登录接口调用成功')
-      localStorage.clear();
-      sessionStorage.clear();
-      window.location.href = DEFAULT_LOGOUT_URL;
-    })
-    .catch((error) => {
-      console.error('Error while logging out, error:', error);
-      message.error('服务器错误，请稍后重试');
-    });
-}
-// 校验token是否失效
-export const checkToken = (token) => {
-  Axios('get',`/auth/oauth/check_token?token=${token}`, '', {} ).then(
-  ).catch(err=>{
-        // console.log('token失效')
-        message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
-          localStorage.clear();
-          sessionStorage.clear();
-          window.location.href = DEFAULT_LOGOUT_URL;
-        }});
-        // localStorage.clear();
-        // sessionStorage.clear();
-        // window.location.href = DEFAULT_LOGOUT_URL;
-      })
-}
+import Axios from './axios';
+import { message } from 'antd';
+
+const DEFAULT_LOGOUT_URL = '/#/login'
+// 退出登录
+export const logout = () => {
+  Axios('delete','/auth/token/logout', '', {} )
+    .then(() => {
+      // console.log('退出登录接口调用成功')
+      localStorage.clear();
+      sessionStorage.clear();
+      window.location.href = DEFAULT_LOGOUT_URL;
+    })
+    .catch((error) => {
+      console.error('Error while logging out, error:', error);
+      message.error('服务器错误，请稍后重试');
+    });
+}
+// 校验token是否失效
+export const checkToken = (token) => {
+  Axios('get',`/auth/oauth/check_token?token=${token}`, '', {} ).then(
+  ).catch(err=>{
+        // console.log('token失效')
+        message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
+          localStorage.clear();
+          sessionStorage.clear();
+          window.location.href = DEFAULT_LOGOUT_URL;
+        }});
+        // localStorage.clear();
+        // sessionStorage.clear();
+        // window.location.href = DEFAULT_LOGOUT_URL;
+      })
+}