diff --git a/README.md b/README.md index 7624c398..7dfa567d 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,8 @@ It is a magical vue admin based on the newest development stack of vue, built-in - [Donate](https://panjiachen.github.io/vue-element-admin-site/donate/) +- [Gitee](https://panjiachen.gitee.io/vue-element-admin/) 国内用户可访问该地址在线预览 + **This project is positioned as a background integration solution and is not suitable for secondary development as a basic template.** - Base template recommends using: [vueAdmin-template](https://github.com/PanJiaChen/vueAdmin-template)   diff --git a/README.zh-CN.md b/README.zh-CN.md index 11360760..45f84e02 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -36,6 +36,8 @@ - [Donate](https://panjiachen.github.io/vue-element-admin-site/zh/donate/) +- [Gitee](https://panjiachen.gitee.io/vue-element-admin/) 国内用户可访问该地址在线预览 + **本项目的定位是后台集成方案，不适合当基础模板来开发。** - 模板建议使用: [vueAdmin-template](https://github.com/PanJiaChen/vueAdmin-template)   - 桌面端: [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin) @@ -51,7 +53,8 @@ - [手摸手，带你用 vue 撸后台 系列四(vueAdmin 一个极简的后台基础模板)](https://juejin.im/post/595b4d776fb9a06bbe7dba56) - [手摸手，带你封装一个 vue component](https://segmentfault.com/a/1190000009090836) - [手摸手，带你优雅的使用 icon](https://juejin.im/post/59bb864b5188257e7a427c09) - + - [手摸手，带你用合理的姿势使用webpack4（上）](https://juejin.im/post/5b56909a518825195f499806) + - [手摸手，带你用合理的姿势使用webpack4（下）](https://juejin.im/post/5b5d6d6f6fb9a04fea58aabc) 或者加入该群主 **[圈子](https://jianshiapp.com/circles/1209)** 楼主会经常分享一些技术相关的东西 diff --git a/package.json b/package.json index 803a6fb5..e8ee8955 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-element-admin", - "version": "3.7.2", + "version": "3.7.3", "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/components/Share/dropdownMenu.vue b/src/components/Share/dropdownMenu.vue index f00b9cd7..e3bb7dec 100644 --- a/src/components/Share/dropdownMenu.vue +++ b/src/components/Share/dropdownMenu.vue @@ -35,7 +35,7 @@ export default { diff --git a/src/components/Tinymce/components/editorImage.vue b/src/components/Tinymce/components/editorImage.vue index dd46916a..7569e4f2 100644 --- a/src/components/Tinymce/components/editorImage.vue +++ b/src/components/Tinymce/components/editorImage.vue @@ -2,7 +2,7 @@
上传图片 - + 点击上传 diff --git a/src/components/Tinymce/toolbar.js b/src/components/Tinymce/toolbar.js index a31efc4a..7d6c2c73 100644 --- a/src/components/Tinymce/toolbar.js +++ b/src/components/Tinymce/toolbar.js @@ -1,6 +1,6 @@ // Here is a list of the toolbar // Detail list see https://www.tinymce.com/docs/advanced/editor-control-identifiers/#toolbarcontrols -const toolbar = ['bold italic underline strikethrough alignleft aligncenter alignright outdent indent blockquote undo redo removeformat subscript superscript code codesample', 'hr bullist numlist link image charmap preview anchor pagebreak insertdatetime media table emoticons forecolor backcolor fullscreen'] +const toolbar = ['bold italic underline strikethrough alignleft aligncenter alignright outdent indent blockquote undo redo removeformat subscript superscript code codesample', 'hr bullist numlist link image charmap preview anchor pagebreak insertdatetime media table emoticons forecolor backcolor fullscreen'] export default toolbar diff --git a/src/directive/waves/waves.js b/src/directive/waves/waves.js index ac1d8611..83070113 100644 --- a/src/directive/waves/waves.js +++ b/src/directive/waves/waves.js @@ -29,8 +29,8 @@ export default{ ripple.style.left = (rect.width / 2 - ripple.offsetWidth / 2) + 'px' break default: - ripple.style.top = (e.pageY - rect.top - ripple.offsetHeight / 2 - document.body.scrollTop) + 'px' - ripple.style.left = (e.pageX - rect.left - ripple.offsetWidth / 2 - document.body.scrollLeft) + 'px' + ripple.style.top = (e.pageY - rect.top - ripple.offsetHeight / 2 - document.documentElement.scrollTop || document.body.scrollTop) + 'px' + ripple.style.left = (e.pageX - rect.left - ripple.offsetWidth / 2 - document.documentElement.scrollLeft || document.body.scrollLeft) + 'px' } ripple.style.backgroundColor = opts.color ripple.className = 'waves-ripple z-active' diff --git a/src/lang/index.js b/src/lang/index.js index a36a9804..a77b07ea 100644 --- a/src/lang/index.js +++ b/src/lang/index.js @@ -20,8 +20,11 @@ const messages = { } const i18n = new VueI18n({ - locale: Cookies.get('language') || 'en', // set locale - messages // set locale messages + // set locale + // options: en or zh + locale: Cookies.get('language') || 'en', + // set locale messages + messages }) export default i18n diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js index 06d092c9..25d513cd 100644 --- a/src/store/modules/tagsView.js +++ b/src/store/modules/tagsView.js @@ -38,7 +38,7 @@ const tagsView = { for (const i of state.cachedViews) { if (i === view.name) { const index = state.cachedViews.indexOf(i) - state.cachedViews = state.cachedViews.slice(index, i + 1) + state.cachedViews = state.cachedViews.slice(index, index + 1) break } } diff --git a/src/views/components-demo/markdown.vue b/src/views/components-demo/markdown.vue index 61a3b51f..4e8b0648 100644 --- a/src/views/components-demo/markdown.vue +++ b/src/views/components-demo/markdown.vue @@ -2,7 +2,7 @@
Markdown is based on simplemde-markdown-editor ，Simply encapsulated in Vue. - + 相关文章
diff --git a/src/views/components-demo/mixin.vue b/src/views/components-demo/mixin.vue index 78adb069..dc80b23f 100644 --- a/src/views/components-demo/mixin.vue +++ b/src/views/components-demo/mixin.vue @@ -7,19 +7,19 @@
- Components + Documentation - Charts + Icons - Excel + Excel - Table + Table - Form + Form Theme @@ -130,12 +130,14 @@ export default { title: [{ required: true, trigger: 'change', validator: validate }] }, articleList: [ - { title: '基础篇', href: 'https://segmentfault.com/a/1190000009275424' }, - { title: '登录权限篇', href: 'https://segmentfault.com/a/1190000009506097' }, - { title: '实战篇', href: 'https://segmentfault.com/a/1190000009762198' }, - { title: 'vueAdmin-template 篇', href: 'https://segmentfault.com/a/1190000010043013' }, + { title: '基础篇', href: 'https://juejin.im/post/59097cd7a22b9d0065fb61d2' }, + { title: '登录权限篇', href: 'https://juejin.im/post/591aa14f570c35006961acac' }, + { title: '实战篇', href: 'https://juejin.im/post/593121aa0ce4630057f70d35' }, + { title: 'vueAdmin-template 篇', href: 'https://juejin.im/post/595b4d776fb9a06bbe7dba56' }, { title: '自行封装 component', href: 'https://segmentfault.com/a/1190000009090836' }, - { title: '优雅的使用 icon', href: 'https://segmentfault.com/a/https://segmentfault.com/a/1190000012213278' } + { title: '优雅的使用 icon', href: 'https://juejin.im/post/59bb864b5188257e7a427c09' }, + { title: 'webpack4（上）', href: 'https://juejin.im/post/59bb864b5188257e7a427c09' }, + { title: 'webpack4（下）', href: 'https://juejin.im/post/5b5d6d6f6fb9a04fea58aabc' } ] } } diff --git a/src/views/dashboard/admin/components/TodoList/index.vue b/src/views/dashboard/admin/components/TodoList/index.vue index 34f0241d..207cdbab 100644 --- a/src/views/dashboard/admin/components/TodoList/index.vue +++ b/src/views/dashboard/admin/components/TodoList/index.vue @@ -72,7 +72,7 @@ export default { } }, methods: { - setLocalStorgae() { + setLocalStorage() { window.localStorage.setItem(STORAGE_KEY, JSON.stringify(this.todos)) }, addTodo(e) { @@ -82,30 +82,30 @@ export default { text, done: false }) - this.setLocalStorgae() + this.setLocalStorage() } e.target.value = '' }, toggleTodo(val) { val.done = !val.done - this.setLocalStorgae() + this.setLocalStorage() }, deleteTodo(todo) { this.todos.splice(this.todos.indexOf(todo), 1) - this.setLocalStorgae() + this.setLocalStorage() }, editTodo({ todo, value }) { todo.text = value - this.setLocalStorgae() + this.setLocalStorage() }, clearCompleted() { this.todos = this.todos.filter(todo => !todo.done) - this.setLocalStorgae() + this.setLocalStorage() }, toggleAll({ done }) { this.todos.forEach(todo => { todo.done = done - this.setLocalStorgae() + this.setLocalStorage() }) } }, diff --git a/src/views/documentation/index.vue b/src/views/documentation/index.vue index d9f8b9e8..c0ca2657 100644 --- a/src/views/documentation/index.vue +++ b/src/views/documentation/index.vue @@ -14,12 +14,14 @@ export default { data() { return { articleList: [ - { title: '基础篇', href: 'https://segmentfault.com/a/1190000009275424' }, - { title: '登录权限篇', href: 'https://segmentfault.com/a/1190000009506097' }, - { title: '实战篇', href: 'https://segmentfault.com/a/1190000009762198' }, - { title: 'vueAdmin-template 篇', href: 'https://segmentfault.com/a/1190000010043013' }, + { title: '基础篇', href: 'https://juejin.im/post/59097cd7a22b9d0065fb61d2' }, + { title: '登录权限篇', href: 'https://juejin.im/post/591aa14f570c35006961acac' }, + { title: '实战篇', href: 'https://juejin.im/post/593121aa0ce4630057f70d35' }, + { title: 'vueAdmin-template 篇', href: 'https://juejin.im/post/595b4d776fb9a06bbe7dba56' }, { title: '自行封装 component', href: 'https://segmentfault.com/a/1190000009090836' }, - { title: '优雅的使用 icon', href: 'https://segmentfault.com/a/1190000012213278' } + { title: '优雅的使用 icon', href: 'https://juejin.im/post/59bb864b5188257e7a427c09' }, + { title: 'webpack4（上）', href: 'https://juejin.im/post/59bb864b5188257e7a427c09' }, + { title: 'webpack4（下）', href: 'https://juejin.im/post/5b5d6d6f6fb9a04fea58aabc' } ] } } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 4d15c055..1ff3d311 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -142,36 +142,50 @@ export default {