qj-common 4.3.5 → 4.3.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/utils/request.js +44 -39
  3. package/src/views/layout/components/Navbar.vue +41 -41
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "qj-common",
3
- "version": "4.3.5",
3
+ "version": "4.3.7",
4
4
  "description": "common files && template for qj-paas",
5
5
  "scripts": {
6
6
  "gulp": "gulp css"
package/src/utils/request.js CHANGED
@@ -3,8 +3,8 @@ import axios from 'axios';
3
3
  // import Vue from 'vue'0
4
4
  // import ElementUI from "element-ui";
5
5
  // Vue.use(ElementUI)
6
- import { getLocalStorage, setLocalStorage, removeToken } from './auth';
7
- import { getQueryString } from './getQueryString';
6
+ import { getLocalStorage, setLocalStorage, removeToken } from './auth';
7
+ import { getQueryString } from './getQueryString';
8
8
 
9
9
 
10
10
  import Cookies from 'js-cookie'
@@ -104,10 +104,10 @@ var ajaxCount = 0;
104
104
  let that = Vue.prototype;
105
105
 
106
106
  let hrefs = window.location.href, hosts = window.location.host;
107
- var secDomainName='';
108
- if(window.__POWERED_BY_QIANKUN__) {
107
+ var secDomainName = '';
108
+ if (window.__POWERED_BY_QIANKUN__) {
109
109
  secDomainName = process.env.API_ROOT
110
- } else if(hrefs && hosts) {
110
+ } else if (hrefs && hosts) {
111
111
  let name = hrefs.split(hosts)[1] ? hrefs.split(hosts)[1].split('/')[1] : null;
112
112
  secDomainName = name && name !== 'paas' && process.env.NODE_ENV != 'development' ? process.env.API_ROOT + '/' + name : process.env.API_ROOT
113
113
  } else {
@@ -116,7 +116,7 @@ if(window.__POWERED_BY_QIANKUN__) {
116
116
 
117
117
 
118
118
 
119
- sessionStorage.setItem('secDomainName',secDomainName)
119
+ sessionStorage.setItem('secDomainName', secDomainName)
120
120
  console.log(process.env, 'process.env')
121
121
  console.log(secDomainName, 'process.env')
122
122
  const service = axios.create({
@@ -190,13 +190,13 @@ service.interceptors.request.use(
190
190
  // if (getLocalStorage('saas-token')) {
191
191
  // config.headers['saas-token'] = getLocalStorage('saas-token');
192
192
  // }
193
- if(window.qs && window.qs['saas-token']){
194
- config.headers['saas-token'] = window.qs['saas-token']
195
- }else if(getQueryString('saas-token')){
196
- config.headers['saas-token'] = getQueryString('saas-token');
197
- console.log('saas-token',getQueryString('saas-token'));
198
- }else if(getLocalStorage('saas-token')){
199
- config.headers['saas-token'] = getLocalStorage('saas-token');
193
+ if (window.qs && window.qs['saas-token']) {
194
+ config.headers['saas-token'] = window.qs['saas-token']
195
+ } else if (getQueryString('saas-token')) {
196
+ config.headers['saas-token'] = getQueryString('saas-token');
197
+ console.log('saas-token', getQueryString('saas-token'));
198
+ } else if (getLocalStorage('saas-token')) {
199
+ config.headers['saas-token'] = getLocalStorage('saas-token');
200
200
  }
201
201
  if (getLocalStorage('saas-proappcode')) {
202
202
  config.headers['saas-proappcode'] = getLocalStorage('saas-proappcode');
@@ -205,7 +205,7 @@ service.interceptors.request.use(
205
205
  config.headers['saas-companycode'] = getLocalStorage('saas-companycode');
206
206
  }
207
207
  /*if (getLocalStorage('saas-tginfocode')) {
208
- config.headers['saas-tginfocode'] = getLocalStorage('saas-tginfocode')
208
+ config.headers['saas-tginfocode'] = getLocalStorage('saas-tginfocode')
209
209
  }*/
210
210
  if (getLocalStorage('saas-proappEnv')) {
211
211
  config.headers['saas-proappEnv'] = getLocalStorage('saas-proappEnv');
@@ -297,7 +297,7 @@ service.interceptors.response.use(
297
297
  proappEnvLayout = JSON.parse(isRedirect);
298
298
  }
299
299
  window.sessionStorage.clear();
300
- window.localStorage.clear();
300
+ window.localStorage.clear();
301
301
  let nJson = JSON.parse(res.data.dataObj);
302
302
  let nUrl = window.location.origin + window.location.pathname + window.location.hash.split('?')[0];
303
303
  if (window.location.hash.split('?')[1]) {
@@ -305,34 +305,39 @@ service.interceptors.response.use(
305
305
  nUrl = nUrl + '?' + window.location.hash.split('?')[1];
306
306
  }
307
307
  if (process.env.NODE_ENV === 'development') {
308
- if(!window.qs){
309
- window.location.href = secDomainName + nJson.loginurl + '?url=' + nUrl;
310
- }else{
311
- setLocalStorage('saas-token', window.qs['saas-token']);
312
- Cookies.set('saas-token-plat', window.qs['saas-token'])
313
- }
308
+ if (!window.qs) {
309
+ window.location.href = secDomainName + nJson.loginurl + '?url=' + nUrl;
310
+ } else {
311
+ setLocalStorage('saas-token', window.qs['saas-token']);
312
+ Cookies.set('saas-token-plat', window.qs['saas-token'])
313
+ }
314
314
  // window.location.href = process.env.API_ROOT + nJson.loginurl
315
315
  } else {
316
316
  // 如果检查到没有登录，则清除保存的登录cookie
317
- if(!window.qs){
318
- let newDomain = document.domain
319
- .split('.')
320
- .splice(-2)
321
- .join('.');
322
- removeToken('LOGININFO', newDomain, '/');
323
- removeToken('personalInfo', newDomain, '/');
324
- console.log(nJson,'nJson')
325
- if(window.__POWERED_BY_QIANKUN__) {
326
- window.history.pushState(null, '', '/login');
327
- } else if (nUrl.indexOf('login') < 0 && !proappEnvLayout.proappEnvOpentype) {
328
- window.location.href =secDomainName + nJson.loginurl + '?url=' + nUrl;
329
- } else {
330
- window.location.href =secDomainName + nJson.loginurl;
331
- }
332
- }else{
333
- setLocalStorage('saas-token', window.qs['saas-token']);
334
- Cookies.set('saas-token-plat', window.qs['saas-token'])
317
+ if (!window.qs) {
318
+ let newDomain = document.domain
319
+ .split('.')
320
+ .splice(-2)
321
+ .join('.');
322
+ removeToken('LOGININFO', newDomain, '/');
323
+ removeToken('personalInfo', newDomain, '/');
324
+ console.log(nJson, 'nJson')
325
+ if (window.__POWERED_BY_QIANKUN__) {
326
+ window.history.pushState(null, '', '/login');
327
+ } else if (nUrl.indexOf('login') < 0 && !proappEnvLayout.proappEnvOpentype) {
328
+ if (nUrl.indexOf('/404') !== -1) {
329
+ window.location.href = secDomainName + nJson.loginurl
330
+ } else {
331
+ window.location.href = secDomainName + nJson.loginurl + '?url=' + nUrl;
332
+ }
333
+
334
+ } else {
335
+ window.location.href = secDomainName + nJson.loginurl;
335
336
  }
337
+ } else {
338
+ setLocalStorage('saas-token', window.qs['saas-token']);
339
+ Cookies.set('saas-token-plat', window.qs['saas-token'])
340
+ }
336
341
  }
337
342
  }
338
343
  window.sessionStorage.setItem('menuCode', menuCode); // 当前页存进去
package/src/views/layout/components/Navbar.vue CHANGED
@@ -270,7 +270,7 @@ export default {
270
270
  this.menuList = window.sessionStorage.getItem('menuList') ? window.sessionStorage.getItem('menuList') : '';
271
271
  this.menuCode = window.sessionStorage.getItem('menuCode') ? window.sessionStorage.getItem('menuCode') : '';
272
272
  this.proappEnvLayout = window.sessionStorage.getItem('proappEnvLayout') ? window.sessionStorage.getItem('proappEnvLayout') : '';
273
- this.commonShowMenuAction = window.sessionStorage.getItem('commonShowMenuAction') ? JSON.parse(window.sessionStorage.getItem('commonShowMenuAction')) : ''
273
+ this.commonShowMenuAction = window.sessionStorage.getItem('commonShowMenuAction') ? window.sessionStorage.getItem('commonShowMenuAction') : ''
274
274
  // 获取 SSO 登出配置
275
275
  this.ssoLogout();
276
276
  },
@@ -482,46 +482,46 @@ export default {
482
482
  align-items: center;
483
483
  color: #bbbbbb;
484
484
  margin-right: 15px;
485
- align-items: center // font-weight: normal;
486
- // transition: all 10s linear;
487
- // i {
488
- // display: inline-block;
489
- // width: 18px;
490
- // height: 18px;
491
- // // margin-right: 25px;
492
- // cursor: pointer;
493
- // }
494
- // .user_name {
495
- // cursor: pointer;
496
- // margin-right: 15px;
497
- // p {
498
- // width: 100%;
499
- // line-height: 24px;
500
- // height: 24px;
501
- // display: inline-table;
502
- // // .user-icon {
503
- // // vertical-align: middle;
504
- // // background: url("../../../assets/nav/admin.png") no-repeat;
505
- // // background-size: 80%;
506
- // // }
507
- // // .user_line {
508
- // // border: 1px solid #f8f8f8;
509
- // // margin: 0 5px;
510
- // // }
511
- // }
512
- // &:hover {
513
- // // .user-icon {
514
- // // vertical-align: middle;
515
- // // background-image: url("../../../assets/nav/admin-hover.png");
516
- // // background-size: 100% 100%;
517
- // // }
518
- // p {
519
- // color: #409dff;
520
- // }
521
- // }
522
- // }
523
-
524
- .spl_line {
485
+ align-items: center; // font-weight: normal;
486
+ // transition: all 10s linear;
487
+ // i {
488
+ // display: inline-block;
489
+ // width: 18px;
490
+ // height: 18px;
491
+ // // margin-right: 25px;
492
+ // cursor: pointer;
493
+ // }
494
+ // .user_name {
495
+ // cursor: pointer;
496
+ // margin-right: 15px;
497
+ // p {
498
+ // width: 100%;
499
+ // line-height: 24px;
500
+ // height: 24px;
501
+ // display: inline-table;
502
+ // // .user-icon {
503
+ // // vertical-align: middle;
504
+ // // background: url("../../../assets/nav/admin.png") no-repeat;
505
+ // // background-size: 80%;
506
+ // // }
507
+ // // .user_line {
508
+ // // border: 1px solid #f8f8f8;
509
+ // // margin: 0 5px;
510
+ // // }
511
+ // }
512
+ // &:hover {
513
+ // // .user-icon {
514
+ // // vertical-align: middle;
515
+ // // background-image: url("../../../assets/nav/admin-hover.png");
516
+ // // background-size: 100% 100%;
517
+ // // }
518
+ // p {
519
+ // color: #409dff;
520
+ // }
521
+ // }
522
+ // }
523
+
524
+ .spl_line {
525
525
  height: 40px;
526
526
  border: 1px solid #f8f8f8;
527
527
  line-height: 46px;