diff --git a/README.md b/README.md index bf0e08be..5f26a357 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@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) - [Documentation](https://panjiachen.github.io/vue-element-admin-site/) diff --git a/README.zh-CN.md b/README.zh-CN.md index 5dc9f1d7..18d4aca3 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -30,7 +30,9 @@ ## 简介 -[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),并且增加了不少新特性。欢迎使用并提出建议。** - [在线访问](http://panjiachen.github.io/vue-element-admin) @@ -52,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+** 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", 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) } 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() } } } 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; } }