From 0be4067103b499bf231b530700bd68bcb88f7dda Mon Sep 17 00:00:00 2001 From: Pan Date: Mon, 22 Apr 2019 12:42:00 +0800 Subject: [PATCH 01/18] fix typo --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bd3dbc8..27b25b2 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,10 @@ English | [简体中文](./README-zh.md) ```bash # clone the project -git clone https://github.com/PanJiaChen/vue-element-admin.git +git clone https://github.com/PanJiaChen/vue-admin-template.git # enter the project directory -cd vue-element-admin +cd vue-admin-template # install dependency npm install From b2fe1a22e14e9d7055ca43b926a994e27553eeb4 Mon Sep 17 00:00:00 2001 From: PLAsusu <35716280+plasusu@users.noreply.github.com> Date: Tue, 23 Apr 2019 09:50:47 +0800 Subject: [PATCH 02/18] fix: fixed error action name (#339) --- src/layout/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layout/index.vue b/src/layout/index.vue index aa67907..db22a7b 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -44,7 +44,7 @@ export default { }, methods: { handleClickOutside() { - this.$store.dispatch('CloseSideBar', { withoutAnimation: false }) + this.$store.dispatch('app/closeSideBar', { withoutAnimation: false }) } } } From 74da10ca29b0c1de28e271ec48b5a738499bfd96 Mon Sep 17 00:00:00 2001 From: Pan Date: Fri, 26 Apr 2019 17:58:55 +0800 Subject: [PATCH 03/18] chore: set ci node version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 16574d9..f4be7a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: node_js -node_js: stable +node_js: 10 script: npm run test notifications: email: false From 16d39eb0154102915c39afc1ddcffe4d717c5e0a Mon Sep 17 00:00:00 2001 From: Pan Date: Sun, 28 Apr 2019 17:57:29 +0800 Subject: [PATCH 04/18] fix[Mock]: add error handling --- mock/mock-server.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/mock/mock-server.js b/mock/mock-server.js index ccce04d..4c4cb2a 100644 --- a/mock/mock-server.js +++ b/mock/mock-server.js @@ -48,17 +48,21 @@ module.exports = app => { ignoreInitial: true }).on('all', (event, path) => { if (event === 'change' || event === 'add') { - // remove mock routes stack - app._router.stack.splice(mockStartIndex, mockRoutesLength) + try { + // remove mock routes stack + app._router.stack.splice(mockStartIndex, mockRoutesLength) - // clear routes cache - unregisterRoutes() + // clear routes cache + unregisterRoutes() - const mockRoutes = registerRoutes(app) - mockRoutesLength = mockRoutes.mockRoutesLength - mockStartIndex = mockRoutes.mockStartIndex + const mockRoutes = registerRoutes(app) + mockRoutesLength = mockRoutes.mockRoutesLength + mockStartIndex = mockRoutes.mockStartIndex - console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed ${path}`)) + console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed ${path}`)) + } catch (error) { + console.log(chalk.redBright(error)) + } } }) } From d482e0bb9f42c215d6ab531afefbeec3c473ec1e Mon Sep 17 00:00:00 2001 From: Pan Date: Sun, 5 May 2019 15:07:18 +0800 Subject: [PATCH 05/18] docs: tips for set port --- vue.config.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vue.config.js b/vue.config.js index be1b518..4ad716c 100644 --- a/vue.config.js +++ b/vue.config.js @@ -7,6 +7,9 @@ function resolve(dir) { } const name = defaultSettings.title || 'vue Admin Template' // page title +// If your port is set to 80, +// use administrator privileges to execute the command line. +// For example, Mac: sudo npm run const port = 9528 // dev port // All configuration item explanations can be find in https://cli.vuejs.org/config/ From 896962a5c57801f2843754bb171d9a0b4bff62c7 Mon Sep 17 00:00:00 2001 From: Pan Date: Sun, 5 May 2019 15:55:25 +0800 Subject: [PATCH 06/18] perf: optimize page scrolling when setting fixedHeader --- src/layout/components/AppMain.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index e01ec98..178d579 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -27,5 +27,7 @@ export default { } .fixed-header+.app-main { padding-top: 50px; + height: 100vh; + overflow: auto; } From 9793fff12dbe881dc83514a8112e38fb82caeee0 Mon Sep 17 00:00:00 2001 From: Pan Date: Wed, 8 May 2019 18:11:50 +0800 Subject: [PATCH 07/18] perf[Style]: refine fixed-header style when open el-dialog --- src/layout/components/AppMain.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 178d579..fd514fa 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -27,7 +27,14 @@ export default { } .fixed-header+.app-main { padding-top: 50px; - height: 100vh; - overflow: auto; +} + + + From ac4865ab2d609668ca27f85e8fd20fb8cb71f278 Mon Sep 17 00:00:00 2001 From: Pan Date: Mon, 13 May 2019 12:56:39 +0800 Subject: [PATCH 08/18] chore: use mockjs in production environment --- src/main.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main.js b/src/main.js index 4ba95a7..1175231 100644 --- a/src/main.js +++ b/src/main.js @@ -17,12 +17,16 @@ import '@/permission' // permission control /** * If you don't want to use mock-server - * you want to use mockjs for request interception - * you can execute: + * you want to use MockJs for mock api + * you can execute: mockXHR() * - * import { mockXHR } from '../mock' - * mockXHR() + * Currently MockJs will be used in the production environment, + * please remove it before going online! ! ! */ +import { mockXHR } from '../mock' +if (process.env.NODE_ENV === 'production') { + mockXHR() +} // set ElementUI lang to EN Vue.use(ElementUI, { locale }) From b6753d0373242afa110995583e68b230ed4bc4a3 Mon Sep 17 00:00:00 2001 From: Pan Date: Mon, 13 May 2019 12:57:01 +0800 Subject: [PATCH 09/18] fix[sidebar.css]: remove redundant css --- src/styles/sidebar.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index e55f865..3dad4c3 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -95,10 +95,6 @@ margin-left: 54px; } - .svg-icon { - margin-right: 0px; - } - .submenu-title-noDropdown { padding: 0 !important; position: relative; From fa7310902a4c28d29d27e149412abbcfbcddec06 Mon Sep 17 00:00:00 2001 From: Bobby Date: Tue, 21 May 2019 12:17:08 +0800 Subject: [PATCH 10/18] doc: fixed default port error in README.md (#373) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 27b25b2..f15c935 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ npm install npm run dev ``` -This will automatically open http://localhost:9527 +This will automatically open http://localhost:9528 ## Build From 79eeed7d592b0ee36ebfa247214c4cc58c6433d0 Mon Sep 17 00:00:00 2001 From: Pan Date: Fri, 24 May 2019 16:57:40 +0800 Subject: [PATCH 11/18] feat[SvgIcon]: support import svg from url --- src/components/SvgIcon/index.vue | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue index 27da76c..b07ded2 100644 --- a/src/components/SvgIcon/index.vue +++ b/src/components/SvgIcon/index.vue @@ -1,10 +1,14 @@