qj-common 4.3.6 → 4.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qj-common",
-  "version": "4.3.6",
+  "version": "4.3.8",
   "description": "common files && template for qj-paas",
   "scripts": {
     "gulp": "gulp css"

package/src/utils/request.js

@@ -3,8 +3,8 @@ import axios from 'axios';
 // import Vue from 'vue'0
 // import ElementUI from "element-ui";
 // Vue.use(ElementUI)
-import { getLocalStorage, setLocalStorage, removeToken  } from './auth';
-import {  getQueryString } from './getQueryString';
+import { getLocalStorage, setLocalStorage, removeToken } from './auth';
+import { getQueryString } from './getQueryString';
 
 
 import Cookies from 'js-cookie'
@@ -104,10 +104,10 @@ var ajaxCount = 0;
 let that = Vue.prototype;
 
 let hrefs = window.location.href, hosts = window.location.host;
-var secDomainName='';
-if(window.__POWERED_BY_QIANKUN__) {
+var secDomainName = '';
+if (window.__POWERED_BY_QIANKUN__) {
   secDomainName = process.env.API_ROOT
-} else if(hrefs && hosts) {
+} else if (hrefs && hosts) {
   let name = hrefs.split(hosts)[1] ? hrefs.split(hosts)[1].split('/')[1] : null;
   secDomainName = name && name !== 'paas' && process.env.NODE_ENV != 'development' ? process.env.API_ROOT + '/' + name : process.env.API_ROOT
 } else {
@@ -116,7 +116,7 @@ if(window.__POWERED_BY_QIANKUN__) {
 
 
 
-sessionStorage.setItem('secDomainName',secDomainName)
+sessionStorage.setItem('secDomainName', secDomainName)
 console.log(process.env, 'process.env')
 console.log(secDomainName, 'process.env')
 const service = axios.create({
@@ -190,13 +190,13 @@ service.interceptors.request.use(
     // if (getLocalStorage('saas-token')) {
     //   config.headers['saas-token'] = getLocalStorage('saas-token');
     // }
-    if(window.qs && window.qs['saas-token']){
-        config.headers['saas-token'] = window.qs['saas-token']
-    }else if(getQueryString('saas-token')){
-        config.headers['saas-token'] = getQueryString('saas-token');
-        console.log('saas-token',getQueryString('saas-token'));
-    }else if(getLocalStorage('saas-token')){
-        config.headers['saas-token'] = getLocalStorage('saas-token');
+    if (window.qs && window.qs['saas-token']) {
+      config.headers['saas-token'] = window.qs['saas-token']
+    } else if (getQueryString('saas-token')) {
+      config.headers['saas-token'] = getQueryString('saas-token');
+      console.log('saas-token', getQueryString('saas-token'));
+    } else if (getLocalStorage('saas-token')) {
+      config.headers['saas-token'] = getLocalStorage('saas-token');
     }
     if (getLocalStorage('saas-proappcode')) {
       config.headers['saas-proappcode'] = getLocalStorage('saas-proappcode');
@@ -205,7 +205,7 @@ service.interceptors.request.use(
       config.headers['saas-companycode'] = getLocalStorage('saas-companycode');
     }
     /*if (getLocalStorage('saas-tginfocode')) {
-  		config.headers['saas-tginfocode'] = getLocalStorage('saas-tginfocode')
+      config.headers['saas-tginfocode'] = getLocalStorage('saas-tginfocode')
   }*/
     if (getLocalStorage('saas-proappEnv')) {
       config.headers['saas-proappEnv'] = getLocalStorage('saas-proappEnv');
@@ -281,6 +281,7 @@ service.interceptors.response.use(
       var cookieKey = response.headers['saas-cookiekey'];
       window.sessionStorage.setItem('cookieKey', cookieKey);
       let menuCode = window.sessionStorage.getItem('menuCode') ? window.sessionStorage.getItem('menuCode') : '';
+      let commonShowMenuAction = window.sessionStorage.getItem('commonShowMenuAction') ? window.sessionStorage.getItem('commonShowMenuAction') : '';
 
 
       setLocalStorage('saas-tenantcode', tenantcode);
@@ -297,7 +298,7 @@ service.interceptors.response.use(
           proappEnvLayout = JSON.parse(isRedirect);
         }
         window.sessionStorage.clear();
-		window.localStorage.clear();
+        window.localStorage.clear();
         let nJson = JSON.parse(res.data.dataObj);
         let nUrl = window.location.origin + window.location.pathname + window.location.hash.split('?')[0];
         if (window.location.hash.split('?')[1]) {
@@ -305,37 +306,43 @@ service.interceptors.response.use(
           nUrl = nUrl + '?' + window.location.hash.split('?')[1];
         }
         if (process.env.NODE_ENV === 'development') {
-            if(!window.qs){
-                window.location.href = secDomainName + nJson.loginurl + '?url=' + nUrl;
-            }else{
-                setLocalStorage('saas-token', window.qs['saas-token']);
-                Cookies.set('saas-token-plat', window.qs['saas-token'])
-            }
+          if (!window.qs) {
+            window.location.href = secDomainName + nJson.loginurl + '?url=' + nUrl;
+          } else {
+            setLocalStorage('saas-token', window.qs['saas-token']);
+            Cookies.set('saas-token-plat', window.qs['saas-token'])
+          }
           // window.location.href = process.env.API_ROOT + nJson.loginurl
         } else {
           // 如果检查到没有登录，则清除保存的登录cookie
-            if(!window.qs){
-                let newDomain = document.domain
-                    .split('.')
-                    .splice(-2)
-                    .join('.');
-                removeToken('LOGININFO', newDomain, '/');
-                removeToken('personalInfo', newDomain, '/');
-                console.log(nJson,'nJson')
-                if(window.__POWERED_BY_QIANKUN__) {
-                  window.history.pushState(null, '', '/login');
-                } else if (nUrl.indexOf('login') < 0 && !proappEnvLayout.proappEnvOpentype) {
-                    window.location.href =secDomainName + nJson.loginurl + '?url=' + nUrl;
-                } else {
-                    window.location.href =secDomainName + nJson.loginurl;
-                }
-            }else{
-                setLocalStorage('saas-token', window.qs['saas-token']);
-                Cookies.set('saas-token-plat', window.qs['saas-token'])
+          if (!window.qs) {
+            let newDomain = document.domain
+              .split('.')
+              .splice(-2)
+              .join('.');
+            removeToken('LOGININFO', newDomain, '/');
+            removeToken('personalInfo', newDomain, '/');
+            console.log(nJson, 'nJson')
+            if (window.__POWERED_BY_QIANKUN__) {
+              window.history.pushState(null, '', '/login');
+            } else if (nUrl.indexOf('login') < 0 && !proappEnvLayout.proappEnvOpentype) {
+              if (nUrl.indexOf('/404') !== -1) {
+                window.location.href = secDomainName + nJson.loginurl
+              } else {
+                window.location.href = secDomainName + nJson.loginurl + '?url=' + nUrl;
+              }
+
+            } else {
+              window.location.href = secDomainName + nJson.loginurl;
             }
+          } else {
+            setLocalStorage('saas-token', window.qs['saas-token']);
+            Cookies.set('saas-token-plat', window.qs['saas-token'])
+          }
         }
       }
-      window.sessionStorage.setItem('menuCode', menuCode);   // 当前页存进去
+      window.sessionStorage.setItem('menuCode', menuCode);// 当前页存进去
+      window.sessionStorage.setItem('commonShowMenuAction', commonShowMenuAction);// 当前页存进去
 
       // else if (!response.config.isValid && res.data && 'success' in res.data && !res.data.success) {
       //   console.log(response.data, 'lllll');

package/src/views/layout/components/Navbar.vue

@@ -270,7 +270,7 @@ export default {
       this.menuList = window.sessionStorage.getItem('menuList') ? window.sessionStorage.getItem('menuList') : '';
       this.menuCode = window.sessionStorage.getItem('menuCode') ? window.sessionStorage.getItem('menuCode') : '';
       this.proappEnvLayout = window.sessionStorage.getItem('proappEnvLayout') ? window.sessionStorage.getItem('proappEnvLayout') : '';
-      this.commonShowMenuAction = window.sessionStorage.getItem('commonShowMenuAction') ? JSON.parse(window.sessionStorage.getItem('commonShowMenuAction')) : ''
+      this.commonShowMenuAction = window.sessionStorage.getItem('commonShowMenuAction') ? window.sessionStorage.getItem('commonShowMenuAction') : ''
       // 获取 SSO 登出配置
       this.ssoLogout();
     },

package/src/views/layout/components/Sidebar/index.vue

@@ -162,7 +162,16 @@ export default {
       console.log(path, 'path');
       console.log(sessionStorage.getItem('commonShowMenuAction'), this.$route, '当前路由信息');
       if (this.$route.name !== '首页' && this.$route.path !== '/404') {
-        path = sessionStorage.getItem('commonShowMenuAction') ? sessionStorage.getItem('commonShowMenuAction') : path
+        if (Object.keys(this.$route.meta) > 0) {
+          if ('title' in this.$route.meta && 'icon' in this.$route.meta && 'menuCode' in this.$route.meta && 'params' in this.$route.meta) {
+            path = path
+          } else {
+            path = sessionStorage.getItem('commonShowMenuAction') ? sessionStorage.getItem('commonShowMenuAction') : path
+          }
+        } else {
+          path = sessionStorage.getItem('commonShowMenuAction') ? sessionStorage.getItem('commonShowMenuAction') : path
+        }
+
       }
 
       return path;