vue2-client 1.3.0 → 1.3.3

package/src/utils/theme-color-replacer-extend.js

@@ -1,92 +1,91 @@
-const { cssResolve } = require('../config/replacer')
-// 修正 webpack-theme-color-replacer 插件提取的 css 结果
-function resolveCss (output, srcArr) {
-  const regExps = []
-  // 提取 resolve 配置中所有的正则配置
-  Object.keys(cssResolve).forEach(key => {
-    let isRegExp = false
-    let reg = {}
-    try {
-      reg = eval(key)
-      isRegExp = reg instanceof RegExp
-    } catch (e) {
-      isRegExp = false
-    }
-    if (isRegExp) {
-      regExps.push([reg, cssResolve[key]])
-    }
-  })
-
-  // 去重
-  srcArr = dropDuplicate(srcArr)
-
-  // 处理 css
-  const outArr = []
-  srcArr.forEach(text => {
-    // 转换为 css 对象
-    const cssObj = parseCssObj(text)
-    // 根据selector匹配配置，匹配成功，则按配置处理 css
-    if (cssResolve[cssObj.selector] != undefined) {
-      const cfg = cssResolve[cssObj.selector]
-      if (cfg) {
-        outArr.push(cfg.resolve(text, cssObj))
-      }
-    } else {
-      let cssText = ''
-      // 匹配不成功，则测试是否有匹配的正则配置，有则按正则对应的配置处理
-      for (const regExp of regExps) {
-        if (regExp[0].test(cssObj.selector)) {
-          const cssCfg = regExp[1]
-          cssText = cssCfg ? cssCfg.resolve(text, cssObj) : ''
-          break
-        }
-        // 未匹配到正则，则设置 cssText 为默认的 css（即不处理）
-        cssText = text
-      }
-      if (cssText != '') {
-        outArr.push(cssText)
-      }
-    }
-  })
-  output = outArr.join('\n')
-  return output
-}
-
-// 数组去重
-function dropDuplicate (arr) {
-  const map = {}
-  const r = []
-  for (const s of arr) {
-    if (!map[s]) {
-      r.push(s)
-      map[s] = 1
-    }
-  }
-  return r
-}
-
-/**
- * 从字符串解析 css 对象
- * @param cssText
- * @returns {{
- *   name: String,
- *   rules: Array[String],
- *   toText: function
- * }}
- */
-function parseCssObj (cssText) {
-  const css = {}
-  const ruleIndex = cssText.indexOf('{')
-  css.selector = cssText.substring(0, ruleIndex)
-  const ruleBody = cssText.substring(ruleIndex + 1, cssText.length - 1)
-  const rules = ruleBody.split(';')
-  css.rules = rules
-  css.toText = function () {
-    let body = ''
-    this.rules.forEach(item => { body += item + ';' })
-    return `${this.selector}{${body}}`
-  }
-  return css
-}
-
-module.exports = { resolveCss }
+const { cssResolve } = require('../config/replacer')
+// 修正 webpack-theme-color-replacer 插件提取的 css 结果
+function resolveCss (output, srcArr) {
+  const regExps = []
+  // 提取 resolve 配置中所有的正则配置
+  Object.keys(cssResolve).forEach(key => {
+    let isRegExp = false
+    let reg = {}
+    try {
+      reg = eval(key)
+      isRegExp = reg instanceof RegExp
+    } catch (e) {
+      isRegExp = false
+    }
+    if (isRegExp) {
+      regExps.push([reg, cssResolve[key]])
+    }
+  })
+
+  // 去重
+  srcArr = dropDuplicate(srcArr)
+
+  // 处理 css
+  const outArr = []
+  srcArr.forEach(text => {
+    // 转换为 css 对象
+    const cssObj = parseCssObj(text)
+    // 根据selector匹配配置，匹配成功，则按配置处理 css
+    if (cssResolve[cssObj.selector] != undefined) {
+      const cfg = cssResolve[cssObj.selector]
+      if (cfg) {
+        outArr.push(cfg.resolve(text, cssObj))
+      }
+    } else {
+      let cssText = ''
+      // 匹配不成功，则测试是否有匹配的正则配置，有则按正则对应的配置处理
+      for (const regExp of regExps) {
+        if (regExp[0].test(cssObj.selector)) {
+          const cssCfg = regExp[1]
+          cssText = cssCfg ? cssCfg.resolve(text, cssObj) : ''
+          break
+        }
+        // 未匹配到正则，则设置 cssText 为默认的 css（即不处理）
+        cssText = text
+      }
+      if (cssText != '') {
+        outArr.push(cssText)
+      }
+    }
+  })
+  output = outArr.join('\n')
+  return output
+}
+
+// 数组去重
+function dropDuplicate (arr) {
+  const map = {}
+  const r = []
+  for (const s of arr) {
+    if (!map[s]) {
+      r.push(s)
+      map[s] = 1
+    }
+  }
+  return r
+}
+
+/**
+ * 从字符串解析 css 对象
+ * @param cssText
+ * @returns {{
+ *   name: String,
+ *   rules: Array[String],
+ *   toText: function
+ * }}
+ */
+function parseCssObj (cssText) {
+  const css = {}
+  const ruleIndex = cssText.indexOf('{')
+  css.selector = cssText.substring(0, ruleIndex)
+  const ruleBody = cssText.substring(ruleIndex + 1, cssText.length - 1)
+  css.rules = ruleBody.split(';')
+  css.toText = function () {
+    let body = ''
+    this.rules.forEach(item => { body += item + ';' })
+    return `${this.selector}{${body}}`
+  }
+  return css
+}
+
+module.exports = { resolveCss }

