| @@ -63,8 +63,8 @@ const UserForm: React.FC<UserFormProps> = (props) => { | |||||
| loginIp: props.values.loginIp, | loginIp: props.values.loginIp, | ||||
| loginDate: props.values.loginDate, | loginDate: props.values.loginDate, | ||||
| remark: props.values.remark, | remark: props.values.remark, | ||||
| gitLinkUsername: props.values.gitLinkUsername, | |||||
| gitLinkPassword: props.values.gitLinkPassword, | |||||
| // gitLinkUsername: props.values.gitLinkUsername, | |||||
| // gitLinkPassword: props.values.gitLinkPassword, | |||||
| credit: props.values.credit, | credit: props.values.credit, | ||||
| }); | }); | ||||
| }, [form, props, statusOptions]); | }, [form, props, statusOptions]); | ||||
| @@ -150,7 +150,7 @@ const UserForm: React.FC<UserFormProps> = (props) => { | |||||
| colProps={{ md: 12, xl: 12 }} | colProps={{ md: 12, xl: 12 }} | ||||
| rules={[ | rules={[ | ||||
| { | { | ||||
| required: false, | |||||
| required: true, | |||||
| message: <FormattedMessage id="请输入手机号码!" defaultMessage="请输入手机号码!" />, | message: <FormattedMessage id="请输入手机号码!" defaultMessage="请输入手机号码!" />, | ||||
| }, | }, | ||||
| { | { | ||||
| @@ -174,7 +174,7 @@ const UserForm: React.FC<UserFormProps> = (props) => { | |||||
| colProps={{ md: 12, xl: 12 }} | colProps={{ md: 12, xl: 12 }} | ||||
| rules={[ | rules={[ | ||||
| { | { | ||||
| required: false, | |||||
| required: true, | |||||
| message: <FormattedMessage id="请输入用户邮箱!" defaultMessage="请输入用户邮箱!" />, | message: <FormattedMessage id="请输入用户邮箱!" defaultMessage="请输入用户邮箱!" />, | ||||
| }, | }, | ||||
| { | { | ||||
| @@ -202,9 +202,9 @@ const UserForm: React.FC<UserFormProps> = (props) => { | |||||
| required: true, | required: true, | ||||
| }, | }, | ||||
| { | { | ||||
| pattern: /^[a-zA-Z0-9](?:[a-zA-Z0-9_.-]*[a-zA-Z0-9])?$/, | |||||
| pattern: /^[a-zA-Z](?:[a-zA-Z0-9_.-]*[a-zA-Z0-9])?$/, | |||||
| message: | message: | ||||
| '只能包含数字,字母,下划线(_),中横线(-),英文句号(.),且必须以数字或字母开头与结尾', | |||||
| '只能包含数字,字母,下划线(_),中横线(-),英文句号(.),且必须以字母开头,数字或字母结尾', | |||||
| }, | }, | ||||
| ]} | ]} | ||||
| /> | /> | ||||
| @@ -221,7 +221,17 @@ const UserForm: React.FC<UserFormProps> = (props) => { | |||||
| autoComplete: 'new-password', | autoComplete: 'new-password', | ||||
| }} | }} | ||||
| allowClear | allowClear | ||||
| rules={props.values.userId ? [] : [{ required: true, message: '请输入密码!' }]} | |||||
| rules={ | |||||
| props.values.userId | |||||
| ? [] | |||||
| : [ | |||||
| { required: true, message: '请输入密码!' }, | |||||
| { | |||||
| pattern: /^[A-Za-z0-9!"#$%&'()*+,-./:;<=>?@[\\\]^_`{|}~]{8,16}$/, | |||||
| message: '密码长度为8 ~ 16位,只支持字母数字和符号', | |||||
| }, | |||||
| ] | |||||
| } | |||||
| /> | /> | ||||
| <ProFormSelect | <ProFormSelect | ||||
| valueEnum={sexOptions} | valueEnum={sexOptions} | ||||
| @@ -279,7 +289,7 @@ const UserForm: React.FC<UserFormProps> = (props) => { | |||||
| colProps={{ md: 12, xl: 12 }} | colProps={{ md: 12, xl: 12 }} | ||||
| rules={[{ required: true, message: '请选择角色!' }]} | rules={[{ required: true, message: '请选择角色!' }]} | ||||
| /> | /> | ||||
| <ProFormText | |||||
| {/* <ProFormText | |||||
| name="gitLinkUsername" | name="gitLinkUsername" | ||||
| label="Git 用户名" | label="Git 用户名" | ||||
| placeholder="请输入 Git 用户名" | placeholder="请输入 Git 用户名" | ||||
| @@ -300,7 +310,7 @@ const UserForm: React.FC<UserFormProps> = (props) => { | |||||
| autoComplete: 'new-password', | autoComplete: 'new-password', | ||||
| }} | }} | ||||
| rules={props.values.userId ? [] : [{ required: true, message: '请输入 Git 密码!' }]} | rules={props.values.userId ? [] : [{ required: true, message: '请输入 Git 密码!' }]} | ||||
| /> | |||||
| /> */} | |||||
| <ProFormDigit | <ProFormDigit | ||||
| name="credit" | name="credit" | ||||
| label="算力积分" | label="算力积分" | ||||