imatrix-ui 2.8.3 → 2.8.4

package/package.json

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

package/src/utils/auth-api.js

@@ -0,0 +1,105 @@
+import Cookies from 'js-cookie'
+
+const jwtKey = 'JWT'
+const currentUserNameKey = 'USERNAME'
+const currentUserInfoKey = 'CURRENT_USER'
+
+function getToken() {
+  return Cookies.get(jwtKey)
+}
+
+function setToken(token) {
+  Cookies.set(jwtKey, token, {
+    path: '/'
+  })
+}
+
+function removeToken() {
+  Cookies.remove(jwtKey, {
+    path: '/'
+  })
+}
+
+function getUsername() {
+  return getCookieCache(currentUserNameKey)
+}
+
+function setUsername(username) {
+  setSessionCache(currentUserNameKey, username)
+  setCookieCache(currentUserNameKey, username)
+}
+
+function removeUsername() {
+  removeSessionCache(currentUserNameKey)
+  removeCookieCache(currentUserNameKey)
+}
+
+function getCurrentUser() {
+  const userJson = getCookieCache(currentUserInfoKey)
+  if (userJson) {
+    return JSON.parse(userJson)
+  }
+}
+
+function setCurrentUser(userInfo) {
+  if (userInfo) {
+    if (userInfo.password) {
+      userInfo.password = null
+    }
+    const userinfoStr = JSON.stringify(userInfo)
+    setSessionCache(currentUserInfoKey, userinfoStr)
+    setCookieCache(currentUserInfoKey, userinfoStr)
+  }
+}
+
+function removeCurrentUser() {
+  removeSessionCache(currentUserInfoKey)
+  removeCookieCache(currentUserInfoKey)
+}
+
+function getCookieCache(key) {
+  const value = Cookies.get(key)
+  return value
+}
+
+function setCookieCache(key, value) {
+  Cookies.set(key, value, {
+    path: '/'
+  })
+}
+
+function removeCookieCache(key) {
+  Cookies.remove(key, {
+    path: '/'
+  })
+}
+
+function getSessionCache(key) {
+  const value = sessionStorage.getItem(key)
+  return value
+}
+
+function setSessionCache(key, value) {
+  return sessionStorage.setItem(key, value)
+}
+
+function removeSessionCache(key) {
+  sessionStorage.removeItem(key)
+}
+export default {
+  getToken,
+  setToken,
+  removeToken,
+  getUsername,
+  setUsername,
+  removeUsername,
+  getCurrentUser,
+  setCurrentUser,
+  removeCurrentUser,
+  getCookieCache,
+  setCookieCache,
+  removeCookieCache,
+  getSessionCache,
+  setSessionCache,
+  removeSessionCache
+}

package/src/utils/auth.js

@@ -1,69 +1,61 @@
-import sessionStorage from 'sessionstorage'
-import Cookies from 'js-cookie'
-import Vue from 'vue'
-
-const jwtKey = 'JWT'
-const currentUserNameKey = 'USERNAME'
-const currentUserInfoKey = 'CURRENT_USER'
+import authApi from './auth-api'
 
 export function getToken() {
-  let jwt = sessionStorage.getItem(jwtKey)
-  // console.log('auth-sessionStorage.getToken=', jwt)
-  if (!jwt) {
-    jwt = Cookies.get(jwtKey)
-    // console.log('auth-Cookies.getToken=', jwt)
-  }
-  return jwt
+  return authApi.getToken()
 }
 
 export function setToken(token) {
-  if (Vue.prototype.projectModel && Vue.prototype.projectModel === 'developing.model') {
-    // 如果是开发模式，需要设置cookie。不设置expires,就是session cookie,表示关闭浏览器，cookie即失效
-    // console.log('auth-Cookies.setToken=', token)
-    // 必须是“/”否则无法移除token
-    Cookies.set(jwtKey, token, { path: '/' })
-  } else {
-    // console.log('auth-sessionStorage.setToken=', token)
-    return sessionStorage.setItem(jwtKey, token)
-  }
+  authApi.setToken(token)
 }
 
 export function removeToken() {
-  sessionStorage.removeItem(jwtKey)
-  // console.log('auth-sessionStorage.removeToken=', getToken())
-  // 必须和setToken中的path“/”一致，否则无法移除token
-  Cookies.remove(jwtKey, { path: '/' })
-  // console.log('auth-Cookies.removeToken=', getToken())
+  authApi.removeToken()
 }
 
 export function getUsername() {
-  return sessionStorage.getItem(currentUserNameKey)
+  return authApi.getUsername()
 }
 
 export function setUsername(username) {
-  sessionStorage.setItem(currentUserNameKey, username)
+  authApi.setUsername(username)
 }
 
 export function removeUsername() {
-  sessionStorage.removeItem(currentUserNameKey)
+  authApi.removeUsername()
 }
 
 export function getCurrentUser() {
-  const userJson = sessionStorage.getItem(currentUserInfoKey)
-  if (userJson) {
-    return JSON.parse(userJson)
-  }
+  return authApi.getCurrentUser()
 }
 
 export function setCurrentUser(userInfo) {
-  if (userInfo) {
-    if (userInfo.password) {
-      userInfo.password = null
-    }
-    sessionStorage.setItem(currentUserInfoKey, JSON.stringify(userInfo))
-  }
+  authApi.setCurrentUser(userInfo)
 }
 
 export function removeCurrentUser() {
-  sessionStorage.removeItem(currentUserInfoKey)
+  authApi.removeCurrentUser()
+}
+
+export function getCookieCache(key) {
+  return authApi.getCookieCache(key)
+}
+
+export function setCookieCache(key, value) {
+  authApi.setCookieCache(key, value)
+}
+
+export function removeCookieCache(key) {
+  authApi.removeCookieCache(key)
+}
+
+export function getSessionCache(key) {
+  return authApi.getSessionCache(key)
+}
+
+export function setSessionCache(key, value) {
+  return authApi.setSessionCache(key, value)
+}
+
+export function removeSessionCache(key) {
+  authApi.removeSessionCache(key)
 }

package/src/views/dsc-component/Sidebar/Item.vue

@@ -29,13 +29,13 @@ export default {
       if (icon.indexOf('fa-') === 0) {
         // 表示以“fa-”开头，使用font-awesome中的图标
         icon = 'fa ' + icon
-        vnodes.push(<div style='display: inline-block;'><i class={icon}/></div>)
+        vnodes.push(<div style='display: inline-block;overflow:hidden;'><i class={icon}/></div>)
       } else if (icon.indexOf('svg-') === 0) {
         icon = icon.substring(icon.indexOf('svg-') + 4)
-        vnodes.push(<div style='display: inline-block;'><svg-icon icon-class={icon}/></div>)
+        vnodes.push(<div style='display: inline-block;overflow:hidden;'><svg-icon icon-class={icon}/></div>)
       } else {
         icon += ' svg-icon'
-        vnodes.push(<div style='display: inline-block;'><i class={icon}/></div>)
+        vnodes.push(<div style='display: inline-block;overflow:hidden;'><i class={icon}/></div>)
       }
     }