From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001 From: ahaos <8406649+lhailgl@user.noreply.gitee.com> Date: 星期三, 13 十二月 2023 09:01:52 +0800 Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance --- src/views/system/user/profile/resetPwd.vue | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue index 11b00f6..0a39fb1 100644 --- a/src/views/system/user/profile/resetPwd.vue +++ b/src/views/system/user/profile/resetPwd.vue @@ -17,37 +17,43 @@ </template> <script setup lang="ts"> -import { updateUserPwd } from "@/api/system/user"; -import type { ResetPwdForm } from "@/api/system/user/types"; +import { updateUserPwd } from '@/api/system/user'; +import type { ResetPwdForm } from '@/api/system/user/types'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const pwdRef = ref<ElFormInstance>(); const user = ref<ResetPwdForm>({ - oldPassword: "", - newPassword: "", - confirmPassword: "" + oldPassword: '', + newPassword: '', + confirmPassword: '' }); const equalToPassword = (rule: any, value: string, callback: any) => { if (user.value.newPassword !== value) { - callback(new Error("涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�")); + callback(new Error('涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�')); } else { callback(); } }; const rules = ref({ - oldPassword: [{ required: true, message: "鏃у瘑鐮佷笉鑳戒负绌�", trigger: "blur" }], - newPassword: [{ required: true, message: "鏂板瘑鐮佷笉鑳戒负绌�", trigger: "blur" }, { - min: 6, - max: 20, - message: "闀垮害鍦� 6 鍒� 20 涓瓧绗�", - trigger: "blur" - }], - confirmPassword: [{ required: true, message: "纭瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" }, { - required: true, - validator: equalToPassword, - trigger: "blur" - }] + oldPassword: [{ required: true, message: '鏃у瘑鐮佷笉鑳戒负绌�', trigger: 'blur' }], + newPassword: [ + { required: true, message: '鏂板瘑鐮佷笉鑳戒负绌�', trigger: 'blur' }, + { + min: 6, + max: 20, + message: '闀垮害鍦� 6 鍒� 20 涓瓧绗�', + trigger: 'blur' + } + ], + confirmPassword: [ + { required: true, message: '纭瀵嗙爜涓嶈兘涓虹┖', trigger: 'blur' }, + { + required: true, + validator: equalToPassword, + trigger: 'blur' + } + ] }); /** 鎻愪氦鎸夐挳 */ @@ -55,7 +61,7 @@ pwdRef.value?.validate(async (valid: boolean) => { if (valid) { await updateUserPwd(user.value.oldPassword, user.value.newPassword); - proxy?.$modal.msgSuccess("淇敼鎴愬姛"); + proxy?.$modal.msgSuccess('淇敼鎴愬姛'); } }); }; -- Gitblit v1.9.3