sale-client 3.4.92 → 3.4.96

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/build/dev-server.js

@@ -1,157 +1,157 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://127.0.0.1:8080/', bendi1 = 'http://119.146.1.106:8300/'
-// 公司测试服务
-var fuwu = 'http://192.168.50.4:8400/'
-//铜川正式
-//  var fuwu = 'http://61.134.55.234:9999/'
-// 铜川测试
-// var fuwu = 'http://61.134.55.234:9999/'
-// var fuwu = 'http://60.222.250.39:8300/'
-// 韶关
-// var fuwu = 'http://119.146.1.106:8300/'
-// 巩义测试服务
-// var fuwu = 'http://192.168.0.227:8400'
-// 燎原测试服务
-// var fuwu = 'http://121.41.19.238:8400  '
-// var fuwu = 'http://121.41.19.238:9001/'
-
-// var fuwu = 'http://139.214.92.34:8301/'
-
-var proxyTable = {
-  // '/rs/logic/saleExport': {
-  //   target: fuwu
-  // },
-  // '/rs/logic/saleGetExportProgress': {
-  //   target: fuwu
-  // },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData': {
-    target: fuwu
-  },
-  '/invoice': {
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getarealist': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getstreetlist': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: fuwu
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    target: fuwu
-    // target:fuwu
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8089, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8089')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var bendi = 'http://127.0.0.1:8080/',bendi1 = 'http://119.146.1.106:8300/'
+// 公司测试服务
+var fuwu = 'http://192.168.50.4:8400/'
+//铜川正式
+//  var fuwu = 'http://61.134.55.234:9999/'
+//铜川测试
+// var fuwu = 'http://61.134.55.234:9999/'
+// var fuwu = 'http://60.222.250.39:8300/'
+//韶关
+// var fuwu = 'http://119.146.1.106:8300/'
+// 巩义测试服务
+// var fuwu = 'http://192.168.0.227:8400'
+// 燎原测试服务
+// var fuwu = 'http://121.41.19.238:8400  '
+// var fuwu = 'http://121.41.19.238:9001/'
+
+// var fuwu = 'http://139.214.92.34:8301/'
+
+var proxyTable = {
+  '/rs/logic/saleExport': {
+    target: fuwu
+  },
+  '/rs/logic/saleGetExportProgress': {
+    target: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData': {
+    target: fuwu
+  },
+  '/invoice':{
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getarealist': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getstreetlist': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: 'http://127.0.0.1:8079'
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs': {
+    // target: 'http://192.168.30.63:8081/'
+    target: 'http://127.0.0.1:8080'
+    // target:fuwu
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8089, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8089')
+})

package/build/webpack.base.conf.js

@@ -35,6 +35,7 @@ module.exports = {
           /src/,
           /build/,
           /examples/,
+          /singlepage/,
           /test/,
           /node_modules\/vue-client\/src/,
           /node_modules\/vue-strap\/src/,

package/build/webpack.singlepage.conf.js

@@ -0,0 +1,67 @@
+var fs = require('fs')
+var path = require('path')
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.base.conf')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+var CompressionWebpackPlugin = require('compression-webpack-plugin')
+
+// add hot-reload related code to entry chunks
+Object.keys(baseConfig.entry).forEach(function (name) {
+  baseConfig.entry[name] = ['./build/dev-client'].concat(baseConfig.entry[name])
+})
+
+// 把singlepage下所有index.html转换成测试例子.html
+fs.readdirSync('./singlepage').forEach((file) => {
+  baseConfig.plugins.push(
+    // https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: file + '.html',
+      template: `singlepage/${file}/index.html`,
+      inject: false
+    })
+  )
+})
+
+// 把singlepage下子目录里的main.js打包成对应组件名的js
+fs.readdirSync('./singlepage').forEach((file) => {
+  baseConfig.entry[file] = `./singlepage/${file}/main.js`
+})
+
+module.exports = merge(baseConfig, {
+  // eval-source-map is faster for development
+  devtool: '#eval-source-map',
+  output: {
+    // necessary for the html plugin to work properly
+    // when serving the html from in-memory
+    publicPath: './',
+    path: path.resolve(__dirname, '../dist/singlepage'),
+    chunkFilename: '[name].[hash].js'
+  },
+  productionGzip: true,
+  productionGzipExtensions: ['js', 'css', 'vue'],
+  plugins: [
+    new CompressionWebpackPlugin({
+      filename: '[path].gz[query]',
+      algorithm: 'gzip',
+      test: new RegExp(
+        '\\.(' +
+        ['js', 'css', 'vue'].join('|') +
+        ')$'
+      ),
+      threshold: 10240,
+      minRatio: 0.8
+    }),
+
+    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
+    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.NoErrorsPlugin(),
+    // https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: 'index.html',
+      template: 'index.html',
+      inject: true
+    })
+  ]
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.4.92",
+  "version": "3.4.96",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -10,7 +10,8 @@
     "unit": "karma start test/unit/karma.conf.js",
     "build": "rimraf dist && mkdirp dist && ncp static dist/mergeUser && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
     "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh"
+    "release": "bash build/release.sh",
+    "page": "rimraf dist && mkdirp dist && ncp static dist/singlepage && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.singlepage.conf.js"
   },
   "repository": {
     "type": "git",
@@ -35,6 +36,7 @@
     "chai": "^3.5.0",
     "co": "^4.6.0",
     "connect-history-api-fallback": "^1.1.0",
+    "compression-webpack-plugin": "1.1.2",
     "cross-env": "^1.0.7",
     "cross-spawn": "^2.1.5",
     "css-loader": "^0.23.0",
@@ -84,9 +86,9 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.1.89-14",
+    "system-clients": "3.1.97",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.47",
+    "vue-client": "1.24.43",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

package/singlepage/FileUserFiles/App.vue

@@ -0,0 +1,9 @@
+<template>
+  <app-base class="bg">
+    <div class='flex'>
+      <article>
+        <route :comp="{name: 'file-user-files'}"></route>
+      </article>
+    </div>
+  </app-base>
+</template>

package/singlepage/FileUserFiles/index.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>档案管理</title>
+  </head>
+  <style>
+    body {
+      padding: 20px!important;
+    }
+  </style>
+  <body id="bodymain" class="themeOne" >
+    <app ></app>
+    <script src="./FileUserFiles.js"></script>
+  </body>
+</html>

package/singlepage/FileUserFiles/main.js

@@ -0,0 +1,20 @@
+import Vue from 'vue'
+import { all } from 'vue-client'
+import App from './App'
+import { system } from 'system-clients'
+import sale from '../../src/sale'
+import { address } from 'address-client'
+import VueClipboard from 'vue-clipboard2'
+Vue.use(VueClipboard)
+Vue.config.silent = true
+
+all()
+system(false)
+sale()
+address()
+require('system-clients/src/styles/less/bootstrap.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})