FatttSnake/oxygen-ui
1
0
Fork 0
Code Pull Requests Activity

Complete main UI #37

Merged
FatttSnake merged 192 commits from FatttSnake into dev 2024-02-23 16:31:17 +08:00
Conversation 0 Commits 192 Files Changed 215 +85 -68
1 changed files with 85 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 926ae6bef8 - Show all commits

25
src/pages/system/User.tsx
View File

@@ -595,14 +595,17 @@ const User: React.FC = () => {
>
<AntdInput allowClear />
</AntdForm.Item>
{!isDrawerEdit ? (
<>
<AntdForm.Item
hidden={isDrawerEdit}
name={'password'}
label={'密码'}
rules={[{ whitespace: false }]}
rules={[{ required: true, whitespace: false }]}
>
<AntdInput.Password allowClear />
</AntdForm.Item>
</>
) : undefined}
<AntdForm.Item name={'nickname'} label={'昵称'} rules={[{ whitespace: false }]}>
<AntdInput allowClear />
</AntdForm.Item>
@@ -613,6 +616,8 @@ const User: React.FC = () => {
>
<AntdInput type={'email'} allowClear />
</AntdForm.Item>
{formValues?.id !== '0' ? (
<>
<AntdForm.Item name={'roleIds'} label={'角色'}>
<AntdSelect
mode={'multiple'}
@@ -653,7 +658,12 @@ const User: React.FC = () => {
date ? dayjsToUtc(date) : undefined
}
>
<AntdDatePicker showTime allowClear changeOnBlur style={{ width: '100%' }} />
<AntdDatePicker
showTime
allowClear
changeOnBlur
style={{ width: '100%' }}
/>
</AntdForm.Item>
<AntdForm.Item
name={'credentialsExpiration'}
@@ -663,7 +673,12 @@ const User: React.FC = () => {
date ? dayjsToUtc(date) : undefined
}
>
<AntdDatePicker showTime allowClear changeOnBlur style={{ width: '100%' }} />
<AntdDatePicker
showTime
allowClear
changeOnBlur
style={{ width: '100%' }}
/>
</AntdForm.Item>
<AntdForm.Item
valuePropName={'checked'}
@@ -673,6 +688,8 @@ const User: React.FC = () => {
>
<AntdSwitch />
</AntdForm.Item>
</>
) : undefined}
</AntdForm>
)