Merge branch 'feature/v1.2' into 'main'

fix: Add psw to account

See merge request apipark/APIPark!67
This commit is contained in:
杨梦洁
2024-10-29 16:47:44 +08:00
2 changed files with 18 additions and 1 deletions
@@ -35,6 +35,7 @@ export type MemberDropdownModalFieldType = {
parent?:string
email?:string
departmentIds?:string[]
password:string
};
export type MemberDropdownModalProps = {
@@ -80,6 +80,15 @@ export const MemberDropdownModal = forwardRef<MemberDropdownModalHandle,MemberDr
})
}
const generateRandomString = () =>{
const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
let result = '';
for (let i = 0; i < 8; i++) {
result += chars.charAt(Math.floor(Math.random() * chars.length));
}
return result;
}
useEffect(() => {
switch(type){
case 'addChild':
@@ -89,7 +98,7 @@ export const MemberDropdownModal = forwardRef<MemberDropdownModalHandle,MemberDr
form.setFieldsValue({id:entity!.id,name:entity!.name})
break
case 'addMember':
form.setFieldsValue('-1' === selectedMemberGroupId ? {} : {departmentIds:selectedMemberGroupId})
form.setFieldsValue({...('-1' === selectedMemberGroupId ? {} : {departmentIds:selectedMemberGroupId}), password:generateRandomString()})
break
case 'editMember':
form.setFieldsValue({...entity,departmentIds:(entity as MemberTableListItem )?.department?.map(x=>x.id)})
@@ -182,6 +191,13 @@ export const MemberDropdownModal = forwardRef<MemberDropdownModalHandle,MemberDr
>
<Input className="w-INPUT_NORMAL" placeholder={$t(PLACEHOLDER.input)}/>
</Form.Item>
<Form.Item<MemberDropdownModalFieldType>
label={$t("密码")}
name="password"
rules={[{required: type === 'addMember',whitespace:true }]}
>
<Input className="w-INPUT_NORMAL" placeholder={$t(PLACEHOLDER.input)}/>
</Form.Item>
<Form.Item<MemberDropdownModalFieldType>
label={$t("部门")}
name="departmentIds"