From 7eb0fb1655b38387991f3a9d00658fcba961881e Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Wed, 21 Dec 2022 16:18:47 +0800
Subject: [PATCH] fix: close modal

---
 yudao-ui-admin-vue3/src/components/Cropper/src/CopperModal.vue   | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------
 yudao-ui-admin-vue3/src/components/Cropper/src/CropperAvatar.vue |  17 ++++++++++++++---
 yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue  |   5 ++++-
 3 files changed, 127 insertions(+), 112 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/components/Cropper/src/CopperModal.vue b/yudao-ui-admin-vue3/src/components/Cropper/src/CopperModal.vue
index a2c50f6..919e1d1 100644
--- a/yudao-ui-admin-vue3/src/components/Cropper/src/CopperModal.vue
+++ b/yudao-ui-admin-vue3/src/components/Cropper/src/CopperModal.vue
@@ -1,115 +1,117 @@
 <template>
-  <Dialog
-    v-model="dialogVisible"
-    :title="t('cropper.modalTitle')"
-    width="800px"
-    maxHeight="380px"
-    :canFullscreen="false"
-  >
-    <div :class="prefixCls">
-      <div :class="`${prefixCls}-left`">
-        <div :class="`${prefixCls}-cropper`">
-          <CropperImage
-            v-if="src"
-            :src="src"
-            height="300px"
-            :circled="circled"
-            @cropend="handleCropend"
-            @ready="handleReady"
-          />
-        </div>
+  <div>
+    <Dialog
+      v-model="dialogVisible"
+      :title="t('cropper.modalTitle')"
+      width="800px"
+      maxHeight="380px"
+      :canFullscreen="false"
+    >
+      <div :class="prefixCls">
+        <div :class="`${prefixCls}-left`">
+          <div :class="`${prefixCls}-cropper`">
+            <CropperImage
+              v-if="src"
+              :src="src"
+              height="300px"
+              :circled="circled"
+              @cropend="handleCropend"
+              @ready="handleReady"
+            />
+          </div>
 
