vue2-client 1.1.0 → 1.2.0

package/src/services/user.js

@@ -1,34 +1,34 @@
-import { LOGIN, ROUTES } from '@/services/api'
-import { request, METHOD, removeAuthorization } from '@/utils/request'
-
-/**
- * 登录服务
- * @param name 账户名
- * @param password 账户密码
- * @returns {Promise<AxiosResponse<T>>}
- */
-export async function login (name, password) {
-  return request(LOGIN, METHOD.POST, {
-    name: name,
-    password: password
-  })
-}
-
-export async function getRoutesConfig (value) {
-  return request(ROUTES, METHOD.POST, value)
-}
-
-/**
- * 退出登录
- */
-export function logout () {
-  localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
-  localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
-  localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
-  removeAuthorization()
-}
-export default {
-  login,
-  logout,
-  getRoutesConfig
-}
+import { LOGIN, ROUTES } from '@vue2-client/services/api'
+import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
+
+/**
+ * 登录服务
+ * @param name 账户名
+ * @param password 账户密码
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+export async function login (name, password) {
+  return request(LOGIN, METHOD.POST, {
+    name: name,
+    password: password
+  })
+}
+
+export async function getRoutesConfig (value) {
+  return request(ROUTES, METHOD.POST, value)
+}
+
+/**
+ * 退出登录
+ */
+export function logout () {
+  localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
+  localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
+  localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
+  removeAuthorization()
+}
+export default {
+  login,
+  logout,
+  getRoutesConfig
+}

package/src/store/index.js

@@ -1,5 +1,5 @@
-import modules from './modules'
-
-export {
-  modules
-}
+import modules from './modules'
+
+export {
+  modules
+}

package/src/store/modules/setting.js

@@ -1,114 +1,114 @@
-import config from '@/config'
-import { ADMIN } from '@/config/default'
-import { formatFullPath } from '@/utils/i18n'
-import { filterMenu } from '@/utils/authority-utils'
-import { getLocalSetting } from '@/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))
-      }
-    }
-  }
-}
+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))
+      }
+    }
+  }
+}

package/src/theme/index.less

@@ -1,5 +1,5 @@
-@import '~ant-design-vue/dist/antd.less';
-@import "default/index";
-@import "antd/index";
-@import "global.less";
-@import "reportTable.less";
+@import '~ant-design-vue/dist/antd.less';
+@import "default/index";
+@import "antd/index";
+@import "global.less";
+@import "reportTable.less";

package/src/theme/reportTable.less

@@ -1,58 +1,58 @@
-#ReportTableHome {
-  // 一个div宽高
-  @height: 30px;
-  @width: 100px;
-  // 边框颜色
-  @boder-color: #000;
-
-  position: relative;
-  display: flex;
-  justify-items: center;
-  #reportTable {
-    border-left: 1px solid @boder-color;
-    border-top: 1px solid @boder-color;
-    div {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      position: absolute;
-      border-bottom: 1px solid @boder-color;
-      border-right: 1px solid @boder-color;
-    }
-  }
-  // 循环编写
-  .generBase(@i) when (@i <= 20) {
-    .hs(@i);
-    .ws(@i);
-    .ts(@i);
-    .ls(@i);
-    .generBase(@i+1);
-  }
-  .hs(@size) {
-    .h-@{size} {
-      height: @height * @size
-    }
-  }
-  .ws(@size) {
-    .w-@{size} {
-      width: @width * @size
-    }
-  }
-  .ts(@size) {
-    .t-@{size} {
-      top: @height * @size
-    }
-  }
-  .ls(@size) {
-    .l-@{size} {
-      left: @width * @size
-    }
-  }
-  .generBase(0);
-  .title {
-    background: #80add9;
-  }
-  .bold {
-    font-weight: bold;
-  }
-}
+#ReportTableHome {
+  // 一个div宽高
+  @height: 30px;
+  @width: 100px;
+  // 边框颜色
+  @boder-color: #000;
+
+  position: relative;
+  display: flex;
+  justify-items: center;
+  #reportTable {
+    border-left: 1px solid @boder-color;
+    border-top: 1px solid @boder-color;
+    div {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      position: absolute;
+      border-bottom: 1px solid @boder-color;
+      border-right: 1px solid @boder-color;
+    }
+  }
+  // 循环编写
+  .generBase(@i) when (@i <= 20) {
+    .hs(@i);
+    .ws(@i);
+    .ts(@i);
+    .ls(@i);
+    .generBase(@i+1);
+  }
+  .hs(@size) {
+    .h-@{size} {
+      height: @height * @size
+    }
+  }
+  .ws(@size) {
+    .w-@{size} {
+      width: @width * @size
+    }
+  }
+  .ts(@size) {
+    .t-@{size} {
+      top: @height * @size
+    }
+  }
+  .ls(@size) {
+    .l-@{size} {
+      left: @width * @size
+    }
+  }
+  .generBase(0);
+  .title {
+    background: #80add9;
+  }
+  .bold {
+    font-weight: bold;
+  }
+}

