vue2-client 1.0.0 → 1.2.1

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,8 +1,8 @@
 import Vue from 'vue'
 import VueI18n from 'vue-i18n'
-import routesI18n from '@/router/i18n'
+import routesI18n from '@vue2-client/router/i18n'
 import './Objects'
-import { getI18nKey } from '@/utils/routerUtil'
+import { getI18nKey } from '@vue2-client/utils/routerUtil'
 
 /**
  * 创建 i18n 配置

package/src/utils/indexedDB.js

@@ -1,146 +1,146 @@
-// indexDB 存储
-import { post } from '@/services/api/restTools'
-
-export const indexedDB = {
-  db: undefined,
-  indexedDB: window.indexedDB || window.webkitindexedDB,
-  IDBKeyRange: window.IDBKeyRange || window.webkitIDBKeyRange, // 键范围
-  openDB: function (callback) {
-    // 建立或打开数据库，建立对象存储空间(ObjectStore)
-    const self = this
-    if (self.db) {
-      callback(self.db)
-    } else {
-      const version = 1
-      const request = self.indexedDB.open('view', version)
-
-      request.onerror = function (e) {
-        console.error('打开数据库失败:' + e.currentTarget.error.message)
-      }
-      request.onsuccess = function (e) {
-        self.db = e.target.result
-        callback(self.db)
-      }
-      request.onupgradeneeded = function (e) {
-        const db = e.target.result
-        if (!db.objectStoreNames.contains('metaCache')) {
-          // 没有该对象空间时创建该对象空间
-          db.createObjectStore('metaCache', {
-            keyPath: 'key'
-          })
-        }
-      }
-    }
-  },
-  deleteDB: function (dbname) {
-    // 删除数据库
-    const self = this
-    self.indexedDB.deleteDatabase(dbname)
-    console.log(dbname + '数据库已删除')
-  },
-  closeDB: function () {
-    const self = this
-    if (!self.db) {
-      self.db.close()
-    }
-    console.log('数据库已关闭')
-  },
-  add: function (key, data) {
-    const self = this
-    self.openDB((res) => {
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').add({
-        key: key,
-        data: data
-      })
-      request.onerror = function () {
-        self.update(data)
-      }
-      request.onsuccess = function () {
-        console.log('数据已存入到数据库')
-      }
-    })
-  },
-  update: function (key, data) {
-    const self = this
-    self.openDB((res) => {
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').put({
-        key: key,
-        data: data
-      })
-      request.onerror = function () {
-        console.error('数据更新失败')
-      }
-      request.onsuccess = function () {
-        console.log('数据已更新到数据库')
-      }
-    })
-  },
-  get: function (key, callback) {
-    const self = this
-    self.openDB((res) => {
-      // 根据存储空间的键找到对应数据
-      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
-      const request = store.get(key)
-      request.onerror = function () {
-        console.log('读取数据失败，键：' + key)
-      }
-      request.onsuccess = function (e) {
-        const result = e.target.result
-        if (typeof (callback) === 'function') {
-          callback(result.data)
-        }
-      }
-    })
-  },
-  getByWeb: function (key, url, params, callback) {
-    const self = this
-    self.openDB((res) => {
-      // 根据存储空间的键找到对应数据
-      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
-      const request = store.get(key)
-      request.onerror = function () {
-        console.log('读取数据失败，键：' + key)
-      }
-      request.onsuccess = function (e) {
-        const result = e.target.result
-        if (!result && url) {
-          post(url, params).then((res) => {
-            self.add(key, res)
-            callback(res)
-          })
-        } else {
-          callback(result.data)
-        }
-      }
-    })
-  },
-  delete: function (key) {
-    const self = this
-    self.openDB((res) => {
-      // 删除某一条记录
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').delete(key)
-
-      request.onerror = function () {
-        console.error('数据删除失败')
-      }
-      request.onsuccess = function (event) {
-        console.log('已删除存储空间' + 'metaCache' + '中' + key + '记录')
-      }
-    })
-  },
-  clear: function (callback) {
-    const self = this
-    self.openDB((res) => {
-      // 删除存储空间全部记录
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').clear()
-
-      request.onerror = function () {
-        console.error('数据删除失败')
-      }
-      request.onsuccess = function (event) {
-        console.log('已删除存储空间' + 'metaCache' + '中所有记录')
-        callback()
-      }
-    })
-  }
-}
+// indexDB 存储
+import { post } from '@vue2-client/services/api/restTools'
+
+export const indexedDB = {
+  db: undefined,
+  indexedDB: window.indexedDB || window.webkitindexedDB,
+  IDBKeyRange: window.IDBKeyRange || window.webkitIDBKeyRange, // 键范围
+  openDB: function (callback) {
+    // 建立或打开数据库，建立对象存储空间(ObjectStore)
+    const self = this
+    if (self.db) {
+      callback(self.db)
+    } else {
+      const version = 1
+      const request = self.indexedDB.open('view', version)
+
+      request.onerror = function (e) {
+        console.error('打开数据库失败:' + e.currentTarget.error.message)
+      }
+      request.onsuccess = function (e) {
+        self.db = e.target.result
+        callback(self.db)
+      }
+      request.onupgradeneeded = function (e) {
+        const db = e.target.result
+        if (!db.objectStoreNames.contains('metaCache')) {
+          // 没有该对象空间时创建该对象空间
+          db.createObjectStore('metaCache', {
+            keyPath: 'key'
+          })
+        }
+      }
+    }
+  },
+  deleteDB: function (dbname) {
+    // 删除数据库
+    const self = this
+    self.indexedDB.deleteDatabase(dbname)
+    console.log(dbname + '数据库已删除')
+  },
+  closeDB: function () {
+    const self = this
+    if (!self.db) {
+      self.db.close()
+    }
+    console.log('数据库已关闭')
+  },
+  add: function (key, data) {
+    const self = this
+    self.openDB((res) => {
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').add({
+        key: key,
+        data: data
+      })
+      request.onerror = function () {
+        self.update(data)
+      }
+      request.onsuccess = function () {
+        console.log('数据已存入到数据库')
+      }
+    })
+  },
+  update: function (key, data) {
+    const self = this
+    self.openDB((res) => {
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').put({
+        key: key,
+        data: data
+      })
+      request.onerror = function () {
+        console.error('数据更新失败')
+      }
+      request.onsuccess = function () {
+        console.log('数据已更新到数据库')
+      }
+    })
+  },
+  get: function (key, callback) {
+    const self = this
+    self.openDB((res) => {
+      // 根据存储空间的键找到对应数据
+      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
+      const request = store.get(key)
+      request.onerror = function () {
+        console.log('读取数据失败，键：' + key)
+      }
+      request.onsuccess = function (e) {
+        const result = e.target.result
+        if (typeof (callback) === 'function') {
+          callback(result.data)
+        }
+      }
+    })
+  },
+  getByWeb: function (key, url, params, callback) {
+    const self = this
+    self.openDB((res) => {
+      // 根据存储空间的键找到对应数据
+      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
+      const request = store.get(key)
+      request.onerror = function () {
+        console.log('读取数据失败，键：' + key)
+      }
+      request.onsuccess = function (e) {
+        const result = e.target.result
+        if (!result && url) {
+          post(url, params).then((res) => {
+            self.add(key, res)
+            callback(res)
+          })
+        } else {
+          callback(result.data)
+        }
+      }
+    })
+  },
+  delete: function (key) {
+    const self = this
+    self.openDB((res) => {
+      // 删除某一条记录
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').delete(key)
+
+      request.onerror = function () {
+        console.error('数据删除失败')
+      }
+      request.onsuccess = function (event) {
+        console.log('已删除存储空间' + 'metaCache' + '中' + key + '记录')
+      }
+    })
+  },
+  clear: function (callback) {
+    const self = this
+    self.openDB((res) => {
+      // 删除存储空间全部记录
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').clear()
+
+      request.onerror = function () {
+        console.error('数据删除失败')
+      }
+      request.onsuccess = function (event) {
+        console.log('已删除存储空间' + 'metaCache' + '中所有记录')
+        callback()
+      }
+    })
+  }
+}

package/src/utils/request.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import Cookie from 'js-cookie'
-import store from '@/store'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import notification from 'ant-design-vue/es/notification'
 
 // 跨域认证信息 header 名
@@ -142,7 +142,7 @@ const errorHandler = (error) => {
         description: data
       })
       if (token) {
-        store.dispatch('Logout').then(() => {
+        Vue.$store.dispatch('Logout').then(() => {
           setTimeout(() => {
             window.location.reload()
           }, 1500)

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 = {
@@ -22,6 +22,19 @@ function setAppOptions (options) {
   appOptions.i18n = i18n
 }
 
+// 应用路由资源
+const appRouterMap = {
+  routerMap: routerMap
+}
+
+/**
+ * 设置应用路由资源
+ * @param options
+ */
+function setAppRouterMap (router) {
+  appRouterMap.routerMap = Object.assign(appRouterMap.routerMap, router)
+}
+
 /**
  * 根据 路由配置 和 路由组件注册 解析路由
  * @param routesConfig 路由配置
@@ -132,7 +145,7 @@ function loadRoutes (routesConfig) {
   const asyncRoutes = store.state.setting.asyncRoutes
   if (asyncRoutes) {
     if (routesConfig && routesConfig.length > 0) {
-      const routes = parseRoutes(routesConfig, routerMap)
+      const routes = parseRoutes(routesConfig, appRouterMap.routerMap)
       const finalRoutes = mergeRoutes(basicOptions.routes, routes)
       formatRoutes(finalRoutes)
       router.options = { ...router.options, routes: finalRoutes }
@@ -350,4 +363,4 @@ function arrRemoveEmpty (arr) {
   return arr
 }
 
-export { parseRoutes, loadRoutes, formatAuthority, getI18nKey, loadGuards, deepMergeRoutes, formatRoutes, setAppOptions, funcToRouter }
+export { parseRoutes, loadRoutes, formatAuthority, getI18nKey, loadGuards, deepMergeRoutes, formatRoutes, setAppOptions, funcToRouter, setAppRouterMap }

package/tests/unit/ReportTable.spec.js

@@ -1,15 +1,15 @@
-import { mount } from '@vue/test-utils'
-import ReportTable from '@/pages/report/ReportTable'
-import { reportData } from '@/mock/common/reportData'
-
-// 报表组件测试域
-describe('ReportTable', () => {
-  it('render', () => {
-    const wrapper = mount(ReportTable, {
-      propsData: {
-        tableData: reportData
-      }
-    })
-    expect(wrapper.find('#ReportTableHome')).not.toBeNull()
-  })
-})
+import { mount } from '@vue/test-utils'
+import ReportTable from '@vue2-client/pages/report/ReportTable'
+import { reportData } from '@vue2-client/mock/common/reportData'
+
+// 报表组件测试域
+describe('ReportTable', () => {
+  it('render', () => {
+    const wrapper = mount(ReportTable, {
+      propsData: {
+        tableData: reportData
+      }
+    })
+    expect(wrapper.find('#ReportTableHome')).not.toBeNull()
+  })
+})