From f32a7105c38ee455c4b165d48651ef19fc6948db Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 18:35:55 +0800
Subject: [PATCH] !68 修复升级依赖带来的问题 * 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 | 85 ++++++++++++++++++++++--------------------
1 files changed, 45 insertions(+), 40 deletions(-)
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index 9cf7c0f..885f1c9 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -1,43 +1,3 @@
-<script setup lang="ts">
-import { updateUserProfile } from "@/api/system/user";
-import { FormRules } from "element-plus";
-import { ComponentInternalInstance } from "vue";
-import { PropType } from "vue";
-import { ElForm } from "element-plus";
-
-const props = defineProps({
- user: {
- type: Object as PropType<any>,
- }
-});
-const userForm = computed(() => props.user);
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-const userRef = ref(ElForm);
-
-const rules = ref<FormRules>({
- 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 submit = () => {
- userRef.value.validate(async (valid: boolean) => {
- if (valid) {
- await updateUserProfile(props.user)
- proxy?.$modal.msgSuccess("淇敼鎴愬姛");
- }
- });
-};
-/** 鍏抽棴鎸夐挳 */
-const close = () => {
- proxy?.$tab.closePage();
-};
-</script>
-
<template>
<el-form ref="userRef" :model="userForm" :rules="rules" label-width="80px">
<el-form-item label="鐢ㄦ埛鏄电О" prop="nickName">
@@ -61,3 +21,48 @@
</el-form-item>
</el-form>
</template>
+
+<script setup lang="ts">
+import { updateUserProfile } from '@/api/system/user';
+import { propTypes } from '@/utils/propTypes';
+
+const props = defineProps({
+ 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 submit = () => {
+ userRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ await updateUserProfile(props.user);
+ proxy?.$modal.msgSuccess('淇敼鎴愬姛');
+ }
+ });
+};
+/** 鍏抽棴鎸夐挳 */
+const close = () => {
+ proxy?.$tab.closePage();
+};
+</script>
--
Gitblit v1.9.3