overview display

TolyFx · Oct 13, 2024 · 1b3f86e · 1b3f86e
1 parent 671fab1
commit 1b3f86e
Show file tree

Hide file tree

Showing 8 changed files with 589 additions and 199 deletions.
diff --git a/lib/incubator/components/layout/grid_layout/wrap_grid_layout.dart b/lib/incubator/components/layout/grid_layout/wrap_grid_layout.dart
@@ -4,11 +4,12 @@ import 'package:flutter/material.dart';
 
 enum ExpandType {
   spacing,
-  width,
+  width, // 宽度延伸
+  limitWidth, // 限制最大宽度为 measureWidth
 }
 
 class Wrap$ extends StatelessWidget {
-  final double maxWidth;
+  final double measureWidth;
   final double height;
   final double spacing;
   final double runSpacing;
@@ -19,7 +20,7 @@ class Wrap$ extends StatelessWidget {
 
   const Wrap$({
     super.key,
-    required this.maxWidth,
+    required this.measureWidth,
     required this.height,
     this.alignment = Alignment.center,
     this.spacing = 0,
@@ -37,17 +38,23 @@ class Wrap$ extends StatelessWidget {
         padding: padding ?? EdgeInsets.symmetric(horizontal: spacing),
         child: LayoutBuilder(
           builder: (ctx, cts) {
-            int count = (cts.maxWidth + spacing) ~/ maxWidth;
+
+            int count = (cts.maxWidth + spacing) ~/ measureWidth;
             double effectSpacing = spacing;
-            count = min(count, children.length);
-            double width = (cts.maxWidth / count) - spacing * (count - 1);
-            if (expandType == ExpandType.width) {
-              width = min(width, maxWidth);
+            if(expandType!=ExpandType.width){
+              count = min(count, children.length);
+
+            }
+            // double width = (cts.maxWidth / count) - spacing * (count - 1);
+            double width = (cts.maxWidth-spacing * (count - 1))/count ;
+            if (expandType == ExpandType.limitWidth) {
+              width = min(width, measureWidth);
             }
             if (expandType == ExpandType.spacing) {
-              width = maxWidth;
+              width = measureWidth;
               effectSpacing = (cts.maxWidth - width * count) / (count);
             }
+
             return Wrap(
               runSpacing: runSpacing,
               spacing: effectSpacing,
@@ -64,4 +71,14 @@ class Wrap$ extends StatelessWidget {
       ),
     );
   }
+
+  /// 以 [measureWidth] 度量，得到每行承载的个数
+  ///
+  // (double,double) calcSize(double layoutWidth){
+  //   int count = (layoutWidth + spacing) ~/ measureWidth;
+  //   double effectSpacing = spacing;
+  //   count = min(count, children.length);
+  //   double width = (layoutWidth / count) - spacing * (count - 1);
+  // }
+
 }
diff --git a/lib/navigation/menu/data.dart b/lib/navigation/menu/data.dart
@@ -84,9 +84,9 @@ Map<String, dynamic> get dataMenus => {
           // 'icon': Icons.text_fields,
         },
         {
-          'path': '/slideshow',
-          'label': 'Slideshow',
-          'subtitle': '幻灯片',
+          'path': '/carousel',
+          'label': 'Carousel',
+          'subtitle': '走马灯',
           'isFlutter': true,
           'tag': '新'
           // 'icon': Icons.text_fields,

diff --git a/lib/navigation/router/widgets_route.dart b/lib/navigation/router/widgets_route.dart
@@ -8,6 +8,7 @@ import '../../view/widgets/overview/overview_page.dart';
 import '../../view/widgets/widgets_page.dart';
 import '../view/empty404/widget404.dart';
 
+
 RouteBase get widgetsRoute => ShellRoute(
         builder: (BuildContext context, GoRouterState state, Widget child) {
           return WidgetNavigationScope(
@@ -72,7 +73,8 @@ RouteBase get widgetsRoute => ShellRoute(
                   _customRoute('card'),
                   _customRoute('tag'),
                   _customRoute('slideshow'),
-                ]),            GoRoute(
+                ]),
+            GoRoute(
                 path: 'advance',
                 builder: (BuildContext context, GoRouterState state) {
                   return EcologicalPage();

diff --git a/lib/navigation/view/app_navigation_scope.dart b/lib/navigation/view/app_navigation_scope.dart
@@ -3,18 +3,23 @@ import 'package:flutter/material.dart';
 
 import '../../view/home_page/home_nav_bar.dart';
 
-class AppNavigationScope extends StatelessWidget{
+class AppNavigationScope extends StatefulWidget{
   final Widget child;
   const AppNavigationScope({super.key, required this.child});
 
+  @override
+  State<AppNavigationScope> createState() => _AppNavigationScopeState();
+}
+
+class _AppNavigationScopeState extends State<AppNavigationScope> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: HomeNavBar(),
       body: Column(
         children: [
           Divider(),
-          Expanded(child: child),
+          Expanded(child: widget.child),
         ],
       ),
     );