|
@@ -33,10 +33,7 @@ const PswModal: React.FC<iPswModalProps> = ({ visible, onCancel, userInfo: { id,
|
|
|
form.setFieldsValue({ id, ps_account: account })
|
|
|
}, [ visible ])
|
|
|
|
|
|
- const handlePsw = () => {
|
|
|
- const ps_password = generatePsw(12)
|
|
|
- form.setFieldsValue({ ps_password })
|
|
|
- }
|
|
|
+
|
|
|
return (
|
|
|
<div>
|
|
|
<Modal
|
|
@@ -49,7 +46,7 @@ const PswModal: React.FC<iPswModalProps> = ({ visible, onCancel, userInfo: { id,
|
|
|
onCancel={onCancel}
|
|
|
onOk={() => {
|
|
|
form.validateFields().then((values: any) => {
|
|
|
- form.setFieldsValue({ ps_password: '' })
|
|
|
+ form.resetFields()
|
|
|
onCreate(values)
|
|
|
})
|
|
|
}}
|
|
@@ -68,16 +65,16 @@ const PswModal: React.FC<iPswModalProps> = ({ visible, onCancel, userInfo: { id,
|
|
|
</Form.Item>
|
|
|
<Form.Item name="ps_password" label="登录密码" rules={[ { required: true, message: '请输入登录密码' }, () => ({
|
|
|
validator(_, value) {
|
|
|
- if (/(?=.*[0-9])(?=.*[a-zA-Z]).{6,30}/.test(value)) {
|
|
|
- return Promise.resolve()
|
|
|
+ if (value) {
|
|
|
+ if (/(?=.*[0-9])(?=.*[a-zA-Z]).{6,30}/.test(value)) {
|
|
|
+ return Promise.resolve()
|
|
|
+ }
|
|
|
+ return Promise.reject('密码必须带有字母与数字的组合且大于6位')
|
|
|
}
|
|
|
- return Promise.reject('密码必须带有字母与数字的组合且大于6位')
|
|
|
+ return Promise.resolve()
|
|
|
}
|
|
|
}) ]}>
|
|
|
- <StrengthMeter placeholder="密码支持英文数字及符号"
|
|
|
- addonAfter={<span className="pi-pd-lr-11" onClick={() => handlePsw()}>随机密码</span>}
|
|
|
- allowClear
|
|
|
- iconRender={visible => (visible ? <EyeTwoTone /> : <EyeInvisibleOutlined />)} />
|
|
|
+ <StrengthMeter />
|
|
|
|
|
|
</Form.Item>
|
|
|
</Form>
|