密码修改bug

src/components/setting/ModifyPwd.vue

@@ -21,7 +21,7 @@ const modalTitle = ref('修改密码')
 const userForm = ref<Record<string, any>>({
   passwd: '',
   newpasswd: '',
-  confirmPasswd: '',
+  confirmNewPasswd: '',
 })
 watchEffect(() => {
   modalType.value = settingStore.userModalState
@@ -29,6 +29,7 @@ watchEffect(() => {
   if (settingStore.currentEditUser && settingStore.currentEditUser.id !== userForm.value.id) {
     userForm.value = settingStore.currentEditUser
     userForm.value.newpasswd = ''
+    userForm.value.confirmNewPasswd = ''
   }
   if (focusedInput.value) {
     userForm.value[focusedInput.value] = inputValue.value
@@ -48,16 +49,9 @@ const onSave = (formRef: FormInstance | undefined) => {
     }
   })
 }
-const doSave = () => {
-  const passwd = userForm.value.passwd
-  const newpasswd = userForm.value.newpasswd
-  const confirmNewPasswd = userForm.value.confirmNewPasswd
-  if (settingStore.currentEditUser && passwd !== settingStore.currentEditUser.passwd) {
-    FtMessage.error('输入的旧密码不对')
-    return
-  }
-  if (newpasswd !== confirmNewPasswd) {
-    FtMessage.error('输入的密码不一致')
+const doSave = async () => {
+  const valid = await userFormRef.value.validate()
+  if (!valid) {
     return
   }
   const saveParams = {
@@ -65,8 +59,8 @@ const doSave = () => {
     fnName: 'chpasswd',
     params: {
       id: userForm.value.id,
-      passwd,
-      newpasswd,
+      passwd: userForm.value.passwd,
+      newpasswd: userForm.value.newpasswd,
     },
   }
   syncSendCmd(saveParams).then((res) => {
@@ -106,7 +100,7 @@ const validateConfirmPasswd = (rule: any, value: string, callback: any) => {
   else if (!value) {
     callback(new Error('请再次输入密码'))
   }
-  else if (value !== userForm.value.passwd) {
+  else if (value !== userForm.value.newpasswd) {
     callback(new Error('两次输入密码不一致!'))
   }
   else {
@@ -124,7 +118,7 @@ const rules = reactive<FormRules>({
     { min: 4, max: 10, message: '长度4-10', trigger: 'blur' },
     { validator: validatePasswd, trigger: 'blur' },
   ],
-  confirmPasswd: [
+  confirmNewPasswd: [
     { required: true, message: '输入新密码', trigger: 'blur' },
     { min: 4, max: 10, message: '长度4-10', trigger: 'blur' },
     { validator: validateConfirmPasswd, trigger: 'blur' },
@@ -150,33 +144,18 @@ const rules = reactive<FormRules>({
             v-show="false"
             label="旧密码："
             prop="passwd"
-            :rules="{
-              required: true,
-              message: '输入密码',
-              trigger: ['blur', 'change'],
-            }"
           >
             <ft-input v-model="userForm.passwd" name="passwd" type="password" placeholder="密码" />
           </el-form-item>
           <el-form-item
             label="新密码："
             prop="newpasswd"
-            :rules="{
-              required: true,
-              message: '输入密码',
-              trigger: ['blur', 'change'],
-            }"
           >
             <ft-input v-model="userForm.newpasswd" name="newpasswd" type="password" placeholder="密码" />
           </el-form-item>
           <el-form-item
-            label="确认新密码："
+            label="确认密码："
             prop="confirmNewPasswd"
-            :rules="{
-              required: true,
-              message: '输入密码',
-              trigger: ['blur', 'change'],
-            }"
           >
             <ft-input
               v-model="userForm.confirmNewPasswd"