From 1e0b9c0055d37bcefa9ae63257903747c3971471 Mon Sep 17 00:00:00 2001 From: Pan Date: Tue, 31 Jul 2018 11:12:38 +0800 Subject: [PATCH 01/19] fix[Tinymce]: fixed tinymce upload dialog bug #654 --- src/components/Tinymce/components/editorImage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@
上传图片 - + 点击上传 From 63d39727ac3849cd54249393a033f0f137fc7726 Mon Sep 17 00:00:00 2001 From: Pan Date: Tue, 31 Jul 2018 11:14:18 +0800 Subject: [PATCH 02/19] [release] 3.7.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", From 48a966fe1cdd676d468ba543f2703a5bfcbf07bf Mon Sep 17 00:00:00 2001 From: Pan Date: Tue, 31 Jul 2018 11:26:45 +0800 Subject: [PATCH 03/19] docs: add gitee --- README.md | 2 ++ README.zh-CN.md | 2 ++ 2 files changed, 4 insertions(+) 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..ef5251f5 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) From fe190b61884b6570d4b6e65d064186bc16a861a3 Mon Sep 17 00:00:00 2001 From: _xiaotian <952822399@qq.com> Date: Wed, 1 Aug 2018 11:03:29 +0800 Subject: [PATCH 04/19] perf[login.vue]: Improve input background and cursor color (#927) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 完善input背景和光标色; 1.完善在Chrome浏览器时登陆界面的input标签 使用记住密码之后颜色和背景不一致; 2.目前的rgb值是 #2d3a4b 修改的rgb值是 #283443; 3.修复光标使用Chrome记录的账号之后变黑色; 4.移除 .title-container .title 重复的font-weight: 400; 5.不用IE我们大家都是好朋友!~ * Update index.vue --- src/views/login/index.vue | 65 +++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 26 deletions(-) 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 { 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..5fda0b68 100644 --- a/src/views/components-demo/mixin.vue +++ b/src/views/components-demo/mixin.vue @@ -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/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' } ] } } From 0ef14ff5c6eb93c6fc7a26c071c7038982abdcec Mon Sep 17 00:00:00 2001 From: Pan Date: Thu, 9 Aug 2018 11:03:13 +0800 Subject: [PATCH 06/19] tweak --- src/components/Tinymce/toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f3733c0b37b9a8316bbb36cf7af17c12ff419cfb Mon Sep 17 00:00:00 2001 From: Pan Date: Mon, 13 Aug 2018 13:13:41 +0800 Subject: [PATCH 07/19] fix: demo links --- src/views/components-demo/mixin.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/components-demo/mixin.vue b/src/views/components-demo/mixin.vue index 5fda0b68..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 From 312a2ca8ed59975e3658e5ce47c9761fa1947c34 Mon Sep 17 00:00:00 2001 From: shufangyi <102338496@qq.com> Date: Mon, 13 Aug 2018 13:45:05 +0800 Subject: [PATCH 08/19] fixBug[waves.js]: wave's position (#949) * fixBug[waves.js]-wave's position * fix[waves.js]-wave's position --- src/directive/waves/waves.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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' From 1df59cc4b6c645e22e988e99007589dae9809494 Mon Sep 17 00:00:00 2001 From: Andrey Dos Date: Wed, 15 Aug 2018 09:51:08 +0300 Subject: [PATCH 09/19] fix typo(#965) --- src/components/Upload/singleImage.vue | 4 ++-- src/components/Upload/singleImage2.vue | 4 ++-- src/components/Upload/singleImage3.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/Upload/singleImage.vue b/src/components/Upload/singleImage.vue index 18b892fe..2a3f26f3 100644 --- a/src/components/Upload/singleImage.vue +++ b/src/components/Upload/singleImage.vue @@ -1,7 +1,7 @@