imatrix-ui 0.2.3-up → 0.2.5-up

package/src/store/modules/permission.js

@@ -1,145 +1,145 @@
-import { protectedRouterMap } from '../../router'
-
-/**
- * 通过meta.role判断是否与当前用户权限匹配
- * @param roles
- * @param route
- */
-function hasPermission(currentUserPermissions, route) {
-  let result = true
-  const orgPermission = route.meta.permission
-  if (orgPermission) {
-    result = false
-    const currentPermission = orgPermission.replace(/\./g, '__')
-    const permissionResult = currentUserPermissions[currentPermission]
-    if (permissionResult !== undefined && permissionResult === true) {
-      result = true
-    }
-  }
-  return result
-}
-
-/**
- * 递归过滤受权限保护的路由表，返回符合用户权限的路由表
- * @param allRoutes 即protectedRouterMap
- * @param currentUserPermissions 后台返回的当前用户具有的权限
- */
-function filterProtectedRouter(allRoutes, currentUserPermissions) {
-  // console.log('filterProtectedRouter--', allRoutes)
-  const res = []
-  const menuRouters = []
-
-  allRoutes.forEach((route) => {
-    const tmp = { ...route }
-
-    if (tmp.children && tmp.children.length > 0) {
-      const routerResult = filterProtectedRouter(
-        tmp.children,
-        currentUserPermissions
-      )
-      // 所有有权限的路由，包括不是菜单的路由
-      tmp.children = routerResult.allRouters
-      // 所有菜单路由
-      tmp.menuChildren = routerResult.menuRouters
-      if (tmp.menuChildren && tmp.menuChildren.length > 0) {
-        if (tmp.redirectTmp) {
-          tmp.redirectTmp = tmp.redirectTmp + '/' + tmp.menuChildren[0].path
-        } else {
-          tmp.redirectTmp = tmp.path + '/' + tmp.menuChildren[0].path
-        }
-        res.push(tmp)
-        menuRouters.push(tmp)
-      }
-    } else {
-      if (tmp.path === '') {
-        // 表示是空路由,即系统路由
-        res.push(tmp)
-      } else {
-        if (hasPermission(currentUserPermissions, tmp)) {
-          if (
-            typeof tmp.hidden === 'undefined' ||
-            (typeof tmp.hidden !== 'undefined' && tmp.hidden === false)
-          ) {
-            menuRouters.push(tmp)
-          }
-          res.push(tmp)
-        }
-      }
-    }
-  })
-
-  return { allRouters: res, menuRouters: menuRouters }
-}
-
-const permission = {
-  state: {
-    // routers: publicRouterMap,
-    protectedRouters: [],
-    currentUserPermissions: [],
-  },
-  mutations: {
-    setCurrentUserPermissions: (state, currentUserPermissions) => {
-      state.currentUserPermissions = currentUserPermissions
-    },
-    setRouters: (state, routers) => {
-      state.protectedRouters = routers
-      // 把公共路由，用户有权限的路由，错误路由合并后就是当前用户的完整路由表
-      // state.routers = publicRouterMap.concat(routers).concat(errorRouterMap)
-    },
-  },
-  actions: {
-    generateRoutes({ commit }, data) {
-      return new Promise((resolve) => {
-        const currentUserPermissions = data
-        // commit('setCurrentUserPermissions', currentUserPermissions)
-        const a = new Date().getTime()
-        const accessableRoutersResult = filterProtectedRouter(
-          protectedRouterMap,
-          currentUserPermissions
-        )
-        const b = new Date().getTime()
-        window.sessionStorage.setItem('generateRoutes==>执行时间:', b - a + '')
-        const accessableRouters = accessableRoutersResult.allRouters
-        const allMenuRoutes = accessableRoutersResult.menuRouters
-        // console.log('有权限的路由表结果==', accessableRouters)
-        // 动态添加空路由（即系统路由）
-        if (accessableRouters.length > 0) {
-          // 获得所有菜单路由
-          // console.log('allMenuRoutes==', allMenuRoutes)
-          const emptyPathRouter = {
-            path: '',
-          }
-          if (allMenuRoutes.length > 0) {
-            if (accessableRouters[0].path !== '') {
-              // 表示不包含空路由，需要添加空路由
-              if (allMenuRoutes[0].redirectTmp) {
-                emptyPathRouter.redirect = allMenuRoutes[0].redirectTmp
-              }
-              accessableRouters.push(emptyPathRouter)
-            } else if (
-              allMenuRoutes.length > 0 &&
-              accessableRouters[0].path === '' &&
-              (!allMenuRoutes[0].children ||
-                allMenuRoutes[0].children.length === 0)
-            ) {
-              // 表示自己配置了空路由，且没有子路由
-              if (allMenuRoutes[0].redirectTmp) {
-                accessableRouters[0].redirect = allMenuRoutes[0].redirectTmp
-              }
-            }
-            // console.log('更新后的有权限的路由表结果，更新了根路由跳转的地址==', accessableRouters)
-          }
-        }
-        commit('setRouters', accessableRouters)
-        const c = new Date().getTime()
-        window.sessionStorage.setItem(
-          'generateRoutes==>执行时间c-a:',
-          c - a + ''
-        )
-        resolve()
-      })
-    },
-  },
-}
-
-export default permission
+import { protectedRouterMap } from '../../router'
+
+/**
+ * 通过meta.role判断是否与当前用户权限匹配
+ * @param roles
+ * @param route
+ */
+function hasPermission(currentUserPermissions, route) {
+  let result = true
+  const orgPermission = route.meta.permission
+  if (orgPermission) {
+    result = false
+    const currentPermission = orgPermission.replace(/\./g, '__')
+    const permissionResult = currentUserPermissions[currentPermission]
+    if (permissionResult !== undefined && permissionResult === true) {
+      result = true
+    }
+  }
+  return result
+}
+
+/**
+ * 递归过滤受权限保护的路由表，返回符合用户权限的路由表
+ * @param allRoutes 即protectedRouterMap
+ * @param currentUserPermissions 后台返回的当前用户具有的权限
+ */
+function filterProtectedRouter(allRoutes, currentUserPermissions) {
+  // console.log('filterProtectedRouter--', allRoutes)
+  const res = []
+  const menuRouters = []
+
+  allRoutes.forEach((route) => {
+    const tmp = { ...route }
+
+    if (tmp.children && tmp.children.length > 0) {
+      const routerResult = filterProtectedRouter(
+        tmp.children,
+        currentUserPermissions
+      )
+      // 所有有权限的路由，包括不是菜单的路由
+      tmp.children = routerResult.allRouters
+      // 所有菜单路由
+      tmp.menuChildren = routerResult.menuRouters
+      if (tmp.menuChildren && tmp.menuChildren.length > 0) {
+        if (tmp.redirectTmp) {
+          tmp.redirectTmp = tmp.redirectTmp + '/' + tmp.menuChildren[0].path
+        } else {
+          tmp.redirectTmp = tmp.path + '/' + tmp.menuChildren[0].path
+        }
+        res.push(tmp)
+        menuRouters.push(tmp)
+      }
+    } else {
+      if (tmp.path === '') {
+        // 表示是空路由,即系统路由
+        res.push(tmp)
+      } else {
+        if (hasPermission(currentUserPermissions, tmp)) {
+          if (
+            typeof tmp.hidden === 'undefined' ||
+            (typeof tmp.hidden !== 'undefined' && tmp.hidden === false)
+          ) {
+            menuRouters.push(tmp)
+          }
+          res.push(tmp)
+        }
+      }
+    }
+  })
+
+  return { allRouters: res, menuRouters: menuRouters }
+}
+
+const permission = {
+  state: {
+    // routers: publicRouterMap,
+    protectedRouters: [],
+    currentUserPermissions: [],
+  },
+  mutations: {
+    setCurrentUserPermissions: (state, currentUserPermissions) => {
+      state.currentUserPermissions = currentUserPermissions
+    },
+    setRouters: (state, routers) => {
+      state.protectedRouters = routers
+      // 把公共路由，用户有权限的路由，错误路由合并后就是当前用户的完整路由表
+      // state.routers = publicRouterMap.concat(routers).concat(errorRouterMap)
+    },
+  },
+  actions: {
+    generateRoutes({ commit }, data) {
+      return new Promise((resolve) => {
+        const currentUserPermissions = data
+        // commit('setCurrentUserPermissions', currentUserPermissions)
+        const a = new Date().getTime()
+        const accessableRoutersResult = filterProtectedRouter(
+          protectedRouterMap,
+          currentUserPermissions
+        )
+        const b = new Date().getTime()
+        window.sessionStorage.setItem('generateRoutes==>执行时间:', b - a + '')
+        const accessableRouters = accessableRoutersResult.allRouters
+        const allMenuRoutes = accessableRoutersResult.menuRouters
+        // console.log('有权限的路由表结果==', accessableRouters)
+        // 动态添加空路由（即系统路由）
+        if (accessableRouters.length > 0) {
+          // 获得所有菜单路由
+          // console.log('allMenuRoutes==', allMenuRoutes)
+          const emptyPathRouter = {
+            path: '',
+          }
+          if (allMenuRoutes.length > 0) {
+            if (accessableRouters[0].path !== '') {
+              // 表示不包含空路由，需要添加空路由
+              if (allMenuRoutes[0].redirectTmp) {
+                emptyPathRouter.redirect = allMenuRoutes[0].redirectTmp
+              }
+              accessableRouters.push(emptyPathRouter)
+            } else if (
+              allMenuRoutes.length > 0 &&
+              accessableRouters[0].path === '' &&
+              (!allMenuRoutes[0].children ||
+                allMenuRoutes[0].children.length === 0)
+            ) {
+              // 表示自己配置了空路由，且没有子路由
+              if (allMenuRoutes[0].redirectTmp) {
+                accessableRouters[0].redirect = allMenuRoutes[0].redirectTmp
+              }
+            }
+            // console.log('更新后的有权限的路由表结果，更新了根路由跳转的地址==', accessableRouters)
+          }
+        }
+        commit('setRouters', accessableRouters)
+        const c = new Date().getTime()
+        window.sessionStorage.setItem(
+          'generateRoutes==>执行时间c-a:',
+          c - a + ''
+        )
+        resolve()
+      })
+    },
+  },
+}
+
+export default permission

