imatrix-ui 2.7.91 → 2.7.92

package/package.json

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

package/src/store/modules/user.js

@@ -1,5 +1,5 @@
 import ssoService from '../../api/sso-service'
-import { setToken, removeToken, setUsername, getUsername, removeUsername } from '../../utils/auth'
+import { setToken, removeToken, setUsername, getUsername, removeUsername, setCurrentUser, removeCurrentUser } from '../../utils/auth'
 
 import { removePermissions, getPermissions, setPermissions, getMenus, setMenus, removeMenus } from '../../utils/permissionAuth'
 
@@ -68,9 +68,11 @@ const user = {
           ssoService.getCurrentUser().then(user => {
             if (user) {
               setUsername(user.loginName)
+              setCurrentUser(user)
               commit('setName', user.name)
             } else {
               removeUsername()
+              removeCurrentUser()
               commit('setName', '')
             }
             // commit('SET_AVATAR', data.avatar)
@@ -94,6 +96,7 @@ const user = {
 
           commit('setName', '')
           removeUsername()
+          removeCurrentUser()
 
           removePermissions()
 
@@ -114,6 +117,7 @@ const user = {
 
         commit('setName', '')
         removeUsername()
+        removeCurrentUser()
 
         removePermissions()
 

package/src/styles/index.scss

@@ -31,4 +31,26 @@ body .el-table th.gutter {
 
 body .el-table colgroup.gutter {
   display: table-cell !important;
+}
+// 日期控件宽度不自适应问题
+.formContent .el-date-editor.el-input,.formContent .el-date-editor.el-input__input,.formContent .el-date-editor.el-input__inner,
+.grid-search-form .el-date-editor.el-input,.grid-search-form .el-date-editor.el-input__input,.grid-search-form .el-date-editor.el-input__inner {
+  width: 100%;
+}
+.formContent .el-date-editor--daterange.el-input,.formContent .el-date-editor--daterange.el-input__inner,.formContent .el-date-editor--timerange.el-input,.formContent .el-date-editor--timerange.el-input__inner,
+.grid-search-form .el-date-editor--daterange.el-input,.grid-search-form .el-date-editor--daterange.el-input__inner,.grid-search-form .el-date-editor--timerange.el-input,.grid-search-form .el-date-editor--timerange.el-input__inner {
+  width: 100%;
+}
+
+// 显示必填标志
+.is_req {
+  .required__label::before {
+    content: '*';
+    color: #f56c6c;
+    margin-right: 4px;
+  }
+}
+
+.formContent .el-form-item {
+  margin-bottom: 0;
 }

package/src/utils/auth.js

@@ -4,6 +4,7 @@ import Vue from 'vue'
 
 const jwtKey = 'JWT'
 const currentUserNameKey = 'USERNAME'
+const currentUserInfoKey = 'CURRENT_USER'
 
 export function getToken() {
   let jwt = sessionStorage.getItem(jwtKey)
@@ -46,3 +47,23 @@ export function setUsername(username) {
 export function removeUsername() {
   sessionStorage.removeItem(currentUserNameKey)
 }
+
+export function getCurrentUser() {
+  const userJson = sessionStorage.getItem(currentUserInfoKey)
+  if (userJson) {
+    return JSON.parse(userJson)
+  }
+}
+
+export function setCurrentUser(userInfo) {
+  if (userInfo) {
+    if (userInfo.password) {
+      userInfo.password = null
+    }
+    sessionStorage.setItem(currentUserInfoKey, JSON.stringify(userInfo))
+  }
+}
+
+export function removeCurrentUser() {
+  sessionStorage.removeItem(currentUserInfoKey)
+}