marking
/
Making.School.Asignment.app
19
1
Fork 0
Code Pull Requests Actions Releases Activity

mcy_new #1

Merged
wangyang merged 179 commits from mcy_new into master 2025-08-28 10:10:45 +08:00
Conversation 0 Commits 179 Files Changed 699 +8 -5
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 158fbc355f - Show all commits

10
making_school_asignment_app/lib/page/home_page/children/job_report/widget/personnel_data_overview.dart
View File

@ -83,24 +83,26 @@ class _PersonnelDataOverviewState extends State<PersonnelDataOverview> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 94.r,
width: 100.r,
height: 40.h,
alignment: Alignment.center,
color: const Color.fromRGBO(230, 230, 230, 1),
margin: EdgeInsets.only(bottom: 1.h, right: 1.w),
padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
// padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
child: quickText(entrie.key, color: const Color.fromRGBO(24, 35, 77, 1), size: 12.sp, maxLines: 2),
),
...entrie.value.map((e) {
bool isTransparentChineseNew = isTransparentChinese && (e?.length ?? 0) == 0;
return Container(
width: 100.r,
height: 40.h,
alignment: Alignment.center,
margin: EdgeInsets.only(bottom: 1.h, right: 1.w),
padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
// padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
color: const Color.fromRGBO(245, 245, 245, 1),
child: isTransparentChineseNew
? quickText('透明', color: Colors.transparent, size: 12.sp)
: RegExp(r'^\d+$').hasMatch(e) || e.contains('%')
: RegExp(r'^\d+$').hasMatch(e) || e.contains(' %')
? Row(
mainAxisSize: MainAxisSize.min,
children: [

3
making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart
View File

@ -271,7 +271,8 @@ Widget $easyRefresh({
emptyWidget: data.isEmpty ? const MyEmptyWidget() : null,
controller: controller,
header: MaterialHeader(),
footer: MaterialFooter(),
// footer: MaterialFooter(),
footer: TaurusFooter(),
child: completed && isPadFlag
? GridView(
padding: EdgeInsets.only(