2.2版本发布，详情查阅版本说明

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eladmin",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "license": "Apache-2.0",
   "description": "eladmin 前端代码",
   "author": "jie <elunez@qq.com>",
@@ -23,7 +23,7 @@
     "codemirror": "^5.38.0",
     "connect": "3.6.6",
     "echarts": "4.1.0",
-    "element-ui": "^2.11.1",
+    "element-ui": "^2.12.0",
     "file-saver": "1.3.8",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",

src/main.js

@@ -15,17 +15,17 @@ import store from './store'
 
 import '@/icons' // icon
 import './router/index' // permission control
-import Router from 'vue-router'
+// import Router from 'vue-router'
 
 Vue.use(mavonEditor)
 Vue.use(permission)
 Vue.use(ElementUI, { locale })
 Vue.config.productionTip = false
 
-const routerPush = Router.prototype.push
-Router.prototype.push = function push(location) {
-  return routerPush.call(this, location).catch(error => error)
-}
+// const routerPush = Router.prototype.push
+// Router.prototype.push = function push(location) {
+//   return routerPush.call(this, location).catch(error => error)
+// }
 require('babel-polyfill')
 
 new Vue({

src/views/system/dept/index.vue

@@ -23,7 +23,7 @@
           size="mini"
           type="warning"
           icon="el-icon-more"
-          @click="changeExpand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
+          @click="changeExpand">{{ expand ? '折叠' : '展开' }}</el-button>
         <eForm ref="form" :is-add="true" :dicts="dicts"/>
       </div>
     </div>

src/views/system/menu/index.vue

@@ -20,7 +20,7 @@
           size="mini"
           type="warning"
           icon="el-icon-more"
-          @click="changExpand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
+          @click="changExpand">{{ expand ? '折叠' : '展开' }}</el-button>
         <eForm ref="form" :is-add="true"/>
       </div>
     </div>

src/views/system/permission/index.vue

@@ -20,7 +20,7 @@
           size="mini"
           type="warning"
           icon="el-icon-more"
-          @click="changeExpand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
+          @click="changeExpand">{{ expand ? '折叠' : '展开' }}</el-button>
         <eForm ref="form" :is-add="true"/>
       </div>
     </div>