Fix #98 问题及优化部分代码

lib/src/components/dialog/brn_scrollable_text_dialog.dart

@@ -134,7 +134,6 @@ class BrnScrollableText extends StatelessWidget {
         if (onSubmitClick != null) {
           onSubmitClick!();
         }
-        Navigator.pop(context);
       },
       isShowOperateWidget: isShowOperateWidget,
     );

lib/src/components/tabbar/normal/brn_tab_bar.dart

@@ -15,7 +15,7 @@ import 'package:flutter/rendering.dart';
 /// [state]:当前组件的State对象，[BrnTabBarState]
 /// [index]:当前组件的角标
 typedef BrnTabBarOnTap = Function(BrnTabBarState state, int index);
-
+const double _tagDefaultSize = 75.0;
 /// 带小红点的Tabbar
 // ignore: must_be_immutable
 class BrnTabBar extends StatefulWidget {
@@ -628,6 +628,7 @@ class BrnTabBarState extends State<BrnTabBar> {
 // 更多弹框样式
 // ignore: must_be_immutable
 class _TabBarOverlayWidget extends StatefulWidget {
+
   List<BadgeTab>? tabs;
 
   String? moreWindowText;
@@ -637,30 +638,30 @@ class _TabBarOverlayWidget extends StatefulWidget {
   BrnTabBarConfig themeData;
 
   /// tag间距
-  double? spacing;
+  double spacing;
 
   /// 每行tag数
-  int? preLineTagCount;
+  int preLineTagCount;
 
   /// tag高度
   double? tagHeight;
 
   _TabBarOverlayWidget(
       {this.tabs,
-        this.moreWindowText,
-        this.brnTabbarController,
-        required this.themeData,
-        this.spacing,
-        this.preLineTagCount,
-        this.tagHeight});
+      this.moreWindowText,
+      this.brnTabbarController,
+      required this.themeData,
+      this.spacing: 12.0,
+      this.preLineTagCount: 4,
+      this.tagHeight});
 
   @override
   _TabBarOverlayWidgetState createState() => _TabBarOverlayWidgetState();
 }
 
 class _TabBarOverlayWidgetState extends State<_TabBarOverlayWidget> {
   /// tag宽度
-  double? _tagWidth;
+  double _tagWidth = _tagDefaultSize;
 
   double _padding = 20;
 
@@ -724,11 +725,8 @@ class _TabBarOverlayWidgetState extends State<_TabBarOverlayWidget> {
 
   Widget _createMoreItems() {
     // 计算tag的宽度
-    _tagWidth = (_parentWidth -
-        widget.spacing! * (widget.preLineTagCount! - 1) -
-        _padding * 2) /
-        widget.preLineTagCount!;
-
+    _tagWidth = (_parentWidth - widget.spacing * (widget.preLineTagCount - 1) - _padding * 2) / widget.preLineTagCount;
+    _tagWidth = _tagWidth <= _tagDefaultSize ? _tagDefaultSize : _tagWidth;
     List<Widget> widgets = <Widget>[];
     List<BadgeTab>? tabList = widget.tabs;
     if (tabList != null && tabList.isNotEmpty) {
@@ -738,7 +736,7 @@ class _TabBarOverlayWidgetState extends State<_TabBarOverlayWidget> {
       }
     }
     return Wrap(
-      spacing: widget.spacing!,
+      spacing: widget.spacing,
       runSpacing: 12,
       children: widgets,
     );

lib/src/components/text/brn_expandable_text.dart

@@ -74,7 +74,7 @@ class _BrnExpandableTextState extends State<BrnExpandableText> {
             ellipsis: 'EllipseText');
         tp.layout(maxWidth: size.maxWidth);
         if (tp.didExceedMaxLines) {
-          if (this._expanded!) {
+          if (this._expanded) {
             return _expandedText(context, widget.text);
           } else {
             return _foldedText(context, widget.text);
@@ -133,7 +133,7 @@ class _BrnExpandableTextState extends State<BrnExpandableText> {
         setState(() {
           _expanded = true;
           if (null != widget.onExpanded) {
-            widget.onExpanded!(_expanded!);
+            widget.onExpanded!(_expanded);
           }
         });
       },

lib/src/theme/base/brn_default_config_utils.dart

@@ -596,12 +596,12 @@ class BrnDefaultConfigUtils {
       color: defaultCommonConfig.colorTextBase,
       fontSize: defaultCommonConfig.fontSizeCaption,
     ),
-    tagNormalBgColor: defaultCommonConfig.brandPrimary.withAlpha(0x14),
+    tagNormalBgColor: defaultCommonConfig.fillBody,
     tagSelectedTextStyle: BrnTextStyle(
       color: defaultCommonConfig.brandPrimary,
       fontSize: defaultCommonConfig.fontSizeCaption,
     ),
-    tagSelectedBgColor: defaultCommonConfig.fillBody,
+    tagSelectedBgColor: defaultCommonConfig.brandPrimary.withAlpha(0x14),
     tagSpacing: 12.0,
     preLineTagCount: 4,
     tagHeight: 32.0,

pubspec.yaml

@@ -17,7 +17,6 @@ dependencies:
   photo_view: ^0.13.0
   provider: ^6.0.1
   badges: ^2.0.2
-  collection: ^1.15.0
 
 dev_dependencies:
   flutter_test: