From 345b3bb81a37b49580f2a668f89595907c783be9 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Thu, 15 Sep 2022 09:18:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/permission/admin/edit.vue | 40 ++++++++++++-----------
 admin/src/views/user/setting.vue          |  3 +-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/admin/src/views/permission/admin/edit.vue b/admin/src/views/permission/admin/edit.vue
index 6feb94a6..dea10b0b 100644
--- a/admin/src/views/permission/admin/edit.vue
+++ b/admin/src/views/permission/admin/edit.vue
@@ -76,12 +76,16 @@
                 </el-form-item>
 
                 <el-form-item label="密码" prop="password">
-                    <el-input v-model="formData.password" show-password placeholder="请输入密码" />
+                    <el-input
+                        v-model.trim="formData.password"
+                        show-password
+                        placeholder="请输入密码"
+                    />
                 </el-form-item>
 
                 <el-form-item label="确认密码" prop="passwordConfirm">
                     <el-input
-                        v-model="formData.passwordConfirm"
+                        v-model.trim="formData.passwordConfirm"
                         show-password
                         placeholder="请输入确认密码"
                     />
@@ -137,6 +141,13 @@ const isRoot = computed(() => {
     return formData.role == '0'
 })
 
+const passwordConfirmValidator = (rule: object, value: string, callback: any) => {
+    if (formData.password) {
+        if (!value) callback(new Error('请再次输入密码'))
+        if (value !== formData.password) callback(new Error('两次输入密码不一致!'))
+    }
+    callback()
+}
 const formRules = reactive({
     username: [
         {
@@ -163,13 +174,6 @@ const formRules = reactive({
         {
             required: true,
             message: '请输入密码',
-            trigger: 'blur',
-            pattern: /(^[^\s]*$)/ // 不能输入空格
-        },
-        {
-            validator: (rule: object, value: string, callback: any) => {
-                !value ? callback(new Error('请输入密码')) : callback()
-            },
             trigger: 'blur'
         }
     ] as any[],
@@ -177,17 +181,10 @@ const formRules = reactive({
         {
             required: true,
             message: '请再次输入密码',
-            trigger: 'blur',
-            pattern: /(^[^\s]*$)/ // 不能输入空格
+            trigger: 'blur'
         },
         {
-            validator: (rule: object, value: string, callback: any) => {
-                if (formData.password) {
-                    if (!value) callback(new Error('请再次输入密码'))
-                    if (value !== formData.password) callback(new Error('两次输入密码不一致!'))
-                }
-                callback()
-            },
+            validator: passwordConfirmValidator,
             trigger: 'blur'
         }
     ] as any[]
@@ -235,7 +232,12 @@ const setFormData = async (row: any) => {
         Number(formData.postId) == 0 && (formData.postId = '')
     }
     formRules.password = []
-    formRules.passwordConfirm = []
+    formRules.passwordConfirm = [
+        {
+            validator: passwordConfirmValidator,
+            trigger: 'blur'
+        }
+    ]
 }
 
 const handleClose = () => {
diff --git a/admin/src/views/user/setting.vue b/admin/src/views/user/setting.vue
index fdb09d51..946b3ec9 100644
--- a/admin/src/views/user/setting.vue
+++ b/admin/src/views/user/setting.vue
@@ -68,6 +68,7 @@
 <script setup lang="ts">
 import { setUserInfo } from '@/api/user'
 import useUserStore from '@/stores/modules/user'
+import feedback from '@/utils/feedback'
 import type { FormInstance } from 'element-plus'
 const formRef = ref<FormInstance>()
 const userStore = useUserStore()
@@ -136,7 +137,6 @@ const rules = reactive<object>({
 // 获取个人设置
 const getUser = async () => {
     const userInfo = userStore.userInfo
-    console.log(userInfo)
     for (const key in formData) {
         //@ts-ignore
         formData[key] = userInfo[key]
@@ -146,6 +146,7 @@ const getUser = async () => {
 // 设置个人设置
 const setUser = async () => {
     await setUserInfo(formData)
+    feedback.msgSuccess('保存成功')
     userStore.getUserInfo()
 }