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 | 91 ++++++++++++++++++++++++++-------------------
1 files changed, 52 insertions(+), 39 deletions(-)
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index 2d62c84..289f8d4 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -1,56 +1,69 @@
<template>
- <el-form ref="userRef" :model="user" :rules="rules" label-width="80px">
- <el-form-item label="鐢ㄦ埛鏄电О" prop="nickName">
- <el-input v-model="user.nickName" maxlength="30" />
- </el-form-item>
- <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
- <el-input v-model="user.phonenumber" maxlength="11" />
- </el-form-item>
- <el-form-item label="閭" prop="email">
- <el-input v-model="user.email" maxlength="50" />
- </el-form-item>
- <el-form-item label="鎬у埆">
- <el-radio-group v-model="user.sex">
- <el-radio label="0">鐢�</el-radio>
- <el-radio label="1">濂�</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item>
+ <el-form ref="userRef" :model="userForm" :rules="rules" label-width="80px">
+ <el-form-item label="鐢ㄦ埛鏄电О" prop="nickName">
+ <el-input v-model="userForm.nickName" maxlength="30" />
+ </el-form-item>
+ <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
+ <el-input v-model="userForm.phonenumber" maxlength="11" />
+ </el-form-item>
+ <el-form-item label="閭" prop="email">
+ <el-input v-model="userForm.email" maxlength="50" />
+ </el-form-item>
+ <el-form-item label="鎬у埆">
+ <el-radio-group v-model="userForm.sex">
+ <el-radio label="0">鐢�</el-radio>
+ <el-radio label="1">濂�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item>
<el-button type="primary" @click="submit">淇濆瓨</el-button>
<el-button type="danger" @click="close">鍏抽棴</el-button>
- </el-form-item>
- </el-form>
+ </el-form-item>
+ </el-form>
</template>
-<script setup>
-import { updateUserProfile } from "@/api/system/user";
+<script setup lang="ts">
+import { updateUserProfile } from '@/api/system/user';
+import { propTypes } from '@/utils/propTypes';
const props = defineProps({
- user: {
- type: Object
- }
+ user: propTypes.any.isRequired
});
-
-const { proxy } = getCurrentInstance();
-
-const rules = ref({
- 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 userForm = computed(() => props.user);
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const userRef = ref<ElFormInstance>();
+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);
/** 鎻愪氦鎸夐挳 */
-function submit() {
- proxy.$refs.userRef.validate(valid => {
+const submit = () => {
+ userRef.value?.validate(async (valid: boolean) => {
if (valid) {
- updateUserProfile(props.user).then(response => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- });
+ await updateUserProfile(props.user);
+ proxy?.$modal.msgSuccess('淇敼鎴愬姛');
}
});
};
/** 鍏抽棴鎸夐挳 */
-function close() {
- proxy.$tab.closePage();
+const close = () => {
+ proxy?.$tab.closePage();
};
</script>
--
Gitblit v1.9.3