package/vue.config.js

@@ -1,163 +1,109 @@
-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
-      },
-      '/webmeterapi/foreignaidUseGasSumCountData': {
-        // pathRewrite: { '^/webmeterapi': '/rs/logic' },
-        target: 'http://61.134.55.234:8405/',
-        changeOrigin: true
-      },
-      '/webmeterapi/getEmpTree': {
-        // pathRewrite: { '^/webmeterapi': '/rs/logic' },
-        target: 'http://123.60.214.109:8406/',
-        changeOrigin: true
-      },
-      '/webmeterapi': {
-        pathRewrite: { '^/webmeterapi': '/rs/logic' },
-        target: local,
-        changeOrigin: true
-      },
-      '/webmeteruploadapi': {
-        pathRewrite: { '^/webmeteruploadapi': '/rs/file' },
-        target: local,
-        changeOrigin: true
-      },
-      '/webmeterresourceapi': {
-        pathRewrite: { '^/webmeterresourceapi': '/rs/resource' },
-        target: local,
-        changeOrigin: true
-      },
-      '/resource': {
-        pathRewrite: { '^/resource': '/' },
-        target: 'http://127.0.0.1:4789',
-        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 server = 'http://121.36.106.17:8400'
+// const local = 'http://localhost:8445/webmeter'
+const local = 'http://123.60.214.109:8406'
+
+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
+      },
+      '/af-system/entity': {
+        pathRewrite: { '^/af-system/entity': '/rs/entity' },
+        target: local,
+        changeOrigin: true
+      },
+      '/af-system/upload': {
+        pathRewrite: { '^/af-system/upload': '/rs/file/upload' },
+        target: local,
+        changeOrigin: true
+      },
+      '/af-system/resource': {
+        pathRewrite: { '^/af-system/resource': '/rs/resource' },
+        target: local,
+        changeOrigin: true
+      },
+      '/af-system': {
+        pathRewrite: { '^/af-system': '/rs/logic' },
+        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
+        })
+    }
+    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/src/base-client/all.js

