From 9580c43a8ee2ce9c71c1db6011941c7338bebfe2 Mon Sep 17 00:00:00 2001 From: ntnyq Date: Tue, 28 Apr 2020 18:26:34 +0800 Subject: [PATCH 1/8] fix[element-variables]: missing space in element-variables (#3144) --- src/styles/element-variables.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 30a0e6bc..5bdc4dad 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -6,7 +6,7 @@ /* theme color */ $--color-primary: #1890ff; $--color-success: #13ce66; -$--color-warning: #FFBA00; +$--color-warning: #ffba00; $--color-danger: #ff4949; // $--color-info: #1E1E1E; @@ -17,10 +17,10 @@ $--button-font-weight: 400; $--border-color-light: #dfe4ed; $--border-color-lighter: #e6ebf5; -$--table-border:1px solid#dfe6ec; +$--table-border: 1px solid #dfe6ec; /* icon font path, required */ -$--font-path: '~element-ui/lib/theme-chalk/fonts'; +$--font-path: "~element-ui/lib/theme-chalk/fonts"; @import "~element-ui/packages/theme-chalk/src/index"; From fc26c3106fefda7ff80afdc8bcad06f0b1ef2909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= Date: Mon, 4 May 2020 21:30:58 +0800 Subject: [PATCH 2/8] fix: compatibility with vetur (#1700) --- src/components/Tinymce/index.vue | 6 +++--- src/layout/components/Sidebar/Link.vue | 25 ++++++++++++++++--------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue index c0f486f0..b3538c25 100644 --- a/src/components/Tinymce/index.vue +++ b/src/components/Tinymce/index.vue @@ -148,9 +148,9 @@ export default { _this.fullscreen = e.state }) }, - //it will try to keep these URLs intact - //https://www.tiny.cloud/docs-3x/reference/configuration/Configuration3x@convert_urls/ - //https://stackoverflow.com/questions/5196205/disable-tinymce-absolute-to-relative-url-conversions + // it will try to keep these URLs intact + // https://www.tiny.cloud/docs-3x/reference/configuration/Configuration3x@convert_urls/ + // https://stackoverflow.com/questions/5196205/disable-tinymce-absolute-to-relative-url-conversions convert_urls: false // 整合七牛上传 // images_dataimg_filter(img) { diff --git a/src/layout/components/Sidebar/Link.vue b/src/layout/components/Sidebar/Link.vue index eb4dd107..530b3d5b 100644 --- a/src/layout/components/Sidebar/Link.vue +++ b/src/layout/components/Sidebar/Link.vue @@ -1,7 +1,5 @@ - @@ -16,19 +14,28 @@ export default { required: true } }, + computed: { + isExternal() { + return isExternal(this.to) + }, + type() { + if (this.isExternal) { + return 'a' + } + return 'router-link' + } + }, methods: { - linkProps(url) { - if (isExternal(url)) { + linkProps(to) { + if (this.isExternal) { return { - is: 'a', - href: url, + href: to, target: '_blank', rel: 'noopener' } } return { - is: 'router-link', - to: url + to: to } } } From a2784dd6ef2e11c9c1242b451fdc3241df1ec70e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=E1=BA=A1m=20Ng=E1=BB=8Dc=20H=C3=B2a?= Date: Mon, 4 May 2020 20:51:21 +0700 Subject: [PATCH 3/8] perf: change default element-ui language to english (#2741) --- src/main.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index 1049d762..b5fa135d 100644 --- a/src/main.js +++ b/src/main.js @@ -6,6 +6,7 @@ import 'normalize.css/normalize.css' // a modern alternative to CSS resets import Element from 'element-ui' import './styles/element-variables.scss' +import enLang from 'element-ui/lib/locale/lang/en'// 如果使用中文语言包请默认支持，无需额外引入，请删除该依赖 import '@/styles/index.scss' // global css @@ -33,7 +34,8 @@ if (process.env.NODE_ENV === 'production') { } Vue.use(Element, { - size: Cookies.get('size') || 'medium' // set element-ui default size + size: Cookies.get('size') || 'medium', // set element-ui default size + locale: enLang // 如果使用中文，无需设置，请删除 }) // register global utility filters From 6dacb783b2c58190e568603e6125883f071528d4 Mon Sep 17 00:00:00 2001 From: garethx Date: Mon, 4 May 2020 16:05:29 +0100 Subject: [PATCH 4/8] feat: add option to try project on CodeSandbox (#2976) --- README.es.md | 2 ++ README.ja.md | 2 ++ README.md | 2 ++ README.zh-CN.md | 2 ++ 4 files changed, 8 insertions(+) diff --git a/README.es.md b/README.es.md index 396556f5..3e054ce9 100644 --- a/README.es.md +++ b/README.es.md @@ -62,6 +62,8 @@ Vue Element Admin es una solución práctica basada en la nueva plataforma de de Necesita instalar [node](https://nodejs.org/) y [git](https://git-scm.com/) localmente. El proyecto es basado en [ES2015+](https://es6.ruanyifeng.com/), [vue](https://cn.vuejs.org/index.html), [vuex](https://vuex.vuejs.org/zh-cn/), [vue-router](https://router.vuejs.org/zh-cn/), [vue-cli](https://github.com/vuejs/vue-cli) , [axios](https://github.com/axios/axios) and [element-ui](https://github.com/ElemeFE/element), toda la solicitud de datos simulada se realiza a través de [Mock.js](https://github.com/nuysoft/Mock). Entendiendo y aprendiendo esto pudiera ayudarle con su proyecto. +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox) +

diff --git a/README.ja.md b/README.ja.md index 0c49685b..a20a4d71 100644 --- a/README.ja.md +++ b/README.ja.md @@ -59,6 +59,8 @@ **バグ修正や新規機能追加のissue と pull requestは大歓迎です。** +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox) +

