vue2-client 1.1.0 → 1.2.0

package/src/main.js

@@ -2,8 +2,8 @@ import Vue from 'vue'
 import App from './App.vue'
 import Router from 'vue-router'
 import Vuex from 'vuex'
-import '@/mock'
-import { routerOptions, modules, i18n, message, bootstrap } from './index'
+import '@vue2-client/mock'
+import { routerOptions, modules, i18n, message, bootstrap } from '../index'
 
 Vue.use(Router)
 Vue.use(Vuex)

package/src/mock/common/reportData.js

@@ -1,20 +1,20 @@
-const reportData = [
-  { '气费': { 'span': 8 } },
-  ['付款方式', '用户类型', '用气性质', '笔数', '气量', '应收金额', '实收金额', '滞纳金'],
-  {
-    '刷卡': {
-      '非民用': {
-        '公服用气': [3, 2777, 6998.04, 7000, 0],
-        '商业用气': [17, 28720, 83811.50, 83806.70, 0]
-      },
-      '民用': {
-        '居民用气': [255, 19310, 44219.70, 44345.50, 0]
-      },
-      '合计': { 'span': 2, 'value': [275, 50807, 135029.24, 135152.20, 0] }
-    }
-  }
-]
-
-export {
-  reportData
-}
+const reportData = [
+  { '气费': { 'span': 8 } },
+  ['付款方式', '用户类型', '用气性质', '笔数', '气量', '应收金额', '实收金额', '滞纳金'],
+  {
+    '刷卡': {
+      '非民用': {
+        '公服用气': [3, 2777, 6998.04, 7000, 0],
+        '商业用气': [17, 28720, 83811.50, 83806.70, 0]
+      },
+      '民用': {
+        '居民用气': [255, 19310, 44219.70, 44345.50, 0]
+      },
+      '合计': { 'span': 2, 'value': [275, 50807, 135029.24, 135152.20, 0] }
+    }
+  }
+]
+
+export {
+  reportData
+}

package/src/mock/goods/index.js

