From c96bdeb99dfc3854e0c1255454383a52e888c670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= Date: Mon, 31 Jul 2017 14:45:32 +0800 Subject: [PATCH 001/786] Update README.md --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e37898bbb3..55861bb1981 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,11 @@ # vue-element-admin # + +[![vue](https://img.shields.io/badge/vue-2.4.2-brightgreen.svg)](https://github.com/vuejs/vue) +[![element-ui](https://img.shields.io/badge/element--ui-1.4.1-brightgreen.svg)](https://github.com/ElemeFE/element) +[![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/PanJiaChen/vue-element-admin/blob/master/LICENSE) +[![GitHub release](https://img.shields.io/github/release/PanJiaChen/vue-element-admin.svg)]() + + [线上地址](http://panjiachen.github.io/vue-element-admin) [English Document](https://github.com/PanJiaChen/vue-element-admin/blob/master/README-en.md) @@ -9,7 +16,7 @@ -**注意:该项目目前使用element-ui@1.3.3版本,所以最低兼容 Vue 2.3.0** +**注意:该项目目前使用element-ui@1.4.1版本,所以最低兼容 Vue 2.3.0** ## 前言 > 这半年来一直在用vue写管理后台,目前后台已经有百来个页面,十几种权限,但维护成本依然很低,所以准备开源分享一下后台开发的经验和成果。目前的技术栈主要的采用vue+element+axios由webpack2打包。由于是个人项目,所以数据请求都是用了mockjs模拟。注意:在此项目基础上改造开发时请移除mock文件。 From a3b1dd81fd03fbf6e6a3aeb05e61982272f159ec Mon Sep 17 00:00:00 2001 From: Pan Date: Wed, 2 Aug 2017 14:42:20 +0800 Subject: [PATCH 002/786] refine sidebar css --- src/styles/sidebar.scss | 1 + src/views/layout/Layout.vue | 3 ++- src/views/layout/Sidebar.vue | 15 ++++----------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 44588586f83..a41a033ee4b 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -1,6 +1,7 @@ // 侧边栏 .sidebar-container>.el-menu { width: 100%!important; + min-height: 100%; } .sidebar-container .svg-icon { diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue index 0318aac4366..e3109603911 100644 --- a/src/views/layout/Layout.vue +++ b/src/views/layout/Layout.vue @@ -50,7 +50,8 @@ bottom: 0; left: 0; z-index: 1001; - background: red; + overflow-y: auto; + &::-webkit-scrollbar {display:none} } .main-container { min-height: 100%; diff --git a/src/views/layout/Sidebar.vue b/src/views/layout/Sidebar.vue index ac3e5ace529..2c46c11e877 100644 --- a/src/views/layout/Sidebar.vue +++ b/src/views/layout/Sidebar.vue @@ -1,11 +1,10 @@ + - - From 97e94c067d875b0f74f7075f5fd106ad8716e81c Mon Sep 17 00:00:00 2001 From: Pan Date: Wed, 2 Aug 2017 14:43:57 +0800 Subject: [PATCH 003/786] refine sidebar css --- src/views/layout/Layout.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue index e3109603911..415a6d822f1 100644 --- a/src/views/layout/Layout.vue +++ b/src/views/layout/Layout.vue @@ -36,6 +36,7 @@ &.hideSidebar { .sidebar-container{ width:36px; + overflow: inherit; } .main-container { margin-left: 36px; From 391e7703ed137e3ee17df16d41fc215e31731af9 Mon Sep 17 00:00:00 2001 From: Pan Date: Thu, 3 Aug 2017 11:24:26 +0800 Subject: [PATCH 004/786] fix router deepClone bug --- src/store/modules/permission.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index dbbc9f4ef3a..b5b1d3189d1 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -1,5 +1,4 @@ -import { asyncRouterMap, constantRouterMap } from 'src/router'; -import { deepClone } from 'utils' +import { asyncRouterMap, constantRouterMap } from 'src/router' /** * 通过meta.role判断是否与当前用户权限匹配 @@ -39,8 +38,8 @@ const permission = { }, mutations: { SET_ROUTERS: (state, routers) => { - state.addRouters = deepClone(routers) - state.routers = deepClone(constantRouterMap.concat(routers)) + state.addRouters = routers + state.routers = constantRouterMap.concat(routers) } }, actions: { From 17ada3c65e9c80928c2b3a6e53477ec2075e37ae Mon Sep 17 00:00:00 2001 From: Pan Date: Fri, 4 Aug 2017 16:04:14 +0800 Subject: [PATCH 005/786] add HashedModuleIdsPlugin --- build/webpack.prod.conf.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 112331d2275..6060eadc46b 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -72,6 +72,8 @@ var webpackConfig = merge(baseWebpackConfig, { // necessary to consistently work with multiple chunks via CommonsChunkPlugin chunksSortMode: 'dependency' }), + // cache Module Identifiers + new webpack.HashedModuleIdsPlugin(), // split vendor js into its own file new webpack.optimize.CommonsChunkPlugin({ name: 'vendor', From 00a83d1e5a70e9e79c3df5d2d11786ca73026533 Mon Sep 17 00:00:00 2001 From: Pan Date: Mon, 7 Aug 2017 10:27:39 +0800 Subject: [PATCH 006/786] update echarts remove warning --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5b63c78f761..dadfce2bc76 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "axios": "0.16.2", "codemirror": "5.26.0", "dropzone": "5.1.0", - "echarts": "3.6.1", + "echarts": "3.6.2", "element-ui": "1.4.1", "file-saver": "1.3.3", "jquery": "3.1.1", From cdebb5c0123ce9ba338f9d085a10cbb46fad0f71 Mon Sep 17 00:00:00 2001 From: Pan Date: Mon, 7 Aug 2017 11:02:51 +0800 Subject: [PATCH 007/786] fix levelbar bug --- src/views/layout/Levelbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/layout/Levelbar.vue b/src/views/layout/Levelbar.vue index 944f95edf50..01dd17b322f 100644 --- a/src/views/layout/Levelbar.vue +++ b/src/views/layout/Levelbar.vue @@ -1,7 +1,7 @@ diff --git a/src/views/example/tab/components/tabPane.vue b/src/views/example/tab/components/tabPane.vue index 74925eefbe4..cd2f55e1e87 100644 --- a/src/views/example/tab/components/tabPane.vue +++ b/src/views/example/tab/components/tabPane.vue @@ -28,7 +28,7 @@ @@ -51,7 +51,6 @@ import { fetchList } from 'api/article_table' export default { - name: 'articleDetail', props: { type: { type: String, @@ -61,7 +60,6 @@ export default { data() { return { list: null, - total: null, listQuery: { page: 1, limit: 5, @@ -86,10 +84,8 @@ export default { methods: { getList() { this.$emit('create') // for test - fetchList(this.listQuery).then(response => { this.list = response.data.items - this.total = response.data.total }) } } diff --git a/src/views/example/tab/index.vue b/src/views/example/tab/index.vue index 7266105974e..4b69d7c852a 100644 --- a/src/views/example/tab/index.vue +++ b/src/views/example/tab/index.vue @@ -20,10 +20,10 @@ export default { data() { return { tabMapOptions: [ - { label: '中国', key: 'CN' }, - { label: '美国', key: 'US' }, - { label: '日本', key: 'JP' }, - { label: '欧元区', key: 'EU' } + { label: '中国', key: 'CN' }, + { label: '美国', key: 'US' }, + { label: '日本', key: 'JP' }, + { label: '欧元区', key: 'EU' } ], activeName: 'CN', createdTimes: 0 diff --git a/src/views/excel/index.vue b/src/views/excel/index.vue index 3023e24d0ae..cab49c9c414 100644 --- a/src/views/excel/index.vue +++ b/src/views/excel/index.vue @@ -1,6 +1,6 @@