module-menu 0.3.16 → 0.3.18

package/src/pages/ModuleUser/index.less

@@ -1,101 +1,101 @@
-.right {
-  display: flex;
-  float: right;
-  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);
-    }
-  }
-}
-.right_size{
-  height: 48px;
-}
-.right_size_LNRD{
-  height: 75px;
-}
-
-:global(.right-select> .ant-select-selector) {
-  border: none !important;
-  box-shadow: none !important;
-}
-
-:global(.right-select> .ant-select-arrow>.anticon) {
-  color: #000000 !important;
-}
-:global(.right-select_LNRD> .ant-select-selector) {
-  border: none !important;
-  box-shadow: none !important;
-}
-:global(.right-select_HBJK> .ant-select-selector) {
-  border: none !important;
-  box-shadow: none !important;
-  background-color: #ffffff00 !important;
-  text-align: end !important;
-}
-:global(.right-select_LNRD> .ant-select-arrow>.anticon) {
-  color: #FFFFFF !important;
-}
-:global(.right-select_HBJK> .ant-select-arrow>.anticon) {
-  color: #FFFFFF !important;
-}
-.right-select_LNRD .ant-select-selection-item{
-  color: #FFFFFF !important;
-}
-.right-select_HBJK .ant-select-selection-item{
-  color: #FFFFFF !important;
-}
-
-.menu {
-  :global(.anticon) {
-    margin-right: 8px;
-  }
-
-  :global(.ant-dropdown-menu-item) {
-    min-width: 160px;
-  }
-}
-.right_size_LNRD  .ant-btn-link{
-  color: #FFE347 ;
-}
-.fwmh_color_LNRD  .ant-btn-link{
-  color: #FFE347 ;
-}
-.fwmh_color_HBJK.ant-btn-link{
-  color: #FFF ;
-}
-.right_size_LNRD .ant-btn-link:hover,
-.right_size_LNRD .ant-btn-link:focus{
-  color:#FFE347
-}
-.right_size_LNRD  .ant-select:not(.ant-select-customize-input) .ant-select-selector{
-  background-color: #fff0 !important;
-}
+.right {
+  display: flex;
+  float: right;
+  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);
+    }
+  }
+}
+.right_size{
+  height: 48px;
+}
+.right_size_LNRD{
+  height: 75px;
+}
+
+:global(.right-select> .ant-select-selector) {
+  border: none !important;
+  box-shadow: none !important;
+}
+
+:global(.right-select> .ant-select-arrow>.anticon) {
+  color: #000000 !important;
+}
+:global(.right-select_LNRD> .ant-select-selector) {
+  border: none !important;
+  box-shadow: none !important;
+}
+:global(.right-select_HBJK> .ant-select-selector) {
+  border: none !important;
+  box-shadow: none !important;
+  background-color: #ffffff00 !important;
+  text-align: end !important;
+}
+:global(.right-select_LNRD> .ant-select-arrow>.anticon) {
+  color: #FFFFFF !important;
+}
+:global(.right-select_HBJK> .ant-select-arrow>.anticon) {
+  color: #FFFFFF !important;
+}
+.right-select_LNRD .ant-select-selection-item{
+  color: #FFFFFF !important;
+}
+.right-select_HBJK .ant-select-selection-item{
+  color: #FFFFFF !important;
+}
+
+.menu {
+  :global(.anticon) {
+    margin-right: 8px;
+  }
+
+  :global(.ant-dropdown-menu-item) {
+    min-width: 160px;
+  }
+}
+.right_size_LNRD  .ant-btn-link{
+  color: #FFE347 ;
+}
+.fwmh_color_LNRD  .ant-btn-link{
+  color: #FFE347 ;
+}
+.fwmh_color_HBJK.ant-btn-link{
+  color: #FFF ;
+}
+.right_size_LNRD .ant-btn-link:hover,
+.right_size_LNRD .ant-btn-link:focus{
+  color:#FFE347
+}
+.right_size_LNRD  .ant-select:not(.ant-select-customize-input) .ant-select-selector{
+  background-color: #fff0 !important;
+}

package/src/pages/index.jsx

@@ -1,6 +1,6 @@
-import ModuleMenu from './ModuleMenu';
-import ModuleUser from './ModuleUser';
-import Footer from './Footer';
-export { ModuleMenu, ModuleUser, Footer };
-// 开发环境，手动打开，并且屏蔽上面的导出
-// export default ModuleMenu;
+import ModuleMenu from './ModuleMenu';
+import ModuleUser from './ModuleUser';
+import Footer from './Footer';
+export { ModuleMenu, ModuleUser, Footer };
+// 开发环境，手动打开，并且屏蔽上面的导出
+// export default ModuleMenu;

package/src/pages/util/axios.js

@@ -1,172 +1,172 @@
-import { message } from 'antd';
-import axios from 'axios';
-import baseCof from './config';
-import getStore from './userInfo';
-import { checkToken } from './permessionUtils';
-import CONSTANT from './constant';
-
-let tokenValue = '5de3ef8171364d6ba756221655fe1310';
-// 轻量级tokenInSessionStor存在（GZW跳/data-platform/#/login，否则/#/login）,一体化tokenInSessionStor不存在
-const tokenInSessionStor = window.sessionStorage.getItem(
-  'bigdata-access_token',
-);
-// stash=GZW为轻量级国资委 stash=integration 为一体化，其余为其他轻量级
-const stash = localStorage.getItem('stash');
-
-axios.interceptors.response.use(
-  (response) => {
-    if (response.status === 200) {
-      return response;
-    } else if (
-      response.status === 401 ||
-      response.status === 302 ||
-      response.status === 403
-    ) {
-      // 一体化需要调接口判断token是否过期，轻量级直接退出
-      if (!tokenInSessionStor) {
-        if (process.env.NODE_ENV === 'production') {
-          tokenValue = getStore({ name: 'access_token' });
-        }
-        checkToken(tokenValue);
-      } else {
-        message.error({
-          content: '用户凭证已过期，请重新登录',
-          onClose: () => {
-            localStorage.clear();
-            sessionStorage.clear();
-            window.location.href =
-              stash === 'GZW' ? '/data-platform/#/login' : '/#/login';
-          },
-        });
-      }
-    } else {
-      console.log('接口异常 response');
-      return Promise.reject('error');
-    }
-  },
-  (error) => {
-    console.log('error', error);
-    if (error.response) {
-      if (error.response.status === 401) {
-        if (!tokenInSessionStor) {
-          if (process.env.NODE_ENV === 'production') {
-            tokenValue = getStore({ name: 'access_token' });
-          }
-          checkToken(tokenValue);
-        } else {
-          message.error({
-            content: '用户凭证已过期，请重新登录',
-            onClose: () => {
-              localStorage.clear();
-              sessionStorage.clear();
-              window.location.href = CONSTANT.DEFAULT_LOGOUT_URL_COMPACT;
-            },
-          });
-        }
-      } 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) {
-  let httpDefult;
-  // 几个外部特殊接口
-  // 退出登录
-  if (api.includes('/auth/token/logout')) {
-    httpDefult = {
-      method: method,
-      url: `${baseCof.baseSever}${api}`,
-      params: params,
-      ...map,
-    };
-  } else if (api.includes('/admin/social/logoutUri')) {
-    httpDefult = {
-      method: method,
-      url: `${baseCof.baseSever}${api}`,
-      params: params,
-      ...map,
-    };
-  } else if (api.search('/admin-api') !== -1) {
-    httpDefult = {
-      method: method,
-      url: `${baseCof.baseSever}${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';
+import CONSTANT from './constant';
+
+let tokenValue = '1cec132bd3da451f9c67b7c6e9fad16f';
+// 轻量级tokenInSessionStor存在（GZW跳/data-platform/#/login，否则/#/login）,一体化tokenInSessionStor不存在
+const tokenInSessionStor = window.sessionStorage.getItem(
+  'bigdata-access_token',
+);
+// stash=GZW为轻量级国资委 stash=integration 为一体化，其余为其他轻量级
+const stash = localStorage.getItem('stash');
+
+axios.interceptors.response.use(
+  (response) => {
+    if (response.status === 200) {
+      return response;
+    } else if (
+      response.status === 401 ||
+      response.status === 302 ||
+      response.status === 403
+    ) {
+      // 一体化需要调接口判断token是否过期，轻量级直接退出
+      if (!tokenInSessionStor) {
+        if (process.env.NODE_ENV === 'production') {
+          tokenValue = getStore({ name: 'access_token' });
+        }
+        checkToken(tokenValue);
+      } else {
+        message.error({
+          content: '用户凭证已过期，请重新登录',
+          onClose: () => {
+            localStorage.clear();
+            sessionStorage.clear();
+            window.location.href =
+              stash === 'GZW' ? '/data-platform/#/login' : '/#/login';
+          },
+        });
+      }
+    } else {
+      console.log('接口异常 response');
+      return Promise.reject('error');
+    }
+  },
+  (error) => {
+    console.log('error', error);
+    if (error.response) {
+      if (error.response.status === 401) {
+        if (!tokenInSessionStor) {
+          if (process.env.NODE_ENV === 'production') {
+            tokenValue = getStore({ name: 'access_token' });
+          }
+          checkToken(tokenValue);
+        } else {
+          message.error({
+            content: '用户凭证已过期，请重新登录',
+            onClose: () => {
+              localStorage.clear();
+              sessionStorage.clear();
+              window.location.href = CONSTANT.DEFAULT_LOGOUT_URL_COMPACT;
+            },
+          });
+        }
+      } 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) {
+  let httpDefult;
+  // 几个外部特殊接口
+  // 退出登录
+  if (api.includes('/auth/token/logout')) {
+    httpDefult = {
+      method: method,
+      url: `${baseCof.baseSever}${api}`,
+      params: params,
+      ...map,
+    };
+  } else if (api.includes('/admin/social/logoutUri')) {
+    httpDefult = {
+      method: method,
+      url: `${baseCof.baseSever}${api}`,
+      params: params,
+      ...map,
+    };
+  } else if (api.search('/admin-api') !== -1) {
+    httpDefult = {
+      method: method,
+      url: `${baseCof.baseSever}${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,6 +1,6 @@
-const {origin} = window.location
-const baseCof = {
-  baseSever: origin,
-  basePath: process.env.NODE_ENV === 'production'?`/app/cmcc/data`:'/cmcc/data',
-};                                                                                                                                                     
-export default baseCof;
+const {origin} = window.location
+const baseCof = {
+  baseSever: origin,
+  basePath: process.env.NODE_ENV === 'production'?`/app/cmcc/data`:'/cmcc/data',
+};                                                                                                                                                     
+export default baseCof;

package/src/pages/util/constant.js

@@ -1,5 +1,5 @@
-const CONSTANT = {
-    // 轻量级登录页地址
-    DEFAULT_LOGOUT_URL_COMPACT: '/#/login',
-};                                                                                                                                                     
+const CONSTANT = {
+    // 轻量级登录页地址
+    DEFAULT_LOGOUT_URL_COMPACT: '/#/login',
+};                                                                                                                                                     
 export default CONSTANT;

package/src/pages/util/permessionUtils.js

@@ -1,36 +1,36 @@
-import Axios from './axios';
-import { message } from 'antd';
-
-// 校验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();
-          getLoginUrl()
-            .then((res) => {
-              if (res?.data?.data?.loginoutUrl) {
-                console.log('Login URL found:', res.data.data.loginoutUrl);
-                window.location.href = res.data.data.loginoutUrl;
-              } else {
-                console.log('No login URL found, redirect to default login page.');
-                window.location.href = '/admin-ui/login';
-              }
-            })
-            .catch((e) => {
-              console.log('GetLoginUrl error: ', e);
-              window.location.href = '/admin-ui/login';
-            });
-        }});
-      })
-}
-
-// 获取登录地址信息
-export function getLoginUrl() {
-  return Axios(
-    'get',
-    '/admin-api/system/auth/getCodeUrl',
-  )
-}
+import Axios from './axios';
+import { message } from 'antd';
+
+// 校验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();
+          getLoginUrl()
+            .then((res) => {
+              if (res?.data?.data?.loginoutUrl) {
+                console.log('Login URL found:', res.data.data.loginoutUrl);
+                window.location.href = res.data.data.loginoutUrl;
+              } else {
+                console.log('No login URL found, redirect to default login page.');
+                window.location.href = '/admin-ui/login';
+              }
+            })
+            .catch((e) => {
+              console.log('GetLoginUrl error: ', e);
+              window.location.href = '/admin-ui/login';
+            });
+        }});
+      })
+}
+
+// 获取登录地址信息
+export function getLoginUrl() {
+  return Axios(
+    'get',
+    '/admin-api/system/auth/getCodeUrl',
+  )
+}