From 8e0b5624a958c99e4035d0d795763a7c235f98c1 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Fri, 8 Mar 2019 17:57:14 +0800
Subject: [PATCH] update version

---
 build/index.js                     |  6 +++---
 package.json                       | 15 +++++++++------
 src/components/TreeTable/index.vue |  6 ------
 vue.config.js                      |  4 ++--
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/build/index.js b/build/index.js
index a750ae0b..fd9b9ff5 100644
--- a/build/index.js
+++ b/build/index.js
@@ -8,14 +8,14 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
   run(`vue-cli-service build ${args}`)
 
   const port = 9526
-  const basePath = config.baseUrl
+  const publicPath = config.publicPath
 
   var connect = require('connect')
   var serveStatic = require('serve-static')
   const app = connect()
 
   app.use(
-    basePath,
+    publicPath,
     serveStatic('./dist', {
       index: ['index.html', '/']
     })
@@ -23,7 +23,7 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
 
   app.listen(port, function() {
     console.log(
-      chalk.green(`> Listening at  http://localhost:${port}${basePath}`)
+      chalk.green(`> Listening at  http://localhost:${port}${publicPath}`)
     )
   })
 } else {
diff --git a/package.json b/package.json
index 3f0c4bdc..a5f917eb 100644
--- a/package.json
+++ b/package.json
@@ -68,21 +68,24 @@
   "devDependencies": {
     "@babel/core": "7.0.0",
     "@babel/register": "7.0.0",
-    "@vue/cli-plugin-babel": "3.2.0",
-    "@vue/cli-plugin-eslint": "3.2.1",
-    "@vue/cli-plugin-unit-jest": "3.2.0",
-    "@vue/cli-service": "3.2.0",
-    "@vue/test-utils": "1.0.0-beta.25",
+    "@vue/cli-plugin-babel": "3.5.0",
+    "@vue/cli-plugin-eslint": "3.5.0",
+    "@vue/cli-plugin-unit-jest": "3.5.0",
+    "@vue/cli-service": "3.5.0",
+    "@vue/test-utils": "1.0.0-beta.29",
     "babel-core": "7.0.0-bridge.0",
+    "babel-eslint": "10.0.1",
     "babel-jest": "23.6.0",
     "chalk": "^2.4.1",
     "connect": "^3.6.6",
+    "eslint": "5.15.1",
+    "eslint-plugin-vue": "5.2.2",
     "husky": "0.14.3",
     "lint-staged": "7.2.2",
     "mockjs": "1.0.1-beta3",
     "node-sass": "^4.9.0",
     "runjs": "^4.3.2",
-    "sass-loader": "7.0.3",
+    "sass-loader": "^7.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",
     "script-loader": "0.7.2",
     "serve-static": "^1.13.2",
diff --git a/src/components/TreeTable/index.vue b/src/components/TreeTable/index.vue
index 23ec0658..cbe1eb60 100644
--- a/src/components/TreeTable/index.vue
+++ b/src/components/TreeTable/index.vue
@@ -80,11 +80,6 @@ export default {
       if (this.data.length === 0) {
         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, {
         expand: this.defaultExpandAll,
         children: this.defaultChildren
@@ -92,7 +87,6 @@ export default {
 
       const retval = treeToArray(data, this.defaultChildren)
       return retval
->>>>>>> dc6030b... perf[Tree-Table]: refactor tree-table (#1587)
     }
   },
   methods: {
diff --git a/vue.config.js b/vue.config.js
index 3cf98e60..83bf78ac 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -15,9 +15,9 @@ module.exports = {
    * for example GitHub pages. If you plan to deploy your site to https://foo.github.io/bar/,
    * then assetsPublicPath should be set to "/bar/".
    * In most cases please use '/' !!!
-   * Detail https://cli.vuejs.org/config/#baseurl
+   * Detail https://cli.vuejs.org/config/#publicPath
    */
-  baseUrl: '/',
+  publicPath: '/',
   outputDir: 'dist',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV !== 'production',