imatrix-ui 0.0.15 → 0.1.1-up

package/src/store/modules/user.js

@@ -1,80 +1,293 @@
-import ssoService from '../../api/sso-service'
-import userService from '../../api/user-service'
-import { setToken, getToken, removeToken } from '../../utils/auth'
-
-const user = {
-  state: {
-    token: '',
-    name: ''
-  },
-
-  mutations: {
-    setToken: (state, token) => {
-      state.token = token
-    },
-    setName: (state, name) => {
-      state.name = name
-    }
-  },
-
-  actions: {
-    // 登录
-    login({ commit }, userInfo) {
-      const username = userInfo.username.trim()
-      return new Promise((resolve, reject) => {
-        ssoService.login(username, userInfo.password).then(data => {
-          // const data = response.data
-          setToken(data.jwt)
-          commit('setToken', data.jwt)
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // 获取用户信息
-    getCurrentUser({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        userService.getUser(getToken()).then(user => {
-          // const data = response.data
-          // if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-          //   commit('SET_ROLES', data.roles)
-          // } else {
-          //   reject('getInfo: roles must be a non-null array !')
-          // }
-
-          commit('setName', user.name)
-          // commit('SET_AVATAR', data.avatar)
-          resolve(user)
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // 登出
-    logout({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        ssoService.logout(state.token).then(() => {
-          commit('setToken', '')
-          removeToken()
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // 出现401错误时清空过期的jwt
-    clearToken({ commit }) {
-      return new Promise(resolve => {
-        commit('setToken', '')
-        removeToken()
-        resolve()
-      })
-    }
-  }
-}
-
-export default user
+import ssoService from '../../api/sso-service'
+import {
+  setToken,
+  removeToken,
+  setUsername,
+  getUsername,
+  removeUsername,
+  setCurrentUser,
+  removeCurrentUser,
+} from '../../utils/auth'
+
+import {
+  removePermissions,
+  getPermissions,
+  setPermissions,
+  getMenus,
+  setMenus,
+  removeMenus,
+} from '../../utils/permissionAuth'
+
+const user = {
+  state: {
+    token: '',
+    name: '',
+    menus: [],
+  },
+
+  mutations: {
+    setToken: (state, token) => {
+      state.token = token
+    },
+    setName: (state, name) => {
+      state.name = name
+    },
+    setMenus: (state, menus) => {
+      state.menus = menus
+    },
+  },
+
+  actions: {
+    // 登录
+    login({ commit }, userInfo) {
+      console.log('%c描述-210610','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px','执行了登录');
+      const username = userInfo.username.trim()
+      return new Promise((resolve, reject) => {
+        ssoService
+          .login(username, userInfo.password, userInfo.language)
+          .then((data) => {
+            // const data = response.data
+            setToken(data.jwt)
+            commit('setToken', data.jwt)
+            return ssoService.getCurrentUserPermissionsBySystem(data.subject)
+          })
+          .then((permissions) => {
+            let currentPermissions = ['index']
+            currentPermissions = currentPermissions.concat(permissions)
+            setPermissions(currentPermissions)
+            resolve()
+          })
+          .catch((error) => {
+            reject(error)
+          })
+      })
+    },
+    // 登录
+    loginWithValidateCode({ commit }, userInfo) {
+      const username = userInfo.username.trim()
+      return new Promise((resolve, reject) => {
+        ssoService
+          .loginWithValidateCode(
+            username,
+            userInfo.password,
+            userInfo.language,
+            userInfo.validCode,
+            userInfo.imageCodeKey
+          )
+          .then((data) => {
+            // const data = response.data
+            setToken(data.jwt)
+            commit('setToken', data.jwt)
+            return ssoService.getCurrentUserPermissionsBySystem(data.subject)
+          })
+          .then((permissions) => {
+            let currentPermissions = ['index']
+            currentPermissions = currentPermissions.concat(permissions)
+            setPermissions(currentPermissions)
+            resolve()
+          })
+          .catch((error) => {
+            reject(error)
+          })
+      })
+    },
+    // 登录。根据token登录系统
+    loginWithCookieToken({ commit }, loginName) {
+      return new Promise((resolve, reject) => {
+        if (loginName) {
+          // setToken(tokenInfo.jwt)
+          // commit('setToken', tokenInfo.jwt)
+          ssoService
+            .getCurrentUserPermissionsBySystem(loginName)
+            .then((permissions) => {
+              let currentPermissions = ['index']
+              currentPermissions = currentPermissions.concat(permissions)
+              setPermissions(currentPermissions)
+              resolve()
+            })
+            .catch((error) => {
+              reject(error)
+            })
+        }
+      })
+    },
+
+    // 获取用户信息
+    getCurrentUser({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const storeUserName = getUsername()
+        if (
+          typeof storeUserName === 'undefined' ||
+          storeUserName === '' ||
+          storeUserName === null
+        ) {
+          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)
+              resolve(user)
+            })
+            .catch((error) => {
+              reject(error)
+            })
+        } else {
+          commit('setName', storeUserName)
+          resolve({ loginName: storeUserName })
+        }
+      })
+    },
+
+    // 登出
+    logout({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        ssoService
+          .logout(state.token)
+          .then((data) => {
+            commit('setToken', '')
+            removeToken()
+
+            commit('setName', '')
+            removeUsername()
+            removeCurrentUser()
+
+            removePermissions()
+
+            removeMenus()
+
+            resolve(data)
+          })
+          .catch((error) => {
+            reject(error)
+          })
+      })
+    },
+
+    // 出现401错误时清空过期的jwt
+    clearToken({ commit }) {
+      return new Promise((resolve) => {
+        commit('setToken', '')
+        removeToken()
+
+        commit('setName', '')
+        removeUsername()
+        removeCurrentUser()
+
+        removePermissions()
+
+        removeMenus()
+
+        resolve()
+      })
+    },
+
+    // 获得当前用户权限集合
+    getCurrentUserPermissions({ commit }, loginName, systemCode) {
+      return new Promise((resolve, reject) => {
+        console.log('%c描述-153104','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px','开始执行');
+        // let storePermissions = getPermissions()
+        let storePermissions = null
+        // 这个判断会导致资源不会重新加载？？
+        console.log('%c描述-110645','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px获得参数',storePermissions);
+        if (
+          typeof storePermissions === 'undefined' ||
+          storePermissions === '' ||
+          storePermissions === null
+        ) {
+          console.log('%c描述-154419','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px','请求');
+          ssoService
+            .getCurrentUserPermissionsBySystem(loginName, systemCode)
+            .then((permissions) => {
+              console.log('%c描述-174411','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',permissions);
+              let currentPermissions = ['index']
+              currentPermissions = currentPermissions.concat(permissions)
+              storePermissions = setPermissions(currentPermissions)
+              resolve(storePermissions)
+            })
+            .catch((error) => {
+              console.log('%c描述-113518','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',error);
+              reject(error)
+            })
+        } else {
+          console.log('%c描述-111518','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',storePermissions);
+          resolve(storePermissions)
+        }
+      })
+    },
+
+    // 判断当前用户密码是否过期
+    isPasswordExpired({ commit }, userInfo) {
+      const username = userInfo.username.trim()
+      return new Promise((resolve, reject) => {
+        ssoService
+          .isPasswordExpired(username, userInfo.password)
+          .then((message) => {
+            resolve(message)
+          })
+          .catch((error) => {
+            reject(error)
+          })
+      })
+    },
+
+    updatePassword({ commit }, map) {
+      return new Promise((resolve, reject) => {
+        ssoService
+          .updatePassword(map, map.userId)
+          .then((data) => {
+            resolve(data)
+          })
+          .catch((error) => {
+            reject(error)
+          })
+      })
+    },
+    // 判断jwt是否超时，防止出现401错误提示信息
+    isLoginTimeOut({ commit }) {
+      return new Promise((resolve, reject) => {
+        ssoService
+          .isLoginTimeOut()
+          .then((message) => {
+            resolve(message)
+          })
+          .catch((error) => {
+            reject(error)
+          })
+      })
+    },
+    // 获得有权限的菜单集合
+    getPermissionMenus({ commit }, systemCode) {
+      return new Promise((resolve, reject) => {
+        const storePermissionMenus = getMenus(systemCode)
+        if (
+          typeof storePermissionMenus === 'undefined' ||
+          storePermissionMenus === '' ||
+          storePermissionMenus === null
+        ) {
+          ssoService
+            .getUserPermissionMenusBySystemCode(systemCode)
+            .then((menus) => {
+              // commit('setMenus', menus)
+              setMenus(menus, systemCode)
+              resolve(menus)
+            })
+            .catch((error) => {
+              reject(error)
+            })
+        } else {
+          resolve(storePermissionMenus)
+        }
+      })
+    },
+  },
+}
+
+export default user

package/src/styles/display-layout.scss

@@ -0,0 +1,34 @@
+.flex-container {
+  display: flex;
+  width: 100%;
+
+  .tree-area {
+    flex: 0 0 200px;
+    overflow: auto;
+  }
+
+  .list-area {
+    flex: 1;
+    overflow: auto;
+    margin-left: 20px;
+  }
+}
+
+.three-column-layout {
+  height: calc(100vh - 20px);
+
+  .el-aside {
+    margin-right: 20px;
+    padding-top: 20px;
+    background-color: #FFFFFF;
+    box-shadow: 0px 1px 8px 0px #00000019;
+
+  }
+
+  .el-main {
+    padding: 20px 0 0 20px;
+    border-radius: 6px;
+    background: #FFFFFF;
+    box-shadow: 0px 1px 8px 0px #00000019;
+  }
+}

package/src/styles/element-ui.scss

@@ -1,29 +1,29 @@
- //to reset element-ui default css
-.el-upload {
-  input[type="file"] {
-    display: none !important;
-  }
-}
-
-.el-upload__input {
-  display: none;
-}
-
-//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461
-.el-dialog {
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
-}
-
-//element ui upload
-.upload-container {
-  .el-upload {
-    width: 100%;
-    .el-upload-dragger {
-      width: 100%;
-      height: 200px;
-    }
-  }
-}
+ //to reset element-ui default css
+ .el-upload {
+  input[type="file"] {
+    display: none !important;
+  }
+}
+
+.el-upload__input {
+  display: none;
+}
+
+//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461
+.el-dialog {
+  transform: none;
+  left: 0;
+  position: relative;
+  margin: 0 auto;
+}
+
+//element ui upload
+.upload-container {
+  .el-upload {
+    width: 100%;
+    .el-upload-dragger {
+      width: 100%;
+      height: 200px;
+    }
+  }
+}