package/src/styles/theme/dark-blue/button.scss

@@ -6,4 +6,10 @@
     background: $--button-opt-background-color;
     border-color: $--button-opt-background-color;
   }
+
+  .el-button--default {
+    border-radius: 4px;
+    border-color: $--color-primary;
+    color: $--color-primary;
+  }
 }

package/src/styles/theme/dark-blue/index.scss

@@ -190,7 +190,8 @@
   }
 
   .el-pagination {
-    text-align: right;
+    display: flex;
+    justify-content: flex-end;
   }
 
   .el-table td {
@@ -209,7 +210,7 @@
   /**表格内容纵向分隔线去掉**/
   .el-table--border td,
   .el-table--border th,
-  .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
+  .el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
     border-right: 0px
   }
 
@@ -217,7 +218,7 @@
   .el-table--border td,
   .el-table--border th,
   .el-table--border th.is-leaf,
-  .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
+  .el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
     border-right: 1px solid #fefefe;
   }
 
@@ -231,7 +232,7 @@
     text-align: left;
   }
 
-  .el-button+.el-button {
+  .el-button + .el-button {
     margin-left: 10px;
   }
 
@@ -269,4 +270,4 @@
     border-radius: 0;
     box-shadow: 0 0px 0px #ccc;
   }
-}
+}

