imatrix-ui 2.8.63-dw → 2.8.64-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.8.63-dw",
+  "version": "2.8.64-dw",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/src/utils/auth-api.js

@@ -1,27 +1,36 @@
 import Cookies from 'js-cookie'
+import Vue from 'vue'
 
 const jwtKey = 'JWT'
 const currentUserNameKey = 'USERNAME'
 const currentUserInfoKey = 'CURRENT_USER'
 
 function getToken() {
-  return Cookies.get(jwtKey)
+  let token = getCookieCache(jwtKey)
+  const projectModel = Vue.prototype.projectModel
+  if (!token && projectModel && projectModel === 'developing.model') {
+    // 如果是开发环境从sessionStorage中获得token
+    token = getSessionCache(jwtKey)
+  }
+  return token
 }
 
 function setToken(token) {
-  Cookies.set(jwtKey, token, {
-    path: '/'
-  })
+  setCookieCache(jwtKey, token)
+  setSessionCache(jwtKey, token)
 }
 
 function removeToken() {
-  Cookies.remove(jwtKey, {
-    path: '/'
-  })
+  removeCookieCache(jwtKey)
+  removeSessionCache(jwtKey)
 }
 
 function getUsername() {
-  return getCookieCache(currentUserNameKey)
+  let username = getCookieCache(currentUserNameKey)
+  if (!username) {
+    username = getSessionCache(currentUserNameKey)
+  }
+  return username
 }
 
 function setUsername(username) {
@@ -35,7 +44,10 @@ function removeUsername() {
 }
 
 function getCurrentUser() {
-  const userJson = getCookieCache(currentUserInfoKey)
+  let userJson = getCookieCache(currentUserInfoKey)
+  if (!userJson) {
+    userJson = getSessionCache(currentUserInfoKey)
+  }
   if (userJson) {
     return JSON.parse(userJson)
   }
@@ -58,8 +70,7 @@ function removeCurrentUser() {
 }
 
 function getCookieCache(key) {
-  const value = Cookies.get(key)
-  return value
+  return Cookies.get(key)
 }
 
 function setCookieCache(key, value) {
@@ -75,8 +86,7 @@ function removeCookieCache(key) {
 }
 
 function getSessionCache(key) {
-  const value = sessionStorage.getItem(key)
-  return value
+  return sessionStorage.getItem(key)
 }
 
 function setSessionCache(key, value) {