From e3cbf4ad90130ba3637f267bad0058d2824b2a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= Date: Mon, 30 Sep 2019 16:38:18 +0800 Subject: [PATCH 01/43] fix[example]: fixed create.vue cache error https://github.com/PanJiaChen/vue-element-admin/issues/2608 --- src/views/example/components/ArticleDetail.vue | 2 -- src/views/example/create.vue | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/example/components/ArticleDetail.vue b/src/views/example/components/ArticleDetail.vue index ef0f1df9..8aa97339 100644 --- a/src/views/example/components/ArticleDetail.vue +++ b/src/views/example/components/ArticleDetail.vue @@ -170,8 +170,6 @@ export default { if (this.isEdit) { const id = this.$route.params && this.$route.params.id this.fetchData(id) - } else { - this.postForm = Object.assign({}, defaultForm) } // Why need to make a copy of this.$route here? diff --git a/src/views/example/create.vue b/src/views/example/create.vue index 4d3a24b5..f28ce287 100644 --- a/src/views/example/create.vue +++ b/src/views/example/create.vue @@ -6,7 +6,7 @@ import ArticleDetail from './components/ArticleDetail' export default { - name: 'CreateForm', + name: 'CreateArticle', components: { ArticleDetail } } From 9c723c66182308995f090621f86cd263c856d6fa Mon Sep 17 00:00:00 2001 From: monkeycf <41945134+monkeycf@users.noreply.github.com> Date: Tue, 8 Oct 2019 17:54:47 +0800 Subject: [PATCH 02/43] perf[utils.js]: perf parseTime function (#2625) --- src/utils/index.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/utils/index.js b/src/utils/index.js index ffb55260..2684e3c2 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -6,7 +6,7 @@ * Parse the time to string * @param {(Object|string|number)} time * @param {string} cFormat - * @returns {string} + * @returns {string | null} */ export function parseTime(time, cFormat) { if (arguments.length === 0) { @@ -34,14 +34,11 @@ export function parseTime(time, cFormat) { s: date.getSeconds(), a: date.getDay() } - const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { - let value = formatObj[key] + const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => { + const value = formatObj[key] // Note: getDay() returns 0 on Sunday if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] } - if (result.length > 0 && value < 10) { - value = '0' + value - } - return value || 0 + return value.toString().padStart(2, '0') }) return time_str } From 0343988f3de2a181bfbee43b1a1400f68f9ffa3b Mon Sep 17 00:00:00 2001 From: monkeycf <41945134+monkeycf@users.noreply.github.com> Date: Tue, 8 Oct 2019 18:15:22 +0800 Subject: [PATCH 03/43] perf[tagsView]: pref DEL_CACHED_VIEW and DEL_OTHERS_CACHED_VIEWS function (#2626) --- src/store/modules/tagsView.js | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js index 3e2c1703..f94546ce 100644 --- a/src/store/modules/tagsView.js +++ b/src/store/modules/tagsView.js @@ -28,13 +28,8 @@ const mutations = { } }, DEL_CACHED_VIEW: (state, view) => { - for (const i of state.cachedViews) { - if (i === view.name) { - const index = state.cachedViews.indexOf(i) - state.cachedViews.splice(index, 1) - break - } - } + const index = state.cachedViews.indexOf(view.name) + index > -1 && state.cachedViews.splice(index, 1) }, DEL_OTHERS_VISITED_VIEWS: (state, view) => { @@ -43,13 +38,8 @@ const mutations = { }) }, DEL_OTHERS_CACHED_VIEWS: (state, view) => { - for (const i of state.cachedViews) { - if (i === view.name) { - const index = state.cachedViews.indexOf(i) - state.cachedViews = state.cachedViews.slice(index, index + 1) - break - } - } + const index = state.cachedViews.indexOf(view.name) + index > -1 && (state.cachedViews = state.cachedViews.slice(index, index + 1)) }, DEL_ALL_VISITED_VIEWS: state => { From f266713daf5ae75d3da792aea129d35905b763da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= Date: Tue, 8 Oct 2019 18:20:11 +0800 Subject: [PATCH 04/43] fix[tagsView]: fixed DEL_OTHERS_CACHED_VIEWS bug --- src/store/modules/tagsView.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js index f94546ce..57e72421 100644 --- a/src/store/modules/tagsView.js +++ b/src/store/modules/tagsView.js @@ -39,7 +39,12 @@ const mutations = { }, DEL_OTHERS_CACHED_VIEWS: (state, view) => { const index = state.cachedViews.indexOf(view.name) - index > -1 && (state.cachedViews = state.cachedViews.slice(index, index + 1)) + if (index > -1) { + state.cachedViews = state.cachedViews.slice(index, index + 1) + } else { + // if index = -1, there is no cached tags + state.cachedViews = [] + } }, DEL_ALL_VISITED_VIEWS: state => { From b4cdf528ba786060709227f0471640d72298a27d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= Date: Tue, 8 Oct 2019 20:38:19 +0800 Subject: [PATCH 05/43] fix[logout]: empty tagsview when logout (#2632) --- src/store/modules/user.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index dbc29003..1391fa4a 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -73,13 +73,18 @@ const actions = { }, // user logout - logout({ commit, state }) { + logout({ commit, state, dispatch }) { return new Promise((resolve, reject) => { logout(state.token).then(() => { commit('SET_TOKEN', '') commit('SET_ROLES', []) removeToken() resetRouter() + + // reset visited views and cached views + // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485 + dispatch('tagsView/delAllViews', null, { root: true }) + resolve() }).catch(error => { reject(error) From 197948dc4414db87df36419022aaf0502d503a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= Date: Tue, 8 Oct 2019 21:20:34 +0800 Subject: [PATCH 06/43] fix[TagsView]: fixed toLastView bug (#2634) --- src/layout/components/TagsView/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 24a92f1d..e5aa91a6 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -155,7 +155,7 @@ export default { toLastView(visitedViews, view) { const latestView = visitedViews.slice(-1)[0] if (latestView) { - this.$router.push(latestView) + this.$router.push(latestView.fullPath) } else { // now the default is to redirect to the home page if there is no tags-view, // you can adjust it according to your needs. From 12b44f5d4bf6061ad64757bf201394f498794967 Mon Sep 17 00:00:00 2001 From: MaYuanhai <414199639@qq.com> Date: Thu, 10 Oct 2019 11:35:48 +0800 Subject: [PATCH 07/43] perf[SvgIcon]: change xlink:href to href(#2645) https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/xlink:href --- src/components/SvgIcon/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue index b07ded2a..9a3318e5 100644 --- a/src/components/SvgIcon/index.vue +++ b/src/components/SvgIcon/index.vue @@ -1,7 +1,7 @@ From b51590b982841795853b82501376d3978763406c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= Date: Fri, 11 Oct 2019 13:37:01 +0800 Subject: [PATCH 08/43] fix[TagsView]: fixed click.middle can close affixed tag bug (#2649) --- src/layout/components/TagsView/index.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index e5aa91a6..642b4f42 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -9,16 +9,16 @@ :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item" - @click.middle.native="closeSelectedTag(tag)" + @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''" @contextmenu.prevent.native="openMenu(tag,$event)" > {{ tag.title }} - +
  • Refresh
    • -
  • Close
    • +
  • Close
  • Close Others
  • Close All
