LianjiaTech · zhoujuanjuan · Jan 24, 2022 · Dec 27, 2021 · Dec 27, 2021 · Dec 28, 2021
diff --git a/example/lib/sample/components/form/items_example/step_input_example.dart b/example/lib/sample/components/form/items_example/step_input_example.dart
@@ -63,7 +63,6 @@ class StepInputExamplePage extends StatelessWidget {
               title: "自然到访保护期",
               subTitle: "这里是副标题",
               tipLabel: "标签",
-              value: 0,
               maxLimit: 5,
               minLimit: 1,
               onTip: () {
@@ -96,7 +95,6 @@ class StepInputExamplePage extends StatelessWidget {
               title: "自然到访保护期",
               subTitle: "这里是副标题",
               tipLabel: "标签",
-              value: 0,
               maxLimit: 5,
               minLimit: 1,
               onTip: () {

diff --git a/example/lib/sample/components/form/items_example/title_select_example.dart b/example/lib/sample/components/form/items_example/title_select_example.dart
@@ -22,7 +22,7 @@ class TitleSelectInputState extends State<TitleSelectInputExamplePage> {
   @override
   void initState() {
     super.initState();
-    _list = List();
+    _list = [];
     _list.add('手机号');
     _list.add('座机');
   }

diff --git a/example/lib/sample/components/selection/selectionview_customview_example_page.dart b/example/lib/sample/components/selection/selectionview_customview_example_page.dart
@@ -117,10 +117,10 @@ class _SelectionViewExamplePageState extends State<SelectionViewCustomViewExampl
               ValueListenableBuilder(
                 valueListenable: _currentCalendarSelectedDate,
                 builder: (context, value, widget) {
-                  return BrnCalendarView(
+                  return BrnCalendarView.single(
                       initStartSelectedDate: _currentCalendarSelectedDate.value,
                       initEndSelectedDate: _currentCalendarSelectedDate.value,
-                      startEndDateChange: (_, __) {
+                      dateChange: (_){
                         _currentCalendarSelectedDate.value = _;
                       });
                 },

diff --git a/lib/bruno.dart b/lib/bruno.dart
@@ -84,7 +84,6 @@ export 'src/components/loading/brn_loading.dart';
 
 //导航栏
 export 'src/components/navbar/brn_appbar.dart';
-export 'src/components/navbar/brn_empty_appbar.dart';
 
 //搜索bar
 export 'src/components/navbar/brn_search_bar.dart';
@@ -125,9 +124,9 @@ export 'src/components/form/items/general/brn_title_select_input_item.dart';
 export 'src/components/form/items/misc/brn_title_item.dart';
 export 'src/components/form/items/misc/brn_add_label_item.dart';
 export 'src/components/form/items/group/brn_normal_group.dart';
-export 'src/components/form/undetermined/brn_expandable_group.dart';
-export 'src/components/form/undetermined/brn_portrait_radio_group.dart';
-export 'src/components/form/items/group/brn_expand_group.dart';
+export 'src/components/form/items/group/brn_expandable_group.dart';
+export 'src/components/form/items/group/brn_portrait_radio_group.dart';
+export 'src/components/form/items/group/brn_expandable_group_with_opreate.dart';
 
 // 新增表单项
 export 'src/components/form/items/title/brn_base_title_item.dart';

diff --git a/lib/src/components/calendar/brn_calendar_view.dart b/lib/src/components/calendar/brn_calendar_view.dart
@@ -31,18 +31,14 @@ class BrnCalendarView extends StatefulWidget {
       this.initStartSelectedDate,
       this.initEndSelectedDate,
       this.initDisplayDate,
-      @Deprecated('使用BrnCalendarView.date或BrnCalendarView.rangeDate')
-          this.startEndDateChange,
       this.dateChange,
       this.rangeDateChange,
       this.minDate,
       this.maxDate})
       : assert(weekNames.length == 7),
         assert(
             selectMode == SelectMode.SINGLE && dateChange != null ||
-                selectMode == SelectMode.RANGE && rangeDateChange != null ||
-                startEndDateChange != null,
-            '必须添加日期选择的回调函数'),
+                selectMode == SelectMode.RANGE && rangeDateChange != null),
         super(key: key);
 
   const BrnCalendarView.single(
@@ -57,7 +53,6 @@ class BrnCalendarView extends StatefulWidget {
       this.minDate,
       this.maxDate})
       : this.selectMode = SelectMode.SINGLE,
-        this.startEndDateChange = null,
         this.rangeDateChange = null,
         assert(weekNames.length == 7),
         super(key: key);
@@ -74,7 +69,6 @@ class BrnCalendarView extends StatefulWidget {
       this.minDate,
       this.maxDate})
       : this.selectMode = SelectMode.RANGE,
-        this.startEndDateChange = null,
         this.dateChange = null,
         assert(weekNames.length == 7),
         super(key: key);
@@ -112,12 +106,10 @@ class BrnCalendarView extends StatefulWidget {
   /// 默认当前时间
   final DateTime? initDisplayDate;
 
-  /// 选择日期回调
-  @Deprecated('使用BrnCalendarView.date或BrnCalendarView.rangeDate')
-  final Function(DateTime startSelectedDate, DateTime endSelectedDate)?
-      startEndDateChange;
-
+  /// single 类型选择日期回调
   final CalendarDateChange? dateChange;
+
+  /// range 类型选择日期回调
   final CalendarRangeDateChange? rangeDateChange;
 
   @override
@@ -588,12 +580,6 @@ class _CustomCalendarViewState extends State<BrnCalendarView> {
     _currentEndSelectedDate = date;
     setState(() {
       try {
-        if (widget.startEndDateChange != null) {
-          widget.startEndDateChange!(
-            _currentStartSelectedDate!,
-            _currentEndSelectedDate!,
-          );
-        }
         if (widget.dateChange != null) {
           widget.dateChange!(date);
         }
@@ -628,21 +614,18 @@ class _CustomCalendarViewState extends State<BrnCalendarView> {
       if (date.isAfter(_currentEndSelectedDate!)) {
         _currentEndSelectedDate = date;
       }
+      setState(() {
+        try {
+          if (widget.rangeDateChange != null) {
+            widget.rangeDateChange!(DateTimeRange(
+              start: _currentStartSelectedDate!,
+              end: _currentEndSelectedDate!,
+            ));
+          }
+        } catch (_) {}
+      });
     }
-    setState(() {
-      try {
-        if (widget.startEndDateChange != null) {
-          widget.startEndDateChange!(
-              _currentStartSelectedDate!, _currentEndSelectedDate!);
-        }
-        if (widget.rangeDateChange != null) {
-          widget.rangeDateChange!(DateTimeRange(
-            start: _currentStartSelectedDate!,
-            end: _currentEndSelectedDate!,
-          ));
-        }
-      } catch (_) {}
-    });
+
   }
 
   String _getChinaWeekName(int weekOfDay) {

diff --git a/lib/src/components/form/base/brn_form_item_type.dart b/lib/src/components/form/base/brn_form_item_type.dart
@@ -1,4 +1,4 @@
-// @dart=2.9
+
 
 class BrnPrefixIconType {
   static const String TYPE_NORMAL = "type_normal";

diff --git a/lib/src/components/form/base/input_item_interface.dart b/lib/src/components/form/base/input_item_interface.dart
@@ -1,17 +1,17 @@
 /// 用于model兼容回调
 /// 主要用于各种点击事件
 
-// @dart=2.9
+
 
 typedef OnBrnFormSelectAll = void Function(int index, bool isSelect);
 
 /// 主要用于各种输入值变化
 typedef OnBrnFormRadioValueChanged = void Function(
-    String oldStr, String newStr);
+    String? oldStr, String? newStr);
 typedef OnBrnFormSwitchChanged = void Function(bool oldValue, bool newValue);
 typedef OnBrnFormValueChanged = void Function(int oldValue, int newValue);
 typedef OnBrnFormMultiChoiceValueChanged = void Function(
-    List<String> oldValue, List<String> newValue);
+    List<String> oldValue, List<String>? newValue);
 typedef OnBrnFormBtnSelectChanged = void Function(
     List<bool> oldValue, List<bool> newValue);