fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 21:49:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge bug

Browse Source
This commit is contained in:
katherinehhh 2025-01-24 16:01:52 +08:00
parent 955c167f5e
commit daefd83114
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/components/MobileDatePicker.tsx
View File

@ -94,7 +94,7 @@ const MobileDateTimePicker = connect(
/> />
</div> </div>
<DatePicker <DatePicker
{...others} {...rest}
cancelText={t('Cancel')} cancelText={t('Cancel')}
confirmText={t('Confirm')} confirmText={t('Confirm')}
visible={visible} visible={visible}
@ -104,8 +104,8 @@ const MobileDateTimePicker = connect(
}} }}
precision={showTime && picker === 'date' ? getPrecision(timeFormat) : picker === 'date' ? 'day' : picker} precision={showTime && picker === 'date' ? getPrecision(timeFormat) : picker === 'date' ? 'day' : picker}
renderLabel={labelRenderer} renderLabel={labelRenderer}
min={others.min || new Date(1000, 0, 1)} min={rest.min || new Date(1000, 0, 1)}
max={others.max || new Date(9999, 11, 31)} max={rest.max || new Date(9999, 11, 31)}
onConfirm={(val) => { onConfirm={(val) => {
handleConfirm(val); handleConfirm(val);
}} }}