@@ -1,108 +1,108 @@
-import Mock from 'mockjs'
-import '@/mock/extend'
-import { parseUrlParams } from '@/utils/request'
-
-const current = new Date().getTime()
-
-const goodsList = Mock.mock({
-  'list|100': [{
-    'id|+1': 0,
-    'name': '@GOODS',
-    'orderId': `${current}-@integer(1,100)`,
-    'status|1-4': 1,
-    'send': '@BOOLEAN',
-    'sendTime': '@DATETIME',
-    'orderDate': '@DATE',
-    'auditTime': '@TIME'
-  }]
-})
-
-Mock.mock(RegExp(`${process.env.VUE_APP_API_BASE_URL}/goods` + '.*'), 'get', ({ url }) => {
-  const params = parseUrlParams(decodeURI(url))
-  let { page, pageSize } = params
-  // eslint-disable-next-line no-eval
-  page = eval(page) - 1 || 0
-  // eslint-disable-next-line no-eval
-  pageSize = eval(pageSize) || 10
-  delete params.page
-  delete params.pageSize
-  let result = goodsList.list.filter(item => {
-    for (const [key, value] of Object.entries(params)) {
-      if (item[key] != value) {
-        return false
-      }
-    }
-    return true
-  })
-  const total = result.length
-  if ((page) * pageSize > total) {
-    result = []
-  } else {
-    result = result.slice(page * pageSize, (page + 1) * pageSize)
-  }
-  return {
-    code: 0,
-    message: 'success',
-    data: {
-      page: page + 1,
-      pageSize,
-      total,
-      list: result
-    }
-  }
-})
-
-const columnsConfig = [
-  {
-    title: '商品名称',
-    dataIndex: 'name',
-    searchAble: true
-  },
-  {
-    title: '订单号',
-    dataIndex: 'orderId'
-  },
-  {
-    searchAble: true,
-    dataIndex: 'status',
-    dataType: 'select',
-    slots: { title: 'statusTitle' },
-    scopedSlots: { customRender: 'status' },
-    search: {
-      selectOptions: [
-        { title: '已下单', value: 1 },
-        { title: '已付款', value: 2 },
-        { title: '已审核', value: 3 }
-        // {title: '已发货', value: 4}
-      ]
-    }
-  },
-  {
-    title: '发货',
-    searchAble: true,
-    dataIndex: 'send',
-    dataType: 'boolean',
-    scopedSlots: { customRender: 'send' }
-  },
-  {
-    title: '发货时间',
-    dataIndex: 'sendTime',
-    dataType: 'datetime'
-  },
-  {
-    title: '下单日期',
-    searchAble: true,
-    dataIndex: 'orderDate',
-    dataType: 'date',
-    visible: false
-  },
-  {
-    title: '审核时间',
-    dataIndex: 'auditTime',
-    dataType: 'time'
-  }
-]
-
-Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/columns`, 'get', () => {
-  return columnsConfig
-})
+import Mock from 'mockjs'
+import '@vue2-client/mock/extend'
+import { parseUrlParams } from '@vue2-client/utils/request'
+
+const current = new Date().getTime()
+
+const goodsList = Mock.mock({
+  'list|100': [{
+    'id|+1': 0,
+    'name': '@GOODS',
+    'orderId': `${current}-@integer(1,100)`,
+    'status|1-4': 1,
+    'send': '@BOOLEAN',
+    'sendTime': '@DATETIME',
+    'orderDate': '@DATE',
+    'auditTime': '@TIME'
+  }]
+})
+
+Mock.mock(RegExp(`${process.env.VUE_APP_API_BASE_URL}/goods` + '.*'), 'get', ({ url }) => {
+  const params = parseUrlParams(decodeURI(url))
+  let { page, pageSize } = params
+  // eslint-disable-next-line no-eval
+  page = eval(page) - 1 || 0
+  // eslint-disable-next-line no-eval
+  pageSize = eval(pageSize) || 10
+  delete params.page
+  delete params.pageSize
+  let result = goodsList.list.filter(item => {
+    for (const [key, value] of Object.entries(params)) {
+      if (item[key] != value) {
+        return false
+      }
+    }
+    return true
+  })
+  const total = result.length
+  if ((page) * pageSize > total) {
+    result = []
+  } else {
+    result = result.slice(page * pageSize, (page + 1) * pageSize)
+  }
+  return {
+    code: 0,
+    message: 'success',
+    data: {
+      page: page + 1,
+      pageSize,
+      total,
+      list: result
+    }
+  }
+})
+
+const columnsConfig = [
+  {
+    title: '商品名称',
+    dataIndex: 'name',
+    searchAble: true
+  },
+  {
+    title: '订单号',
+    dataIndex: 'orderId'
+  },
+  {
+    searchAble: true,
+    dataIndex: 'status',
+    dataType: 'select',
+    slots: { title: 'statusTitle' },
+    scopedSlots: { customRender: 'status' },
+    search: {
+      selectOptions: [
+        { title: '已下单', value: 1 },
+        { title: '已付款', value: 2 },
+        { title: '已审核', value: 3 }
+        // {title: '已发货', value: 4}
+      ]
+    }
+  },
+  {
+    title: '发货',
+    searchAble: true,
+    dataIndex: 'send',
+    dataType: 'boolean',
+    scopedSlots: { customRender: 'send' }
+  },
+  {
+    title: '发货时间',
+    dataIndex: 'sendTime',
+    dataType: 'datetime'
+  },
+  {
+    title: '下单日期',
+    searchAble: true,
+    dataIndex: 'orderDate',
+    dataType: 'date',
+    visible: false
+  },
+  {
+    title: '审核时间',
+    dataIndex: 'auditTime',
+    dataType: 'time'
+  }
+]
+
+Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/columns`, 'get', () => {
+  return columnsConfig
+})

package/src/mock/index.js

