From 158fbc355f2679c12c0cfd75158c90a111bb0612 Mon Sep 17 00:00:00 2001 From: machuanyu <840649825@qq.com> Date: Wed, 23 Apr 2025 17:51:17 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job_report/widget/personnel_data_overview.dart | 10 ++++++---- .../children/read_over/widget/annotate_list.dart | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/making_school_asignment_app/lib/page/home_page/children/job_report/widget/personnel_data_overview.dart b/making_school_asignment_app/lib/page/home_page/children/job_report/widget/personnel_data_overview.dart index 5a8ca3e..41f633a 100644 --- a/making_school_asignment_app/lib/page/home_page/children/job_report/widget/personnel_data_overview.dart +++ b/making_school_asignment_app/lib/page/home_page/children/job_report/widget/personnel_data_overview.dart @@ -83,24 +83,26 @@ class _PersonnelDataOverviewState extends State { 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: [ diff --git a/making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart b/making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart index 35499cb..2776691 100644 --- a/making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart +++ b/making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart @@ -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(