From fb300794779b8017f04b2d28ea95d824a206d85c Mon Sep 17 00:00:00 2001 From: Pan Date: Mon, 25 Mar 2019 18:04:14 +0800 Subject: [PATCH 1/7] docs --- README.md | 2 ++ README.zh-CN.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index bf0e08be..21c1cd0b 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,8 @@ English | [简体中文](./README.zh-CN.md) It is a magical vue admin based on the newest development stack of vue, built-in i18n solution, typical templates for enterprise applications, lots of awesome features. It helps you build a large complex Single-Page Applications. I believe whatever your needs are, this project will help you. +** [v4.0](https://github.com/PanJiaChen/vue-element-admin/tree/v4.0) has in beta. It built on vue-cli, optimized a lot of code, and added a lot of new features. Welcome to use and make suggestions. ** + - [Preview](http://panjiachen.github.io/vue-element-admin) - [Documentation](https://panjiachen.github.io/vue-element-admin-site/) diff --git a/README.zh-CN.md b/README.zh-CN.md index 5dc9f1d7..310095f1 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -32,6 +32,8 @@ [vue-element-admin](http://panjiachen.github.io/vue-element-admin) 是一个后台集成解决方案，它基于 [vue](https://github.com/vuejs/vue) 和 [element](https://github.com/ElemeFE/element)。它使用了最新的前端技术栈，内置了 i18 国际化解决方案，动态路由，权限验证，提炼了典型的业务模型，提供了丰富的功能组件，它可以帮助你快速搭建企业级中后台产品原型。相信不管你的需求是什么，本项目都能帮助到你。 +**[v4.0](https://github.com/PanJiaChen/vue-element-admin/tree/v4.0) 已经进入 beta 测试阶段。 它基于vue-cli进行构建，优化了大量代码尤其是权限和mock这快，并且增加了不少新特性。欢迎使用并提出建议。** + - [在线访问](http://panjiachen.github.io/vue-element-admin) - [使用文档](https://panjiachen.github.io/vue-element-admin-site/zh/) From f890685d8d36eccf8774bae998d4dc389d477a5b Mon Sep 17 00:00:00 2001 From: Pan Date: Mon, 25 Mar 2019 18:39:54 +0800 Subject: [PATCH 2/7] docs --- README.md | 2 +- README.zh-CN.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 21c1cd0b..5f26a357 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ English | [简体中文](./README.zh-CN.md) It is a magical vue admin based on the newest development stack of vue, built-in i18n solution, typical templates for enterprise applications, lots of awesome features. It helps you build a large complex Single-Page Applications. I believe whatever your needs are, this project will help you. -** [v4.0](https://github.com/PanJiaChen/vue-element-admin/tree/v4.0) has in beta. It built on vue-cli, optimized a lot of code, and added a lot of new features. Welcome to use and make suggestions. ** +**[v4.0](https://github.com/PanJiaChen/vue-element-admin/tree/v4.0) has in beta. It built on vue-cli@3, optimized a lot of code and added a lot of new features. Welcome to use and make suggestions.** - [Preview](http://panjiachen.github.io/vue-element-admin) diff --git a/README.zh-CN.md b/README.zh-CN.md index 310095f1..b1fa5c9f 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -32,7 +32,7 @@ [vue-element-admin](http://panjiachen.github.io/vue-element-admin) 是一个后台集成解决方案，它基于 [vue](https://github.com/vuejs/vue) 和 [element](https://github.com/ElemeFE/element)。它使用了最新的前端技术栈，内置了 i18 国际化解决方案，动态路由，权限验证，提炼了典型的业务模型，提供了丰富的功能组件，它可以帮助你快速搭建企业级中后台产品原型。相信不管你的需求是什么，本项目都能帮助到你。 -**[v4.0](https://github.com/PanJiaChen/vue-element-admin/tree/v4.0) 已经进入 beta 测试阶段。 它基于vue-cli进行构建，优化了大量代码尤其是权限和mock这快，并且增加了不少新特性。欢迎使用并提出建议。** +**[v4.0](https://github.com/PanJiaChen/vue-element-admin/tree/v4.0) 已经进入 beta 测试阶段。 它基于 vue-cli@3 进行构建，优化了大量代码(尤其是权限和 mock)，并且增加了不少新特性。欢迎使用并提出建议。** - [在线访问](http://panjiachen.github.io/vue-element-admin) @@ -54,7 +54,7 @@ - 桌面端: [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin) - Typescript版: [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (鸣谢: [@Armour](https://github.com/Armour)) -群主 **[圈子](https://jianshiapp.com/circles/1209)** 楼主会经常分享一些技术相关的东西，或者加入[qq 群](https://github.com/PanJiaChen/vue-element-admin/issues/602) +群主 **[圈子](https://jianshiapp.com/circles/1209)** 楼主会经常分享一些技术相关的东西，或者加入[qq 群](https://github.com/PanJiaChen/vue-element-admin/issues/602)或者关注[微博](https://weibo.com/u/3423485724?is_all=1) **注意：该项目使用 element-ui@2.3.0+ 版本，所以最低兼容 vue@2.5.0+** From 331173ffee0601073e228383926aaffa43ef28b7 Mon Sep 17 00:00:00 2001 From: MaYuanhai <414199639@qq.com> Date: Tue, 26 Mar 2019 12:59:31 +0800 Subject: [PATCH 3/7] perf[Css]: fixed typo (#1776) --- src/views/login/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 352df494..d74e027a 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -201,7 +201,7 @@ export default { height: 47px; caret-color: $cursor; &:-webkit-autofill { - -webkit-box-shadow: 0 0 0px 1000px $bg inset !important; + box-shadow: 0 0 0px 1000px $bg inset !important; -webkit-text-fill-color: $cursor !important; } } From 9d975b5effe7a9718f17f15e235889df363e6e8d Mon Sep 17 00:00:00 2001 From: sun ao Date: Wed, 27 Mar 2019 13:31:34 +0800 Subject: [PATCH 4/7] fix[Mock]: add xhr.responseType (#1779) --- src/mock/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mock/index.js b/src/mock/index.js index f22c762f..a6ab5f14 100644 --- a/src/mock/index.js +++ b/src/mock/index.js @@ -11,6 +11,7 @@ Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send Mock.XHR.prototype.send = function() { if (this.custom.xhr) { this.custom.xhr.withCredentials = this.withCredentials || false + this.custom.xhr.responseType = this.responseType } this.proxy_send(...arguments) } From 9a5c404ef8d1b24856f5a48266d0545895c253d2 Mon Sep 17 00:00:00 2001 From: zhu yu Date: Wed, 27 Mar 2019 16:18:30 +0900 Subject: [PATCH 5/7] docs: fix typo (#1782) i18 -> i18n --- README.zh-CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.zh-CN.md b/README.zh-CN.md index b1fa5c9f..18d4aca3 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -30,7 +30,7 @@ ## 简介 -[vue-element-admin](http://panjiachen.github.io/vue-element-admin) 是一个后台集成解决方案，它基于 [vue](https://github.com/vuejs/vue) 和 [element](https://github.com/ElemeFE/element)。它使用了最新的前端技术栈，内置了 i18 国际化解决方案，动态路由，权限验证，提炼了典型的业务模型，提供了丰富的功能组件，它可以帮助你快速搭建企业级中后台产品原型。相信不管你的需求是什么，本项目都能帮助到你。 +[vue-element-admin](http://panjiachen.github.io/vue-element-admin) 是一个后台集成解决方案，它基于 [vue](https://github.com/vuejs/vue) 和 [element](https://github.com/ElemeFE/element)。它使用了最新的前端技术栈，内置了 i18n 国际化解决方案，动态路由，权限验证，提炼了典型的业务模型，提供了丰富的功能组件，它可以帮助你快速搭建企业级中后台产品原型。相信不管你的需求是什么，本项目都能帮助到你。 **[v4.0](https://github.com/PanJiaChen/vue-element-admin/tree/v4.0) 已经进入 beta 测试阶段。 它基于 vue-cli@3 进行构建，优化了大量代码(尤其是权限和 mock)，并且增加了不少新特性。欢迎使用并提出建议。** From 77030050135b2483890bf4ed2ee636254477dee3 Mon Sep 17 00:00:00 2001 From: Pan Date: Thu, 28 Mar 2019 11:43:36 +0800 Subject: [PATCH 6/7] perf: remove redundant code --- src/views/example/list.vue | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/views/example/list.vue b/src/views/example/list.vue index 59f6ee6e..e90d3443 100644 --- a/src/views/example/list.vue +++ b/src/views/example/list.vue @@ -94,14 +94,6 @@ export default { this.total = response.data.total this.listLoading = false }) - }, - handleSizeChange(val) { - this.listQuery.limit = val - this.getList() - }, - handleCurrentChange(val) { - this.listQuery.page = val - this.getList() } } } From 20f61507419283a812042122c2d3bb4946f81075 Mon Sep 17 00:00:00 2001 From: Pan Date: Thu, 28 Mar 2019 14:15:32 +0800 Subject: [PATCH 7/7] [release] 3.11.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d2748c5a..86c334f2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-element-admin", - "version": "3.10.0", + "version": "3.11.0", "description": "A magical vue admin. Typical templates for enterprise applications. Newest development stack of vue. Lots of awesome features", "author": "Pan ", "license": "MIT",