package/src/styles/theme/dark-blue/pagination.scss

@@ -11,4 +11,8 @@
       background-color: $--button-default-font-color;
     }
   }
+
+  .el-pagination.is-background .el-pager li.is-active {
+    background-color: $--button-default-font-color;
+  }
 }

package/src/utils/auth-api.js

@@ -1,159 +1,161 @@
-import * as Cookies from 'js-cookie'
-import * as Vue from 'vue'
-
-const jwtKey = 'JWT'
-const currentUserNameKey = 'USERNAME'
-const currentUserInfoKey = 'CURRENT_USER'
-const currentSystemUrlKey = 'CURRENT_SYSTEM_URL_'
-
-function getToken() {
-  let token = getCookieCache(jwtKey)
-  const projectModel = window.$vueApp.config.globalProperties.projectModel
-  if (!token && projectModel && projectModel === 'developing.model') {
-    // 如果是开发环境从window.sessionStorage中获得token
-    token = getSessionCache(jwtKey)
-  }
-  return token
-}
-
-function setToken(token) {
-  setCookieCache(jwtKey, token)
-  setSessionCache(jwtKey, token)
-}
-
-function removeToken() {
-  removeCookieCache(jwtKey)
-  removeSessionCache(jwtKey)
-}
-
-function getUsername() {
-  let username = getCookieCache(currentUserNameKey)
-  if (!username) {
-    username = getSessionCache(currentUserNameKey)
-  }
-  return username
-}
-
-function setUsername(username) {
-  setSessionCache(currentUserNameKey, username)
-  setCookieCache(currentUserNameKey, username)
-}
-
-function removeUsername() {
-  removeSessionCache(currentUserNameKey)
-  removeCookieCache(currentUserNameKey)
-}
-
-function getCurrentUser() {
-  let userJson = getCookieCache(currentUserInfoKey)
-  if (!userJson) {
-    userJson = getSessionCache(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) {
-  return Cookies.get(key)
-}
-
-function setCookieCache(key, value) {
-  Cookies.set(key, value, {
-    path: '/',
-  })
-}
-
-function removeCookieCache(key) {
-  Cookies.remove(key, {
-    path: '/',
-  })
-}
-
-function getSessionCache(key) {
-  return window.sessionStorage.getItem(key)
-}
-
-function setSessionCache(key, value) {
-  return window.sessionStorage.setItem(key, value)
-}
-
-function removeSessionCache(key) {
-  window.sessionStorage.removeItem(key)
-}
-
-function getSystemCacheUrlByCode(systemCode) {
-  if (!systemCode) {
-    systemCode = window.$vueApp.config.globalProperties.customSystem
-  }
-  if (!systemCode) {
-    systemCode = window.$vueApp.config.globalProperties.systemCode
-  }
-  if (systemCode) {
-    const systemUrls = getSystemCacheUrl()
-    if (systemUrls) {
-      return systemUrls[systemCode]
-    }
-  }
-}
-
-function getSystemCacheUrl() {
-  let systemUrlJson = getCookieCache(currentSystemUrlKey)
-  if (!systemUrlJson) {
-    systemUrlJson = getSessionCache(currentSystemUrlKey)
-  }
-  if (systemUrlJson) {
-    return JSON.parse(systemUrlJson)
-  }
-}
-
-function setSystemCacheUrl(systemUrlObj) {
-  if (systemUrlObj) {
-    const systemUrlStr = JSON.stringify(systemUrlObj)
-    setSessionCache(currentSystemUrlKey, systemUrlStr)
-    setCookieCache(currentSystemUrlKey, systemUrlStr)
-  }
-}
-
-function removeSystemCacheUrl() {
-  removeSessionCache(currentSystemUrlKey)
-  removeCookieCache(currentSystemUrlKey)
-}
-
-export default {
-  getToken,
-  setToken,
-  removeToken,
-  getUsername,
-  setUsername,
-  removeUsername,
-  getCurrentUser,
-  setCurrentUser,
-  removeCurrentUser,
-  getCookieCache,
-  setCookieCache,
-  removeCookieCache,
-  getSessionCache,
-  setSessionCache,
-  removeSessionCache,
-  getSystemCacheUrlByCode,
-  getSystemCacheUrl,
-  setSystemCacheUrl,
-  removeSystemCacheUrl,
-}
+import Cookies from 'js-cookie'
+// const Cookies = require('js-cookie')
+
+const jwtKey = 'JWT'
+const currentUserNameKey = 'USERNAME'
+const currentUserInfoKey = 'CURRENT_USER'
+const currentSystemUrlKey = 'CURRENT_SYSTEM_URL_'
+
+function getToken() {
+    let token = getCookieCache(jwtKey)
+    const projectModel = window.$vueApp.config.globalProperties.projectModel
+    if (!token && projectModel && projectModel === 'developing.model') {
+        // 如果是开发环境从window.sessionStorage中获得token
+        token = getSessionCache(jwtKey)
+    }
+    return token
+}
+
+function setToken(token) {
+    setCookieCache(jwtKey, token)
+    setSessionCache(jwtKey, token)
+}
+
+function removeToken() {
+    removeCookieCache(jwtKey)
+    removeSessionCache(jwtKey)
+}
+
+function getUsername() {
+    let username = getCookieCache(currentUserNameKey)
+    if (!username) {
+        username = getSessionCache(currentUserNameKey)
+    }
+    return username
+}
+
+function setUsername(username) {
+    setSessionCache(currentUserNameKey, username)
+    setCookieCache(currentUserNameKey, username)
+}
+
+function removeUsername() {
+    removeSessionCache(currentUserNameKey)
+    removeCookieCache(currentUserNameKey)
+}
+
+function getCurrentUser() {
+    let userJson = getCookieCache(currentUserInfoKey)
+    if (!userJson) {
+        userJson = getSessionCache(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) {
+    console.log('%c描述-173122', 'color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px', Cookies);
+    console.dir(Cookies);
+    return Cookies.get(key)
+}
+
+function setCookieCache(key, value) {
+    Cookies.set(key, value, {
+        path: '/',
+    })
+}
+
+function removeCookieCache(key) {
+    Cookies.remove(key, {
+        path: '/',
+    })
+}
+
+function getSessionCache(key) {
+    return window.sessionStorage.getItem(key)
+}
+
+function setSessionCache(key, value) {
+    return window.sessionStorage.setItem(key, value)
+}
+
+function removeSessionCache(key) {
+    window.sessionStorage.removeItem(key)
+}
+
+function getSystemCacheUrlByCode(systemCode) {
+    if (!systemCode) {
+        systemCode = window.$vueApp.config.globalProperties.customSystem
+    }
+    if (!systemCode) {
+        systemCode = window.$vueApp.config.globalProperties.systemCode
+    }
+    if (systemCode) {
+        const systemUrls = getSystemCacheUrl()
+        if (systemUrls) {
+            return systemUrls[systemCode]
+        }
+    }
+}
+
+function getSystemCacheUrl() {
+    let systemUrlJson = getCookieCache(currentSystemUrlKey)
+    if (!systemUrlJson) {
+        systemUrlJson = getSessionCache(currentSystemUrlKey)
+    }
+    if (systemUrlJson) {
+        return JSON.parse(systemUrlJson)
+    }
+}
+
+function setSystemCacheUrl(systemUrlObj) {
+    if (systemUrlObj) {
+        const systemUrlStr = JSON.stringify(systemUrlObj)
+        setSessionCache(currentSystemUrlKey, systemUrlStr)
+        setCookieCache(currentSystemUrlKey, systemUrlStr)
+    }
+}
+
+function removeSystemCacheUrl() {
+    removeSessionCache(currentSystemUrlKey)
+    removeCookieCache(currentSystemUrlKey)
+}
+
+export default {
+    getToken,
+    setToken,
+    removeToken,
+    getUsername,
+    setUsername,
+    removeUsername,
+    getCurrentUser,
+    setCurrentUser,
+    removeCurrentUser,
+    getCookieCache,
+    setCookieCache,
+    removeCookieCache,
+    getSessionCache,
+    setSessionCache,
+    removeSessionCache,
+    getSystemCacheUrlByCode,
+    getSystemCacheUrl,
+    setSystemCacheUrl,
+    removeSystemCacheUrl,
+}