vue2-client 1.16.71 → 1.16.72

package/src/store/modules/setting.js

@@ -1,119 +1,119 @@
-import config from '@vue2-client/config'
-import { ADMIN } from '@vue2-client/config/default'
-import { formatFullPath } from '@vue2-client/utils/i18n'
-import { filterMenu } from '@vue2-client/utils/authority-utils'
-import { getLocalSetting } from '@vue2-client/utils/themeUtil'
-import deepClone from 'lodash.clonedeep'
-
-const localSetting = getLocalSetting(true)
-const customTitlesStr = sessionStorage.getItem(process.env.VUE_APP_TBAS_TITLES_KEY)
-const customTitles = (customTitlesStr && JSON.parse(customTitlesStr)) || []
-
-export default {
-  namespaced: true,
-  state: {
-    isMobile: false,
-    animates: ADMIN.animates,
-    palettes: ADMIN.palettes,
-    pageMinHeight: 0,
-    menuData: [],
-    activatedFirst: undefined,
-    customTitles,
-    ...config,
-    ...localSetting
-  },
-  getters: {
-    menuData (state, getters, rootState) {
-      if (state.filterMenu) {
-        const { permissions, roles } = rootState.account
-        return filterMenu(deepClone(state.menuData), permissions, roles)
-      }
-      return state.menuData
-    },
-    firstMenu (state, getters) {
-      const { menuData } = getters
-      if (menuData.length > 0 && !menuData[0].fullPath) {
-        formatFullPath(menuData)
-      }
-      return menuData.map(item => {
-        const menuItem = { ...item }
-        delete menuItem.children
-        return menuItem
-      })
-    },
-    subMenu (state) {
-      const { menuData, activatedFirst } = state
-      if (menuData.length > 0 && !menuData[0].fullPath) {
-        formatFullPath(menuData)
-      }
-      const current = menuData.find(menu => menu.fullPath === activatedFirst)
-      return current && current.children || []
-    }
-  },
-  mutations: {
-    setDevice (state, isMobile) {
-      state.isMobile = isMobile
-    },
-    setTheme (state, theme) {
-      state.theme = theme
-    },
-    setLayout (state, layout) {
-      state.layout = layout
-    },
-    setMultiPage (state, multiPage) {
-      state.multiPage = multiPage
-    },
-    setAnimate (state, animate) {
-      state.animate = animate
-    },
-    setWeekMode (state, weekMode) {
-      state.weekMode = weekMode
-    },
-    setFixedHeader (state, fixedHeader) {
-      state.fixedHeader = fixedHeader
-    },
-    setFixedSideBar (state, fixedSideBar) {
-      state.fixedSideBar = fixedSideBar
-    },
-    setLang (state, lang) {
-      state.lang = lang
-    },
-    setHideSetting (state, hideSetting) {
-      state.hideSetting = hideSetting
-    },
-    correctPageMinHeight (state, minHeight) {
-      state.pageMinHeight += minHeight
-    },
-    setMenuData (state, menuData) {
-      state.menuData = menuData
-    },
-    setAsyncRoutes (state, asyncRoutes) {
-      state.asyncRoutes = asyncRoutes
-    },
-    setPageWidth (state, pageWidth) {
-      state.pageWidth = pageWidth
-    },
-    setActivatedFirst (state, activatedFirst) {
-      state.activatedFirst = activatedFirst
-    },
-    setFixedTabs (state, fixedTabs) {
-      state.fixedTabs = fixedTabs
-    },
-    setCustomTitle (state, { path, title }) {
-      if (title) {
-        const obj = state.customTitles.find(item => item.path === path)
-        if (obj) {
-          obj.title = title
-        } else {
-          state.customTitles.push({ path, title })
-        }
-        sessionStorage.setItem(process.env.VUE_APP_TBAS_TITLES_KEY, JSON.stringify(state.customTitles))
-      }
-    },
-    setSetting (state, setting) {
-      for (const key in setting) {
-        state[key] = setting[key]
-      }
-    }
-  }
-}
+import config from '@vue2-client/config'
+import { ADMIN } from '@vue2-client/config/default'
+import { formatFullPath } from '@vue2-client/utils/i18n'
+import { filterMenu } from '@vue2-client/utils/authority-utils'
+import { getLocalSetting } from '@vue2-client/utils/themeUtil'
+import deepClone from 'lodash.clonedeep'
+
+const localSetting = getLocalSetting(true)
+const customTitlesStr = sessionStorage.getItem(process.env.VUE_APP_TBAS_TITLES_KEY)
+const customTitles = (customTitlesStr && JSON.parse(customTitlesStr)) || []
+
+export default {
+  namespaced: true,
+  state: {
+    isMobile: false,
+    animates: ADMIN.animates,
+    palettes: ADMIN.palettes,
+    pageMinHeight: 0,
+    menuData: [],
+    activatedFirst: undefined,
+    customTitles,
+    ...config,
+    ...localSetting
+  },
+  getters: {
+    menuData (state, getters, rootState) {
+      if (state.filterMenu) {
+        const { permissions, roles } = rootState.account
+        return filterMenu(deepClone(state.menuData), permissions, roles)
+      }
+      return state.menuData
+    },
+    firstMenu (state, getters) {
+      const { menuData } = getters
+      if (menuData.length > 0 && !menuData[0].fullPath) {
+        formatFullPath(menuData)
+      }
+      return menuData.map(item => {
+        const menuItem = { ...item }
+        delete menuItem.children
+        return menuItem
+      })
+    },
+    subMenu (state) {
+      const { menuData, activatedFirst } = state
+      if (menuData.length > 0 && !menuData[0].fullPath) {
+        formatFullPath(menuData)
+      }
+      const current = menuData.find(menu => menu.fullPath === activatedFirst)
+      return current && current.children || []
+    }
+  },
+  mutations: {
+    setDevice (state, isMobile) {
+      state.isMobile = isMobile
+    },
+    setTheme (state, theme) {
+      state.theme = theme
+    },
+    setLayout (state, layout) {
+      state.layout = layout
+    },
+    setMultiPage (state, multiPage) {
+      state.multiPage = multiPage
+    },
+    setAnimate (state, animate) {
+      state.animate = animate
+    },
+    setWeekMode (state, weekMode) {
+      state.weekMode = weekMode
+    },
+    setFixedHeader (state, fixedHeader) {
+      state.fixedHeader = fixedHeader
+    },
+    setFixedSideBar (state, fixedSideBar) {
+      state.fixedSideBar = fixedSideBar
+    },
+    setLang (state, lang) {
+      state.lang = lang
+    },
+    setHideSetting (state, hideSetting) {
+      state.hideSetting = hideSetting
+    },
+    correctPageMinHeight (state, minHeight) {
+      state.pageMinHeight += minHeight
+    },
+    setMenuData (state, menuData) {
+      state.menuData = menuData
+    },
+    setAsyncRoutes (state, asyncRoutes) {
+      state.asyncRoutes = asyncRoutes
+    },
+    setPageWidth (state, pageWidth) {
+      state.pageWidth = pageWidth
+    },
+    setActivatedFirst (state, activatedFirst) {
+      state.activatedFirst = activatedFirst
+    },
+    setFixedTabs (state, fixedTabs) {
+      state.fixedTabs = fixedTabs
+    },
+    setCustomTitle (state, { path, title }) {
+      if (title) {
+        const obj = state.customTitles.find(item => item.path === path)
+        if (obj) {
+          obj.title = title
+        } else {
+          state.customTitles.push({ path, title })
+        }
+        sessionStorage.setItem(process.env.VUE_APP_TBAS_TITLES_KEY, JSON.stringify(state.customTitles))
+      }
+    },
+    setSetting (state, setting) {
+      for (const key in setting) {
+        state[key] = setting[key]
+      }
+    }
+  }
+}

