From 090e258bf9867f3678c1607529c6d4fb2fd0eba7 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 24 Mar 2021 15:46:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E9=9A=90=E5=88=97=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=9A=90=E8=97=8F=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/RightToolbar/index.vue        |  9 ++++++++-
 ruoyi-ui/src/views/system/user/profile/userAvatar.vue | 11 ++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ruoyi-ui/src/components/RightToolbar/index.vue b/ruoyi-ui/src/components/RightToolbar/index.vue
index 9bf972277..c7ab139d7 100644
--- a/ruoyi-ui/src/components/RightToolbar/index.vue
+++ b/ruoyi-ui/src/components/RightToolbar/index.vue
@@ -43,7 +43,14 @@ export default {
       type: Array,
     },
   },
-
+  created() {
+    // 显隐列初始默认隐藏列
+    for (let item in this.columns) {
+      if (this.columns[item].visible === false) {
+        this.value.push(parseInt(item));
+      }
+    }
+  },
   methods: {
     // 搜索
     toggleSearch() {
diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
index d478e30eb..49c2cd545 100644
--- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
@@ -81,14 +81,6 @@ export default {
       },
       previews: {}
     };
-  },
-    created() {
-    // 显隐列组件默认隐藏列
-    for (let item in this.columns) {
-      if (this.columns[item].visible === false) {
-        this.value.push(parseInt(item))
-      }
-    }
   },
   methods: {
     // 编辑头像
@@ -145,9 +137,10 @@ export default {
     realTime(data) {
       this.previews = data;
     },
-    //取消截图，关闭对话框
+    // 关闭窗口
     closeDialog() {
       this.options.img = store.getters.avatar
+	  this.visible = false;
     }
   }
 };