package/src/utils/i18n.js

@@ -1,80 +1,80 @@
-import Vue from 'vue'
-import VueI18n from 'vue-i18n'
-import routesI18n from '@/router/i18n'
-import './Objects'
-import { getI18nKey } from '@/utils/routerUtil'
-
-/**
- * 创建 i18n 配置
- * @param locale 本地化语言
- * @param fallback 回退语言
- * @returns {VueI18n}
- */
-function initI18n (locale, fallback) {
-  Vue.use(VueI18n)
-  const i18nOptions = {
-    locale,
-    fallbackLocale: fallback,
-    silentFallbackWarn: true
-  }
-  return new VueI18n(i18nOptions)
-}
-
-/**
- * 根据 router options 配置生成 国际化语言
- * @param lang
- * @param routes
- * @param valueKey
- * @returns {*}
- */
-function generateI18n (lang, routes, valueKey) {
-  routes.forEach(route => {
-    const keys = getI18nKey(route.fullPath).split('.')
-    const value = valueKey === 'path' ? route[valueKey].split('/').filter(item => !item.startsWith(':') && item != '').join('.') : route[valueKey]
-    lang.assignProps(keys, value)
-    if (route.children) {
-      generateI18n(lang, route.children, valueKey)
-    }
-  })
-  return lang
-}
-
-/**
- * 格式化 router.options.routes，生成 fullPath
- * @param routes
- * @param parentPath
- */
-function formatFullPath (routes, parentPath = '') {
-  routes.forEach(route => {
-    const isFullPath = route.path.substring(0, 1) === '/'
-    route.fullPath = isFullPath ? route.path : (parentPath === '/' ? parentPath + route.path : parentPath + '/' + route.path)
-    if (route.children) {
-      formatFullPath(route.children, route.fullPath)
-    }
-  })
-}
-
-/**
- * 从路由提取国际化数据
- * @param i18n
- * @param routes
- */
-function mergeI18nFromRoutes (i18n, routes) {
-  formatFullPath(routes)
-  // eslint-disable-next-line no-new-object
-  const CN = generateI18n(new Object(), routes, 'name')
-  // eslint-disable-next-line no-new-object
-  const US = generateI18n(new Object(), routes, 'path')
-  i18n.mergeLocaleMessage('CN', CN)
-  i18n.mergeLocaleMessage('US', US)
-  const messages = routesI18n.messages
-  Object.keys(messages).forEach(lang => {
-    i18n.mergeLocaleMessage(lang, messages[lang])
-  })
-}
-
-export {
-  initI18n,
-  mergeI18nFromRoutes,
-  formatFullPath
-}
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+import routesI18n from '@vue2-client/router/i18n'
+import './Objects'
+import { getI18nKey } from '@vue2-client/utils/routerUtil'
+
+/**
+ * 创建 i18n 配置
+ * @param locale 本地化语言
+ * @param fallback 回退语言
+ * @returns {VueI18n}
+ */
+function initI18n (locale, fallback) {
+  Vue.use(VueI18n)
+  const i18nOptions = {
+    locale,
+    fallbackLocale: fallback,
+    silentFallbackWarn: true
+  }
+  return new VueI18n(i18nOptions)
+}
+
+/**
+ * 根据 router options 配置生成 国际化语言
+ * @param lang
+ * @param routes
+ * @param valueKey
+ * @returns {*}
+ */
+function generateI18n (lang, routes, valueKey) {
+  routes.forEach(route => {
+    const keys = getI18nKey(route.fullPath).split('.')
+    const value = valueKey === 'path' ? route[valueKey].split('/').filter(item => !item.startsWith(':') && item != '').join('.') : route[valueKey]
+    lang.assignProps(keys, value)
+    if (route.children) {
+      generateI18n(lang, route.children, valueKey)
+    }
+  })
+  return lang
+}
+
+/**
+ * 格式化 router.options.routes，生成 fullPath
+ * @param routes
+ * @param parentPath
+ */
+function formatFullPath (routes, parentPath = '') {
+  routes.forEach(route => {
+    const isFullPath = route.path.substring(0, 1) === '/'
+    route.fullPath = isFullPath ? route.path : (parentPath === '/' ? parentPath + route.path : parentPath + '/' + route.path)
+    if (route.children) {
+      formatFullPath(route.children, route.fullPath)
+    }
+  })
+}
+
+/**
+ * 从路由提取国际化数据
+ * @param i18n
+ * @param routes
+ */
+function mergeI18nFromRoutes (i18n, routes) {
+  formatFullPath(routes)
+  // eslint-disable-next-line no-new-object
+  const CN = generateI18n(new Object(), routes, 'name')
+  // eslint-disable-next-line no-new-object
+  const US = generateI18n(new Object(), routes, 'path')
+  i18n.mergeLocaleMessage('CN', CN)
+  i18n.mergeLocaleMessage('US', US)
+  const messages = routesI18n.messages
+  Object.keys(messages).forEach(lang => {
+    i18n.mergeLocaleMessage(lang, messages[lang])
+  })
+}
+
+export {
+  initI18n,
+  mergeI18nFromRoutes,
+  formatFullPath
+}