@@ -69,6 +69,9 @@ export default { isActive(route) { return route.path === this.$route.path }, + isAffix(tag) { + return tag.meta && tag.meta.affix + }, filterAffixTags(routes, basePath = '/') { let tags = [] routes.forEach(route => { From 5273e022591a5b873b5c3f1d01abb7fb9b644c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= Date: Sat, 12 Oct 2019 17:51:26 +0800 Subject: [PATCH 09/43] docs: add job ad --- src/views/documentation/index.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/documentation/index.vue b/src/views/documentation/index.vue index 0f4c4d92..6f69cf42 100644 --- a/src/views/documentation/index.vue +++ b/src/views/documentation/index.vue @@ -16,6 +16,11 @@ href="https://panjiachen.gitee.io/vue-element-admin-site/zh/" >国内文档 + 内推招聘 @@ -46,8 +51,9 @@ export default { From 53803d067dc962e6e15c0471253aaab532c35614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=E1=BA=A1m=20Ng=E1=BB=8Dc=20H=C3=B2a?= Date: Wed, 27 Nov 2019 09:06:28 +0700 Subject: [PATCH 19/43] perf: format pdf download (#2791) --- src/views/pdf/download.vue | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/pdf/download.vue b/src/views/pdf/download.vue index bd0b3be2..a348c697 100644 --- a/src/views/pdf/download.vue +++ b/src/views/pdf/download.vue @@ -26,17 +26,17 @@ export default { }, methods: { fetchData() { - import('./content.js').then(data => { - const { title } = data.default - document.title = title - this.article = data.default - setTimeout(() => { - this.fullscreenLoading = false - this.$nextTick(() => { - window.print() - }) - }, 3000) - }) + import('./content.js').then(data => { + const { title } = data.default + document.title = title + this.article = data.default + setTimeout(() => { + this.fullscreenLoading = false + this.$nextTick(() => { + window.print() + }) + }, 3000) + }) } } } From e1554fdbd0d03413a46dd64797abc299446b328e Mon Sep 17 00:00:00 2001 From: xuanzai <43233731+MikuBlog@users.noreply.github.com> Date: Sun, 1 Dec 2019 15:48:30 +0800 Subject: [PATCH 20/43] perf[views/icons]: use grid (#2803) --- src/views/icons/index.vue | 54 +++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/src/views/icons/index.vue b/src/views/icons/index.vue index 3677afd6..33fab3a3 100644 --- a/src/views/icons/index.vue +++ b/src/views/icons/index.vue @@ -6,30 +6,34 @@ -
- -
- {{ generateIconCode(item) }} -
-
- - {{ item }} -
- -
+
+
+ +
+ {{ generateIconCode(item) }} +
+
+ + {{ item }} +
+ +
+
-
- -
- {{ generateElementIconCode(item) }} -
-
- - {{ item }} -
- -
+
+
+ +
+ {{ generateElementIconCode(item) }} +
+
+ + {{ item }} +
+ +
+
@@ -66,6 +70,12 @@ export default { .icons-container { margin: 10px 20px 0; overflow: hidden; + + .grid { + position: relative; + display: grid; + grid-template-columns: repeat(auto-fill, minmax(120px, 1fr)); + } .icon-item { margin: 20px; From 65d8c451e89c4f679cd983316b7b9a5f1e9ac748 Mon Sep 17 00:00:00 2001 From: monkeycf <41945134+monkeycf@users.noreply.github.com> Date: Wed, 4 Dec 2019 10:34:23 +0800 Subject: [PATCH 21/43] feat: plop new generate store (#2805) --- plop-templates/store/index.hbs | 16 +++++++++ plop-templates/store/prompt.js | 62 ++++++++++++++++++++++++++++++++++ plopfile.js | 2 ++ 3 files changed, 80 insertions(+) create mode 100644 plop-templates/store/index.hbs create mode 100644 plop-templates/store/prompt.js diff --git a/plop-templates/store/index.hbs b/plop-templates/store/index.hbs new file mode 100644 index 00000000..4f8e2dc0 --- /dev/null +++ b/plop-templates/store/index.hbs @@ -0,0 +1,16 @@ +{{#if state}} +const state = {} +{{/if}} + +{{#if mutations}} +const mutations = {} +{{/if}} + +{{#if actions}} +const actions = {} +{{/if}} + +export default { + namespaced: true, + {{options}} +} diff --git a/plop-templates/store/prompt.js b/plop-templates/store/prompt.js new file mode 100644 index 00000000..bcbc11d1 --- /dev/null +++ b/plop-templates/store/prompt.js @@ -0,0 +1,62 @@ +const { notEmpty } = require('../utils.js') + +module.exports = { + description: 'generate store', + prompts: [{ + type: 'input', + name: 'name', + message: 'store name please', + validate: notEmpty('name') + }, + { + type: 'checkbox', + name: 'blocks', + message: 'Blocks:', + choices: [{ + name: 'state', + value: 'state', + checked: true + }, + { + name: 'mutations', + value: 'mutations', + checked: true + }, + { + name: 'actions', + value: 'actions', + checked: true + } + ], + validate(value) { + if (!value.includes('state') || !value.includes('mutations')) { + return 'store require at least state and mutations' + } + return true + } + } + ], + actions(data) { + const name = '{{name}}' + const { blocks } = data + const options = ['state', 'mutations'] + const joinFlag = `, + ` + if (blocks.length === 3) { + options.push('actions') + } + + const actions = [{ + type: 'add', + path: `src/store/modules/${name}.js`, + templateFile: 'plop-templates/store/index.hbs', + data: { + options: options.join(joinFlag), + state: blocks.includes('state'), + mutations: blocks.includes('mutations'), + actions: blocks.includes('actions') + } + }] + return actions + } +} diff --git a/plopfile.js b/plopfile.js index 9f3147e2..57387bf1 100644 --- a/plopfile.js +++ b/plopfile.js @@ -1,7 +1,9 @@ const viewGenerator = require('./plop-templates/view/prompt') const componentGenerator = require('./plop-templates/component/prompt') +const storeGenerator = require('./plop-templates/store/prompt.js') module.exports = function(plop) { plop.setGenerator('view', viewGenerator) plop.setGenerator('component', componentGenerator) + plop.setGenerator('store', storeGenerator) } From 594fc58d0cb58f3c44b9c93f4d085e4c6e78c035 Mon Sep 17 00:00:00 2001 From: flitrue <812863096@qq.com> Date: Thu, 12 Dec 2019 15:16:03 +0800 Subject: [PATCH 22/43] fix[icons]:fixed eslint 1 error and 2 warnings (#2835) --- src/views/icons/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/icons/index.vue b/src/views/icons/index.vue index 33fab3a3..4c483db4 100644 --- a/src/views/icons/index.vue +++ b/src/views/icons/index.vue @@ -18,7 +18,7 @@ - +
@@ -33,7 +33,7 @@
- + @@ -70,7 +70,7 @@ export default { .icons-container { margin: 10px 20px 0; overflow: hidden; - + .grid { position: relative; display: grid; From 262c0ba08e80df87768c1bd855374ef2ec93432e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= Date: Sun, 15 Dec 2019 20:17:59 +0800 Subject: [PATCH 23/43] perf[documentation]: refine css --- src/components/Share/DropdownMenu.vue | 5 ++++- src/views/documentation/index.vue | 30 +++++++-------------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/components/Share/DropdownMenu.vue b/src/components/Share/DropdownMenu.vue index a629fe9a..d194a517 100644 --- a/src/components/Share/DropdownMenu.vue +++ b/src/components/Share/DropdownMenu.vue @@ -44,6 +44,7 @@ $t: .1s; width: 250px; position: relative; z-index: 1; + height: auto!important; &-title { width: 100%; display: block; @@ -65,10 +66,12 @@ $t: .1s; position: absolute; width: 100%; background: #e0e0e0; + color: #000; line-height: 60px; height: 60px; cursor: pointer; - font-size: 20px; + font-size: 18px; + overflow: hidden; opacity: 1; transition: transform 0.28s ease; &:hover { diff --git a/src/views/documentation/index.vue b/src/views/documentation/index.vue index 6f69cf42..d3f77468 100644 --- a/src/views/documentation/index.vue +++ b/src/views/documentation/index.vue @@ -1,26 +1,10 @@ @@ -53,8 +37,10 @@ export default { margin: 50px; display: flex; flex-wrap: wrap; + justify-content: space-evenly; + .document-btn { - margin-left: 50px; + flex-shrink: 0; display: block; cursor: pointer; background: black; From 4f563a7bfe6e6e601c4500d491c8e60cfd9c7023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=AC?= <605682551@qq.com> Date: Tue, 31 Dec 2019 14:14:34 +0800 Subject: [PATCH 24/43] =?UTF-8?q?fix[Logout]:=20click=20blank=20area=20of?= =?UTF-8?q?=20=E2=80=8B=E2=80=8BdropDown=20able=20to=20logout=20(#2896)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed clicking blank area of ​​drop-down unable to log out --- src/layout/components/Navbar.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index d9075a24..37bc1e69 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -36,8 +36,8 @@ Docs - - Log Out + + Log Out From a0b39d5043349e1ee236173a395af7260e000d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=BE=BD=E9=A3=9E?= Date: Mon, 6 Jan 2020 22:22:37 +0800 Subject: [PATCH 25/43] perf: import mockXHR only in production (#2910) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 自动排除mock 生产环境，使用webpack的条件编译自动排除mock数据 * perf: refine Co-authored-by: 花裤衩 --- src/main.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main.js b/src/main.js index ef07f389..fb75857d 100644 --- a/src/main.js +++ b/src/main.js @@ -25,11 +25,12 @@ import * as filters from './filters' // global filters * you can execute: mockXHR() * * Currently MockJs will be used in the production environment, - * please remove it before going online! ! ! + * please remove it before going online ! ! ! */ -import { mockXHR } from '../mock' if (process.env.NODE_ENV === 'production') { - mockXHR() + import('../mock').then(({ mockXHR }) => { + mockXHR() + }) } Vue.use(Element, { From fd5a2e8da2592fdb6cb30426de40d87a773b8bfe Mon Sep 17 00:00:00 2001 From: Kaitian Xie Date: Mon, 6 Jan 2020 06:34:14 -0800 Subject: [PATCH 26/43] perf[Menu]: remove unused menu-wrapper (#2903) --- src/layout/components/Sidebar/SidebarItem.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index 2d49dd87..a418c3d7 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -1,5 +1,5 @@