From b91c28df2f734b680198e755b7828666e238cea0 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 21 六月 2024 16:43:44 +0800 Subject: [PATCH] Merge branch 'develop' --- src/components/header/loginform.jsx | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/components/header/loginform.jsx b/src/components/header/loginform.jsx index 95e702f..5154a9c 100644 --- a/src/components/header/loginform.jsx +++ b/src/components/header/loginform.jsx @@ -3,8 +3,6 @@ import { Form, Input, Checkbox } from 'antd' import { UserOutlined, LockOutlined } from '@ant-design/icons' -import zhCN from '@/locales/zh-CN/login.js' -import enUS from '@/locales/en-US/login.js' import './index.scss' class HeaderLoginForm extends Component { @@ -13,7 +11,6 @@ } state = { - dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS, remember: false, username: '', password: '', @@ -22,8 +19,7 @@ } UNSAFE_componentWillMount () { - let _url = window.location.href.split('#')[0] + 'cloud' - let _user = localStorage.getItem(_url) + let _user = localStorage.getItem(window.GLOB.sysSign + 'cloud') if (_user) { try { @@ -36,7 +32,7 @@ if (_user && new Date().getTime() - _user.time > 1000 * 7 * 24 * 60 * 60) { _user = '' - localStorage.removeItem(_url) + localStorage.removeItem(window.GLOB.sysSign + 'cloud') } if (_user) { @@ -86,10 +82,9 @@ rememberChange = (e) => { let val = e.target.checked - let _url = window.location.href.split('#')[0] + 'cloud' if (!val) { - localStorage.removeItem(_url) + localStorage.removeItem(window.GLOB.sysSign + 'cloud') } } @@ -116,12 +111,12 @@ </Form.Item> : null} <Form.Item style={{marginBottom: '0px', height: '60px'}}> {getFieldDecorator('username', { - rules: [{ required: true, message: this.state.dict['login.username.empty'] }], + rules: [{ required: true, message: '璇疯緭鍏ョ敤鎴峰悕' }], initialValue: username, })( <Input prefix={<UserOutlined style={{ color: 'rgba(0,0,0,.25)' }}/>} - placeholder={this.state.dict['login.username']} + placeholder="鐢ㄦ埛鍚�" autoComplete="off" onPressEnter={(e) => {this.handleSubmit(e, 'password')}} /> @@ -133,10 +128,10 @@ rules: [ { required: true, - message: this.state.dict['login.password.empty'], + message: '璇疯緭鍏ュ瘑鐮�', } ] - })(<Input.Password onPressEnter={(e) => {this.handleSubmit(e, 'username')}} placeholder={this.state.dict['login.password']} prefix={<LockOutlined style={{ color: 'rgba(0,0,0,.25)' }} />} />)} + })(<Input.Password onPressEnter={(e) => {this.handleSubmit(e, 'username')}} placeholder="瀵嗙爜" prefix={<LockOutlined style={{ color: 'rgba(0,0,0,.25)' }} />} />)} </Form.Item> {window.GLOB.keepKey ? <Form.Item style={{marginBottom: '10px'}}> {getFieldDecorator('remember', { -- Gitblit v1.8.0