package/src/theme/default/style.less

@@ -1,58 +1,58 @@
-.week-mode{
-  overflow: hidden;
-  filter: invert(80%);
-}
-
-.split-right{
-  &:not(:last-child) {
-    border-right: 1px solid rgba(98, 98, 98, 0.2);
-  }
-}
-.disabled{
-  cursor: not-allowed;
-  color: @disabled-color;
-  pointer-events: none;
-}
-
-.beauty-scroll{
-  -ms-overflow-style:none;
-  position: relative;
-  &::-webkit-scrollbar{
-    width: 3px;
-  }
-  &::-webkit-scrollbar-thumb {
-    border-radius: 3px;
-    background: @primary-color;
-  }
-  &::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
-    border-radius: 3px;
-    background: @primary-3;
-  }
-}
-
-// 美化滚动条
-::-webkit-scrollbar{
-  width: 7px !important;
-  height: 7px !important;
-}
-
-::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background: @primary-3;
-  border-style: dashed;
-  border-color: transparent;
-  border-width: 2px;
-  background-clip: padding-box;
-}
-
-::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
-  border-radius: 10px;
-  background: transparent;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background: @primary-3;
-  border: 0;
-}
+.week-mode{
+  overflow: hidden;
+  filter: invert(80%);
+}
+
+.split-right{
+  &:not(:last-child) {
+    border-right: 1px solid rgba(98, 98, 98, 0.2);
+  }
+}
+.disabled{
+  cursor: not-allowed;
+  color: @disabled-color;
+  pointer-events: none;
+}
+
+.beauty-scroll{
+  -ms-overflow-style:none;
+  position: relative;
+  &::-webkit-scrollbar{
+    width: 3px;
+  }
+  &::-webkit-scrollbar-thumb {
+    border-radius: 3px;
+    background: @primary-color;
+  }
+  &::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
+    border-radius: 3px;
+    background: @primary-3;
+  }
+}
+
+// 美化滚动条
+::-webkit-scrollbar{
+  width: 7px !important;
+  height: 7px !important;
+}
+
+::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background: @primary-3;
+  border-style: dashed;
+  border-color: transparent;
+  border-width: 2px;
+  background-clip: padding-box;
+}
+
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
+  border-radius: 10px;
+  background: transparent;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: @primary-3;
+  border: 0;
+}