@@ -1,12 +1,12 @@
-import Mock from 'mockjs'
-import '@/mock/user/current'
-import '@/mock/project'
-import '@/mock/user/login'
-import '@/mock/workplace'
-import '@/mock/user/routes'
-import '@/mock/goods'
-
-// 设置全局延时
-Mock.setup({
-  timeout: '200-400'
-})
+import Mock from 'mockjs'
+import '@vue2-client/mock/user/current'
+import '@vue2-client/mock/project'
+import '@vue2-client/mock/user/login'
+import '@vue2-client/mock/workplace'
+import '@vue2-client/mock/user/routes'
+import '@vue2-client/mock/goods'
+
+// 设置全局延时
+Mock.setup({
+  timeout: '200-400'
+})

package/src/mock/project/index.js

@@ -1,17 +1,17 @@
-import Mock from 'mockjs'
-import '@/mock/extend'
-
-const projectArr = Mock.mock({
-  'list|6': [
-    {
-      logo: '@LOGO',
-      desc: '@SAYING'
-    }
-  ]
-}).list
-
-Mock.mock('/project', 'get', () => {
-  return projectArr
-})
-
-export { projectArr }
+import Mock from 'mockjs'
+import '@vue2-client/mock/extend'
+
+const projectArr = Mock.mock({
+  'list|6': [
+    {
+      logo: '@LOGO',
+      desc: '@SAYING'
+    }
+  ]
+}).list
+
+Mock.mock('/project', 'get', () => {
+  return projectArr
+})
+
+export { projectArr }

package/src/mock/user/current.js

@@ -1,13 +1,13 @@
-import Mock from 'mockjs'
-import '@/mock/extend'
-
-const welcome = Mock.mock({
-  timeFix: '@TIMEFIX',
-  message: '@WELCOME'
-})
-
-Mock.mock('/user/welcome', 'get', () => {
-  return welcome
-})
-
-export { welcome }
+import Mock from 'mockjs'
+import '@vue2-client/mock/extend'
+
+const welcome = Mock.mock({
+  timeFix: '@TIMEFIX',
+  message: '@WELCOME'
+})
+
+Mock.mock('/user/welcome', 'get', () => {
+  return welcome
+})
+
+export { welcome }

package/src/mock/user/login.js

@@ -1,39 +1,39 @@
-// import Mock from 'mockjs'
-// import '@/mock/extend'
-
-// const user = Mock.mock({
-//   name: '@ADMIN',
-//   avatar: '@AVATAR',
-//   address: '@CITY',
-//   position: '@POSITION'
-// })
-// Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/login`, 'post', ({body}) => {
-//   let result = {data: {}}
-//   const {name, password} = JSON.parse(body)
-//
-//   let success = false
-//
-//   if (name === 'admin' && password === '888888') {
-//     success = true
-//     result.data.permissions = [{id: 'queryForm', operation: ['add', 'edit']}]
-//     result.data.roles = [{id: 'admin', operation: ['add', 'edit', 'delete']}]
-//   } else if (name === 'test' || password === '888888') {
-//     success = true
-//     result.data.permissions = [{id: 'queryForm', operation: ['add', 'edit']}]
-//     result.data.roles = [{id: 'test', operation: ['add', 'edit', 'delete']}]
-//   } else {
-//     success = false
-//   }
-//
-//   if (success) {
-//     result.code = 0
-//     result.message = Mock.mock('@TIMEFIX').CN + '，欢迎回来'
-//     result.data.user = user
-//     result.data.token = 'Authorization:' + Math.random()
-//     result.data.expireAt = new Date(new Date().getTime() + 30 * 60 * 1000)
-//   } else {
-//     result.code = -1
-//     result.message = '账户名或密码错误（admin/888888 or test/888888）'
-//   }
-//   return result
-// })
+// import Mock from 'mockjs'
+// import '@vue2-client/mock/extend'
+
+// const user = Mock.mock({
+//   name: '@ADMIN',
+//   avatar: '@AVATAR',
+//   address: '@CITY',
+//   position: '@POSITION'
+// })
+// Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/login`, 'post', ({body}) => {
+//   let result = {data: {}}
+//   const {name, password} = JSON.parse(body)
+//
+//   let success = false
+//
+//   if (name === 'admin' && password === '888888') {
+//     success = true
+//     result.data.permissions = [{id: 'queryForm', operation: ['add', 'edit']}]
+//     result.data.roles = [{id: 'admin', operation: ['add', 'edit', 'delete']}]
+//   } else if (name === 'test' || password === '888888') {
+//     success = true
+//     result.data.permissions = [{id: 'queryForm', operation: ['add', 'edit']}]
+//     result.data.roles = [{id: 'test', operation: ['add', 'edit', 'delete']}]
+//   } else {
+//     success = false
+//   }
+//
+//   if (success) {
+//     result.code = 0
+//     result.message = Mock.mock('@TIMEFIX').CN + '，欢迎回来'
+//     result.data.user = user
+//     result.data.token = 'Authorization:' + Math.random()
+//     result.data.expireAt = new Date(new Date().getTime() + 30 * 60 * 1000)
+//   } else {
+//     result.code = -1
+//     result.message = '账户名或密码错误（admin/888888 or test/888888）'
+//   }
+//   return result
+// })

