wangliankun/flutter_common
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

feat(update):更新时间组件星期显示

Browse Source
This commit is contained in:
王连坤
2026-04-16 15:49:57 +08:00
parent be5b5bb951
commit d6f27690c6
6 changed files with 260 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/calendarcalendar/calendar_choose_widget.dart
View File

@@ -83,38 +83,44 @@ class _CalendarChooseWidgetState extends State<CalendarChooseWidget> {
String get dealTimeString {
String? time = "";
if (endTime == null) {
time = DateTimeUtils.dateTimeUtilsTool(
dateTime: startTime.toString(),
dateTimeUtilsType:
widget.dateTimeUtilsType ?? DateTimeUtilsType.yearMonthDay,
);
time = _formatDisplayDate(startTime);
} else if (endTime == startTime) {
time = DateTimeUtils.dateTimeUtilsTool(
dateTime: startTime.toString(),
dateTimeUtilsType:
widget.dateTimeUtilsType ?? DateTimeUtilsType.yearMonthDay,
);
time = _formatDisplayDate(startTime);
} else {
time = "${DateTimeUtils.dateTimeUtilsTool(
dateTime: startTime.toString(),
dateTimeUtilsType:
widget.dateTimeUtilsType ?? DateTimeUtilsType.yearMonthDay,
)} - ${DateTimeUtils.dateTimeUtilsTool(
dateTime: endTime.toString(),
dateTimeUtilsType:
widget.dateTimeUtilsType ?? DateTimeUtilsType.yearMonthDay,
)}";
time =
"${_formatDisplayDate(startTime)} - ${_formatDisplayDate(endTime)}";
}
return time;
}
String _formatDisplayDate(DateTime? dateTime) {
if (dateTime == null) {
return '-- --';
}
final dateType = widget.dateTimeUtilsType ?? DateTimeUtilsType.yearMonthDay;
final formatted = DateTimeUtils.dateTimeUtilsTool(
dateTime: dateTime.toString(),
dateTimeUtilsType: dateType,
);
if (widget.chooseIndex == 1 &&
dateType == DateTimeUtilsType.yearMonthDayWord) {
return '$formatted ${DateTimeUtils.getWeekDay(dateTime)}';
}
return formatted;
}
///日历弹窗
onTapDate() {
final screenHeight = MediaQuery.of(context).size.height;
final singlePickerHeight =
screenHeight * 0.5 < 420 ? 420.0 : screenHeight * 0.5;
final rangePickerHeight =
screenHeight * 0.5 < 460 ? 460.0 : screenHeight * 0.5;
if (widget.chooseIndex == 1) {
ToastUtils.showBottomSheet(
context: context,
title: '选择时间',
height: MediaQuery.of(context).size.height / 2,
height: singlePickerHeight,
isShowConfirm: true,
contentWidget: CustomDatePicker(
initialDate: DateTime.now(),
@@ -131,7 +137,7 @@ class _CalendarChooseWidgetState extends State<CalendarChooseWidget> {
ToastUtils.showBottomSheet(
context: context,
title: '选择时间',
height: MediaQuery.of(context).size.height / 2,
height: rangePickerHeight,
isShowConfirm: true,
contentWidget: CustomCalendarRangePickerWidget(
firstDate: DateTime(DateTime.now().year - 2),