vue2-client 1.1.0 → 1.2.0

package/src/pages/system/applyInstallView/index.vue

@@ -1,34 +1,34 @@
-<template>
-  <div>
-    <Core></Core>
-  </div>
-</template>
-<script>
-
-import Core from '@/pages/system/applyInstallView/Core'
-
-export default {
-  name: 'Test',
-  data () {
-    return {
-      isShowOne: false,
-      isShowTwo: false
-    }
-  },
-  components: {
-    Core
-  },
-  methods: {
-    goto () {
-      this.isShowTwo = false
-      this.isShowOne = true
-    },
-    goto2 () {
-      this.isShowTwo = true
-      this.isShowOne = false
-    }
-  }
-}
-</script>
-<style scoped>
-</style>
+<template>
+  <div>
+    <Core></Core>
+  </div>
+</template>
+<script>
+
+import Core from '@vue2-client/pages/system/applyInstallView/Core'
+
+export default {
+  name: 'Test',
+  data () {
+    return {
+      isShowOne: false,
+      isShowTwo: false
+    }
+  },
+  components: {
+    Core
+  },
+  methods: {
+    goto () {
+      this.isShowTwo = false
+      this.isShowOne = true
+    },
+    goto2 () {
+      this.isShowTwo = true
+      this.isShowOne = false
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

package/src/pages/system/dictionary/index.vue

@@ -1,41 +1,41 @@
-<template>
-  <a-card :bordered="false">
-    <dictionary-details-view
-      :visible.sync="detailVisible"
-      :id="selectId"
-      v-if="selectId"
-    />
-    <x-form-table
-      title="字典"
-      :queryParamsName="queryParamsName"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-  import XFormTable from '@/base-client/components/common/XFormTable/XFormTable'
-
-  export default {
-    name: 'Dictionary',
-    components: {
-      XFormTable
-    },
-    data () {
-      return {
-        // 选中的编号
-        selectId: undefined,
-        // 查询配置文件名
-        queryParamsName: 'dictionaryQueryParams',
-        // 是否显示详情抽屉
-        detailVisible: false
-      }
-    },
-    methods: {
-      toDetail (record, id) {
-        this.selectId = id + ''
-        this.detailVisible = true
-      }
-    }
-  }
-</script>
+<template>
+  <a-card :bordered="false">
+    <dictionary-details-view
+      :visible.sync="detailVisible"
+      :id="selectId"
+      v-if="selectId"
+    />
+    <x-form-table
+      title="字典"
+      :queryParamsName="queryParamsName"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+
+  export default {
+    name: 'Dictionary',
+    components: {
+      XFormTable
+    },
+    data () {
+      return {
+        // 选中的编号
+        selectId: undefined,
+        // 查询配置文件名
+        queryParamsName: 'dictionaryQueryParams',
+        // 是否显示详情抽屉
+        detailVisible: false
+      }
+    },
+    methods: {
+      toDetail (record, id) {
+        this.selectId = id + ''
+        this.detailVisible = true
+      }
+    }
+  }
+</script>

package/src/pages/system/queryParams/index.vue

@@ -1,41 +1,41 @@
-<template>
-  <a-card :bordered="false">
-    <query-params-details-view
-      :visible.sync="detailVisible"
-      :id="selectId"
-      v-if="selectId"
-    />
-    <x-form-table
-      title="查询配置"
-      :queryParamsName="queryParamsName"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-  import XFormTable from '@/base-client/components/common/XFormTable/XFormTable'
-
-  export default {
-    name: 'QueryParams',
-    components: {
-      XFormTable
-    },
-    data () {
-      return {
-        // 选中的编号
-        selectId: undefined,
-        // 查询配置文件名
-        queryParamsName: 'queryParams',
-        // 是否显示详情抽屉
-        detailVisible: false
-      }
-    },
-    methods: {
-      toDetail (record, id) {
-        this.selectId = id + ''
-        this.detailVisible = true
-      }
-    }
-  }
-</script>
+<template>
+  <a-card :bordered="false">
+    <query-params-details-view
+      :visible.sync="detailVisible"
+      :id="selectId"
+      v-if="selectId"
+    />
+    <x-form-table
+      title="查询配置"
+      :queryParamsName="queryParamsName"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+
+  export default {
+    name: 'QueryParams',
+    components: {
+      XFormTable
+    },
+    data () {
+      return {
+        // 选中的编号
+        selectId: undefined,
+        // 查询配置文件名
+        queryParamsName: 'queryParams',
+        // 是否显示详情抽屉
+        detailVisible: false
+      }
+    },
+    methods: {
+      toDetail (record, id) {
+        this.selectId = id + ''
+        this.detailVisible = true
+      }
+    }
+  }
+</script>

package/src/router/async/config.async.js

@@ -1,25 +1,25 @@
-import routerMap from './router.map'
-import { parseRoutes } from '@/utils/routerUtil'
-
-// 异步路由配置
-const routesConfig = [
-  'login',
-  'root',
-  {
-    router: 'exp404',
-    path: '*',
-    name: '404'
-  },
-  {
-    router: 'exp403',
-    path: '/403',
-    name: '403'
-  }
-]
-
-const options = {
-  mode: 'history',
-  routes: parseRoutes(routesConfig, routerMap)
-}
-
-export default options
+import routerMap from './router.map'
+import { parseRoutes } from '@vue2-client/utils/routerUtil'
+
+// 异步路由配置
+const routesConfig = [
+  'login',
+  'root',
+  {
+    router: 'exp404',
+    path: '*',
+    name: '404'
+  },
+  {
+    router: 'exp403',
+    path: '/403',
+    name: '403'
+  }
+]
+
+const options = {
+  mode: 'history',
+  routes: parseRoutes(routesConfig, routerMap)
+}
+
+export default options

package/src/router/async/router.map.js

@@ -1,9 +1,9 @@
 // 视图组件
 const view = {
-  tabs: () => import('@/layouts/tabs'),
-  blank: () => import('@/layouts/BlankView'),
-  page: () => import('@/layouts/PageView'),
-  singlePage: () => import('@/layouts/SinglePageView')
+  tabs: () => import('@vue2-client/layouts/tabs'),
+  blank: () => import('@vue2-client/layouts/BlankView'),
+  page: () => import('@vue2-client/layouts/PageView'),
+  singlePage: () => import('@vue2-client/layouts/SinglePageView')
 }
 // 动态路由对象定义
 const routerResource = {}
@@ -15,22 +15,22 @@ routerResource.singlePage = view.singlePage
 // --------------------------------------系统配置--------------------------------------
 routerResource.system = view.blank
 // 字典管理
-routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@/pages/system/dictionary')
+routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@vue2-client/pages/system/dictionary')
 // 查询配置管理
-routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@/pages/system/queryParams')
+routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@vue2-client/pages/system/queryParams')
 // 报装可视化
-routerResource.applyInstallView = () => import(/* webpackChunkName: "applyInstallView" */ '@/pages/system/applyInstallView')
+routerResource.applyInstallView = () => import(/* webpackChunkName: "applyInstallView" */ '@vue2-client/pages/system/applyInstallView')
 // --------------------------------------报表组件--------------------------------------
-routerResource.reportTable = () => import(/* webpackChunkName: "ReportTableHome" */ '@/pages/report/ReportTableHome')
+routerResource.reportTable = () => import(/* webpackChunkName: "ReportTableHome" */ '@vue2-client/pages/report/ReportTableHome')
 // --------------------------------------资源管理--------------------------------------
-routerResource.resourceManageMain = () => import(/* webpackChunkName: "resourceManageMain" */ '@/pages/resourceManage/resourceManageMain')
+routerResource.resourceManageMain = () => import(/* webpackChunkName: "resourceManageMain" */ '@vue2-client/pages/resourceManage/resourceManageMain')
 
 // 基础路由组件注册
 const routerMap = {
   login: {
     authority: '*',
     path: '/login',
-    component: () => import('@/pages/login')
+    component: () => import('@vue2-client/pages/login')
   },
   root: {
     path: '/',
@@ -42,17 +42,17 @@ const routerMap = {
     authority: '*',
     name: 'exp403',
     path: '403',
-    component: () => import('@/pages/exception/403')
+    component: () => import('@vue2-client/pages/exception/403')
   },
   exp404: {
     name: 'exp404',
     path: '404',
-    component: () => import('@/pages/exception/404')
+    component: () => import('@vue2-client/pages/exception/404')
   },
   exp500: {
     name: 'exp500',
     path: '500',
-    component: () => import('@/pages/exception/500')
+    component: () => import('@vue2-client/pages/exception/500')
   }
 }
 Object.assign(routerMap, routerResource)

package/src/router/guards.js

@@ -1,104 +1,104 @@
-import { hasAuthority } from '@/utils/authority-utils'
-import { loginIgnore } from '@/router/index'
-import { checkAuthorization } from '@/utils/request'
-import NProgress from 'nprogress'
-
-NProgress.configure({ showSpinner: false })
-
-/**
- * 进度条开始
- * @param to
- * @param form
- * @param next
- */
-const progressStart = (to, from, next) => {
-  // start progress bar
-  if (!NProgress.isStarted()) {
-    NProgress.start()
-  }
-  next()
-}
-
-/**
- * 登录守卫
- * @param to
- * @param form
- * @param next
- * @param options
- */
-const loginGuard = (to, from, next, options) => {
-  const { message } = options
-  if (!loginIgnore.includes(to) && !checkAuthorization()) {
-    message.warning('登录已失效，请重新登录')
-    next({ path: '/login' })
-  } else {
-    next()
-  }
-}
-
-/**
- * 权限守卫
- * @param to
- * @param form
- * @param next
- * @param options
- */
-const authorityGuard = (to, from, next, options) => {
-  const { store, message } = options
-  const permissions = store.getters['account/permissions']
-  const roles = store.getters['account/roles']
-  if (!hasAuthority(to, permissions, roles)) {
-    message.warning(`对不起，您无权访问页面: ${to.fullPath}，请联系管理员`)
-    next({ path: '/403' })
-    // NProgress.done()
-  } else {
-    next()
-  }
-}
-
-/**
- * 混合导航模式下一级菜单跳转重定向
- * @param to
- * @param from
- * @param next
- * @param options
- * @returns {*}
- */
-const redirectGuard = (to, from, next, options) => {
-  const { store } = options
-  const getFirstChild = (routes) => {
-    const route = routes[0]
-    if (!route.children || route.children.length === 0) {
-      return route
-    }
-    return getFirstChild(route.children)
-  }
-  if (store.state.setting.layout === 'mix') {
-    const firstMenu = store.getters['setting/firstMenu']
-    if (firstMenu.find(item => item.fullPath === to.fullPath)) {
-      store.commit('setting/setActivatedFirst', to.fullPath)
-      const subMenu = store.getters['setting/subMenu']
-      if (subMenu.length > 0) {
-        const redirect = getFirstChild(subMenu)
-        return next({ path: redirect.fullPath })
-      }
-    }
-  }
-  next()
-}
-
-/**
- * 进度条结束
- * @param to
- * @param form
- * @param options
- */
-const progressDone = () => {
-  // finish progress bar
-  NProgress.done()
-}
-
-export default {
-  beforeEach: [progressStart, loginGuard, authorityGuard, redirectGuard],
-  afterEach: [progressDone]
-}
+import { hasAuthority } from '@vue2-client/utils/authority-utils'
+import { loginIgnore } from '@vue2-client/router/index'
+import { checkAuthorization } from '@vue2-client/utils/request'
+import NProgress from 'nprogress'
+
+NProgress.configure({ showSpinner: false })
+
+/**
+ * 进度条开始
+ * @param to
+ * @param form
+ * @param next
+ */
+const progressStart = (to, from, next) => {
+  // start progress bar
+  if (!NProgress.isStarted()) {
+    NProgress.start()
+  }
+  next()
+}
+
+/**
+ * 登录守卫
+ * @param to
+ * @param form
+ * @param next
+ * @param options
+ */
+const loginGuard = (to, from, next, options) => {
+  const { message } = options
+  if (!loginIgnore.includes(to) && !checkAuthorization()) {
+    message.warning('登录已失效，请重新登录')
+    next({ path: '/login' })
+  } else {
+    next()
+  }
+}
+
+/**
+ * 权限守卫
+ * @param to
+ * @param form
+ * @param next
+ * @param options
+ */
+const authorityGuard = (to, from, next, options) => {
+  const { store, message } = options
+  const permissions = store.getters['account/permissions']
+  const roles = store.getters['account/roles']
+  if (!hasAuthority(to, permissions, roles)) {
+    message.warning(`对不起，您无权访问页面: ${to.fullPath}，请联系管理员`)
+    next({ path: '/403' })
+    // NProgress.done()
+  } else {
+    next()
+  }
+}
+
+/**
+ * 混合导航模式下一级菜单跳转重定向
+ * @param to
+ * @param from
+ * @param next
+ * @param options
+ * @returns {*}
+ */
+const redirectGuard = (to, from, next, options) => {
+  const { store } = options
+  const getFirstChild = (routes) => {
+    const route = routes[0]
+    if (!route.children || route.children.length === 0) {
+      return route
+    }
+    return getFirstChild(route.children)
+  }
+  if (store.state.setting.layout === 'mix') {
+    const firstMenu = store.getters['setting/firstMenu']
+    if (firstMenu.find(item => item.fullPath === to.fullPath)) {
+      store.commit('setting/setActivatedFirst', to.fullPath)
+      const subMenu = store.getters['setting/subMenu']
+      if (subMenu.length > 0) {
+        const redirect = getFirstChild(subMenu)
+        return next({ path: redirect.fullPath })
+      }
+    }
+  }
+  next()
+}
+
+/**
+ * 进度条结束
+ * @param to
+ * @param form
+ * @param options
+ */
+const progressDone = () => {
+  // finish progress bar
+  NProgress.done()
+}
+
+export default {
+  beforeEach: [progressStart, loginGuard, authorityGuard, redirectGuard],
+  afterEach: [progressDone]
+}

package/src/router/index.js

@@ -1,4 +1,4 @@
-import { formatRoutes } from '@/utils/routerUtil'
+import { formatRoutes } from '@vue2-client/utils/routerUtil'
 
 // 不需要登录拦截的路由配置
 const loginIgnore = {
@@ -20,7 +20,7 @@ const loginIgnore = {
  * @returns {RouterOptions}
  */
 function initRouter (isAsync) {
-  const options = isAsync ? require('./async/config.async').default : require('./config').default
+  const options = require('./async/config.async').default
   formatRoutes(options.routes)
   return options
 }

package/src/services/api/common.js

@@ -1,4 +1,4 @@
-import { METHOD, request } from '@/utils/request'
+import { METHOD, request } from '@vue2-client/utils/request'
 
 const commonApi = {
   // 获取表格列配置

package/src/services/api/restTools.js

@@ -1,4 +1,4 @@
-import { METHOD, request } from '@/utils/request'
+import { METHOD, request } from '@vue2-client/utils/request'
 
 /**
  * GET请求

package/src/services/dataSource.js

@@ -1,12 +1,12 @@
-import { GOODS, GOODS_COLUMNS } from './api'
-import { METHOD, request } from '@/utils/request'
-
-export async function goodsList (params) {
-  return request(GOODS, METHOD.GET, params)
-}
-
-export async function goodsColumns () {
-  return request(GOODS_COLUMNS, METHOD.GET)
-}
-
-export default { goodsList, goodsColumns }
+import { GOODS, GOODS_COLUMNS } from './api'
+import { METHOD, request } from '@vue2-client/utils/request'
+
+export async function goodsList (params) {
+  return request(GOODS, METHOD.GET, params)
+}
+
+export async function goodsColumns () {
+  return request(GOODS_COLUMNS, METHOD.GET)
+}
+
+export default { goodsList, goodsColumns }