zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update version

This commit is contained in:
Pan 2019-03-08 17:57:14 +08:00
parent 44e4d3d005
commit 8e0b5624a9
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/index.js
View File

@ -8,14 +8,14 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
run(`vue-cli-service build ${args}`) run(`vue-cli-service build ${args}`)
const port = 9526 const port = 9526
const basePath = config.baseUrl const publicPath = config.publicPath
var connect = require('connect') var connect = require('connect')
var serveStatic = require('serve-static') var serveStatic = require('serve-static')
const app = connect() const app = connect()
app.use( app.use(
basePath, publicPath,
serveStatic('./dist', { serveStatic('./dist', {
index: ['index.html', '/'] index: ['index.html', '/']
}) })
@ -23,7 +23,7 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
app.listen(port, function() { app.listen(port, function() {
console.log( console.log(
chalk.green(`> Listening at http://localhost:${port}${basePath}`) chalk.green(`> Listening at http://localhost:${port}${publicPath}`)
) )
}) })
} else { } else {

15
package.json
View File

@ -68,21 +68,24 @@
"devDependencies": { "devDependencies": {
"@babel/core": "7.0.0", "@babel/core": "7.0.0",
"@babel/register": "7.0.0", "@babel/register": "7.0.0",
"@vue/cli-plugin-babel": "3.2.0", "@vue/cli-plugin-babel": "3.5.0",
"@vue/cli-plugin-eslint": "3.2.1", "@vue/cli-plugin-eslint": "3.5.0",
"@vue/cli-plugin-unit-jest": "3.2.0", "@vue/cli-plugin-unit-jest": "3.5.0",
"@vue/cli-service": "3.2.0", "@vue/cli-service": "3.5.0",
"@vue/test-utils": "1.0.0-beta.25", "@vue/test-utils": "1.0.0-beta.29",
"babel-core": "7.0.0-bridge.0", "babel-core": "7.0.0-bridge.0",
"babel-eslint": "10.0.1",
"babel-jest": "23.6.0", "babel-jest": "23.6.0",
"chalk": "^2.4.1", "chalk": "^2.4.1",
"connect": "^3.6.6", "connect": "^3.6.6",
"eslint": "5.15.1",
"eslint-plugin-vue": "5.2.2",
"husky": "0.14.3", "husky": "0.14.3",
"lint-staged": "7.2.2", "lint-staged": "7.2.2",
"mockjs": "1.0.1-beta3", "mockjs": "1.0.1-beta3",
"node-sass": "^4.9.0", "node-sass": "^4.9.0",
"runjs": "^4.3.2", "runjs": "^4.3.2",
"sass-loader": "7.0.3", "sass-loader": "^7.1.0",
"script-ext-html-webpack-plugin": "2.1.3", "script-ext-html-webpack-plugin": "2.1.3",
"script-loader": "0.7.2", "script-loader": "0.7.2",
"serve-static": "^1.13.2", "serve-static": "^1.13.2",

6
src/components/TreeTable/index.vue
View File

@ -80,11 +80,6 @@ export default {
if (this.data.length === 0) { if (this.data.length === 0) {
return [] return []
} }
<<<<<<< HEAD
const func = this.evalFunc || treeToArray
const args = this.evalArgs ? [].concat([tmp, this.expandAll], this.evalArgs) : [tmp, this.expandAll]
return func.apply(null, args)
=======
addAttrs(data, { addAttrs(data, {
expand: this.defaultExpandAll, expand: this.defaultExpandAll,
children: this.defaultChildren children: this.defaultChildren
@ -92,7 +87,6 @@ export default {
const retval = treeToArray(data, this.defaultChildren) const retval = treeToArray(data, this.defaultChildren)
return retval return retval
>>>>>>> dc6030b... perf[Tree-Table]: refactor tree-table (#1587)
} }
}, },
methods: { methods: {

4
vue.config.js
View File

@ -15,9 +15,9 @@ module.exports = {
* for example GitHub pages. If you plan to deploy your site to https://foo.github.io/bar/, * for example GitHub pages. If you plan to deploy your site to https://foo.github.io/bar/,
* then assetsPublicPath should be set to "/bar/". * then assetsPublicPath should be set to "/bar/".
* In most cases please use '/' !!! * In most cases please use '/' !!!
* Detail https://cli.vuejs.org/config/#baseurl * Detail https://cli.vuejs.org/config/#publicPath
*/ */
baseUrl: '/', publicPath: '/',
outputDir: 'dist', outputDir: 'dist',
assetsDir: 'static', assetsDir: 'static',
lintOnSave: process.env.NODE_ENV !== 'production', lintOnSave: process.env.NODE_ENV !== 'production',