From 30836b07973a9587d62ead920943acf0d513ac7e Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Thu, 28 Jul 2022 10:28:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=B3=E9=97=AD=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81=E5=8A=9F=E8=83=BD=E5=89=8D=E7=AB=AF=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/user/profile/index.ts      |  4 ++--
 yudao-ui-admin-vue3/src/hooks/web/useAxios.ts |  9 ++++++++-
 .../src/views/Login/components/LoginForm.vue  | 18 +++++++++++++-----
 .../views/Profile/components/ProfileUser.vue  |  4 ++--
 .../views/Profile/components/UserAvatar.vue   | 19 +++++++++++++------
 5 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/api/system/user/profile/index.ts b/yudao-ui-admin-vue3/src/api/system/user/profile/index.ts
index bf3d322f1..a5a24490f 100644
--- a/yudao-ui-admin-vue3/src/api/system/user/profile/index.ts
+++ b/yudao-ui-admin-vue3/src/api/system/user/profile/index.ts
@@ -24,6 +24,6 @@ export const updateUserPwdApi = (oldPassword: string, newPassword: string) => {
 }
 
 // 用户头像上传
-export const uploadAvatarApi = (data) => {
-  return request.put({ url: '/system/user/profile/update-avatar', data: data })
+export const uploadAvatarApi = (params) => {
+  return request.upload({ url: '/system/user/profile/update-avatar', params })
 }
diff --git a/yudao-ui-admin-vue3/src/hooks/web/useAxios.ts b/yudao-ui-admin-vue3/src/hooks/web/useAxios.ts
index f8aacd087..331969c6e 100644
--- a/yudao-ui-admin-vue3/src/hooks/web/useAxios.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useAxios.ts
@@ -42,12 +42,19 @@ async function downloadFn<T = any>(option: AxiosConfig): Promise<T> {
   return res as unknown as Promise<T>
 }
 
+async function uploadFn<T = any>(option: AxiosConfig): Promise<T> {
+  option.headersType = 'multipart/form-data'
+  const res = await request({ method: 'PUT', ...option })
+  return res as unknown as Promise<T>
+}
+
 export const useAxios = () => {
   return {
     get: getFn,
     post: postFn,
     delete: deleteFn,
     put: putFn,
-    download: downloadFn
+    download: downloadFn,
+    upload: uploadFn
   }
 }
diff --git a/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue b/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
index e65e0ca22..bb876e0a3 100644
--- a/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
+++ b/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
@@ -47,12 +47,17 @@ const iconHouse = useIcon({ icon: 'ep:house' })
 const iconAvatar = useIcon({ icon: 'ep:avatar' })
 const iconLock = useIcon({ icon: 'ep:lock' })
 const iconCircleCheck = useIcon({ icon: 'ep:circle-check' })
-const LoginRules = {
+const LoginCaptchaRules = {
   tenantName: [required],
   username: [required],
   password: [required],
   code: [required]
 }
+const LoginRules = {
+  tenantName: [required],
+  username: [required],
+  password: [required]
+}
 const loginLoading = ref(false)
 const loginData = reactive({
   codeImg: '',
@@ -76,8 +81,11 @@ const loginData = reactive({
 // 获取验证码
 const getCode = async () => {
   const res = await LoginApi.getCodeImgApi()
-  loginData.codeImg = 'data:image/gif;base64,' + res.img
-  loginData.loginForm.uuid = res.uuid
+  loginData.captchaEnable = res.enable
+  if (res.enable) {
+    loginData.codeImg = 'data:image/gif;base64,' + res.img
+    loginData.loginForm.uuid = res.uuid
+  }
 }
 //获取租户ID
 const getTenantId = async () => {
@@ -159,7 +167,7 @@ onMounted(async () => {
 <template>
   <el-form
     :model="loginData.loginForm"
-    :rules="LoginRules"
+    :rules="loginData.captchaEnable ? LoginCaptchaRules : LoginRules"
     label-position="top"
     class="login-form"
     label-width="120px"
@@ -205,7 +213,7 @@ onMounted(async () => {
         </el-form-item>
       </el-col>
       <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
-        <el-form-item prop="code">
+        <el-form-item prop="code" v-if="loginData.captchaEnable">
           <el-row justify="space-between" style="width: 100%">
             <el-col :span="14">
               <el-input
diff --git a/yudao-ui-admin-vue3/src/views/Profile/components/ProfileUser.vue b/yudao-ui-admin-vue3/src/views/Profile/components/ProfileUser.vue
index 5efa7c40c..ee61fb73a 100644
--- a/yudao-ui-admin-vue3/src/views/Profile/components/ProfileUser.vue
+++ b/yudao-ui-admin-vue3/src/views/Profile/components/ProfileUser.vue
@@ -2,7 +2,7 @@
 import { getUserProfileApi } from '@/api/system/user/profile'
 import { onMounted, reactive } from 'vue'
 import dayjs from 'dayjs'
-import { UserAvatarVue } from './'
+import UserAvatar from './UserAvatar.vue'
 import { ProfileVO } from '@/api/system/user/profile/types'
 import { useI18n } from '@/hooks/web/useI18n'
 const { t } = useI18n()
@@ -43,7 +43,7 @@ onMounted(async () => {
 <template>
   <div>
     <div class="text-center">
-      <UserAvatarVue :img="userInfo.user.avatar" />
+      <UserAvatar :img="userInfo.user.avatar" />
     </div>
     <ul class="list-group list-group-striped">
       <li class="list-group-item">
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 47887ad09..4cdfb1484 100644
--- a/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
+++ b/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
@@ -2,7 +2,7 @@
 import { ref, reactive, watch } from 'vue'
 import 'vue-cropper/dist/index.css'
 import { VueCropper } from 'vue-cropper'
-import { ElRow, ElCol, ElUpload, ElMessage } from 'element-plus'
+import { ElRow, ElCol, ElUpload, ElMessage, ElDialog } from 'element-plus'
 import { propTypes } from '@/utils/propTypes'
 import { uploadAvatarApi } from '@/api/system/user/profile'
 const cropper = ref()
@@ -43,6 +43,8 @@ const changeScale = (num: number) => {
   num = num || 1
   cropper.value.changeScale(num)
 }
+// 覆盖默认的上传行为
+const requestUpload = () => {}
 /** 上传预处理 */
 const beforeUpload = (file: Blob) => {
   if (file.type.indexOf('image/') == -1) {
@@ -84,7 +86,7 @@ watch(
   <div class="user-info-head" @click="editCropper()">
     <img :src="state.options.img" title="点击上传头像" class="img-circle img-lg" alt="" />
   </div>
-  <Dialog
+  <el-dialog
     v-model="state.dialogVisible"
     :title="state.dialogTitle"
     width="50%"
@@ -92,7 +94,7 @@ watch(
     style="padding: 30px 20px"
   >
     <el-row>
-      <el-col :xs="24" :md="12" :style="{ height: '350px' }">
+      <el-col :xs="24" :md="12" style="height: 350px">
         <VueCropper
           ref="cropper"
           :img="state.options.img"
@@ -105,7 +107,7 @@ watch(
           v-if="state.cropperVisible"
         />
       </el-col>
-      <el-col :xs="24" :md="12" :style="{ height: '350px' }">
+      <el-col :xs="24" :md="12" style="height: 350px">
         <div class="avatar-upload-preview">
           <img
             :src="state.previews.url"
@@ -119,7 +121,12 @@ watch(
     <template #footer>
       <el-row>
         <el-col :lg="2" :md="2">
-          <el-upload action="#" :show-file-list="false" :before-upload="beforeUpload">
+          <el-upload
+            action="#"
+            :http-request="requestUpload"
+            :show-file-list="false"
+            :before-upload="beforeUpload"
+          >
             <el-button size="small">
               <Icon icon="ep:upload-filled" class="mr-5px" />
               选择
@@ -151,7 +158,7 @@ watch(
         </el-col>
       </el-row>
     </template>
-  </Dialog>
+  </el-dialog>
 </template>
 <style scoped>
 .user-info-head {