diff --git a/react-ui/src/pages/System/User/edit.tsx b/react-ui/src/pages/System/User/edit.tsx index 3c8f045b..8fb46945 100644 --- a/react-ui/src/pages/System/User/edit.tsx +++ b/react-ui/src/pages/System/User/edit.tsx @@ -63,8 +63,8 @@ const UserForm: React.FC = (props) => { loginIp: props.values.loginIp, loginDate: props.values.loginDate, remark: props.values.remark, - gitLinkUsername: props.values.gitLinkUsername, - gitLinkPassword: props.values.gitLinkPassword, + // gitLinkUsername: props.values.gitLinkUsername, + // gitLinkPassword: props.values.gitLinkPassword, credit: props.values.credit, }); }, [form, props, statusOptions]); @@ -150,7 +150,7 @@ const UserForm: React.FC = (props) => { colProps={{ md: 12, xl: 12 }} rules={[ { - required: false, + required: true, message: , }, { @@ -174,7 +174,7 @@ const UserForm: React.FC = (props) => { colProps={{ md: 12, xl: 12 }} rules={[ { - required: false, + required: true, message: , }, { @@ -202,9 +202,9 @@ const UserForm: React.FC = (props) => { 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: - '只能包含数字,字母,下划线(_),中横线(-),英文句号(.),且必须以数字或字母开头与结尾', + '只能包含数字,字母,下划线(_),中横线(-),英文句号(.),且必须以字母开头,数字或字母结尾', }, ]} /> @@ -221,7 +221,17 @@ const UserForm: React.FC = (props) => { autoComplete: 'new-password', }} 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位,只支持字母数字和符号', + }, + ] + } /> = (props) => { colProps={{ md: 12, xl: 12 }} rules={[{ required: true, message: '请选择角色!' }]} /> - = (props) => { autoComplete: 'new-password', }} rules={props.values.userId ? [] : [{ required: true, message: '请输入 Git 密码!' }]} - /> + /> */}