-        <div :class="`${prefixCls}-toolbar`">
-          <el-upload :fileList="[]" accept="image/*" :beforeUpload="handleBeforeUpload">
-            <el-tooltip :content="t('cropper.selectImage')" placement="bottom">
-              <XButton preIcon="ant-design:upload-outlined" type="primary" />
-            </el-tooltip>
-          </el-upload>
-          <el-space>
-            <el-tooltip :content="t('cropper.btn_reset')" placement="bottom">
-              <XButton
-                type="primary"
-                preIcon="ant-design:reload-outlined"
-                size="small"
-                :disabled="!src"
-                @click="handlerToolbar('reset')"
-              />
-            </el-tooltip>
-            <el-tooltip :content="t('cropper.btn_rotate_left')" placement="bottom">
-              <XButton
-                type="primary"
-                preIcon="ant-design:rotate-left-outlined"
-                size="small"
-                :disabled="!src"
-                @click="handlerToolbar('rotate', -45)"
-              />
-            </el-tooltip>
-            <el-tooltip :content="t('cropper.btn_rotate_right')" placement="bottom">
-              <XButton
-                type="primary"
-                preIcon="ant-design:rotate-right-outlined"
-                size="small"
-                :disabled="!src"
-                @click="handlerToolbar('rotate', 45)"
-              />
-            </el-tooltip>
-            <el-tooltip :content="t('cropper.btn_scale_x')" placement="bottom">
-              <XButton
-                type="primary"
-                preIcon="vaadin:arrows-long-h"
-                size="small"
-                :disabled="!src"
-                @click="handlerToolbar('scaleX')"
-              />
-            </el-tooltip>
-            <el-tooltip :content="t('cropper.btn_scale_y')" placement="bottom">
-              <XButton
-                type="primary"
-                preIcon="vaadin:arrows-long-v"
-                size="small"
-                :disabled="!src"
-                @click="handlerToolbar('scaleY')"
-              />
-            </el-tooltip>
-            <el-tooltip :content="t('cropper.btn_zoom_in')" placement="bottom">
-              <XButton
-                type="primary"
-                preIcon="ant-design:zoom-in-outlined"
-                size="small"
-                :disabled="!src"
-                @click="handlerToolbar('zoom', 0.1)"
-              />
-            </el-tooltip>
-            <el-tooltip :content="t('cropper.btn_zoom_out')" placement="bottom">
-              <XButton
-                type="primary"
-                preIcon="ant-design:zoom-out-outlined"
-                size="small"
-                :disabled="!src"
-                @click="handlerToolbar('zoom', -0.1)"
-              />
-            </el-tooltip>
-          </el-space>
-        </div>
-      </div>
-      <div :class="`${prefixCls}-right`">
-        <div :class="`${prefixCls}-preview`">
-          <img :src="previewSource" v-if="previewSource" :alt="t('cropper.preview')" />
+          <div :class="`${prefixCls}-toolbar`">
+            <el-upload :fileList="[]" accept="image/*" :beforeUpload="handleBeforeUpload">
+              <el-tooltip :content="t('cropper.selectImage')" placement="bottom">
+                <XButton preIcon="ant-design:upload-outlined" type="primary" />
+              </el-tooltip>
+            </el-upload>
+            <el-space>
+              <el-tooltip :content="t('cropper.btn_reset')" placement="bottom">
+                <XButton
+                  type="primary"
+                  preIcon="ant-design:reload-outlined"
+                  size="small"
+                  :disabled="!src"
+                  @click="handlerToolbar('reset')"
+                />
+              </el-tooltip>
+              <el-tooltip :content="t('cropper.btn_rotate_left')" placement="bottom">
+                <XButton
+                  type="primary"
+                  preIcon="ant-design:rotate-left-outlined"
+                  size="small"
+                  :disabled="!src"
+                  @click="handlerToolbar('rotate', -45)"
+                />
+              </el-tooltip>
+              <el-tooltip :content="t('cropper.btn_rotate_right')" placement="bottom">
+                <XButton
+                  type="primary"
+                  preIcon="ant-design:rotate-right-outlined"
+                  size="small"
+                  :disabled="!src"
+                  @click="handlerToolbar('rotate', 45)"
+                />
+              </el-tooltip>
+              <el-tooltip :content="t('cropper.btn_scale_x')" placement="bottom">
+                <XButton
+                  type="primary"
+                  preIcon="vaadin:arrows-long-h"
+                  size="small"
+                  :disabled="!src"
+                  @click="handlerToolbar('scaleX')"
+                />
+              </el-tooltip>
+              <el-tooltip :content="t('cropper.btn_scale_y')" placement="bottom">
+                <XButton
+                  type="primary"
+                  preIcon="vaadin:arrows-long-v"
+                  size="small"
+                  :disabled="!src"
+                  @click="handlerToolbar('scaleY')"
+                />
+              </el-tooltip>
+              <el-tooltip :content="t('cropper.btn_zoom_in')" placement="bottom">
+                <XButton
+                  type="primary"
+                  preIcon="ant-design:zoom-in-outlined"
+                  size="small"
+                  :disabled="!src"
+                  @click="handlerToolbar('zoom', 0.1)"
+                />
+              </el-tooltip>
+              <el-tooltip :content="t('cropper.btn_zoom_out')" placement="bottom">
+                <XButton
+                  type="primary"
+                  preIcon="ant-design:zoom-out-outlined"
+                  size="small"
+                  :disabled="!src"
+                  @click="handlerToolbar('zoom', -0.1)"
+                />
+              </el-tooltip>
+            </el-space>
+          </div>
         </div>
-        <template v-if="previewSource">
-          <div :class="`${prefixCls}-group`">
-            <el-avatar :src="previewSource" size="large" />
-            <el-avatar :src="previewSource" :size="48" />
-            <el-avatar :src="previewSource" :size="64" />
-            <el-avatar :src="previewSource" :size="80" />
+        <div :class="`${prefixCls}-right`">
+          <div :class="`${prefixCls}-preview`">
+            <img :src="previewSource" v-if="previewSource" :alt="t('cropper.preview')" />
           </div>
