From 391e7703ed137e3ee17df16d41fc215e31731af9 Mon Sep 17 00:00:00 2001 From: Pan Date: Thu, 3 Aug 2017 11:24:26 +0800 Subject: [PATCH 001/783] 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 002/783] 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 003/783] 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 004/783] 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 @@