Commit 064b2ce6 by Archer Committed by GitHub

fix: ui (#6642)

parent 0ce410d7
...@@ -89,70 +89,93 @@ const DateRangePicker = ({ ...@@ -89,70 +89,93 @@ const DateRangePicker = ({
<Card <Card
position={'absolute'} position={'absolute'}
zIndex={1} zIndex={1}
css={{ p={3}
'--rdp-background-color': '#d6e8ff',
'--rdp-accent-color': '#0000ff'
}}
{...(popPosition === 'top' {...(popPosition === 'top'
? { ? {
bottom: '40px' bottom: '40px'
} }
: {})} : {})}
> >
<DayPicker <Box
locale={zhCN} sx={{
id="test" '.rdp-day_button:hover:not(:disabled)': {
mode="range" backgroundColor: '#E1EAFF'
defaultMonth={defaultDate.to} },
selected={range} '.rdp-range_start .rdp-day_button, .rdp-range_end .rdp-day_button': {
disabled={[ backgroundColor: '#3370FF',
{ from: new Date(2022, 3, 1), to: addDays(new Date(), -180) }, color: 'white',
{ from: addDays(new Date(), 1), to: new Date(2099, 1, 1) } border: 'none'
]} },
onSelect={(date) => { '.rdp-range_start .rdp-day_button:hover, .rdp-range_end .rdp-day_button:hover': {
let typeDate = date as DateRangeType; backgroundColor: '#2860E0'
if (!typeDate || typeDate?.from === undefined) { },
typeDate = { '.rdp-button_previous:hover, .rdp-button_next:hover': {
from: range?.from, backgroundColor: '#F0F4FF',
to: range?.from borderRadius: '6px'
};
} }
if (typeDate?.to === undefined) { }}
typeDate.to = typeDate.from; >
<DayPicker
locale={zhCN}
id="test"
mode="range"
style={
{
'--rdp-accent-color': '#3370FF',
'--rdp-accent-background-color': '#E1EAFF'
} as React.CSSProperties
} }
defaultMonth={defaultDate.to}
selected={range}
disabled={[
{ from: new Date(2022, 3, 1), to: addDays(new Date(), -180) },
{ from: addDays(new Date(), 1), to: new Date(2099, 1, 1) }
]}
onSelect={(date) => {
let typeDate = date as DateRangeType;
if (!typeDate || typeDate?.from === undefined) {
typeDate = {
from: range?.from,
to: range?.from
};
}
if (typeDate?.to === undefined) {
typeDate.to = typeDate.from;
}
if (typeDate?.from) { if (typeDate?.from) {
typeDate.from = new Date(typeDate.from.setHours(0, 0, 0, 0)); typeDate.from = new Date(typeDate.from.setHours(0, 0, 0, 0));
} }
if (typeDate?.to) { if (typeDate?.to) {
typeDate.to = new Date(typeDate.to.setHours(23, 59, 59, 999)); typeDate.to = new Date(typeDate.to.setHours(23, 59, 59, 999));
} }
setRange(typeDate); setRange(typeDate);
onChange?.(typeDate); onChange?.(typeDate);
}} }}
footer={ footer={
<Flex justifyContent={'flex-end'}> <Flex justifyContent={'flex-end'}>
<Button <Button
variant={'outline'} variant={'outline'}
size={'sm'} size={'sm'}
mr={2} mr={2}
onClick={() => setShowSelected(false)} onClick={() => setShowSelected(false)}
> >
{t('common:Close')} {t('common:Close')}
</Button> </Button>
<Button <Button
size={'sm'} size={'sm'}
onClick={() => { onClick={() => {
onSuccess?.(range || defaultDate); onSuccess?.(range || defaultDate);
setShowSelected(false); setShowSelected(false);
}} }}
> >
{t('common:Confirm')} {t('common:Confirm')}
</Button> </Button>
</Flex> </Flex>
} }
/> />
</Box>
</Card> </Card>
)} )}
</Box> </Box>
......
...@@ -136,23 +136,45 @@ const DateTimePicker = ({ ...@@ -136,23 +136,45 @@ const DateTimePicker = ({
top={`${position.top}px`} top={`${position.top}px`}
left={`${position.left}px`} left={`${position.left}px`}
zIndex={1500} zIndex={1500}
css={{ p={3}
'--rdp-background-color': '#d6e8ff',
'--rdp-accent-color': '#0000ff'
}}
> >
<DayPicker <Box
locale={zhCN} sx={{
mode="single" '.rdp-day_button:hover:not(:disabled)': {
defaultMonth={selectedDate} backgroundColor: '#E1EAFF'
selected={selectedDate} },
disabled={disabled} '.rdp-selected .rdp-day_button': {
onSelect={(date) => { backgroundColor: '#3370FF',
setSelectedDate(date); color: 'white',
onChange?.(date); border: 'none'
setShowSelected(false); },
'.rdp-selected .rdp-day_button:hover': {
backgroundColor: '#2860E0'
},
'.rdp-button_previous:hover, .rdp-button_next:hover': {
backgroundColor: '#F0F4FF',
borderRadius: '6px'
}
}} }}
/> >
<DayPicker
locale={zhCN}
mode="single"
style={
{
'--rdp-accent-color': '#3370FF'
} as React.CSSProperties
}
defaultMonth={selectedDate}
selected={selectedDate}
disabled={disabled}
onSelect={(date) => {
setSelectedDate(date);
onChange?.(date);
setShowSelected(false);
}}
/>
</Box>
</Card> </Card>
</Portal> </Portal>
)} )}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment