From 65cf05fddb6b2215eaebf15b19345b0792908312 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 19 Oct 2022 10:55:34 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E5=9C=A8Drawer=E7=BB=84=E4=BB=B6=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98(I5VCF0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/App.vue | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ruoyi-ui/src/App.vue b/ruoyi-ui/src/App.vue index 60325ff4..a2c4b872 100644 --- a/ruoyi-ui/src/App.vue +++ b/ruoyi-ui/src/App.vue @@ -1,12 +1,16 @@ + From 839366f2b0d170b5958fc81fb97514e2a46c940f Mon Sep 17 00:00:00 2001 From: Rain <938448486@qq.com> Date: Fri, 21 Oct 2022 01:53:32 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7fastjson=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=882.0.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rain <938448486@qq.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ed74390..1be94640 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 2.11.0 1.4 2.3 - 2.0.14 + 2.0.15 0.9.1 8.2.2 4.1.2 From 98c3e4b48a3616d9e977347e3bd3e3bc05320092 Mon Sep 17 00:00:00 2001 From: runphp Date: Fri, 21 Oct 2022 03:04:00 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: runphp --- .../src/main/java/com/ruoyi/system/domain/SysMenu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java index 4e22a578..0d674d76 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java @@ -54,7 +54,7 @@ public class SysMenu extends BaseEntity /** 显示状态（0显示 1隐藏） */ private String visible; - /** 菜单状态（0显示 1隐藏） */ + /** 菜单状态（0正常 1停用） */ private String status; /** 权限字符串 */ From 58e07ba1423be34ff6c55dc921e3acd97837914b Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 21 Oct 2022 12:01:42 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=E8=A7=92=E8=89=B2=E5=92=8C=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=AD=98=E5=9C=A8=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/system/user/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index a26a33f8..2494fa24 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -576,8 +576,8 @@ export default { this.form = response.data; this.postOptions = response.posts; this.roleOptions = response.roles; - this.form.postIds = response.postIds; - this.form.roleIds = response.roleIds; + this.$set(this.form, "postIds", response.postIds); + this.$set(this.form, "roleIds", response.roleIds); this.open = true; this.title = "修改用户"; this.form.password = ""; From c759728269a667ec184db6c2016278a19dae2239 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 21 Oct 2022 12:02:25 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=9C=A8=E5=B0=8F=E5=B1=8F=E5=B9=95=E4=B8=8A?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E9=94=99=E4=BD=8D=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/assets/styles/ruoyi.scss | 5 ++-- .../views/system/user/profile/userAvatar.vue | 29 ++++++++++++++----- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index e3912cec..4d3cf312 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -250,9 +250,10 @@ } .avatar-upload-preview { - position: absolute; + position: relative; top: 50%; - transform: translate(50%, -50%); + left: 50%; + transform: translate(-50%, -50%); width: 200px; height: 200px; border-radius: 50%; diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue index 835602e8..8d3195b4 100644 --- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue +++ b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue @@ -24,7 +24,7 @@
- + 选择 @@ -32,19 +32,19 @@ - + - + - + - + - + 提 交 @@ -56,6 +56,7 @@ import store from "@/store"; import { VueCropper } from "vue-cropper"; import { uploadAvatar } from "@/api/system/user"; +import { debounce } from '@/utils' export default { components: { VueCropper }, @@ -79,7 +80,8 @@ export default { autoCropHeight: 200, // 默认生成截图框高度 fixedBox: true // 固定截图框大小 不允许改变 }, - previews: {} + previews: {}, + resizeHandler: null }; }, methods: { @@ -90,6 +92,16 @@ export default { // 打开弹出层结束时的回调 modalOpened() { this.visible = true; + if (!this.resizeHandler) { + this.resizeHandler = debounce(() => { + this.refresh() + }, 100) + } + window.addEventListener("resize", this.resizeHandler) + }, + // 刷新组件 + refresh() { + this.$refs.cropper.refresh(); }, // 覆盖默认的上传行为 requestUpload() { @@ -141,6 +153,7 @@ export default { closeDialog() { this.options.img = store.getters.avatar this.visible = false; + window.removeEventListener("resize", this.resizeHandler) } } }; @@ -169,4 +182,4 @@ export default { line-height: 110px; border-radius: 50%; } - \ No newline at end of file +