Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

fix: edit username inputer

emaile37bc5a832a3
diff --git a/web/src/components/MyAccountSection.tsx b/web/src/components/MyAccountSection.tsx
index 05e22ef47..d7b3ee2a5 100644
--- a/web/src/components/MyAccountSection.tsx
+++ b/web/src/components/MyAccountSection.tsx
@@ -21,7 +21,6 @@ const MyAccountSection: React.FC<Props> = () => {
const { userState } = useContext(appContext);
const user = userState.user as Model.User;
const [username, setUsername] = useState<string>(user.username);
- const [showEditUsernameInputs, setShowEditUsernameInputs] = useState(false);
const [showConfirmUnbindGithubBtn, setShowConfirmUnbindGithubBtn] = useState(false);
const handleUsernameChanged = (e: React.ChangeEvent<HTMLInputElement>) => {
@@ -36,7 +35,6 @@ const MyAccountSection: React.FC<Props> = () => {
}
if (username === user.username) {
- setShowEditUsernameInputs(false);
return;
}
@@ -56,7 +54,6 @@ const MyAccountSection: React.FC<Props> = () => {
await userService.updateUsername(username);
await userService.doSignIn();
- setShowEditUsernameInputs(false);
toastHelper.info("修改成功~");
} catch (error: any) {
toastHelper.error(error.message);
@@ -88,6 +85,7 @@ const MyAccountSection: React.FC<Props> = () => {
const handlePreventDefault = (e: React.MouseEvent) => {
e.preventDefault();
+ e.stopPropagation();
};
return (
@@ -104,24 +102,15 @@ const MyAccountSection: React.FC<Props> = () => {
</label>
<label className="form-label input-form-label username-label">
<span className="normal-text">账号:</span>
- <input
- type="text"
- readOnly={!showEditUsernameInputs}
- value={username}
- onClick={() => {
- setShowEditUsernameInputs(true);
- }}
- onChange={handleUsernameChanged}
- />
- <div className="btns-container" onClick={handlePreventDefault}>
- <span className={"btn confirm-btn " + (showEditUsernameInputs ? "" : "hidden")} onClick={handleConfirmEditUsernameBtnClick}>
+ <input type="text" value={username} onChange={handleUsernameChanged} />
+ <div className={`btns-container ${username === user.username ? "hidden" : ""}`} onClick={handlePreventDefault}>
+ <span className="btn confirm-btn" onClick={handleConfirmEditUsernameBtnClick}>
保存
</span>
<span
- className={"btn cancel-btn " + (showEditUsernameInputs ? "" : "hidden")}
+ className="btn cancel-btn"
onClick={() => {
setUsername(user.username);
- setShowEditUsernameInputs(false);
}}
>
撤销
diff --git a/web/src/less/my-account-section.less b/web/src/less/my-account-section.less
index 651be6077..ae1af7e91 100644
--- a/web/src/less/my-account-section.less
+++ b/web/src/less/my-account-section.less
@@ -17,10 +17,6 @@
&:focus {
border-color: black;
-
- + .btns-container {
- display: flex;
- }
}
}
@@ -28,7 +24,6 @@
.flex(row, flex-start, center);
margin-left: 8px;
flex-shrink: 0;
- display: none;
> .btn {
font-size: 12px;