package/src/utils/authority-utils.js

@@ -1,85 +1,85 @@
-/**
- * 判断是否有路由的权限
- * @param authority 路由权限配置
- * @param permissions 用户权限集合
- * @returns {boolean|*}
- */
-function hasPermission (authority, permissions) {
-  let required = '*'
-  if (typeof authority === 'string') {
-    required = authority
-  } else if (Array.isArray(authority)) {
-    required = authority
-  } else if (typeof authority === 'object') {
-    required = authority.permission
-  }
-  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断是否有路由需要的角色
- * @param authority 路由权限配置
- * @param roles 用户角色集合
- */
-function hasRole (authority, roles) {
-  let required
-  if (typeof authority === 'object') {
-    required = authority.role
-  }
-  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断目标数组是否有所需元素
- * @param {String | String[]}required 所需元素，数组或单个元素
- * @param {String[]|Object[]} source 目标数组
- * @param {Function} filter 匹配条件
- * (r: String, s: String|Object) => boolean
- * @returns {boolean}
- */
-function hasAnyItem (required, source, filter) {
-  if (!required) {
-    return false
-  }
-  const checkedList = Array.isArray(required) ? required : [required]
-  return !!source.find(s => checkedList.find(r => filter(r, s)))
-}
-
-/**
- * 路由权限校验
- * @param route 路由
- * @param permissions 用户权限集合
- * @param roles 用户角色集合
- * @returns {boolean}
- */
-function hasAuthority (route, permissions, roles) {
-  const authorities = [...route.meta.pAuthorities, route.meta.authority]
-  for (const authority of authorities) {
-    if (!hasPermission(authority, permissions) && !hasRole(authority, roles)) {
-      return false
-    }
-  }
-  return true
-}
-
-/**
- * 根据权限配置过滤菜单数据
- * @param menuData
- * @param permissions
- * @param roles
- */
-function filterMenu (menuData, permissions, roles) {
-  return menuData.filter(menu => {
-    if (menu.meta && menu.meta.invisible === undefined) {
-      if (!hasAuthority(menu, permissions, roles)) {
-        return false
-      }
-    }
-    if (menu.children && menu.children.length > 0) {
-      menu.children = filterMenu(menu.children, permissions, roles)
-    }
-    return true
-  })
-}
-
-export { filterMenu, hasAuthority }
+/**
+ * 判断是否有路由的权限
+ * @param authority 路由权限配置
+ * @param permissions 用户权限集合
+ * @returns {boolean|*}
+ */
+function hasPermission (authority, permissions) {
+  let required = '*'
+  if (typeof authority === 'string') {
+    required = authority
+  } else if (Array.isArray(authority)) {
+    required = authority
+  } else if (typeof authority === 'object') {
+    required = authority.permission
+  }
+  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断是否有路由需要的角色
+ * @param authority 路由权限配置
+ * @param roles 用户角色集合
+ */
+function hasRole (authority, roles) {
+  let required
+  if (typeof authority === 'object') {
+    required = authority.role
+  }
+  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断目标数组是否有所需元素
+ * @param {String | String[]}required 所需元素，数组或单个元素
+ * @param {String[]|Object[]} source 目标数组
+ * @param {Function} filter 匹配条件
+ * (r: String, s: String|Object) => boolean
+ * @returns {boolean}
+ */
+function hasAnyItem (required, source, filter) {
+  if (!required) {
+    return false
+  }
+  const checkedList = Array.isArray(required) ? required : [required]
+  return !!source.find(s => checkedList.find(r => filter(r, s)))
+}
+
+/**
+ * 路由权限校验
+ * @param route 路由
+ * @param permissions 用户权限集合
+ * @param roles 用户角色集合
+ * @returns {boolean}
+ */
+function hasAuthority (route, permissions, roles) {
+  const authorities = [...route.meta.pAuthorities, route.meta.authority]
+  for (const authority of authorities) {
+    if (!hasPermission(authority, permissions) && !hasRole(authority, roles)) {
+      return false
+    }
+  }
+  return true
+}
+
+/**
+ * 根据权限配置过滤菜单数据
+ * @param menuData
+ * @param permissions
+ * @param roles
+ */
+function filterMenu (menuData, permissions, roles) {
+  return menuData.filter(menu => {
+    if (menu.meta && menu.meta.invisible === undefined) {
+      if (!hasAuthority(menu, permissions, roles)) {
+        return false
+      }
+    }
+    if (menu.children && menu.children.length > 0) {
+      menu.children = filterMenu(menu.children, permissions, roles)
+    }
+    return true
+  })
+}
+
+export { filterMenu, hasAuthority }

package/src/utils/errorCode.js

@@ -1,6 +1,6 @@
-export default {
-  401: '认证失败，无法访问系统资源',
-  403: '当前操作没有权限',
-  404: '访问资源不存在',
-  default: '系统未知错误，请反馈给管理员'
-}
+export default {
+  401: '认证失败，无法访问系统资源',
+  403: '当前操作没有权限',
+  404: '访问资源不存在',
+  default: '系统未知错误，请反馈给管理员'
+}