@@ -1,62 +0,0 @@
-import Vue from 'vue'
-
-import CustomColumnsDrawer from '@vue2-client/base-client/components/common/CustomColumnsDrawer'
-import InstructDetailsView from '@vue2-client/base-client/components/iot/InstructDetailsView'
-import MeterDetailsView from '@vue2-client/base-client/components/iot/MeterDetailsView'
-import CustomerDetailsView from '@vue2-client/base-client/components/iot/CustomerDetailsView'
-import LogDetailsView from '@vue2-client/base-client/components/iot/LogDetailsView'
-import WebmeterAnalysisView from '@vue2-client/base-client/components/iot/WebmeterAnalysisView'
-import XCard from '@vue2-client/base-client/components/common/XCard/XCard'
-import XFormCol from '@vue2-client/base-client/components/common/XFormCol'
-import XBadge from '@vue2-client/base-client/components/common/XBadge'
-import DataAnalysisUser from '@vue2-client/base-client/components/iot/DataAnalysisUser'
-import AmapPointRendering from '@vue2-client/base-client/components/common/AmapMarker'
-import DeviceTypeDetailsView from '@vue2-client/base-client/components/iot/DeviceTypeDetailsView'
-import DeviceBrandDetailsView from '@vue2-client/base-client/components/iot/DeviceBrandDetailsView'
-import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
-import QueryParamsDetailsView from '@vue2-client/base-client/components/system/QueryParamsDetailsView'
-import DeviceDetailsView from '@vue2-client/base-client/components/iot/DeviceDetailsView'
-import TicketDetailsView from '@vue2-client/base-client/components/ticket/TicketDetailsView'
-import EmployeeDetailsView from '@vue2-client/base-client/components/ticket/EmployeeDetailsView'
-import submitTicketSuccess from '@vue2-client/base-client/components/ticket/TicketSubmitSuccessView'
-import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
-import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
-import FormGroupQuery from '@vue2-client/base-client/components/common/FormGroupQuery'
-import FormGroupEdit from '@vue2-client/base-client/components/common/FormGroupEdit'
-import JSONToTree from '@vue2-client/base-client/components/common/JSONToTree'
-import Upload from '@vue2-client/base-client/components/common/Upload'
-import AddressSearchCombobox from '@vue2-client/base-client/components/common/AddressSearchCombobox'
-import CitySelect from '@vue2-client/base-client/components/common/CitySelect'
-import PersonSetting from '@vue2-client/base-client/components/common/PersonSetting'
-// 插件
-import Plugins from '@vue2-client/base-client/plugins'
-Vue.use(Plugins)
-
-Vue.component('custom-columns-drawer', CustomColumnsDrawer)
-Vue.component('InstructDetailsView', InstructDetailsView)
-Vue.component('MeterDetailsView', MeterDetailsView)
-Vue.component('CustomerDetailsView', CustomerDetailsView)
-Vue.component('LogDetailsView', LogDetailsView)
-Vue.component('WebmeterAnalysisView', WebmeterAnalysisView)
-Vue.component('XCard', XCard)
-Vue.component('XBadge', XBadge)
-Vue.component('XFormCol', XFormCol)
-Vue.component('DataAnalysisUser', DataAnalysisUser)
-Vue.component('DeviceTypeDetailsView', DeviceTypeDetailsView)
-Vue.component('DeviceBrandDetailsView', DeviceBrandDetailsView)
-Vue.component('DeviceDetailsView', DeviceDetailsView)
-Vue.component('DictionaryDetailsView', DictionaryDetailsView)
-Vue.component('QueryParamsDetailsView', QueryParamsDetailsView)
-Vue.component('TicketDetailsView', TicketDetailsView)
-Vue.component('EmployeeDetailsView', EmployeeDetailsView)
-Vue.component('submitTicketSuccess', submitTicketSuccess)
-Vue.component('CreateQuery', CreateQuery)
-Vue.component('CreateSimpleFormQuery', CreateSimpleFormQuery)
-Vue.component('FormGroupQuery', FormGroupQuery)
-Vue.component('FormGroupEdit', FormGroupEdit)
-Vue.component('JSONToTree', JSONToTree)
-Vue.component('Upload', Upload)
-Vue.component('AmapPointRendering', AmapPointRendering)
-Vue.component('AddressSearchCombobox', AddressSearchCombobox)
-Vue.component('CitySelect', CitySelect)
-Vue.component('PersonSetting', PersonSetting)