vue2-client 1.2.0 → 1.2.1

package/src/utils/routerUtil.js

@@ -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 '@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()
-  })
-})
+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()
+  })
+})

package/vue.config.js

@@ -1,153 +1,153 @@
-const path = require('path')
-const webpack = require('webpack')
-const ThemeColorReplacer = require('webpack-theme-color-replacer')
-const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
-const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
-const CompressionWebpackPlugin = require('compression-webpack-plugin')
-
-const productionGzipExtensions = ['js', 'css']
-const isProd = process.env.NODE_ENV === 'production'
-
-const assetsCDN = {
-  // webpack build externals
-  externals: {
-    vue: 'Vue',
-    'vue-router': 'VueRouter',
-    vuex: 'Vuex',
-    axios: 'axios',
-    nprogress: 'NProgress',
-    clipboard: 'ClipboardJS',
-    '@antv/data-set': 'DataSet',
-    'js-cookie': 'Cookies'
-  },
-  css: [
-  ],
-  js: [
-    '//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js',
-    '//cdn.jsdelivr.net/npm/vue-router@3.3.4/dist/vue-router.min.js',
-    '//cdn.jsdelivr.net/npm/vuex@3.4.0/dist/vuex.min.js',
-    '//cdn.jsdelivr.net/npm/axios@0.19.2/dist/axios.min.js',
-    '//cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js',
-    '//cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js',
-    '//cdn.jsdelivr.net/npm/@antv/data-set@0.11.4/build/data-set.min.js',
-    '//cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js'
-  ]
-}
-
-const server = 'http://121.36.106.17:8400'
-// const local = 'http://localhost:8445/webmeter'
-const local = 'http://123.60.214.109:8405/webmeter'
-
-module.exports = {
-  devServer: {
-    // development server port 8000
-    port: 8001,
-    // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
-    proxy: {
-      '/rs': {
-        target: server,
-        ws: false,
-        changeOrigin: true
-      },
-      '/image': {
-        target: server,
-        ws: false,
-        changeOrigin: true
-      },
-      '/webapps': {
-        target: server,
-        ws: false,
-        changeOrigin: true
-      },
-      'iot/webmeterapi': {
-        pathRewrite: { '^/iot/webmeterapi': '/rs/logic' },
-        target: local,
-        changeOrigin: true
-      },
-      '/webmeterapi': {
-        pathRewrite: { '^/webmeterapi': '/rs/logic' },
-        target: local,
-        changeOrigin: true
-      },
-      '/webmeteruploadapi': {
-        pathRewrite: { '^/webmeteruploadapi': '/rs/file' },
-        target: local,
-        changeOrigin: true
-      },
-      '/webmetersql': {
-        pathRewrite: { '^/webmetersql': '/rs/sql' },
-        target: local,
-        changeOrigin: true
-      }
-    }
-  },
-  pluginOptions: {
-    'style-resources-loader': {
-      preProcessor: 'less',
-      patterns: [path.resolve(__dirname, './src/theme/theme.less')]
-    }
-  },
-  configureWebpack: config => {
-    config.entry.app = ['babel-polyfill', 'whatwg-fetch', './src/main.js']
-    config.performance = {
-      hints: false
-    }
-    config.plugins.push(
-      new ThemeColorReplacer({
-        fileName: 'css/theme-colors-[contenthash:8].css',
-        matchColors: getThemeColors(),
-        injectCss: true,
-        resolveCss
-      })
-    )
-    // Ignore all locale files of moment.js
-    config.plugins.push(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))
-    // 生产环境下将资源压缩成gzip格式
-    if (isProd) {
-      // add `CompressionWebpack` plugin to webpack plugins
-      config.plugins.push(new CompressionWebpackPlugin({
-        algorithm: 'gzip',
-        test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
-        threshold: 10240,
-        minRatio: 0.8
-      }))
-    }
-    // if prod, add externals
-    if (isProd) {
-      config.externals = assetsCDN.externals
-    }
-  },
-  chainWebpack: config => {
-    // 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
-    if (isProd) {
-      config.plugin('optimize-css')
-        .tap(args => {
-            args[0].cssnanoOptions.preset[1].colormin = false
-          return args
-        })
-    }
-    // 生产环境下使用CDN
-    if (isProd) {
-      config.plugin('html')
-        .tap(args => {
-          args[0].cdn = assetsCDN
-        return args
-      })
-    }
-    config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
-  },
-  css: {
-    loaderOptions: {
-      less: {
-        lessOptions: {
-          modifyVars: modifyVars(),
-          javascriptEnabled: true
-        }
-      }
-    }
-  },
-  publicPath: process.env.VUE_APP_PUBLIC_PATH,
-  outputDir: 'dist',
-  assetsDir: 'static',
-  productionSourceMap: false
-}
+const path = require('path')
+const webpack = require('webpack')
+const ThemeColorReplacer = require('webpack-theme-color-replacer')
+const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
+const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
+const CompressionWebpackPlugin = require('compression-webpack-plugin')
+
+const productionGzipExtensions = ['js', 'css']
+const isProd = process.env.NODE_ENV === 'production'
+
+const assetsCDN = {
+  // webpack build externals
+  externals: {
+    vue: 'Vue',
+    'vue-router': 'VueRouter',
+    vuex: 'Vuex',
+    axios: 'axios',
+    nprogress: 'NProgress',
+    clipboard: 'ClipboardJS',
+    '@antv/data-set': 'DataSet',
+    'js-cookie': 'Cookies'
+  },
+  css: [
+  ],
+  js: [
+    '//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js',
+    '//cdn.jsdelivr.net/npm/vue-router@3.3.4/dist/vue-router.min.js',
+    '//cdn.jsdelivr.net/npm/vuex@3.4.0/dist/vuex.min.js',
+    '//cdn.jsdelivr.net/npm/axios@0.19.2/dist/axios.min.js',
+    '//cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js',
+    '//cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js',
+    '//cdn.jsdelivr.net/npm/@antv/data-set@0.11.4/build/data-set.min.js',
+    '//cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js'
+  ]
+}
+
+const server = 'http://121.36.106.17:8400'
+// const local = 'http://localhost:8445/webmeter'
+const local = 'http://123.60.214.109:8405/webmeter'
+
+module.exports = {
+  devServer: {
+    // development server port 8000
+    port: 8001,
+    // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
+    proxy: {
+      '/rs': {
+        target: server,
+        ws: false,
+        changeOrigin: true
+      },
+      '/image': {
+        target: server,
+        ws: false,
+        changeOrigin: true
+      },
+      '/webapps': {
+        target: server,
+        ws: false,
+        changeOrigin: true
+      },
+      'iot/webmeterapi': {
+        pathRewrite: { '^/iot/webmeterapi': '/rs/logic' },
+        target: local,
+        changeOrigin: true
+      },
+      '/webmeterapi': {
+        pathRewrite: { '^/webmeterapi': '/rs/logic' },
+        target: local,
+        changeOrigin: true
+      },
+      '/webmeteruploadapi': {
+        pathRewrite: { '^/webmeteruploadapi': '/rs/file' },
+        target: local,
+        changeOrigin: true
+      },
+      '/webmetersql': {
+        pathRewrite: { '^/webmetersql': '/rs/sql' },
+        target: local,
+        changeOrigin: true
+      }
+    }
+  },
+  pluginOptions: {
+    'style-resources-loader': {
+      preProcessor: 'less',
+      patterns: [path.resolve(__dirname, './src/theme/theme.less')]
+    }
+  },
+  configureWebpack: config => {
+    config.entry.app = ['babel-polyfill', 'whatwg-fetch', './src/main.js']
+    config.performance = {
+      hints: false
+    }
+    config.plugins.push(
+      new ThemeColorReplacer({
+        fileName: 'css/theme-colors-[contenthash:8].css',
+        matchColors: getThemeColors(),
+        injectCss: true,
+        resolveCss
+      })
+    )
+    // Ignore all locale files of moment.js
+    config.plugins.push(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))
+    // 生产环境下将资源压缩成gzip格式
+    if (isProd) {
+      // add `CompressionWebpack` plugin to webpack plugins
+      config.plugins.push(new CompressionWebpackPlugin({
+        algorithm: 'gzip',
+        test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
+        threshold: 10240,
+        minRatio: 0.8
+      }))
+    }
+    // if prod, add externals
+    if (isProd) {
+      config.externals = assetsCDN.externals
+    }
+  },
+  chainWebpack: config => {
+    // 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
+    if (isProd) {
+      config.plugin('optimize-css')
+        .tap(args => {
+            args[0].cssnanoOptions.preset[1].colormin = false
+          return args
+        })
+    }
+    // 生产环境下使用CDN
+    if (isProd) {
+      config.plugin('html')
+        .tap(args => {
+          args[0].cdn = assetsCDN
+        return args
+      })
+    }
+    config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
+  },
+  css: {
+    loaderOptions: {
+      less: {
+        lessOptions: {
+          modifyVars: modifyVars(),
+          javascriptEnabled: true
+        }
+      }
+    }
+  },
+  publicPath: process.env.VUE_APP_PUBLIC_PATH,
+  outputDir: 'dist',
+  assetsDir: 'static',
+  productionSourceMap: false
+}

package/webpack.config.js

@@ -1,12 +1,12 @@
-'use strict'
-const path = require('path')
-
-module.exports = {
-  context: path.resolve(__dirname, './'),
-  resolve: {
-    extensions: ['.js', '.vue', '.json'],
-    alias: {
-      '@vue2-client': path.resolve('src')
-    }
-  }
-}
+'use strict'
+const path = require('path')
+
+module.exports = {
+  context: path.resolve(__dirname, './'),
+  resolve: {
+    extensions: ['.js', '.vue', '.json'],
+    alias: {
+      '@vue2-client': path.resolve('src')
+    }
+  }
+}