From 7e5200a09b2c6282382ec8725220f5561de139f6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 二月 2024 18:05:53 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/components/header/loginform.jsx | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/components/header/loginform.jsx b/src/components/header/loginform.jsx
index b20fc13..95e702f 100644
--- a/src/components/header/loginform.jsx
+++ b/src/components/header/loginform.jsx
@@ -43,7 +43,7 @@
this.setState({
remember: true,
username: _user.username,
- password: '*********',
+ password: _user.password ? '*********' : '',
oripassword: _user.password
})
}
@@ -59,8 +59,8 @@
values.password = oripassword
}
- values.username = values.username.replace(/\t*|\v*|\s*/g, '')
- values.password = values.password.replace(/\t*|\v*|\s*/g, '')
+ values.username = values.username.replace(/\t+|\v+|\s+/g, '')
+ values.password = values.password.replace(/\t+|\v+|\s+/g, '')
resolve(values)
} else {
@@ -94,8 +94,15 @@
}
componentDidMount () {
- const input = document.getElementById('username')
- input && input.focus()
+ const { username, password } = this.state
+
+ if (username && !password) {
+ const input = document.getElementById('password')
+ input && input.focus()
+ } else {
+ const input = document.getElementById('username')
+ input && input.focus()
+ }
}
render() {
--
Gitblit v1.8.0