fix: BrnTabBar More 组件内item点击切换，没有触发onTap事件。 (#393)

* fix: 修复传入居中对齐，bottomWidget不起作用的问题。 * fix: BrnTabBar More 组件内item点击切换，没有触发onTap事件。
LianjiaTech · Jul 24, 2023 · 3179af4 · 3179af4
1 parent c2825e0
commit 3179af4
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 18 deletions.
diff --git a/lib/src/components/card/content_card/brn_enhance_number_card.dart b/lib/src/components/card/content_card/brn_enhance_number_card.dart
@@ -1,5 +1,3 @@
-
-
 import 'package:bruno/src/constants/brn_asset_constants.dart';
 import 'package:bruno/src/constants/brn_strings_constants.dart';
 import 'package:bruno/src/theme/brn_theme.dart';
@@ -237,35 +235,38 @@ class BrnEnhanceNumberCard extends StatelessWidget {
       style: config.descTextStyle.generateTextStyle(),
       overflow: TextOverflow.ellipsis,
     );
+    Widget? icon;
     if (model.iconTapCallBack != null) {
-      Widget icon = BrunoTools.getAssetSizeImage(BrnAsset.iconQuestion, 14, 14);
+      icon = BrunoTools.getAssetSizeImage(BrnAsset.iconQuestion, 14, 14);
 
       if (model.numberInfoIcon == BrnNumberInfoIcon.arrow) {
         icon = BrunoTools.getAssetSizeImage(BrnAsset.iconRightArrow, 14, 14);
       }
       debugPrint('${tp.height}');
       debugPrint(model.title);
-      text = Row(
-        mainAxisAlignment: itemTextAlign == TextAlign.center
-            ? MainAxisAlignment.center
-            : (itemTextAlign == TextAlign.right
-                ? MainAxisAlignment.end
-                : MainAxisAlignment.start),
-        crossAxisAlignment:
-            tp.height > 22 ? CrossAxisAlignment.end : CrossAxisAlignment.center,
-        children: <Widget>[
-          Flexible(
-            child: text,
-          ),
+    }
+    text = Row(
+      mainAxisAlignment: itemTextAlign == TextAlign.center
+          ? MainAxisAlignment.center
+          : (itemTextAlign == TextAlign.right
+              ? MainAxisAlignment.end
+              : MainAxisAlignment.start),
+      crossAxisAlignment:
+          tp.height > 22 ? CrossAxisAlignment.end : CrossAxisAlignment.center,
+      children: <Widget>[
+        Flexible(
+          child: text,
+        ),
+        if (icon != null)
           GestureDetector(
             onTap: () {
               model.iconTapCallBack!(model);
             },
             child: icon,
           )
-        ],
-      );
-    }
+      ],
+    );
+
     return text;
   }
 

diff --git a/lib/src/components/tabbar/normal/brn_tab_bar.dart b/lib/src/components/tabbar/normal/brn_tab_bar.dart
@@ -619,6 +619,11 @@ class BrnTabBarState extends State<BrnTabBar> {
                       padding: EdgeInsets.all(0),
                       child: _TabBarOverlayWidget(
                         tabs: widget.tabs,
+                        onTap: (index) {
+                          if (widget.onTap != null) {
+                            widget.onTap!(this, index);
+                          }
+                        },
                         moreWindowText: widget.moreWindowText,
                         brnTabbarController: _brnTabbarController,
                         themeData: widget.themeData!,
@@ -676,8 +681,12 @@ class _TabBarOverlayWidget extends StatefulWidget {
   /// tag高度
   double? tagHeight;
 
+  /// Tab的选中点击事件
+  final ValueChanged<int>? onTap;
+
   _TabBarOverlayWidget(
       {this.tabs,
+      this.onTap,
       this.moreWindowText,
       this.brnTabbarController,
       required this.themeData,
@@ -785,6 +794,9 @@ class _TabBarOverlayWidgetState extends State<_TabBarOverlayWidget> {
           widget.brnTabbarController?.entry = null;
           setState(() {});
         } else {
+          if (widget.onTap != null) {
+            widget.onTap!(index);
+          }
           widget.brnTabbarController!.setSelectIndex(index);
           widget.brnTabbarController?.isShow = false;
           widget.brnTabbarController?.entry?.remove();