Commit 365039d6 authored by 文旺-丰林-DEV's avatar 文旺-丰林-DEV

fix style

parent 2b2cf8ab
...@@ -105,6 +105,7 @@ ol { ...@@ -105,6 +105,7 @@ ol {
} }
.ant-btn:hover { .ant-btn:hover {
color: #fff;
background-color: #00beb6 !important; background-color: #00beb6 !important;
border-color: #00beb6 !important; border-color: #00beb6 !important;
} }
...@@ -225,23 +225,15 @@ const UserManage = () => { ...@@ -225,23 +225,15 @@ const UserManage = () => {
if (!value || phoneNumberRegex.test(value)) { if (!value || phoneNumberRegex.test(value)) {
return Promise.resolve(); return Promise.resolve();
} }
return Promise.reject(new Error('请输入有效的手机号码')); return Promise.reject(new Error('请输入有效的手机号码'));
}; };
const validatePassword = (_, value: any) => { const validatePassword = (_, value: any) => {
const letterNumberRegex = /^(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[^0-9a-zA-Z])([a-zA-Z0-9\S]+)$/; const regex = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z\d]{8,16}$/;
const lowercaseRegex = /[a-z]/; if (regex.test(value)) {
const uppercaseRegex = /[A-Z]/;
const specialCharacterRegex = /[^0-9a-zA-Z]/;
if (
letterNumberRegex.test(value) &&
lowercaseRegex.test(value) &&
uppercaseRegex.test(value) &&
specialCharacterRegex.test(value)
) {
return Promise.resolve(); return Promise.resolve();
} }
return Promise.reject(new Error('密码格式不正确!')); return Promise.reject(new Error('密码必须包含数字、大小写字母且长度为8-16位'));
}; };
const handleClickOpenModalDelete = () => { const handleClickOpenModalDelete = () => {
...@@ -314,7 +306,7 @@ const UserManage = () => { ...@@ -314,7 +306,7 @@ const UserManage = () => {
<Item <Item
name={'newPassword'} name={'newPassword'}
label={'新密码'} label={'新密码'}
rules={[{ required: true, message: '请输入密码' }, { validator: validatePassword }]} rules={[{ required: true, message: '请输入密码' }, { validator: validatePassword }]}
> >
<Input placeholder="请输入6-12位的数字或者字母" /> <Input placeholder="请输入6-12位的数字或者字母" />
</Item> </Item>
...@@ -331,7 +323,7 @@ const UserManage = () => { ...@@ -331,7 +323,7 @@ const UserManage = () => {
if (!value || getFieldValue('newPassword') === value) { if (!value || getFieldValue('newPassword') === value) {
return Promise.resolve(); return Promise.resolve();
} }
return Promise.reject(new Error('两次密码输入不一致')); return Promise.reject(new Error('两次密码输入不一致'));
}, },
}), }),
]} ]}
...@@ -371,7 +363,7 @@ const UserManage = () => { ...@@ -371,7 +363,7 @@ const UserManage = () => {
name={'UserName'} name={'UserName'}
label="用户账号" label="用户账号"
rules={[ rules={[
{ required: true, message: '请输入手机号' }, { required: true, message: '请输入手机号' },
{ validator: validatePhoneNumber }, { validator: validatePhoneNumber },
]} ]}
> >
...@@ -380,16 +372,13 @@ const UserManage = () => { ...@@ -380,16 +372,13 @@ const UserManage = () => {
<Item <Item
name={'Password'} name={'Password'}
label="密码" label="密码"
rules={[ rules={[{ required: true, message: '请输入密码' }, { validator: validatePassword }]}
{ required: true, message: '请输入密码!' },
{ validator: validatePassword },
]}
> >
<Password /> <Password />
</Item> </Item>
</> </>
)} )}
<Item name={'Role'} label="角色" rules={[{ required: true, message: '请设置你的角色' }]}> <Item name={'Role'} label="角色" rules={[{ required: true, message: '请选择你的角色' }]}>
<Radio.Group> <Radio.Group>
{roles.map((item) => { {roles.map((item) => {
return ( return (
...@@ -401,7 +390,7 @@ const UserManage = () => { ...@@ -401,7 +390,7 @@ const UserManage = () => {
</Radio.Group> </Radio.Group>
</Item> </Item>
<Item name={'Name'} label="姓名" rules={[{ required: true, message: '请输入你的姓名' }]}> <Item name={'Name'} label="姓名" rules={[{ required: true, message: '请输入你的姓名' }]}>
<Input placeholder="请输入(必填)" /> <Input placeholder="" />
</Item> </Item>
<Item label="是否启用" name={'isActive'} valuePropName="checked"> <Item label="是否启用" name={'isActive'} valuePropName="checked">
<Switch checked /> <Switch checked />
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
name="viewport" name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
/> />
<title>Ant Design Pro</title> <title>加载中...</title>
<link <link
rel="icon" rel="icon"
href="https://baibaomen.oss-cn-hangzhou.aliyuncs.com/zhensheng/favicon.ico" href="https://baibaomen.oss-cn-hangzhou.aliyuncs.com/zhensheng/favicon.ico"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment