li.shaoyi 2 years ago
parent
commit
e605ab4a9b

+ 8 - 5
src/packages/pc/components/layouts/header/components/modify/index.vue

@@ -6,7 +6,12 @@
                 <el-input placeholder="请输入原密码" show-password v-model="formData.OldPwd" />
             </el-form-item>
             <el-form-item label="新密码" prop="NewPwd">
-                <el-input placeholder="请输入新密码" show-password v-model="formData.NewPwd" />
+                <el-tooltip effect="light" placement="top" trigger="click" :hide-after="0">
+                    <template #content>
+                        <span style="color: #f2f2f2;">{{ validateRules.password.message }}</span>
+                    </template>
+                    <el-input placeholder="请输入新密码" show-password v-model="formData.NewPwd" />
+                </el-tooltip>
             </el-form-item>
             <el-form-item label="确认密码" prop="Confirmpassword">
                 <el-input placeholder="请重新输入新密码" show-password v-model="Confirmpassword" />
@@ -42,7 +47,7 @@ const formRules: FormRules = {
             if (validateRules.password.validate(value)) {
                 callback()
             } else {
-                callback(new Error(validateRules.password.message))
+                callback(new Error('请输入新密码'))
             }
         },
         trigger: 'blur'
@@ -71,13 +76,11 @@ const onSubmit = () => {
     formRef.value?.validate((valid) => {
         if (valid) {
             formSubmit().then(() => {
-                ElMessage.success('密码修改成功')
-                eventBus.$emit('LogoutNotify')
+                eventBus.$emit('LogoutNotify', '密码修改成功,请重新登录。')
             }).catch((err) => {
                 ElMessage.error('提交失败:' + err)
             })
         }
     })
 }
-
 </script>

+ 1 - 1
src/packages/pc/components/layouts/header/index.vue

@@ -55,7 +55,7 @@ const componentMap = new Map<string, unknown>([
     ['setting', defineAsyncComponent(() => import('./components/setting/index.vue'))],
 ])
 
-const { componentId, openComponent, closeComponent } = useComponent()
+const { componentId, openComponent, closeComponent } = useComponent(undefined, false)
 const globalStore = useGlobalStore()
 const userStore = useUserStore()
 const noticeStore = useNoticeStore()