package/src/utils/indexedDB.js

@@ -1,5 +1,5 @@
 // indexDB 存储
-import { post } from '@/services/api/restTools'
+import { post } from '@vue2-client/services/api/restTools'
 
 export const indexedDB = {
   db: undefined,

package/src/utils/request.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import Cookie from 'js-cookie'
 import Vue from 'vue'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
+import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import notification from 'ant-design-vue/es/notification'
 
 // 跨域认证信息 header 名

package/src/utils/routerUtil.js

@@ -1,8 +1,8 @@
-import routerMap from '@/router/async/router.map'
-import { mergeI18nFromRoutes } from '@/utils/i18n'
+import routerMap from '@vue2-client/router/async/router.map'
+import { mergeI18nFromRoutes } from '@vue2-client/utils/i18n'
 import Router from 'vue-router'
 import deepMerge from 'deepmerge'
-import basicOptions from '@/router/async/config.async'
+import basicOptions from '@vue2-client/router/async/config.async'
 
 // 应用配置
 const appOptions = {

package/tests/unit/ReportTable.spec.js

@@ -1,6 +1,6 @@
 import { mount } from '@vue/test-utils'
-import ReportTable from '@/pages/report/ReportTable'
-import { reportData } from '@/mock/common/reportData'
+import ReportTable from '@vue2-client/pages/report/ReportTable'
+import { reportData } from '@vue2-client/mock/common/reportData'
 
 // 报表组件测试域
 describe('ReportTable', () => {

package/vue.config.js

@@ -134,6 +134,7 @@ module.exports = {
         return args
       })
     }
+    config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
   },
   css: {
     loaderOptions: {

package/webpack.config.js

@@ -6,7 +6,7 @@ module.exports = {
   resolve: {
     extensions: ['.js', '.vue', '.json'],
     alias: {
-      '@': path.resolve('src')
+      '@vue2-client': path.resolve('src')
     }
   }
 }