-        </template>
+          <template v-if="previewSource">
+            <div :class="`${prefixCls}-group`">
+              <el-avatar :src="previewSource" size="large" />
+              <el-avatar :src="previewSource" :size="48" />
+              <el-avatar :src="previewSource" :size="64" />
+              <el-avatar :src="previewSource" :size="80" />
+            </div>
+          </template>
+        </div>
       </div>
-    </div>
-    <template #footer>
-      <el-button type="primary" @click="handleOk">{{ t('cropper.okText') }}</el-button>
-    </template>
-  </Dialog>
+      <template #footer>
+        <el-button type="primary" @click="handleOk">{{ t('cropper.okText') }}</el-button>
+      </template>
+    </Dialog>
+  </div>
 </template>
 <script setup lang="ts">
 import { useDesign } from '@/hooks/web/useDesign'
@@ -173,7 +175,6 @@ function handlerToolbar(event: string, arg?: number) {
 async function handleOk() {
   const blob = dataURLtoBlob(previewSource.value)
   emit('uploadSuccess', { source: previewSource.value, data: blob, filename: filename })
-  closeModal()
 }
 function openModal() {
   dialogVisible.value = true
diff --git a/yudao-ui-admin-vue3/src/components/Cropper/src/CropperAvatar.vue b/yudao-ui-admin-vue3/src/components/Cropper/src/CropperAvatar.vue
index a960afc..455f9f0 100644
--- a/yudao-ui-admin-vue3/src/components/Cropper/src/CropperAvatar.vue
+++ b/yudao-ui-admin-vue3/src/components/Cropper/src/CropperAvatar.vue
@@ -4,7 +4,11 @@
     <el-button :class="`${prefixCls}-upload-btn`" @click="open()" v-if="showBtn">
       {{ btnText ? btnText : t('cropper.selectImage') }}
     </el-button>
-    <CopperModal ref="cropperModel" @upload-success="handleUploadSuccess" :srcValue="sourceValue" />
+    <CopperModal
+      ref="cropperModelRef"
+      @upload-success="handleUploadSuccess"
+      :srcValue="sourceValue"
+    />
   </div>
 </template>
 <script setup lang="ts">
@@ -29,7 +33,7 @@ const prefixCls = getPrefixCls('cropper-avatar')
 const message = useMessage()
 const { t } = useI18n()
 
-const cropperModel = ref()
+const cropperModelRef = ref()
 
 watchEffect(() => {
   sourceValue.value = props.value
@@ -49,8 +53,15 @@ function handleUploadSuccess({ source, data, filename }) {
 }
 
 function open() {
-  cropperModel.value.openModal()
+  cropperModelRef.value.openModal()
 }
+function close() {
+  cropperModelRef.value.closeModal()
+}
+defineExpose({
+  open,
+  close
+})
 </script>
 <style lang="scss" scoped>
 $prefix-cls: #{$namespace}--cropper-avatar;
diff --git a/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue b/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
index e6c0a28..d879d5b 100644
--- a/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
+++ b/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="change-avatar">
     <CropperAvatar
+      ref="cropperRef"
       :value="avatar"
       :showBtn="false"
       @change="handelUpload"
@@ -10,7 +11,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 import { propTypes } from '@/utils/propTypes'
 import { CropperAvatar } from '@/components/Cropper'
 import { uploadAvatarApi } from '@/api/system/user/profile'
@@ -21,8 +22,10 @@ const avatar = computed(() => {
   return props.img
 })
 
+const cropperRef = ref()
 const handelUpload = async ({ data }) => {
   await uploadAvatarApi({ avatarFile: data })
+  cropperRef.value.close()
 }
 </script>
 
--
libgit2 0.21.4