[Task] check password tips (#282)
* [Task] check password tips
* reset display status
* ci fix
---------
Co-authored-by: peng.heng <peng.heng@dmall.com>
diff --git a/src/components/GlobalHeader/index.js b/src/components/GlobalHeader/index.js
index 46edd03..b6cf788 100644
--- a/src/components/GlobalHeader/index.js
+++ b/src/components/GlobalHeader/index.js
@@ -20,6 +20,7 @@
import { connect } from "dva";
import styles from "./index.less";
import { getIntlContent, getCurrentLocale } from "../../utils/IntlUtils";
+import { checkUserPassword } from "../../services/api";
import { emit } from "../../utils/emit";
const TranslationOutlinedSvg = () => (
@@ -65,10 +66,22 @@
? window.sessionStorage.getItem("locale")
: "en-US",
userName: window.sessionStorage.getItem("userName"),
- visible: false
+ visible: false,
+ display: "none"
};
}
+ componentDidMount(){
+ const token = window.sessionStorage.getItem("token");
+ if (token) {
+ checkUserPassword().then(res => {
+ if (res && res.code !== 200) {
+ this.setState({ visible: true ,display :"block"})
+ }
+ });
+ }
+ }
+
handleLocalesValueChange = value => {
const { changeLocalName } = this.props;
if (value.key === "0") {
@@ -139,7 +152,7 @@
loading
}}
onCancel={() => {
- this.setState({ visible: false });
+ this.setState({ visible: false, display: "none"});
resetFields();
}}
onOk={() => {
@@ -154,7 +167,7 @@
oldPassword: values.oldPassword
},
callback: () => {
- this.setState({ visible: false });
+ this.setState({ visible: false, display: "none" });
resetFields();
onLogout();
}
@@ -163,6 +176,11 @@
});
}}
>
+ <div className={styles.warning} style={{display: this.state.display}}>
+ {getIntlContent("SHENYU.SYSTEM.USER.CHANGEPASSWORD")}
+ </div>
+
+
<Form labelCol={{ span: 8 }} wrapperCol={{ span: 14 }}>
<Form.Item
required
diff --git a/src/components/GlobalHeader/index.less b/src/components/GlobalHeader/index.less
index a6f460a..bace749 100644
--- a/src/components/GlobalHeader/index.less
+++ b/src/components/GlobalHeader/index.less
@@ -28,6 +28,11 @@
position: relative;
}
+.warning {
+ padding-left: 34px;
+ color: red;
+}
+
.text {
font-size: 20px;
font-weight: 600;
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index faf9bdf..f248c0f 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -125,6 +125,7 @@
"SHENYU.SYSTEM.ROLENAME": "RoleName",
"SHENYU.SYSTEM.USER.NAME": "UserName",
"SHENYU.SYSTEM.USER.PASSWORD": "InputPassword",
+ "SHENYU.SYSTEM.USER.CHANGEPASSWORD": "The password is the default password and you must complete the change once",
"SHENYU.SYSTEM.USER": "User",
"SHENYU.SYSTEM.DATA.PERMISSION.CONFIG": "Configure Data Permission",
"SHENYU.SYSTEM.DATA.PERMISSION.CHECKED": "Checked",
diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json
index 163629d..798a6f3 100644
--- a/src/locales/zh-CN.json
+++ b/src/locales/zh-CN.json
@@ -116,6 +116,7 @@
"SHENYU.SYSTEM.ROLENAME": "角色名称",
"SHENYU.SYSTEM.USER.NAME": "请输入用户名",
"SHENYU.SYSTEM.USER.PASSWORD": "请输入密码",
+ "SHENYU.SYSTEM.USER.CHANGEPASSWORD": "密码是默认密码，您必须完成一次更改",
"SHENYU.SYSTEM.USER": "用户",
"SHENYU.SYSTEM.DATA.PERMISSION.CONFIG": "配置数据权限",
"SHENYU.SYSTEM.DATA.PERMISSION.CHECKED": "权限选择",
diff --git a/src/services/api.js b/src/services/api.js
index 8caf746..ff783fd 100644
--- a/src/services/api.js
+++ b/src/services/api.js
@@ -53,6 +53,13 @@
});
}
+/* check user password */
+export async function checkUserPassword() {
+ return request(`${baseUrl}/dashboardUser/check/password`, {
+ method: `GET`
+ });
+}
+
/* update password */
export async function updatePassword(params) {
return request(`${baseUrl}/dashboardUser/modify-password/${params.id}`, {
