Commit 61006f2e by dqjdda

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

parent e5d334d6
{ {
"name": "eladmin", "name": "eladmin",
"version": "2.1.0", "version": "2.2.0",
"license": "Apache-2.0", "license": "Apache-2.0",
"description": "eladmin 前端代码", "description": "eladmin 前端代码",
"author": "jie <elunez@qq.com>", "author": "jie <elunez@qq.com>",
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
"codemirror": "^5.38.0", "codemirror": "^5.38.0",
"connect": "3.6.6", "connect": "3.6.6",
"echarts": "4.1.0", "echarts": "4.1.0",
"element-ui": "^2.11.1", "element-ui": "^2.12.0",
"file-saver": "1.3.8", "file-saver": "1.3.8",
"js-cookie": "2.2.0", "js-cookie": "2.2.0",
"jsencrypt": "^3.0.0-rc.1", "jsencrypt": "^3.0.0-rc.1",
......
...@@ -15,17 +15,17 @@ import store from './store' ...@@ -15,17 +15,17 @@ import store from './store'
import '@/icons' // icon import '@/icons' // icon
import './router/index' // permission control import './router/index' // permission control
import Router from 'vue-router' // import Router from 'vue-router'
Vue.use(mavonEditor) Vue.use(mavonEditor)
Vue.use(permission) Vue.use(permission)
Vue.use(ElementUI, { locale }) Vue.use(ElementUI, { locale })
Vue.config.productionTip = false Vue.config.productionTip = false
const routerPush = Router.prototype.push // const routerPush = Router.prototype.push
Router.prototype.push = function push(location) { // Router.prototype.push = function push(location) {
return routerPush.call(this, location).catch(error => error) // return routerPush.call(this, location).catch(error => error)
} // }
require('babel-polyfill') require('babel-polyfill')
new Vue({ new Vue({
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
size="mini" size="mini"
type="warning" type="warning"
icon="el-icon-more" icon="el-icon-more"
@click="changeExpand">{{ $parent.expand ? '折叠' : '展开' }}</el-button> @click="changeExpand">{{ expand ? '折叠' : '展开' }}</el-button>
<eForm ref="form" :is-add="true" :dicts="dicts"/> <eForm ref="form" :is-add="true" :dicts="dicts"/>
</div> </div>
</div> </div>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
size="mini" size="mini"
type="warning" type="warning"
icon="el-icon-more" icon="el-icon-more"
@click="changExpand">{{ $parent.expand ? '折叠' : '展开' }}</el-button> @click="changExpand">{{ expand ? '折叠' : '展开' }}</el-button>
<eForm ref="form" :is-add="true"/> <eForm ref="form" :is-add="true"/>
</div> </div>
</div> </div>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
size="mini" size="mini"
type="warning" type="warning"
icon="el-icon-more" icon="el-icon-more"
@click="changeExpand">{{ $parent.expand ? '折叠' : '展开' }}</el-button> @click="changeExpand">{{ expand ? '折叠' : '展开' }}</el-button>
<eForm ref="form" :is-add="true"/> <eForm ref="form" :is-add="true"/>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment