From 1d5133b6957d95c0c2b1e9641f21a03d9a1c85bb Mon Sep 17 00:00:00 2001 From: ahaos <8406649+lhailgl@user.noreply.gitee.com> Date: 星期四, 14 十二月 2023 16:17:12 +0800 Subject: [PATCH] !69 修复升级依赖带来的类型问题 * fix 修复变量问题 * Merge remote-tracking branch 'origin/dev' into dev * update 依赖升级 * update 依赖升级 * Merge remote-tracking branch 'origin/dev' into dev * 升级依赖 * Merge remote-tracking branch 'origin/ts' into ts * 升级依赖 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance --- src/views/system/user/profile/userInfo.vue | 44 ++++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue index 3dd5ff7..289f8d4 100644 --- a/src/views/system/user/profile/userInfo.vue +++ b/src/views/system/user/profile/userInfo.vue @@ -23,38 +23,42 @@ </template> <script setup lang="ts"> -import { updateUserProfile } from "@/api/system/user"; +import { updateUserProfile } from '@/api/system/user'; +import { propTypes } from '@/utils/propTypes'; const props = defineProps({ - user: { - type: Object as PropType<any>, - required: true - } + user: propTypes.any.isRequired }); const userForm = computed(() => props.user); const { proxy } = getCurrentInstance() as ComponentInternalInstance; const userRef = ref<ElFormInstance>(); -const rules = ref<ElFormRules>({ - nickName: [{ required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }], - email: [{ required: true, message: "閭鍦板潃涓嶈兘涓虹┖", trigger: "blur" }, { - type: "email", - message: "璇疯緭鍏ユ纭殑閭鍦板潃", - trigger: ["blur", "change"] - }], - phonenumber: [{ - required: true, - message: "鎵嬫満鍙风爜涓嶈兘涓虹┖", - trigger: "blur" - }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜", trigger: "blur" }] -}); - +const rule: ElFormRules = { + nickName: [{ required: true, message: '鐢ㄦ埛鏄电О涓嶈兘涓虹┖', trigger: 'blur' }], + email: [ + { required: true, message: '閭鍦板潃涓嶈兘涓虹┖', trigger: 'blur' }, + { + type: 'email', + message: '璇疯緭鍏ユ纭殑閭鍦板潃', + trigger: ['blur', 'change'] + } + ], + phonenumber: [ + { + required: true, + message: '鎵嬫満鍙风爜涓嶈兘涓虹┖', + trigger: 'blur' + }, + { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '璇疯緭鍏ユ纭殑鎵嬫満鍙风爜', trigger: 'blur' } + ] +}; +const rules = ref<ElFormRules>(rule); /** 鎻愪氦鎸夐挳 */ const submit = () => { userRef.value?.validate(async (valid: boolean) => { if (valid) { await updateUserProfile(props.user); - proxy?.$modal.msgSuccess("淇敼鎴愬姛"); + proxy?.$modal.msgSuccess('淇敼鎴愬姛'); } }); }; -- Gitblit v1.9.3