package/src/mock/user/routes.js

@@ -1,61 +1,61 @@
-import Mock from 'mockjs'
-
-const router = [{
-  router: 'root',
-  children: [
-    {
-      router: 'dashboard',
-      icon: 'dashboard',
-      name: '仪表盘',
-      children: [
-        {
-          router: 'workplace',
-          name: '工作台'
-        },
-        {
-          router: 'analysis',
-          name: '分析页'
-        }
-      ]
-    },
-    // {
-    //   router: 'webmeter',
-    //   children: ['userFilesManage', 'gasAnalysisManage', 'handAnalysisManage', 'exceptionManage']
-    // },
-    // {
-    //   router: 'iot',
-    //   children: ['iotDeviceType', 'iotDeviceBrand', 'iotDevice', 'iotSetDeviceParams', 'instructManage', 'reportedDataQuery', 'deviceException', 'deviceManage']
-    // },
-    // {
-    //   router: 'dataAnalyze',
-    //   children: ['DataAnalysisView']
-    // },
-    // {
-    //   router: 'system',
-    //   children: ['dictionaryManage', 'queryParamsManage', 'customerManage', 'safeguardSearchLog', 'runtime', 'createQuery']
-    // },
-    {
-      router: 'antdv',
-      path: 'antdv',
-      name: 'Ant Design Vue',
-      icon: 'ant-design',
-      link: 'https://www.antdv.com/docs/vue/introduce-cn/'
-    },
-    {
-      router: 'document',
-      path: 'document',
-      name: '使用文档',
-      icon: 'file-word',
-      link: 'https://iczer.gitee.io/vue-antd-admin-docs/'
-    }
-  ]
-}]
-
-Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/routes`, 'get', () => {
-  const result = {}
-  result.code = 0
-  result.data = router
-  return result
-})
-
-export { router }
+import Mock from 'mockjs'
+
+const router = [{
+  router: 'root',
+  children: [
+    {
+      router: 'dashboard',
+      icon: 'dashboard',
+      name: '仪表盘',
+      children: [
+        {
+          router: 'workplace',
+          name: '工作台'
+        },
+        {
+          router: 'analysis',
+          name: '分析页'
+        }
+      ]
+    },
+    // {
+    //   router: 'webmeter',
+    //   children: ['userFilesManage', 'gasAnalysisManage', 'handAnalysisManage', 'exceptionManage']
+    // },
+    // {
+    //   router: 'iot',
+    //   children: ['iotDeviceType', 'iotDeviceBrand', 'iotDevice', 'iotSetDeviceParams', 'instructManage', 'reportedDataQuery', 'deviceException', 'deviceManage']
+    // },
+    // {
+    //   router: 'dataAnalyze',
+    //   children: ['DataAnalysisView']
+    // },
+    // {
+    //   router: 'system',
+    //   children: ['dictionaryManage', 'queryParamsManage', 'customerManage', 'safeguardSearchLog', 'runtime', 'createQuery']
+    // },
+    {
+      router: 'antdv',
+      path: 'antdv',
+      name: 'Ant Design Vue',
+      icon: 'ant-design',
+      link: 'https://www.antdv.com/docs/vue/introduce-cn/'
+    },
+    {
+      router: 'document',
+      path: 'document',
+      name: '使用文档',
+      icon: 'file-word',
+      link: 'https://iczer.gitee.io/vue-antd-admin-docs/'
+    }
+  ]
+}]
+
+Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/routes`, 'get', () => {
+  const result = {}
+  result.code = 0
+  result.data = router
+  return result
+})
+
+export { router }