diff --git a/README.md b/README.md index a6a10447..458ae970 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,8 @@ English | [简体中文](./README.zh-CN.md) | [日本語](./README.ja.md) | [Spa You need to install [node](https://nodejs.org/) and [git](https://git-scm.com/) locally. The project is based on [ES2015+](https://es6.ruanyifeng.com/), [vue](https://cn.vuejs.org/index.html), [vuex](https://vuex.vuejs.org/zh-cn/), [vue-router](https://router.vuejs.org/zh-cn/), [vue-cli](https://github.com/vuejs/vue-cli) , [axios](https://github.com/axios/axios) and [element-ui](https://github.com/ElemeFE/element), all request data is simulated using [Mock.js](https://github.com/nuysoft/Mock). Understanding and learning this knowledge in advance will greatly help the use of this project. +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox) +

diff --git a/README.zh-CN.md b/README.zh-CN.md index 3df8b8ea..e8424111 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -77,6 +77,8 @@ **如有问题请先看上述使用文档和文章，若不能满足，欢迎 issue 和 pr** +[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox) +

From e692876c289a227b92476b13b355987a18b59422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= Date: Tue, 5 May 2020 11:06:51 +0800 Subject: [PATCH 5/8] docs: add tips --- src/permission.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/permission.js b/src/permission.js index 750aeab6..ff5eaad2 100644 --- a/src/permission.js +++ b/src/permission.js @@ -24,7 +24,7 @@ router.beforeEach(async(to, from, next) => { if (to.path === '/login') { // if is logged in, redirect to the home page next({ path: '/' }) - NProgress.done() + NProgress.done() // hack: https://github.com/PanJiaChen/vue-element-admin/pull/2939 } else { // determine whether the user has obtained his permission roles through getInfo const hasRoles = store.getters.roles && store.getters.roles.length > 0 From 29b4ff636b36d8a3b4fc2707251e671e995ba9b4 Mon Sep 17 00:00:00 2001 From: AiMe1991 Date: Tue, 5 May 2020 12:55:22 +0800 Subject: [PATCH 6/8] perf: when tags-view scroll close the right-menu --- src/layout/components/TagsView/ScrollPane.vue | 9 +++++++++ src/layout/components/TagsView/index.vue | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue index 0ec76e72..34a7e55f 100644 --- a/src/layout/components/TagsView/ScrollPane.vue +++ b/src/layout/components/TagsView/ScrollPane.vue @@ -19,12 +19,21 @@ export default { return this.$refs.scrollContainer.$refs.wrap } }, + mounted() { + this.scrollWrapper.addEventListener('scroll', this.emitScroll, true) + }, + beforeDestroy() { + this.scrollWrapper.removeEventListener('scroll', this.emitScroll) + }, methods: { handleScroll(e) { const eventDelta = e.wheelDelta || -e.deltaY * 40 const $scrollWrapper = this.scrollWrapper $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4 }, + emitScroll() { + this.$emit('scroll') + }, moveToTarget(currentTag) { const $container = this.$refs.scrollContainer.$el const $containerWidth = $container.offsetWidth diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 642b4f42..d2a56e70 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -1,6 +1,6 @@