diff --git a/src/timemanagerapp/.dart_tool/package_config.json b/src/timemanagerapp/.dart_tool/package_config.json index 5767269..26702da 100644 --- a/src/timemanagerapp/.dart_tool/package_config.json +++ b/src/timemanagerapp/.dart_tool/package_config.json @@ -296,7 +296,7 @@ "languageVersion": "3.1" } ], - "generated": "2023-09-23T11:39:32.187593Z", + "generated": "2023-09-26T14:43:12.084123Z", "generator": "pub", "generatorVersion": "3.1.0" } diff --git a/src/timemanagerapp/.dart_tool/package_config_subset b/src/timemanagerapp/.dart_tool/package_config_subset index 5f1388c..22b261a 100644 --- a/src/timemanagerapp/.dart_tool/package_config_subset +++ b/src/timemanagerapp/.dart_tool/package_config_subset @@ -192,6 +192,6 @@ file:///C:/Users/L/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/xdg_director file:///C:/Users/L/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/xdg_directories-1.0.3/lib/ timemanagerapp 3.1 -file:///D:/Myprogramfile/Flutter/TimeManager/src/timemanagerapp/ -file:///D:/Myprogramfile/Flutter/TimeManager/src/timemanagerapp/lib/ +file:///D:/Myprogramfile/Flutter/TimeManager/TimeManager/src/timemanagerapp/ +file:///D:/Myprogramfile/Flutter/TimeManager/TimeManager/src/timemanagerapp/lib/ 2 diff --git a/src/timemanagerapp/.idea/workspace.xml b/src/timemanagerapp/.idea/workspace.xml index 0383553..3650a29 100644 --- a/src/timemanagerapp/.idea/workspace.xml +++ b/src/timemanagerapp/.idea/workspace.xml @@ -30,12 +30,12 @@ - - + - + + @@ -64,6 +64,8 @@ + + @@ -98,17 +100,6 @@ - - - diff --git a/src/timemanagerapp/lib/wighets/TimetableWighet.dart b/src/timemanagerapp/lib/wighets/TimetableWighet.dart index 4cdac71..5b94eac 100644 --- a/src/timemanagerapp/lib/wighets/TimetableWighet.dart +++ b/src/timemanagerapp/lib/wighets/TimetableWighet.dart @@ -277,89 +277,95 @@ class PageState extends State { left: courseWeekMap[weekCount]![index] .getdx() + 50, - child: Container( - //课程方块 - width: 40, - height: - courseWeekMap[weekCount]![index] - .getHeight(), - decoration: BoxDecoration( - color: Colors.tealAccent, - // 设置颜色 - borderRadius: BorderRadius.all( - Radius.circular(10.0)), // 添加圆角 - ), - child: ClipRect( - child: Column( - //课程方块中的文字 - children: [ - Text( - courseWeekMap[weekCount]![ - index] - .name, - style: TextStyle( - fontSize: 10, - fontWeight: - FontWeight.bold), - overflow: TextOverflow - .clip, //name加粗 - ), - Text( - courseWeekMap[weekCount]![ - index] - .teacher, - style: TextStyle(fontSize: 8), - overflow: TextOverflow.clip, - ), - Text( - courseWeekMap[weekCount]![ - index] - .location, - style: - TextStyle(fontSize: 10), - overflow: TextOverflow.clip, - ), - Text( - courseWeekMap[weekCount]![ - index] - .start - .hour - .toString() + - ':' + - courseWeekMap[weekCount]![ - index] - .start - .minute - .toString(), - style: - TextStyle(fontSize: 10), - overflow: TextOverflow.clip, - ), - Text( - courseWeekMap[weekCount]![ - index] - .end - .hour - .toString() + - ':' + - courseWeekMap[weekCount]![ - index] - .end - .minute - .toString(), - style: - TextStyle(fontSize: 10), - overflow: TextOverflow.clip, - ), - Text( - courseWeekMap[weekCount]![ - index] - .remark, - style: - TextStyle(fontSize: 10), - overflow: TextOverflow.clip, - ), - ], + child: SingleChildScrollView( + child: Container( + //课程方块 + width: 40, + height: + courseWeekMap[weekCount]![index] + .getHeight(), + decoration: BoxDecoration( + color: Colors.tealAccent, + // 设置颜色 + borderRadius: BorderRadius.all( + Radius.circular( + 10.0)), // 添加圆角 + ), + child: SingleChildScrollView( + child: Column( + //课程方块中的文字 + children: [ + Text( + courseWeekMap[weekCount]![ + index] + .name, + style: TextStyle( + fontSize: 10, + fontWeight: + FontWeight.bold), + overflow: TextOverflow + .clip, //name加粗 + ), + Text( + courseWeekMap[weekCount]![ + index] + .teacher, + style: + TextStyle(fontSize: 8), + overflow: TextOverflow.clip, + ), + Text( + courseWeekMap[weekCount]![ + index] + .location, + style: + TextStyle(fontSize: 10), + overflow: TextOverflow.clip, + ), + Text( + courseWeekMap[weekCount]![ + index] + .start + .hour + .toString() + + ':' + + courseWeekMap[ + weekCount]![ + index] + .start + .minute + .toString(), + style: + TextStyle(fontSize: 10), + overflow: TextOverflow.clip, + ), + Text( + courseWeekMap[weekCount]![ + index] + .end + .hour + .toString() + + ':' + + courseWeekMap[ + weekCount]![ + index] + .end + .minute + .toString(), + style: + TextStyle(fontSize: 10), + overflow: TextOverflow.clip, + ), + Text( + courseWeekMap[weekCount]![ + index] + .remark, + style: + TextStyle(fontSize: 10), + overflow: TextOverflow.clip, + ), + ], + ), ), ), ),