package/src/mock/workplace/index.js

@@ -1,15 +1,15 @@
-import Mock from 'mockjs'
-import { activities, templates } from '../common/activityData'
-import { teams } from '@/mock/common'
-
-activities.forEach(item => {
-  item.template = templates[item.activity.type](item.user, item.activity)
-})
-
-Mock.mock('/work/activity', 'get', () => {
-  return activities
-})
-
-Mock.mock('/work/team', 'get', () => {
-  return teams
-})
+import Mock from 'mockjs'
+import { activities, templates } from '../common/activityData'
+import { teams } from '@vue2-client/mock/common'
+
+activities.forEach(item => {
+  item.template = templates[item.activity.type](item.user, item.activity)
+})
+
+Mock.mock('/work/activity', 'get', () => {
+  return activities
+})
+
+Mock.mock('/work/team', 'get', () => {
+  return teams
+})

package/src/pages/exception/403.vue

@@ -3,9 +3,9 @@
 </template>
 
 <script>
-import ExceptionPage from '@/components/exception/ExceptionPage'
+import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
 import { mapState } from 'vuex'
-const { homePage } = require('@/config')
+const { homePage } = require('@vue2-client/config')
 export default {
   name: 'Exp403',
   components: { ExceptionPage },

package/src/pages/exception/404.vue

@@ -3,9 +3,9 @@
 </template>
 
 <script>
-import ExceptionPage from '@/components/exception/ExceptionPage'
+import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
 import { mapState } from 'vuex'
-const { homePage } = require('@/config')
+const { homePage } = require('@vue2-client/config')
 export default {
   name: 'Exp404',
   components: { ExceptionPage },

package/src/pages/exception/500.vue

@@ -3,9 +3,9 @@
 </template>
 
 <script>
-import ExceptionPage from '@/components/exception/ExceptionPage'
+import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
 import { mapState } from 'vuex'
-const { homePage } = require('@/config')
+const { homePage } = require('@vue2-client/config')
 export default {
   name: 'Exp500',
   components: { ExceptionPage },

package/src/pages/login/Login.vue

@@ -53,18 +53,18 @@
 </template>
 
 <script>
-import CommonLayout from '@/layouts/CommonLayout'
-import { getRoutesConfig, login } from '@/services/user'
-import { setAuthorization } from '@/utils/request'
-import { loadRoutes, funcToRouter } from '@/utils/routerUtil'
+import CommonLayout from '@vue2-client/layouts/CommonLayout'
+import { getRoutesConfig, login } from '@vue2-client/services/user'
+import { setAuthorization } from '@vue2-client/utils/request'
+import { loadRoutes, funcToRouter } from '@vue2-client/utils/routerUtil'
 import { mapMutations } from 'vuex'
 import JSEncrypt from 'jsencrypt'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
+import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import Vue from 'vue'
 import Mock from 'mockjs'
-import { positions } from '@/mock/common'
-const { homePage } = require('@/config')
-// import { router } from '@/mock/user/routes'
+import { positions } from '@vue2-client/mock/common'
+const { homePage } = require('@vue2-client/config')
+// import { router } from '@vue2-client/mock/user/routes'
 
 export default {
   name: 'Login',