diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c76fe51..4bf45da8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,17 @@ -## [2.1.0-nullsafety.1] - 2022-3-10 + + +## [2.1.0-nullsafety] - 2022-4-1 + ### Changed -#### base +#### base - **Breaking change**: Sound null safety support, thanks to @leftcoding #39#33 @donywan #20 @laiiihz #80#64#59#32#14 @kalifun #36 @jojinshallar #81#75#65#62#56#42 @junlandroid #73 @Kenneth #53 @HappyImp #55 @kkkman22 #23 @AlexV525 #30 - **Breaking change**: Refer to the dart language specification to optimized constant and enum naming. - Replace DIN Font with Bebas Font . #### components + - **Breaking change**: remove BrnHorizontalStepsManager and put function forwardStep() backStep() into BrnStepsController thanks to leftcoding. - **Breaking change**: remove BrnDialogStyle and replace with BrnDialogConfig. - BrnCalendarView: add BrnCalendarView.single() and BrnCalendarView.range() constructor and had its argument startEndDateChange removed. @@ -16,6 +20,7 @@ - BrnScrollableTextDialog: remove Navigator.pop(context) in onSubmit() and hand it over to external processing (user). - BrnBubbleText: add attribute bgColor and textStyle. - BrnPairInfoTable: add attribute defaultVerticalAlignment. +- BrnSingleSelectDialog : add attribute messageText and messageWidget. @@ -23,10 +28,17 @@ ### Fixed - Fix example error [#71](https://github.com/LianjiaTech/bruno/issues/71) thanks to **leftcoding** fixing this issue. + - Fix BrnPickerTitleConfig titleContent setting is invalid [#70](https://github.com/LianjiaTech/bruno/issues/70). + - Optimize BrnPopupWindow onItemClick logic [#57 ](https://github.com/LianjiaTech/bruno/issues/57) . + - Fix BrnDialog is obscured by keyboard [#7](https://github.com/LianjiaTech/bruno/issues/7) . +- Fix BrnTextSelectFormItem set titlePaddingLg doesn't work [#108](https://github.com/LianjiaTech/bruno/issues/108). + +- Fix the bottom text of BrnBottomTabBar cannot be displayed in some cases [#141](https://github.com/LianjiaTech/bruno/issues/141). + Thanks again to **leftcoding**, **jojinshallar**, **laiiihz**, **donywan**, **kalifun**, **junlandroid**, **Kenneth**, **HappyImp**, **kkkman22** , **a1017480401** and **Alex**. diff --git a/docs/FAQ.md b/doc/FAQ.md similarity index 100% rename from docs/FAQ.md rename to doc/FAQ.md diff --git a/docs/bruno.md b/doc/bruno.md similarity index 100% rename from docs/bruno.md rename to doc/bruno.md diff --git a/docs/components/abnormalCard/BrnAbnormalStateWidget/BrnAbnormalStateWidget.md b/doc/components/abnormalCard/BrnAbnormalStateWidget/BrnAbnormalStateWidget.md similarity index 100% rename from docs/components/abnormalCard/BrnAbnormalStateWidget/BrnAbnormalStateWidget.md rename to doc/components/abnormalCard/BrnAbnormalStateWidget/BrnAbnormalStateWidget.md diff --git a/docs/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_1.png b/doc/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_1.png similarity index 100% rename from docs/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_1.png rename to doc/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_1.png diff --git a/docs/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_2.png b/doc/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_2.png similarity index 100% rename from docs/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_2.png rename to doc/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_2.png diff --git a/docs/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_3.png b/doc/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_3.png similarity index 100% rename from docs/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_3.png rename to doc/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_3.png diff --git a/docs/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_4.png b/doc/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_4.png similarity index 100% rename from docs/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_4.png rename to doc/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_4.png diff --git a/docs/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_5.png b/doc/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_5.png similarity index 100% rename from docs/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_5.png rename to doc/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_5.png diff --git a/docs/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_intro.png b/doc/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_intro.png similarity index 100% rename from docs/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_intro.png rename to doc/components/abnormalCard/BrnAbnormalStateWidget/img/empty_state_intro.png diff --git a/docs/components/actionsheet/BrnCommonActionSheet/BrnCommonActionSheet.md b/doc/components/actionsheet/BrnCommonActionSheet/BrnCommonActionSheet.md similarity index 100% rename from docs/components/actionsheet/BrnCommonActionSheet/BrnCommonActionSheet.md rename to doc/components/actionsheet/BrnCommonActionSheet/BrnCommonActionSheet.md diff --git a/docs/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_1.png b/doc/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_1.png similarity index 100% rename from docs/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_1.png rename to doc/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_1.png diff --git a/docs/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_2.png b/doc/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_2.png similarity index 100% rename from docs/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_2.png rename to doc/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_2.png diff --git a/docs/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_3.png b/doc/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_3.png similarity index 100% rename from docs/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_3.png rename to doc/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_3.png diff --git a/docs/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_4.png b/doc/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_4.png similarity index 100% rename from docs/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_4.png rename to doc/components/actionsheet/BrnCommonActionSheet/img/brn_action_sheet_common_widget_4.png diff --git a/docs/components/actionsheet/BrnSelectedListActionSheet/BrnSelectedListActionSheet.md b/doc/components/actionsheet/BrnSelectedListActionSheet/BrnSelectedListActionSheet.md similarity index 97% rename from docs/components/actionsheet/BrnSelectedListActionSheet/BrnSelectedListActionSheet.md rename to doc/components/actionsheet/BrnSelectedListActionSheet/BrnSelectedListActionSheet.md index 9af650b9..a0304672 100644 --- a/docs/components/actionsheet/BrnSelectedListActionSheet/BrnSelectedListActionSheet.md +++ b/doc/components/actionsheet/BrnSelectedListActionSheet/BrnSelectedListActionSheet.md @@ -21,7 +21,7 @@ group: ### 交互规则 -1. 通用的已选列表弹窗。包括顶部工具条和中间的数据列表两部分，不包括底部的按钮交互区域，底部的按钮Demo中使用的是 [BrnBottomButtonPanel](../../buttonPanel/BrnButtonPanel/BrnBottomButtonPanel.md)。整体布局通过`OverlayEntry` 实现，将控制列表的控制功能和已选列表视图独立开来，一来可以更加方便的控制列表，二来可以充分自定义控制列表的功能区域。 +1. 通用的已选列表弹窗。包括顶部工具条和中间的数据列表两部分，不包括底部的按钮交互区域，底部的按钮Demo中使用的是 [BrnBottomButtonPanel](../widgets/brn-button-panel)。整体布局通过`OverlayEntry` 实现，将控制列表的控制功能和已选列表视图独立开来，一来可以更加方便的控制列表，二来可以充分自定义控制列表的功能区域。 2. 工具条：包括关闭弹窗和清空按钮。 3. 数据列表中每一行，从左至右依次是`icon`(高50，宽45)、文本和移除按钮。 4. 最小行高50，如果是自定义每行视图，则高度自动撑开。 diff --git a/docs/components/actionsheet/BrnSelectedListActionSheet/img/BrnSelectedListActionSheetDemo1.png b/doc/components/actionsheet/BrnSelectedListActionSheet/img/BrnSelectedListActionSheetDemo1.png similarity index 100% rename from docs/components/actionsheet/BrnSelectedListActionSheet/img/BrnSelectedListActionSheetDemo1.png rename to doc/components/actionsheet/BrnSelectedListActionSheet/img/BrnSelectedListActionSheetDemo1.png diff --git a/docs/components/actionsheet/BrnSelectedListActionSheet/img/BrnSelectedListActionSheetDemo2.png b/doc/components/actionsheet/BrnSelectedListActionSheet/img/BrnSelectedListActionSheetDemo2.png similarity index 100% rename from docs/components/actionsheet/BrnSelectedListActionSheet/img/BrnSelectedListActionSheetDemo2.png rename to doc/components/actionsheet/BrnSelectedListActionSheet/img/BrnSelectedListActionSheetDemo2.png diff --git a/docs/components/actionsheet/BrnSelectedListActionSheet/img/BrnSelectedListActionSheetDemo3.png b/doc/components/actionsheet/BrnSelectedListActionSheet/img/BrnSelectedListActionSheetDemo3.png similarity index 100% rename from docs/components/actionsheet/BrnSelectedListActionSheet/img/BrnSelectedListActionSheetDemo3.png rename to doc/components/actionsheet/BrnSelectedListActionSheet/img/BrnSelectedListActionSheetDemo3.png diff --git a/docs/components/actionsheet/BrnShareActionSheet/BrnShareActionSheet.md b/doc/components/actionsheet/BrnShareActionSheet/BrnShareActionSheet.md similarity index 100% rename from docs/components/actionsheet/BrnShareActionSheet/BrnShareActionSheet.md rename to doc/components/actionsheet/BrnShareActionSheet/BrnShareActionSheet.md diff --git a/docs/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_1.png b/doc/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_1.png similarity index 100% rename from docs/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_1.png rename to doc/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_1.png diff --git a/docs/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_2.png b/doc/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_2.png similarity index 100% rename from docs/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_2.png rename to doc/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_2.png diff --git a/docs/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_3.png b/doc/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_3.png similarity index 100% rename from docs/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_3.png rename to doc/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_3.png diff --git a/docs/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_4.png b/doc/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_4.png similarity index 100% rename from docs/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_4.png rename to doc/components/actionsheet/BrnShareActionSheet/img/actionSheet_share_4.png diff --git a/docs/components/anchor/BrnAnchorTab/BrnAnchorTab.md b/doc/components/anchor/BrnAnchorTab/BrnAnchorTab.md similarity index 100% rename from docs/components/anchor/BrnAnchorTab/BrnAnchorTab.md rename to doc/components/anchor/BrnAnchorTab/BrnAnchorTab.md diff --git a/docs/components/anchor/BrnAnchorTab/img/anchorTab.gif b/doc/components/anchor/BrnAnchorTab/img/anchorTab.gif similarity index 100% rename from docs/components/anchor/BrnAnchorTab/img/anchorTab.gif rename to doc/components/anchor/BrnAnchorTab/img/anchorTab.gif diff --git a/docs/components/appbar/BrnAppBar/BrnAppBar.md b/doc/components/appbar/BrnAppBar/BrnAppBar.md similarity index 100% rename from docs/components/appbar/BrnAppBar/BrnAppBar.md rename to doc/components/appbar/BrnAppBar/BrnAppBar.md diff --git a/docs/components/appbar/BrnAppBar/img/BrnAppBarIntro.png b/doc/components/appbar/BrnAppBar/img/BrnAppBarIntro.png similarity index 100% rename from docs/components/appbar/BrnAppBar/img/BrnAppBarIntro.png rename to doc/components/appbar/BrnAppBar/img/BrnAppBarIntro.png diff --git a/docs/components/appbar/BrnAppBar/img/appbar_doubleright_icon.png b/doc/components/appbar/BrnAppBar/img/appbar_doubleright_icon.png similarity index 100% rename from docs/components/appbar/BrnAppBar/img/appbar_doubleright_icon.png rename to doc/components/appbar/BrnAppBar/img/appbar_doubleright_icon.png diff --git a/docs/components/appbar/BrnAppBar/img/appbar_down.png b/doc/components/appbar/BrnAppBar/img/appbar_down.png similarity index 100% rename from docs/components/appbar/BrnAppBar/img/appbar_down.png rename to doc/components/appbar/BrnAppBar/img/appbar_down.png diff --git a/docs/components/appbar/BrnAppBar/img/appbar_left_icon.png b/doc/components/appbar/BrnAppBar/img/appbar_left_icon.png similarity index 100% rename from docs/components/appbar/BrnAppBar/img/appbar_left_icon.png rename to doc/components/appbar/BrnAppBar/img/appbar_left_icon.png diff --git a/docs/components/appbar/BrnAppBar/img/appbar_leftright_icon.png b/doc/components/appbar/BrnAppBar/img/appbar_leftright_icon.png similarity index 100% rename from docs/components/appbar/BrnAppBar/img/appbar_leftright_icon.png rename to doc/components/appbar/BrnAppBar/img/appbar_leftright_icon.png diff --git a/docs/components/appbar/BrnAppBar/img/appbar_srolltitle.png b/doc/components/appbar/BrnAppBar/img/appbar_srolltitle.png similarity index 100% rename from docs/components/appbar/BrnAppBar/img/appbar_srolltitle.png rename to doc/components/appbar/BrnAppBar/img/appbar_srolltitle.png diff --git a/docs/components/appbar/BrnAppBar/img/appbar_three_tab.png b/doc/components/appbar/BrnAppBar/img/appbar_three_tab.png similarity index 100% rename from docs/components/appbar/BrnAppBar/img/appbar_three_tab.png rename to doc/components/appbar/BrnAppBar/img/appbar_three_tab.png diff --git a/docs/components/appbar/BrnAppBar/img/more_icon.png b/doc/components/appbar/BrnAppBar/img/more_icon.png similarity index 100% rename from docs/components/appbar/BrnAppBar/img/more_icon.png rename to doc/components/appbar/BrnAppBar/img/more_icon.png diff --git a/docs/components/appbar/BrnSearchAppbar/BrnSearchAppbar.md b/doc/components/appbar/BrnSearchAppbar/BrnSearchAppbar.md similarity index 100% rename from docs/components/appbar/BrnSearchAppbar/BrnSearchAppbar.md rename to doc/components/appbar/BrnSearchAppbar/BrnSearchAppbar.md diff --git a/docs/components/appbar/BrnSearchAppbar/img/BrnSearchAppbarDemo1.png b/doc/components/appbar/BrnSearchAppbar/img/BrnSearchAppbarDemo1.png similarity index 100% rename from docs/components/appbar/BrnSearchAppbar/img/BrnSearchAppbarDemo1.png rename to doc/components/appbar/BrnSearchAppbar/img/BrnSearchAppbarDemo1.png diff --git a/docs/components/appbar/BrnSearchAppbar/img/BrnSearchAppbarDemo2.png b/doc/components/appbar/BrnSearchAppbar/img/BrnSearchAppbarDemo2.png similarity index 100% rename from docs/components/appbar/BrnSearchAppbar/img/BrnSearchAppbarDemo2.png rename to doc/components/appbar/BrnSearchAppbar/img/BrnSearchAppbarDemo2.png diff --git a/docs/components/appbar/BrnSearchAppbar/img/BrnSearchAppbarIntro.png b/doc/components/appbar/BrnSearchAppbar/img/BrnSearchAppbarIntro.png similarity index 100% rename from docs/components/appbar/BrnSearchAppbar/img/BrnSearchAppbarIntro.png rename to doc/components/appbar/BrnSearchAppbar/img/BrnSearchAppbarIntro.png diff --git a/docs/components/appraise/BrnAppraise/BrnAppraise.md b/doc/components/appraise/BrnAppraise/BrnAppraise.md similarity index 98% rename from docs/components/appraise/BrnAppraise/BrnAppraise.md rename to doc/components/appraise/BrnAppraise/BrnAppraise.md index 899564bd..c0ad9aa4 100644 --- a/docs/components/appraise/BrnAppraise/BrnAppraise.md +++ b/doc/components/appraise/BrnAppraise/BrnAppraise.md @@ -22,7 +22,7 @@ group: ### 交互规则 1. BrnAppraise：评价组件，支持表情包和五角星两种，可使用在页面和弹窗里。 -2. [BrnAppraiseBottomPicker](../brn-appraise-bottom-picker/brn-appraise-bottom-picker)：评价组件底部弹窗，对 BrnAppraise 做了一层 picker 的封装，参数与 BrnAppraise 完全一致。 +2. [BrnAppraiseBottomPicker](../widgets/brn-appraise-bottom-picker)：评价组件底部弹窗，对 BrnAppraise 做了一层 picker 的封装，参数与 BrnAppraise 完全一致。 ### 使用规范 diff --git a/docs/components/appraise/BrnAppraise/img/BrnAppraiseDemo1.png b/doc/components/appraise/BrnAppraise/img/BrnAppraiseDemo1.png similarity index 100% rename from docs/components/appraise/BrnAppraise/img/BrnAppraiseDemo1.png rename to doc/components/appraise/BrnAppraise/img/BrnAppraiseDemo1.png diff --git a/docs/components/appraise/BrnAppraise/img/BrnAppraiseDemo2.png b/doc/components/appraise/BrnAppraise/img/BrnAppraiseDemo2.png similarity index 100% rename from docs/components/appraise/BrnAppraise/img/BrnAppraiseDemo2.png rename to doc/components/appraise/BrnAppraise/img/BrnAppraiseDemo2.png diff --git a/docs/components/appraise/BrnAppraise/img/BrnAppraiseDemo2_1.png b/doc/components/appraise/BrnAppraise/img/BrnAppraiseDemo2_1.png similarity index 100% rename from docs/components/appraise/BrnAppraise/img/BrnAppraiseDemo2_1.png rename to doc/components/appraise/BrnAppraise/img/BrnAppraiseDemo2_1.png diff --git a/docs/components/appraise/BrnAppraise/img/BrnAppraiseDemoIntro.png b/doc/components/appraise/BrnAppraise/img/BrnAppraiseDemoIntro.png similarity index 100% rename from docs/components/appraise/BrnAppraise/img/BrnAppraiseDemoIntro.png rename to doc/components/appraise/BrnAppraise/img/BrnAppraiseDemoIntro.png diff --git a/docs/components/appraise/BrnAppraiseBottomPicker/BrnAppraiseBottomPicker.md b/doc/components/appraise/BrnAppraiseBottomPicker/BrnAppraiseBottomPicker.md similarity index 96% rename from docs/components/appraise/BrnAppraiseBottomPicker/BrnAppraiseBottomPicker.md rename to doc/components/appraise/BrnAppraiseBottomPicker/BrnAppraiseBottomPicker.md index 15a0d259..ccec6891 100644 --- a/docs/components/appraise/BrnAppraiseBottomPicker/BrnAppraiseBottomPicker.md +++ b/doc/components/appraise/BrnAppraiseBottomPicker/BrnAppraiseBottomPicker.md @@ -7,7 +7,7 @@ group: # BrnAppraiseBottomPicker -以 picker 样式展现的评价组件。具体参数和 [BrnAppraise](../brn-appraise/brn-appraise) 一样。 +以 picker 样式展现的评价组件。具体参数和 [BrnAppraise](../widgets/brn-appraise) 一样。 ## 一、效果总览 ![](./img/BrnAppraiseBottomPickerIntro.png) @@ -16,7 +16,7 @@ group: ### 适用场景 -需要收集用户评价和反馈的业务场景，并以弹窗形式展示。页面交互规则和使用规范参见 [BrnAppraise](../brn-appraise/brn-appraise)。 +需要收集用户评价和反馈的业务场景，并以弹窗形式展示。页面交互规则和使用规范参见 [BrnAppraise](../widgets/brn-appraise)。 ## 三、构造函数及参数说明 @@ -47,7 +47,7 @@ BrnAppraiseBottomPicker({ | tags | `List?` | 供选择的标签数据 | 否 | 无 | | inputHintText | String | 输入框的提示文字 | 否 | '' | | onConfirm | `void Function(int index, List selectedTags, String input)?` | 点击提交时的回调，其中index是选中的表情或者五角星的index，selectedTags是选中的标签，input是输入框的内容 | 否 | 无 | -| config | BrnAppraiseConfig | 配置类，具体参见 [BrnAppraise](../brn-appraise/brn-appraise) | 否 | BrnAppraiseConfig() | +| config | BrnAppraiseConfig | 配置类，具体参见 [BrnAppraise](../widgets/brn-appraise) | 否 | BrnAppraiseConfig() | ### 四、代码演示 diff --git a/docs/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerDemo1.png b/doc/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerDemo1.png similarity index 100% rename from docs/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerDemo1.png rename to doc/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerDemo1.png diff --git a/docs/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerDemo2.png b/doc/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerDemo2.png similarity index 100% rename from docs/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerDemo2.png rename to doc/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerDemo2.png diff --git a/docs/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerDemo3.png b/doc/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerDemo3.png similarity index 100% rename from docs/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerDemo3.png rename to doc/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerDemo3.png diff --git a/docs/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerIntro.png b/doc/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerIntro.png similarity index 100% rename from docs/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerIntro.png rename to doc/components/appraise/BrnAppraiseBottomPicker/img/BrnAppraiseBottomPickerIntro.png diff --git a/docs/components/appraise/BrnAppraiseBottomPicker/img/brn_appraise_picker.png b/doc/components/appraise/BrnAppraiseBottomPicker/img/brn_appraise_picker.png similarity index 100% rename from docs/components/appraise/BrnAppraiseBottomPicker/img/brn_appraise_picker.png rename to doc/components/appraise/BrnAppraiseBottomPicker/img/brn_appraise_picker.png diff --git a/docs/components/bottomButtonPanel/BrnBottomButtonPanel/BrnBottomButtonPanel.md b/doc/components/bottomButtonPanel/BrnBottomButtonPanel/BrnBottomButtonPanel.md similarity index 97% rename from docs/components/bottomButtonPanel/BrnBottomButtonPanel/BrnBottomButtonPanel.md rename to doc/components/bottomButtonPanel/BrnBottomButtonPanel/BrnBottomButtonPanel.md index 232526b3..c5f266e9 100644 --- a/docs/components/bottomButtonPanel/BrnBottomButtonPanel/BrnBottomButtonPanel.md +++ b/doc/components/bottomButtonPanel/BrnBottomButtonPanel/BrnBottomButtonPanel.md @@ -59,8 +59,8 @@ const BrnBottomButtonPanel( | 参数名 | 参数类型 | 描述 | 是否必填 | 默认值 | | --- | --- | --- | --- | --- | -| mainButtonName | String | 主按钮的显示文案 | 否 | 无 | -| mainButtonOnTap | VoidCallback | 主按钮的点击回调 | 否 | 无 | +| mainButtonName | String | 主按钮的显示文案 | 是 | 无 | +| mainButtonOnTap | VoidCallback | 主按钮的点击回调 | 是 | 无 | | secondaryButtonName | String? | 次按钮显示文案 | 否 | 无 | | secondaryButtonOnTap | VoidCallback? | 次按钮的点击回调 | 否 | 无 | | iconButtonList | List? | icon按钮的集合 | 否 | 无 | diff --git a/docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/disable_and_enable.png b/doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/disable_and_enable.png similarity index 100% rename from docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/disable_and_enable.png rename to doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/disable_and_enable.png diff --git a/docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/disable_main.png b/doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/disable_main.png similarity index 100% rename from docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/disable_main.png rename to doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/disable_main.png diff --git a/docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_1.png b/doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_1.png similarity index 100% rename from docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_1.png rename to doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_1.png diff --git a/docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_2.png b/doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_2.png similarity index 100% rename from docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_2.png rename to doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_2.png diff --git a/docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_3.png b/doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_3.png similarity index 100% rename from docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_3.png rename to doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_3.png diff --git a/docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_4.png b/doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_4.png similarity index 100% rename from docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_4.png rename to doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_4.png diff --git a/docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_5.png b/doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_5.png similarity index 100% rename from docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_5.png rename to doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_5.png diff --git a/docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_6.png b/doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_6.png similarity index 100% rename from docs/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_6.png rename to doc/components/bottomButtonPanel/BrnBottomButtonPanel/img/pannel_6.png diff --git a/docs/components/bottomButtonPanel/BrnMultipleBottomButton/BrnMultipleBottomButton.md b/doc/components/bottomButtonPanel/BrnMultipleBottomButton/BrnMultipleBottomButton.md similarity index 100% rename from docs/components/bottomButtonPanel/BrnMultipleBottomButton/BrnMultipleBottomButton.md rename to doc/components/bottomButtonPanel/BrnMultipleBottomButton/BrnMultipleBottomButton.md diff --git a/docs/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo1.png b/doc/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo1.png similarity index 100% rename from docs/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo1.png rename to doc/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo1.png diff --git a/docs/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo2.png b/doc/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo2.png similarity index 100% rename from docs/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo2.png rename to doc/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo2.png diff --git a/docs/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo3.png b/doc/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo3.png similarity index 100% rename from docs/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo3.png rename to doc/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo3.png diff --git a/docs/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo4.png b/doc/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo4.png similarity index 100% rename from docs/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo4.png rename to doc/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonDemo4.png diff --git a/docs/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonIntro.png b/doc/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonIntro.png similarity index 100% rename from docs/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonIntro.png rename to doc/components/bottomButtonPanel/BrnMultipleBottomButton/img/BrnMultipleBottomButtonIntro.png diff --git a/docs/components/bottomTabBar/BrnBottomTabBar/BrnBottomTabBar.md b/doc/components/bottomTabBar/BrnBottomTabBar/BrnBottomTabBar.md similarity index 90% rename from docs/components/bottomTabBar/BrnBottomTabBar/BrnBottomTabBar.md rename to doc/components/bottomTabBar/BrnBottomTabBar/BrnBottomTabBar.md index 3033aeeb..10c268e4 100644 --- a/docs/components/bottomTabBar/BrnBottomTabBar/BrnBottomTabBar.md +++ b/doc/components/bottomTabBar/BrnBottomTabBar/BrnBottomTabBar.md @@ -64,14 +64,16 @@ BrnBottomTabBar({ ```dart const BrnBottomTabBarItem({ - required this.icon, - this.title, - Widget? activeIcon, - this.backgroundColor, - this.badge, - this.badgeNo, - this.maxBadgeNo = 99, -}) : activeIcon = activeIcon ?? icon; + this.title, + required this.icon, + Widget? activeIcon, + this.selectedTextStyle, + this.unSelectedTextStyle, + this.backgroundColor, + this.badge, + this.badgeNo, + this.maxBadgeNo = 99, +}) : activeIcon = activeIcon ?? icon; ``` @@ -81,11 +83,15 @@ const BrnBottomTabBarItem({ | icon | Widget | 未选中时的icon | 是 | 无 | | activeIcon | Widget | 选中时的icon | 否 | 无 | | title | Widget? | Tab标题名调 | 否 | 无 | +| selectedTextStyle | TextStyle? | tab 选中文本样式 | 否 | 否 | +| unSelectedTextStyle | TextStyle? | tab 未选中文本样式 | 否 | 否 | | backgroundColor | Color? | 背景色 | 否 | 无 | | badge | Widget? | 未读信息 | 否 | 无 | | badgeNo | String? | 未读信息个数 | 否 | 无 | | maxBadgeNo | int | 未读消息最大个数 | 否 | 99 | + + ## 四、代码演示 ### 效果1 diff --git a/docs/components/bottomTabBar/BrnBottomTabBar/img/BrnBottomTabBar.png b/doc/components/bottomTabBar/BrnBottomTabBar/img/BrnBottomTabBar.png similarity index 100% rename from docs/components/bottomTabBar/BrnBottomTabBar/img/BrnBottomTabBar.png rename to doc/components/bottomTabBar/BrnBottomTabBar/img/BrnBottomTabBar.png diff --git a/docs/components/bubble/BrnBubbleText/BrnBubbleText.md b/doc/components/bubble/BrnBubbleText/BrnBubbleText.md similarity index 100% rename from docs/components/bubble/BrnBubbleText/BrnBubbleText.md rename to doc/components/bubble/BrnBubbleText/BrnBubbleText.md diff --git a/docs/components/bubble/BrnBubbleText/img/bubbleTextCollapsed.png b/doc/components/bubble/BrnBubbleText/img/bubbleTextCollapsed.png similarity index 100% rename from docs/components/bubble/BrnBubbleText/img/bubbleTextCollapsed.png rename to doc/components/bubble/BrnBubbleText/img/bubbleTextCollapsed.png diff --git a/docs/components/bubble/BrnBubbleText/img/bubbleTextExpaned.png b/doc/components/bubble/BrnBubbleText/img/bubbleTextExpaned.png similarity index 100% rename from docs/components/bubble/BrnBubbleText/img/bubbleTextExpaned.png rename to doc/components/bubble/BrnBubbleText/img/bubbleTextExpaned.png diff --git a/docs/components/bubble/BrnInsertInfo/BrnInsertInfo.md b/doc/components/bubble/BrnInsertInfo/BrnInsertInfo.md similarity index 100% rename from docs/components/bubble/BrnInsertInfo/BrnInsertInfo.md rename to doc/components/bubble/BrnInsertInfo/BrnInsertInfo.md diff --git a/docs/components/bubble/BrnInsertInfo/img/insert_info.png b/doc/components/bubble/BrnInsertInfo/img/insert_info.png similarity index 100% rename from docs/components/bubble/BrnInsertInfo/img/insert_info.png rename to doc/components/bubble/BrnInsertInfo/img/insert_info.png diff --git a/docs/components/buttonPanel/BrnButtonPanel/BrnButtonPanel.md b/doc/components/buttonPanel/BrnButtonPanel/BrnButtonPanel.md similarity index 100% rename from docs/components/buttonPanel/BrnButtonPanel/BrnButtonPanel.md rename to doc/components/buttonPanel/BrnButtonPanel/BrnButtonPanel.md diff --git a/docs/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo1.png b/doc/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo1.png similarity index 100% rename from docs/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo1.png rename to doc/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo1.png diff --git a/docs/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo2.png b/doc/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo2.png similarity index 100% rename from docs/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo2.png rename to doc/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo2.png diff --git a/docs/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo3.png b/doc/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo3.png similarity index 100% rename from docs/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo3.png rename to doc/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo3.png diff --git a/docs/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo4.png b/doc/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo4.png similarity index 100% rename from docs/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo4.png rename to doc/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo4.png diff --git a/docs/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo5.png b/doc/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo5.png similarity index 100% rename from docs/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo5.png rename to doc/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo5.png diff --git a/docs/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo6.png b/doc/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo6.png similarity index 100% rename from docs/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo6.png rename to doc/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelDemo6.png diff --git a/docs/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelIntro.png b/doc/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelIntro.png similarity index 100% rename from docs/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelIntro.png rename to doc/components/buttonPanel/BrnButtonPanel/img/BrnButtonPanelIntro.png diff --git a/docs/components/buttonPanel/BrnTextButtonPanel/BrnTextButtonPanel.md b/doc/components/buttonPanel/BrnTextButtonPanel/BrnTextButtonPanel.md similarity index 100% rename from docs/components/buttonPanel/BrnTextButtonPanel/BrnTextButtonPanel.md rename to doc/components/buttonPanel/BrnTextButtonPanel/BrnTextButtonPanel.md diff --git a/docs/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo1.png b/doc/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo1.png similarity index 100% rename from docs/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo1.png rename to doc/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo1.png diff --git a/docs/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo2.png b/doc/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo2.png similarity index 100% rename from docs/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo2.png rename to doc/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo2.png diff --git a/docs/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo3.png b/doc/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo3.png similarity index 100% rename from docs/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo3.png rename to doc/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo3.png diff --git a/docs/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo4.png b/doc/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo4.png similarity index 100% rename from docs/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo4.png rename to doc/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo4.png diff --git a/docs/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo5.png b/doc/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo5.png similarity index 100% rename from docs/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo5.png rename to doc/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelDemo5.png diff --git a/docs/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelIntro.png b/doc/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelIntro.png similarity index 100% rename from docs/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelIntro.png rename to doc/components/buttonPanel/BrnTextButtonPanel/img/BrnTextButtonPanelIntro.png diff --git a/docs/components/calendar/BrnCalendarView/BrnCalendarView.md b/doc/components/calendar/BrnCalendarView/BrnCalendarView.md similarity index 100% rename from docs/components/calendar/BrnCalendarView/BrnCalendarView.md rename to doc/components/calendar/BrnCalendarView/BrnCalendarView.md diff --git a/docs/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo1.png b/doc/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo1.png similarity index 100% rename from docs/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo1.png rename to doc/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo1.png diff --git a/docs/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo2.png b/doc/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo2.png similarity index 100% rename from docs/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo2.png rename to doc/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo2.png diff --git a/docs/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo3.png b/doc/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo3.png similarity index 100% rename from docs/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo3.png rename to doc/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo3.png diff --git a/docs/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo4.png b/doc/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo4.png similarity index 100% rename from docs/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo4.png rename to doc/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo4.png diff --git a/docs/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo5.png b/doc/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo5.png similarity index 100% rename from docs/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo5.png rename to doc/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo5.png diff --git a/docs/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo6.png b/doc/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo6.png similarity index 100% rename from docs/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo6.png rename to doc/components/calendar/BrnCalendarView/img/BrnCalendarViewDemo6.png diff --git a/docs/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro1.png b/doc/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro1.png similarity index 100% rename from docs/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro1.png rename to doc/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro1.png diff --git a/docs/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro2.png b/doc/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro2.png similarity index 100% rename from docs/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro2.png rename to doc/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro2.png diff --git a/docs/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro3.png b/doc/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro3.png similarity index 100% rename from docs/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro3.png rename to doc/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro3.png diff --git a/docs/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro4.png b/doc/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro4.png similarity index 100% rename from docs/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro4.png rename to doc/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro4.png diff --git a/docs/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro5.png b/doc/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro5.png similarity index 100% rename from docs/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro5.png rename to doc/components/calendar/BrnCalendarView/img/BrnCalendarViewIntro5.png diff --git a/docs/components/charts/BrnBrokenLine/BrnBrokenLine.md b/doc/components/charts/BrnBrokenLine/BrnBrokenLine.md similarity index 89% rename from docs/components/charts/BrnBrokenLine/BrnBrokenLine.md rename to doc/components/charts/BrnBrokenLine/BrnBrokenLine.md index c34e53e9..1206b72e 100644 --- a/docs/components/charts/BrnBrokenLine/BrnBrokenLine.md +++ b/doc/components/charts/BrnBrokenLine/BrnBrokenLine.md @@ -30,37 +30,37 @@ group: ```dart BrnBrokenLine({ - Key? key, - required this.size, - required this.lines, - this.contentPadding = const EdgeInsets.only(left: 10, right: 10), - this.backgroundColor, - this.xyDialLineWidth = 2, - this.xDialColor, - this.yDialColor, - this.yHintLineOffset = 20.0, - this.showPointDashLine = true, - this.dialWidth = 4, - this.xDialMin, - this.xDialMax, - this.xDialValues, - required this.yDialMin, - required this.yDialMax, - this.yDialValues, - this.isShowXHintLine = true, - this.isShowYHintLine = false, - this.isHintLineSolid = true, - this.hintLineColor, - this.isTipWindowAutoDismiss = true, - this.isShowXDialText = false, - this.isShowYDialText = false, - }) : super(key: key) { - // 设置自定义 X 轴时，检查 x轴的最大、最小刻度范围 - if (xDialValues != null) { - assert(xDialMin != null); - assert(xDialMax != null); - } + Key? key, + required this.size, + required this.lines, + this.contentPadding = const EdgeInsets.only(left: 10, right: 10), + this.backgroundColor, + this.xyDialLineWidth = 2, + this.xDialColor, + this.yDialColor, + this.yHintLineOffset = 20.0, + this.showPointDashLine = true, + this.dialWidth = 4, + this.xDialMin, + this.xDialMax, + this.xDialValues, + required this.yDialMin, + required this.yDialMax, + this.yDialValues, + this.isShowXHintLine = true, + this.isShowYHintLine = false, + this.isHintLineSolid = true, + this.hintLineColor, + this.isTipWindowAutoDismiss = true, + this.isShowXDialText = false, + this.isShowYDialText = false, +}) : super(key: key) { + // 设置自定义 X 轴时，检查 x轴的最大、最小刻度范围 + if (xDialValues != null) { + assert(xDialMin != null); + assert(xDialMax != null); } +} ``` ### 参数说明： @@ -77,19 +77,19 @@ BrnBrokenLine({ | yHintLineOffset | double | Y 轴辅助线向右偏移量，默认 20（X 轴刻度线也会跟随该偏移量向右偏移） | 否 | 20.0 | | | showPointDashLine | bool | 是否展示数据点选中时的辅助线 | 否 | true | | | dialWidth | double | Y 轴刻度的宽度，和 X 轴刻度的高度 | 否 | 4 | | -| xDialMin | double | X 轴展示范围最小值 | 否 | | | -| xDialMax | double | X 轴展示范围最大值 | 否 | | | +| xDialMin | double? | X 轴展示范围最小值 | 否 | | | +| xDialMax | double? | X 轴展示范围最大值 | 否 | | | | yDialMin | double | Y 轴展示范围最小值 | 是 | | | | yDialMax | double | Y 轴展示范围最大值 | 是 | | | -| xDialValues | `List` | X 轴刻度数据 | 否 | | | -| yDialValues | `List`？ | Y 轴刻度数据 | 否 | | | -| isShowXHintLine | bool | 是否展示 X 轴辅助线 | | true | | -| isShowYHintLine | bool | 是否展示 Y 轴辅助线 | | false | | -| isHintLineSolid | bool | 辅助线是否为虚线 | | true | | -| hintLineColor | Color？ | 辅助线颜色 | | | | -| isTipWindowAutoDismiss | bool | 点击弹出的 tip 提示框，是否自动消失 | | true | | -| isShowXDialText | bool | 是否展示 X 坐标刻度文案 | | false | | -| isShowYDialText | bool | 是否展示 Y 坐标刻度文案 | | false | | +| xDialValues | `List?` | X 轴刻度数据 | 否 | | | +| yDialValues | `List?` | Y 轴刻度数据 | 否 | | | +| isShowXHintLine | bool | 是否展示 X 轴辅助线 | 否 | true | | +| isShowYHintLine | bool | 是否展示 Y 轴辅助线 | 否 | false | | +| isHintLineSolid | bool | 辅助线是否为虚线 | 否 | true | | +| hintLineColor | Color？ | 辅助线颜色 | 否 | | | +| isTipWindowAutoDismiss | bool | 点击弹出的 tip 提示框，是否自动消失 | 否 | true | | +| isShowXDialText | bool | 是否展示 X 坐标刻度文案 | 否 | false | | +| isShowYDialText | bool | 是否展示 Y 坐标刻度文案 | 否 | false | | ### 其他数据结构 @@ -121,7 +121,7 @@ class BrnPointData { #### BrnLineTouchData 每个点的点击行为配置数据 -``` +```dart class BrnLineTouchData { /// 用于临时存储要展示 tip 内容在坐标的位置 double? x, y; diff --git a/docs/components/charts/BrnBrokenLine/img/BrnBrokenLineDemo1.png b/doc/components/charts/BrnBrokenLine/img/BrnBrokenLineDemo1.png similarity index 100% rename from docs/components/charts/BrnBrokenLine/img/BrnBrokenLineDemo1.png rename to doc/components/charts/BrnBrokenLine/img/BrnBrokenLineDemo1.png diff --git a/docs/components/charts/BrnBrokenLine/img/BrnBrokenLineDemo2.png b/doc/components/charts/BrnBrokenLine/img/BrnBrokenLineDemo2.png similarity index 100% rename from docs/components/charts/BrnBrokenLine/img/BrnBrokenLineDemo2.png rename to doc/components/charts/BrnBrokenLine/img/BrnBrokenLineDemo2.png diff --git a/docs/components/charts/BrnBrokenLine/img/BrnBrokenLineIntro.png b/doc/components/charts/BrnBrokenLine/img/BrnBrokenLineIntro.png similarity index 100% rename from docs/components/charts/BrnBrokenLine/img/BrnBrokenLineIntro.png rename to doc/components/charts/BrnBrokenLine/img/BrnBrokenLineIntro.png diff --git a/docs/components/charts/BrnDoughnutChart/BrnDoughnutChart.md b/doc/components/charts/BrnDoughnutChart/BrnDoughnutChart.md similarity index 98% rename from docs/components/charts/BrnDoughnutChart/BrnDoughnutChart.md rename to doc/components/charts/BrnDoughnutChart/BrnDoughnutChart.md index 69f0ae97..42fc8e87 100644 --- a/docs/components/charts/BrnDoughnutChart/BrnDoughnutChart.md +++ b/doc/components/charts/BrnDoughnutChart/BrnDoughnutChart.md @@ -47,7 +47,7 @@ BrnDoughnutChart( | width | double | 宽 | 否 | 0 | | height | double | 高 | 否 | 0 | | padding | EdgeInsetsGeometry | 内边距 | 否 | EdgeInsets.zero | -| ringWidth | double | 圆环宽度 | 否 | 50 | +| ringWidth | int | 圆环宽度 | 否 | 50 | | data | `List` | 饼图数据 | 是 | | | fontSize | double | 选中时展示文字大小 | 否 | 12 | | fontColor | Color | 选中时展示文字颜色 | 否 | Colors.white | diff --git a/docs/components/charts/BrnDoughnutChart/img/BrnDoughnutChartDemo1.png b/doc/components/charts/BrnDoughnutChart/img/BrnDoughnutChartDemo1.png similarity index 100% rename from docs/components/charts/BrnDoughnutChart/img/BrnDoughnutChartDemo1.png rename to doc/components/charts/BrnDoughnutChart/img/BrnDoughnutChartDemo1.png diff --git a/docs/components/charts/BrnDoughnutChart/img/BrnDoughnutChartIntro.png b/doc/components/charts/BrnDoughnutChart/img/BrnDoughnutChartIntro.png similarity index 100% rename from docs/components/charts/BrnDoughnutChart/img/BrnDoughnutChartIntro.png rename to doc/components/charts/BrnDoughnutChart/img/BrnDoughnutChartIntro.png diff --git a/docs/components/charts/BrnFunnelChart/BrnFunnelChart.md b/doc/components/charts/BrnFunnelChart/BrnFunnelChart.md similarity index 100% rename from docs/components/charts/BrnFunnelChart/BrnFunnelChart.md rename to doc/components/charts/BrnFunnelChart/BrnFunnelChart.md diff --git a/docs/components/charts/BrnFunnelChart/img/BrnFunnelChart1.png b/doc/components/charts/BrnFunnelChart/img/BrnFunnelChart1.png similarity index 100% rename from docs/components/charts/BrnFunnelChart/img/BrnFunnelChart1.png rename to doc/components/charts/BrnFunnelChart/img/BrnFunnelChart1.png diff --git a/docs/components/charts/BrnFunnelChart/img/BrnFunnelChart2.png b/doc/components/charts/BrnFunnelChart/img/BrnFunnelChart2.png similarity index 100% rename from docs/components/charts/BrnFunnelChart/img/BrnFunnelChart2.png rename to doc/components/charts/BrnFunnelChart/img/BrnFunnelChart2.png diff --git a/docs/components/charts/BrnFunnelChart/img/BrnFunnelChart3.png b/doc/components/charts/BrnFunnelChart/img/BrnFunnelChart3.png similarity index 100% rename from docs/components/charts/BrnFunnelChart/img/BrnFunnelChart3.png rename to doc/components/charts/BrnFunnelChart/img/BrnFunnelChart3.png diff --git a/docs/components/charts/BrnFunnelChart/img/BrnFunnelChartIntro.png b/doc/components/charts/BrnFunnelChart/img/BrnFunnelChartIntro.png similarity index 100% rename from docs/components/charts/BrnFunnelChart/img/BrnFunnelChartIntro.png rename to doc/components/charts/BrnFunnelChart/img/BrnFunnelChartIntro.png diff --git a/docs/components/charts/BrnProgressBarChart/BrnProgressBarChart.md b/doc/components/charts/BrnProgressBarChart/BrnProgressBarChart.md similarity index 100% rename from docs/components/charts/BrnProgressBarChart/BrnProgressBarChart.md rename to doc/components/charts/BrnProgressBarChart/BrnProgressBarChart.md diff --git a/docs/components/charts/BrnProgressBarChart/img/BrnProgressBarChartDemo1.png b/doc/components/charts/BrnProgressBarChart/img/BrnProgressBarChartDemo1.png similarity index 100% rename from docs/components/charts/BrnProgressBarChart/img/BrnProgressBarChartDemo1.png rename to doc/components/charts/BrnProgressBarChart/img/BrnProgressBarChartDemo1.png diff --git a/docs/components/charts/BrnProgressBarChart/img/BrnProgressBarChartDemo2.png b/doc/components/charts/BrnProgressBarChart/img/BrnProgressBarChartDemo2.png similarity index 100% rename from docs/components/charts/BrnProgressBarChart/img/BrnProgressBarChartDemo2.png rename to doc/components/charts/BrnProgressBarChart/img/BrnProgressBarChartDemo2.png diff --git a/docs/components/charts/BrnProgressBarChart/img/BrnProgressBarChartIntro1.png b/doc/components/charts/BrnProgressBarChart/img/BrnProgressBarChartIntro1.png similarity index 100% rename from docs/components/charts/BrnProgressBarChart/img/BrnProgressBarChartIntro1.png rename to doc/components/charts/BrnProgressBarChart/img/BrnProgressBarChartIntro1.png diff --git a/docs/components/charts/BrnProgressBarChart/img/BrnProgressBarChartIntro2.png b/doc/components/charts/BrnProgressBarChart/img/BrnProgressBarChartIntro2.png similarity index 100% rename from docs/components/charts/BrnProgressBarChart/img/BrnProgressBarChartIntro2.png rename to doc/components/charts/BrnProgressBarChart/img/BrnProgressBarChartIntro2.png diff --git a/docs/components/charts/BrnProgressChart/BrnProgressChart.md b/doc/components/charts/BrnProgressChart/BrnProgressChart.md similarity index 100% rename from docs/components/charts/BrnProgressChart/BrnProgressChart.md rename to doc/components/charts/BrnProgressChart/BrnProgressChart.md diff --git a/docs/components/charts/BrnProgressChart/img/BrnProgressChartDemo1.png b/doc/components/charts/BrnProgressChart/img/BrnProgressChartDemo1.png similarity index 100% rename from docs/components/charts/BrnProgressChart/img/BrnProgressChartDemo1.png rename to doc/components/charts/BrnProgressChart/img/BrnProgressChartDemo1.png diff --git a/docs/components/charts/BrnProgressChart/img/BrnProgressChartIntro.png b/doc/components/charts/BrnProgressChart/img/BrnProgressChartIntro.png similarity index 100% rename from docs/components/charts/BrnProgressChart/img/BrnProgressChartIntro.png rename to doc/components/charts/BrnProgressChart/img/BrnProgressChartIntro.png diff --git a/docs/components/charts/BrnRadarChart/BrnRadarChart.md b/doc/components/charts/BrnRadarChart/BrnRadarChart.md similarity index 100% rename from docs/components/charts/BrnRadarChart/BrnRadarChart.md rename to doc/components/charts/BrnRadarChart/BrnRadarChart.md diff --git a/docs/components/charts/BrnRadarChart/img/BrnRadarChartDemo1.png b/doc/components/charts/BrnRadarChart/img/BrnRadarChartDemo1.png similarity index 100% rename from docs/components/charts/BrnRadarChart/img/BrnRadarChartDemo1.png rename to doc/components/charts/BrnRadarChart/img/BrnRadarChartDemo1.png diff --git a/docs/components/charts/BrnRadarChart/img/BrnRadarChartDemo2.png b/doc/components/charts/BrnRadarChart/img/BrnRadarChartDemo2.png similarity index 100% rename from docs/components/charts/BrnRadarChart/img/BrnRadarChartDemo2.png rename to doc/components/charts/BrnRadarChart/img/BrnRadarChartDemo2.png diff --git a/docs/components/charts/BrnRadarChart/img/BrnRadarChartIntro.png b/doc/components/charts/BrnRadarChart/img/BrnRadarChartIntro.png similarity index 100% rename from docs/components/charts/BrnRadarChart/img/BrnRadarChartIntro.png rename to doc/components/charts/BrnRadarChart/img/BrnRadarChartIntro.png diff --git a/docs/components/checkbox/BrnCheckbox/BrnCheckbox.md b/doc/components/checkbox/BrnCheckbox/BrnCheckbox.md similarity index 95% rename from docs/components/checkbox/BrnCheckbox/BrnCheckbox.md rename to doc/components/checkbox/BrnCheckbox/BrnCheckbox.md index 8e355ccd..e9699d85 100644 --- a/docs/components/checkbox/BrnCheckbox/BrnCheckbox.md +++ b/doc/components/checkbox/BrnCheckbox/BrnCheckbox.md @@ -1,17 +1,17 @@ --- -title: BrnRadioItem +title: BrnCheckbox group: title: Radio order: 25 --- -# BrnRadioItem +# BrnCheckbox 多项选择 ## 一、效果总览 - + ## 二、描述 @@ -60,7 +60,7 @@ const BrnCheckbox({ ### 效果1：多选+选项居右+不可用状态 -![](./img/BrnRadioItemDemo1.png) +![](./img/BrnCheckboxDemo1.png) ```dart Container( height: 130, @@ -93,7 +93,7 @@ Container( ### 效果2：自定义视图 -![](./img/BrnRadioItemDemo2.png) +![](./img/BrnCheckboxDemo2.png) ```dart BrnCheckbox( radioIndex: 10, diff --git a/docs/components/citySelection/BrnSingleSelectCityPage/BrnSingleSelectCityPage.md b/doc/components/citySelection/BrnSingleSelectCityPage/BrnSingleSelectCityPage.md similarity index 100% rename from docs/components/citySelection/BrnSingleSelectCityPage/BrnSingleSelectCityPage.md rename to doc/components/citySelection/BrnSingleSelectCityPage/BrnSingleSelectCityPage.md diff --git a/docs/components/citySelection/BrnSingleSelectCityPage/img/BrnSingleSelectCityPageDemo1.png b/doc/components/citySelection/BrnSingleSelectCityPage/img/BrnSingleSelectCityPageDemo1.png similarity index 100% rename from docs/components/citySelection/BrnSingleSelectCityPage/img/BrnSingleSelectCityPageDemo1.png rename to doc/components/citySelection/BrnSingleSelectCityPage/img/BrnSingleSelectCityPageDemo1.png diff --git a/docs/components/citySelection/BrnSingleSelectCityPage/img/BrnSingleSelectCityPageIntro.png b/doc/components/citySelection/BrnSingleSelectCityPage/img/BrnSingleSelectCityPageIntro.png similarity index 100% rename from docs/components/citySelection/BrnSingleSelectCityPage/img/BrnSingleSelectCityPageIntro.png rename to doc/components/citySelection/BrnSingleSelectCityPage/img/BrnSingleSelectCityPageIntro.png diff --git a/docs/components/dashedLine/BrnDashedLine/BrnDashedLine.md b/doc/components/dashedLine/BrnDashedLine/BrnDashedLine.md similarity index 100% rename from docs/components/dashedLine/BrnDashedLine/BrnDashedLine.md rename to doc/components/dashedLine/BrnDashedLine/BrnDashedLine.md diff --git a/docs/components/dashedLine/BrnDashedLine/img/BrnDashedLineDemo1.png b/doc/components/dashedLine/BrnDashedLine/img/BrnDashedLineDemo1.png similarity index 100% rename from docs/components/dashedLine/BrnDashedLine/img/BrnDashedLineDemo1.png rename to doc/components/dashedLine/BrnDashedLine/img/BrnDashedLineDemo1.png diff --git a/docs/components/dashedLine/BrnDashedLine/img/BrnDashedLineDemo2.png b/doc/components/dashedLine/BrnDashedLine/img/BrnDashedLineDemo2.png similarity index 100% rename from docs/components/dashedLine/BrnDashedLine/img/BrnDashedLineDemo2.png rename to doc/components/dashedLine/BrnDashedLine/img/BrnDashedLineDemo2.png diff --git a/docs/components/dashedLine/BrnDashedLine/img/BrnDashedLineDemo3.png b/doc/components/dashedLine/BrnDashedLine/img/BrnDashedLineDemo3.png similarity index 100% rename from docs/components/dashedLine/BrnDashedLine/img/BrnDashedLineDemo3.png rename to doc/components/dashedLine/BrnDashedLine/img/BrnDashedLineDemo3.png diff --git a/docs/components/dashedLine/BrnDashedLine/img/BrnDashedLineIntro.png b/doc/components/dashedLine/BrnDashedLine/img/BrnDashedLineIntro.png similarity index 100% rename from docs/components/dashedLine/BrnDashedLine/img/BrnDashedLineIntro.png rename to doc/components/dashedLine/BrnDashedLine/img/BrnDashedLineIntro.png diff --git a/docs/components/dialog/BrnDialog/BrnDialog.md b/doc/components/dialog/BrnDialog/BrnDialog.md similarity index 97% rename from docs/components/dialog/BrnDialog/BrnDialog.md rename to doc/components/dialog/BrnDialog/BrnDialog.md index 4a272260..8e4e380c 100644 --- a/docs/components/dialog/BrnDialog/BrnDialog.md +++ b/doc/components/dialog/BrnDialog/BrnDialog.md @@ -62,11 +62,11 @@ BrnDialog({ | titleText | String? | 对话框的标题文案 | 否 | 无 | | messageText | String? | 对话框中间的显示文本 | 否 | 无 | | warningText | String? | 对话框的警示文案文本 | 否 | 无 | -| actionsText | List? | 对话框底部的按钮 | 否 | 无 | +| actionsText | `List?` | 对话框底部的按钮 | 否 | 无 | | titleWidget | Widget? | 自定义widget的标题 | 否 | 无 | | contentWidget | Widget? | 自定义widget的内容 | 否 | 无 | | warningWidget | Widget? | 自定义widget的警示内容 | 否 | 无 | -| actionsWidget | List? | 对话框底部的自定义widget按钮 | 否 | 无 | +| actionsWidget | `List?` | 对话框底部的自定义widget按钮 | 否 | 无 | | indexedActionCallback | DialogIndexedActionClickCallback? | 对话框底部的点击回调 | 否 | 无 | | divider | Divider | 底部按钮的水平和上面内容的水平分割线 | 否 | 高1像素的L1分割线 | | verticalDivider | VerticalDivider | 底部按钮之间的分割线 | 否 | 宽1像素的L1分割线 | @@ -130,7 +130,7 @@ BrnDialog({ | **参数名** | **参数类型** | **作用** | **是否必填** | **默认值** | | --- | --- | --- | --- | --- | | context | BuildContext | 用于显示弹窗的上下文 | 是 | 五 | -| actions | List | 对话框底部的按钮 | 否 | 无 | +| actions | `List` | 对话框底部的按钮 | 否 | 无 | | showIcon | bool | 是否显示icon | 否 | false | | iconWidget | Image? | 头部显示的icon 默认为alert | 否 | 主题色alert | | title | String? | 对话框的标题文案 | 否 | 无 | @@ -139,7 +139,7 @@ BrnDialog({ | messageWidget | Widget? | 自定义widget的内容 | 否 | 无 | | warning | String? | 对话框的警示文案文本 | 否 | 无 | | warningWidget | Widget? | 自定义widget的警示内容 | 否 | 无 | -| actionsWidget | List? | 对话框底部的自定义widget按钮 | 否 | 无 | +| actionsWidget |` List?` | 对话框底部的自定义widget按钮 | 否 | 无 | | indexedActionClickCallback | DialogIndexedActionClickCallback? | 对话按钮点击的回调 | 否 | 无 | | titleMaxLines | int | 标题最大行数 | 否 | 3 | | barrierDismissible | bool | 点击对话框遮罩是否消失对话框 | 否 | true 关闭 | diff --git a/docs/components/dialog/BrnDialog/img/common_dialog_2.png b/doc/components/dialog/BrnDialog/img/common_dialog_2.png similarity index 100% rename from docs/components/dialog/BrnDialog/img/common_dialog_2.png rename to doc/components/dialog/BrnDialog/img/common_dialog_2.png diff --git a/docs/components/dialog/BrnDialog/img/common_dialog_3.png b/doc/components/dialog/BrnDialog/img/common_dialog_3.png similarity index 100% rename from docs/components/dialog/BrnDialog/img/common_dialog_3.png rename to doc/components/dialog/BrnDialog/img/common_dialog_3.png diff --git a/docs/components/dialog/BrnDialog/img/common_dialog_4.png b/doc/components/dialog/BrnDialog/img/common_dialog_4.png similarity index 100% rename from docs/components/dialog/BrnDialog/img/common_dialog_4.png rename to doc/components/dialog/BrnDialog/img/common_dialog_4.png diff --git a/docs/components/dialog/BrnDialog/img/common_dialog_5.png b/doc/components/dialog/BrnDialog/img/common_dialog_5.png similarity index 100% rename from docs/components/dialog/BrnDialog/img/common_dialog_5.png rename to doc/components/dialog/BrnDialog/img/common_dialog_5.png diff --git a/docs/components/dialog/BrnDialog/img/common_dialog_6.png b/doc/components/dialog/BrnDialog/img/common_dialog_6.png similarity index 100% rename from docs/components/dialog/BrnDialog/img/common_dialog_6.png rename to doc/components/dialog/BrnDialog/img/common_dialog_6.png diff --git a/docs/components/dialog/BrnDialog/img/common_dialog_7.png b/doc/components/dialog/BrnDialog/img/common_dialog_7.png similarity index 100% rename from docs/components/dialog/BrnDialog/img/common_dialog_7.png rename to doc/components/dialog/BrnDialog/img/common_dialog_7.png diff --git a/docs/components/dialog/BrnDialog/img/common_dialog_8.png b/doc/components/dialog/BrnDialog/img/common_dialog_8.png similarity index 100% rename from docs/components/dialog/BrnDialog/img/common_dialog_8.png rename to doc/components/dialog/BrnDialog/img/common_dialog_8.png diff --git a/docs/components/dialog/BrnDialog/img/common_dialog_9.png b/doc/components/dialog/BrnDialog/img/common_dialog_9.png similarity index 100% rename from docs/components/dialog/BrnDialog/img/common_dialog_9.png rename to doc/components/dialog/BrnDialog/img/common_dialog_9.png diff --git a/docs/components/dialog/BrnDialog/img/common_diloag_0.png b/doc/components/dialog/BrnDialog/img/common_diloag_0.png similarity index 100% rename from docs/components/dialog/BrnDialog/img/common_diloag_0.png rename to doc/components/dialog/BrnDialog/img/common_diloag_0.png diff --git a/docs/components/dialog/BrnDialog/img/common_diloag_1.png b/doc/components/dialog/BrnDialog/img/common_diloag_1.png similarity index 100% rename from docs/components/dialog/BrnDialog/img/common_diloag_1.png rename to doc/components/dialog/BrnDialog/img/common_diloag_1.png diff --git a/docs/components/dialog/BrnEnhanceOperationDialog/BrnEnhanceOperationDialog.md b/doc/components/dialog/BrnEnhanceOperationDialog/BrnEnhanceOperationDialog.md similarity index 100% rename from docs/components/dialog/BrnEnhanceOperationDialog/BrnEnhanceOperationDialog.md rename to doc/components/dialog/BrnEnhanceOperationDialog/BrnEnhanceOperationDialog.md diff --git a/docs/components/dialog/BrnEnhanceOperationDialog/img/BrnEnhanceOperationDialogDemo1.png b/doc/components/dialog/BrnEnhanceOperationDialog/img/BrnEnhanceOperationDialogDemo1.png similarity index 100% rename from docs/components/dialog/BrnEnhanceOperationDialog/img/BrnEnhanceOperationDialogDemo1.png rename to doc/components/dialog/BrnEnhanceOperationDialog/img/BrnEnhanceOperationDialogDemo1.png diff --git a/docs/components/dialog/BrnEnhanceOperationDialog/img/BrnEnhanceOperationDialogDemo2.png b/doc/components/dialog/BrnEnhanceOperationDialog/img/BrnEnhanceOperationDialogDemo2.png similarity index 100% rename from docs/components/dialog/BrnEnhanceOperationDialog/img/BrnEnhanceOperationDialogDemo2.png rename to doc/components/dialog/BrnEnhanceOperationDialog/img/BrnEnhanceOperationDialogDemo2.png diff --git a/docs/components/dialog/BrnEnhanceOperationDialog/img/BrnEnhanceOperationDialogIntro1.png b/doc/components/dialog/BrnEnhanceOperationDialog/img/BrnEnhanceOperationDialogIntro1.png similarity index 100% rename from docs/components/dialog/BrnEnhanceOperationDialog/img/BrnEnhanceOperationDialogIntro1.png rename to doc/components/dialog/BrnEnhanceOperationDialog/img/BrnEnhanceOperationDialogIntro1.png diff --git a/docs/components/dialog/BrnEnhanceOperationDialog/img/dialog_two_vertical_button_1.png b/doc/components/dialog/BrnEnhanceOperationDialog/img/dialog_two_vertical_button_1.png similarity index 100% rename from docs/components/dialog/BrnEnhanceOperationDialog/img/dialog_two_vertical_button_1.png rename to doc/components/dialog/BrnEnhanceOperationDialog/img/dialog_two_vertical_button_1.png diff --git a/docs/components/dialog/BrnLoadingDialog/BrnLoadingDialog.md b/doc/components/dialog/BrnLoadingDialog/BrnLoadingDialog.md similarity index 100% rename from docs/components/dialog/BrnLoadingDialog/BrnLoadingDialog.md rename to doc/components/dialog/BrnLoadingDialog/BrnLoadingDialog.md diff --git a/docs/components/dialog/BrnLoadingDialog/img/BrnLoadingDialogIntro.png b/doc/components/dialog/BrnLoadingDialog/img/BrnLoadingDialogIntro.png similarity index 100% rename from docs/components/dialog/BrnLoadingDialog/img/BrnLoadingDialogIntro.png rename to doc/components/dialog/BrnLoadingDialog/img/BrnLoadingDialogIntro.png diff --git a/docs/components/dialog/BrnMiddleInputDialog/BrnMiddleInputDialog.md b/doc/components/dialog/BrnMiddleInputDialog/BrnMiddleInputDialog.md similarity index 93% rename from docs/components/dialog/BrnMiddleInputDialog/BrnMiddleInputDialog.md rename to doc/components/dialog/BrnMiddleInputDialog/BrnMiddleInputDialog.md index a8ace15f..9dd40a66 100644 --- a/docs/components/dialog/BrnMiddleInputDialog/BrnMiddleInputDialog.md +++ b/doc/components/dialog/BrnMiddleInputDialog/BrnMiddleInputDialog.md @@ -16,7 +16,7 @@ group: ## 二、描述 1. 带输入框的Dialog，在BrnDialogManager 基础上封装了输入框功能。 -2. 更进一步的细节定制，可使用 [BrnDialog](../brn-dialog/brn-dialog) 实现 +2. 更进一步的细节定制，可使用 [BrnDialog](../widgets/brn-dialog) 实现 ## 三、构造方法及参数说明 @@ -57,7 +57,7 @@ const BrnMiddleInputDialog( | inputEditingController | TextEditingController? | 输入控制器。如果有初始状态的填充文字，可以通过 [inputEditingController] 设置 | 否 | | | cancelText | String | 取消文案 | 否 | 取消 | | confirmText | String | 确定文案 | 否 | 确定 | -| inputFormatters | List? | 键盘操作按钮类型，可参见系统的 TextField.textInputAction | 否 | TextInputAction.newline | +| inputFormatters | `List?` | 键盘操作按钮类型，可参见系统的 TextField.textInputAction | 否 | TextInputAction.newline | | textInputAction | `TextInputAction` | 用于控制输入的内容范围比如只能输入数字可以填写:`FilteringTextInputFormatter.digitsOnly` | 否 | 无 | | onConfirm | void Function(String value)? | 确定回调，返回输入的值 | 否 | | | onCancel | VoidCallback | 取消回调 | 否 | | diff --git a/docs/components/dialog/BrnMiddleInputDialog/img/BrnMiddleInputDialogIntro1.png b/doc/components/dialog/BrnMiddleInputDialog/img/BrnMiddleInputDialogIntro1.png similarity index 100% rename from docs/components/dialog/BrnMiddleInputDialog/img/BrnMiddleInputDialogIntro1.png rename to doc/components/dialog/BrnMiddleInputDialog/img/BrnMiddleInputDialogIntro1.png diff --git a/docs/components/dialog/BrnMiddleInputDialog/img/BrnMiddleInputDialogIntro2.png b/doc/components/dialog/BrnMiddleInputDialog/img/BrnMiddleInputDialogIntro2.png similarity index 100% rename from docs/components/dialog/BrnMiddleInputDialog/img/BrnMiddleInputDialogIntro2.png rename to doc/components/dialog/BrnMiddleInputDialog/img/BrnMiddleInputDialogIntro2.png diff --git a/docs/components/dialog/BrnMiddleInputDialog/img/middleinoutdialog.png b/doc/components/dialog/BrnMiddleInputDialog/img/middleinoutdialog.png similarity index 100% rename from docs/components/dialog/BrnMiddleInputDialog/img/middleinoutdialog.png rename to doc/components/dialog/BrnMiddleInputDialog/img/middleinoutdialog.png diff --git a/docs/components/dialog/BrnMultiSelectDialog/BrnMultiSelectDialog.md b/doc/components/dialog/BrnMultiSelectDialog/BrnMultiSelectDialog.md similarity index 98% rename from docs/components/dialog/BrnMultiSelectDialog/BrnMultiSelectDialog.md rename to doc/components/dialog/BrnMultiSelectDialog/BrnMultiSelectDialog.md index 4d035372..8cb174f1 100644 --- a/docs/components/dialog/BrnMultiSelectDialog/BrnMultiSelectDialog.md +++ b/doc/components/dialog/BrnMultiSelectDialog/BrnMultiSelectDialog.md @@ -17,7 +17,7 @@ group: ### 适用场景 -多选列表，适用于从页面中部弹出的情况，属于 Dialog。 相似组件有 [BrnMultiSelectListPicker](../../picker/brn-multi-select-list-picker/brn-multi-select-list-picker)， 从页面中部弹出。 +多选列表，适用于从页面中部弹出的情况，属于 Dialog。 相似组件有 [BrnMultiSelectListPicker](../widgets/brn-multi-select-list-picker)， 从页面中部弹出。 ## 三、构造函数及参数说明 diff --git a/docs/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogDemo1.png b/doc/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogDemo1.png similarity index 100% rename from docs/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogDemo1.png rename to doc/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogDemo1.png diff --git a/docs/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogDemo2.png b/doc/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogDemo2.png similarity index 100% rename from docs/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogDemo2.png rename to doc/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogDemo2.png diff --git a/docs/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogDemo3.png b/doc/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogDemo3.png similarity index 100% rename from docs/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogDemo3.png rename to doc/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogDemo3.png diff --git a/docs/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogIntro.png b/doc/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogIntro.png similarity index 100% rename from docs/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogIntro.png rename to doc/components/dialog/BrnMultiSelectDialog/img/BrnMultiSelectDialogIntro.png diff --git a/docs/components/dialog/BrnScrollableTextDialog/BrnScrollableTextDialog.md b/doc/components/dialog/BrnScrollableTextDialog/BrnScrollableTextDialog.md similarity index 100% rename from docs/components/dialog/BrnScrollableTextDialog/BrnScrollableTextDialog.md rename to doc/components/dialog/BrnScrollableTextDialog/BrnScrollableTextDialog.md diff --git a/docs/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo1.png b/doc/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo1.png similarity index 100% rename from docs/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo1.png rename to doc/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo1.png diff --git a/docs/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo2.png b/doc/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo2.png similarity index 100% rename from docs/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo2.png rename to doc/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo2.png diff --git a/docs/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo3.png b/doc/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo3.png similarity index 100% rename from docs/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo3.png rename to doc/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo3.png diff --git a/docs/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo4.png b/doc/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo4.png similarity index 100% rename from docs/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo4.png rename to doc/components/dialog/BrnScrollableTextDialog/img/BrnScrollableTextDialogDemo4.png diff --git a/docs/components/dialog/BrnShareDialog/BrnShareDialog.md b/doc/components/dialog/BrnShareDialog/BrnShareDialog.md similarity index 100% rename from docs/components/dialog/BrnShareDialog/BrnShareDialog.md rename to doc/components/dialog/BrnShareDialog/BrnShareDialog.md diff --git a/docs/components/dialog/BrnShareDialog/img/BrnShareDialogDemo1.png b/doc/components/dialog/BrnShareDialog/img/BrnShareDialogDemo1.png similarity index 100% rename from docs/components/dialog/BrnShareDialog/img/BrnShareDialogDemo1.png rename to doc/components/dialog/BrnShareDialog/img/BrnShareDialogDemo1.png diff --git a/docs/components/dialog/BrnShareDialog/img/BrnShareDialogDemo2.png b/doc/components/dialog/BrnShareDialog/img/BrnShareDialogDemo2.png similarity index 100% rename from docs/components/dialog/BrnShareDialog/img/BrnShareDialogDemo2.png rename to doc/components/dialog/BrnShareDialog/img/BrnShareDialogDemo2.png diff --git a/docs/components/dialog/BrnSingleSelectDialog/BrnSingleSelectDialog.md b/doc/components/dialog/BrnSingleSelectDialog/BrnSingleSelectDialog.md similarity index 53% rename from docs/components/dialog/BrnSingleSelectDialog/BrnSingleSelectDialog.md rename to doc/components/dialog/BrnSingleSelectDialog/BrnSingleSelectDialog.md index b6d46bd4..f5212325 100644 --- a/docs/components/dialog/BrnSingleSelectDialog/BrnSingleSelectDialog.md +++ b/doc/components/dialog/BrnSingleSelectDialog/BrnSingleSelectDialog.md @@ -27,6 +27,8 @@ group: const BrnSingleSelectDialog( {this.isClose: true, this.title: "", + this.messageText, + this.messageWidget, required this.conditions, this.submitText: "提交", this.submitBgColor, @@ -44,6 +46,8 @@ const BrnSingleSelectDialog( | ------------------------ | ----------------------------------- | --------------------------------------------------------- | ------------ | ---------- | | isClose | bool | 用于控制弹窗是否相应电机外部关闭，true 关闭，false 不关闭 | 否 | true | | title | String | 弹窗标题名称 | 否 | "" | +| messageText | String? | 描述文案，优先级较 messageWidget 低，优先使用 messageWidget | 否 | | +| messageWidget | Widget? | 描述 Widget | 否 | | | conditions | List | 备选项数组 | 否 | | | checkedItem | String | 选中的选项名称 | 否 | | | submitText | String | 确定/提交 按钮文案 | 否 | | @@ -60,6 +64,7 @@ const BrnSingleSelectDialog( + ```dart String hintText = "感兴趣待跟进"; int selectedIndex = 0; @@ -75,51 +80,53 @@ String hintText = "感兴趣待跟进"; "vzxczxc" ]; showDialog( - context: context, - builder: (_) => StatefulBuilder( - builder: (context, state) { - return BrnSingleSelectDialog( - isClose: true, - title: '请选择无效客源原因', - conditions: conditions, - checkedItem: conditions[selectedIndex], - submitText: '提交', - isCustomFollowScroll: true, - customWidget: TextField( - //光标颜色 - maxLines: 2, - cursorColor: Color(0xFF0984F9), - //光标圆角弧度 - cursorRadius: Radius.circular(2.0), - style: TextStyle(fontSize: 14, color: Color(0xFF222222)), - maxLengthEnforcement: MaxLengthEnforcement.enforced, - onChanged: (value) {}, - decoration: InputDecoration( - contentPadding: EdgeInsets.all(8.0), - hintText: hintText, - hintStyle: TextStyle(fontSize: 14, color: Color(0xFFCCCCCC)), - enabledBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(2.0), - borderSide: BorderSide( - width: 0.5, - color: Color(0xFFCCCCCC), - )), - focusedBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(2.0), - borderSide: BorderSide( - width: 0.5, - color: Color(0xFFCCCCCC), - )), - ), - ), - onItemClick: (BuildContext context, int index) { - hintText = conditions[index]; - selectedIndex = index; - state(() {}); - }, - onSubmitClick: (data) { - BrnToast.show(data, context); - }); - }, - )); + context: context, + builder: (_) => StatefulBuilder( + builder: (context, state) { + return BrnSingleSelectDialog( + isClose: true, + title: '请选择无效客源原因', + messageText: '请您评价该条线索请您评价该条线索请您评价该条线索请您评价该条线索请您评价该条线索', + conditions: conditions, + checkedItem: conditions[selectedIndex], + submitText: '提交', + isCustomFollowScroll: true, + customWidget: TextField( + //光标颜色 + maxLines: 2, + cursorColor: Color(0xFF0984F9), + //光标圆角弧度 + cursorRadius: Radius.circular(2.0), + style: TextStyle(fontSize: 14, color: Color(0xFF222222)), + maxLengthEnforcement: MaxLengthEnforcement.enforced, + onChanged: (value) {}, + decoration: InputDecoration( + contentPadding: EdgeInsets.all(8.0), + hintText: hintText, + hintStyle: + TextStyle(fontSize: 14, color: Color(0xFFCCCCCC)), + enabledBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(2.0), + borderSide: BorderSide( + width: 0.5, + color: Color(0xFFCCCCCC), + )), + focusedBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(2.0), + borderSide: BorderSide( + width: 0.5, + color: Color(0xFFCCCCCC), + )), + ), + ), + onItemClick: (BuildContext context, int index) { + hintText = conditions[index]; + selectedIndex = index; + state(() {}); + }, + onSubmitClick: (data) { + BrnToast.show(data!, context); + }); + }, + )); ``` diff --git a/doc/components/dialog/BrnSingleSelectDialog/img/BrnSingleSelectDialog.png b/doc/components/dialog/BrnSingleSelectDialog/img/BrnSingleSelectDialog.png new file mode 100644 index 00000000..2fa2c4ae Binary files /dev/null and b/doc/components/dialog/BrnSingleSelectDialog/img/BrnSingleSelectDialog.png differ diff --git a/docs/components/form/BrnAddLabel/BrnAddLabel.md b/doc/components/form/BrnAddLabel/BrnAddLabel.md similarity index 100% rename from docs/components/form/BrnAddLabel/BrnAddLabel.md rename to doc/components/form/BrnAddLabel/BrnAddLabel.md diff --git a/docs/components/form/BrnAddLabel/img/BrnAddLabelDemo1.png b/doc/components/form/BrnAddLabel/img/BrnAddLabelDemo1.png similarity index 100% rename from docs/components/form/BrnAddLabel/img/BrnAddLabelDemo1.png rename to doc/components/form/BrnAddLabel/img/BrnAddLabelDemo1.png diff --git a/docs/components/form/BrnAddLabel/img/BrnAddLabelIntro.png b/doc/components/form/BrnAddLabel/img/BrnAddLabelIntro.png similarity index 100% rename from docs/components/form/BrnAddLabel/img/BrnAddLabelIntro.png rename to doc/components/form/BrnAddLabel/img/BrnAddLabelIntro.png diff --git a/docs/components/form/BrnBaseTitle/BrnBaseTitle.md b/doc/components/form/BrnBaseTitle/BrnBaseTitle.md similarity index 100% rename from docs/components/form/BrnBaseTitle/BrnBaseTitle.md rename to doc/components/form/BrnBaseTitle/BrnBaseTitle.md diff --git a/docs/components/form/BrnBaseTitle/img/BrnBaseTitleDemo1.png b/doc/components/form/BrnBaseTitle/img/BrnBaseTitleDemo1.png similarity index 100% rename from docs/components/form/BrnBaseTitle/img/BrnBaseTitleDemo1.png rename to doc/components/form/BrnBaseTitle/img/BrnBaseTitleDemo1.png diff --git a/docs/components/form/BrnBaseTitle/img/BrnBaseTitleDemo2.png b/doc/components/form/BrnBaseTitle/img/BrnBaseTitleDemo2.png similarity index 100% rename from docs/components/form/BrnBaseTitle/img/BrnBaseTitleDemo2.png rename to doc/components/form/BrnBaseTitle/img/BrnBaseTitleDemo2.png diff --git a/docs/components/form/BrnBaseTitle/img/BrnBaseTitleIntro.png b/doc/components/form/BrnBaseTitle/img/BrnBaseTitleIntro.png similarity index 100% rename from docs/components/form/BrnBaseTitle/img/BrnBaseTitleIntro.png rename to doc/components/form/BrnBaseTitle/img/BrnBaseTitleIntro.png diff --git a/docs/components/form/BrnExpandFormGroup/BrnExpandFormGroup.md b/doc/components/form/BrnExpandFormGroup/BrnExpandFormGroup.md similarity index 100% rename from docs/components/form/BrnExpandFormGroup/BrnExpandFormGroup.md rename to doc/components/form/BrnExpandFormGroup/BrnExpandFormGroup.md diff --git a/docs/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupDemo1.png b/doc/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupDemo1.png similarity index 100% rename from docs/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupDemo1.png rename to doc/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupDemo1.png diff --git a/docs/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupDemo2.png b/doc/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupDemo2.png similarity index 100% rename from docs/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupDemo2.png rename to doc/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupDemo2.png diff --git a/docs/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupDemo3.png b/doc/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupDemo3.png similarity index 100% rename from docs/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupDemo3.png rename to doc/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupDemo3.png diff --git a/docs/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupIntro.png b/doc/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupIntro.png similarity index 100% rename from docs/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupIntro.png rename to doc/components/form/BrnExpandFormGroup/img/BrnExpandFormGroupIntro.png diff --git a/docs/components/form/BrnExpandableGroup/BrnExpandableGroup.md b/doc/components/form/BrnExpandableGroup/BrnExpandableGroup.md similarity index 100% rename from docs/components/form/BrnExpandableGroup/BrnExpandableGroup.md rename to doc/components/form/BrnExpandableGroup/BrnExpandableGroup.md diff --git a/docs/components/form/BrnExpandableGroup/img/BrnExpandableGroupIntro1.gif b/doc/components/form/BrnExpandableGroup/img/BrnExpandableGroupIntro1.gif similarity index 100% rename from docs/components/form/BrnExpandableGroup/img/BrnExpandableGroupIntro1.gif rename to doc/components/form/BrnExpandableGroup/img/BrnExpandableGroupIntro1.gif diff --git a/docs/components/form/BrnExpandableGroup/img/BrnExpandableGroupIntro2.png b/doc/components/form/BrnExpandableGroup/img/BrnExpandableGroupIntro2.png similarity index 100% rename from docs/components/form/BrnExpandableGroup/img/BrnExpandableGroupIntro2.png rename to doc/components/form/BrnExpandableGroup/img/BrnExpandableGroupIntro2.png diff --git a/docs/components/form/BrnMultiChoiceInputFormItem/BrnMultiChoiceInputFormItem.md b/doc/components/form/BrnMultiChoiceInputFormItem/BrnMultiChoiceInputFormItem.md similarity index 100% rename from docs/components/form/BrnMultiChoiceInputFormItem/BrnMultiChoiceInputFormItem.md rename to doc/components/form/BrnMultiChoiceInputFormItem/BrnMultiChoiceInputFormItem.md diff --git a/docs/components/form/BrnMultiChoiceInputFormItem/img/BrnMultiChoiceInputFormItemDemo1.png b/doc/components/form/BrnMultiChoiceInputFormItem/img/BrnMultiChoiceInputFormItemDemo1.png similarity index 100% rename from docs/components/form/BrnMultiChoiceInputFormItem/img/BrnMultiChoiceInputFormItemDemo1.png rename to doc/components/form/BrnMultiChoiceInputFormItem/img/BrnMultiChoiceInputFormItemDemo1.png diff --git a/docs/components/form/BrnMultiChoiceInputFormItem/img/BrnMultiChoiceInputFormItemDemo2.png b/doc/components/form/BrnMultiChoiceInputFormItem/img/BrnMultiChoiceInputFormItemDemo2.png similarity index 100% rename from docs/components/form/BrnMultiChoiceInputFormItem/img/BrnMultiChoiceInputFormItemDemo2.png rename to doc/components/form/BrnMultiChoiceInputFormItem/img/BrnMultiChoiceInputFormItemDemo2.png diff --git a/docs/components/form/BrnMultiChoiceInputFormItem/img/BrnMultiChoiceInputFormItemIntro.png b/doc/components/form/BrnMultiChoiceInputFormItem/img/BrnMultiChoiceInputFormItemIntro.png similarity index 100% rename from docs/components/form/BrnMultiChoiceInputFormItem/img/BrnMultiChoiceInputFormItemIntro.png rename to doc/components/form/BrnMultiChoiceInputFormItem/img/BrnMultiChoiceInputFormItemIntro.png diff --git a/docs/components/form/BrnMultiChoicePortraitInputFormItem/BrnMultiChoicePortraitInputFormItem.md b/doc/components/form/BrnMultiChoicePortraitInputFormItem/BrnMultiChoicePortraitInputFormItem.md similarity index 100% rename from docs/components/form/BrnMultiChoicePortraitInputFormItem/BrnMultiChoicePortraitInputFormItem.md rename to doc/components/form/BrnMultiChoicePortraitInputFormItem/BrnMultiChoicePortraitInputFormItem.md diff --git a/docs/components/form/BrnMultiChoicePortraitInputFormItem/img/BrnMultiChoicePortraitInputFormItemDemo1.png b/doc/components/form/BrnMultiChoicePortraitInputFormItem/img/BrnMultiChoicePortraitInputFormItemDemo1.png similarity index 100% rename from docs/components/form/BrnMultiChoicePortraitInputFormItem/img/BrnMultiChoicePortraitInputFormItemDemo1.png rename to doc/components/form/BrnMultiChoicePortraitInputFormItem/img/BrnMultiChoicePortraitInputFormItemDemo1.png diff --git a/docs/components/form/BrnMultiChoicePortraitInputFormItem/img/BrnMultiChoicePortraitInputFormItemDemo2.png b/doc/components/form/BrnMultiChoicePortraitInputFormItem/img/BrnMultiChoicePortraitInputFormItemDemo2.png similarity index 100% rename from docs/components/form/BrnMultiChoicePortraitInputFormItem/img/BrnMultiChoicePortraitInputFormItemDemo2.png rename to doc/components/form/BrnMultiChoicePortraitInputFormItem/img/BrnMultiChoicePortraitInputFormItemDemo2.png diff --git a/docs/components/form/BrnMultiChoicePortraitInputFormItem/img/BrnMultiChoicePortraitInputFormItemIntro.png b/doc/components/form/BrnMultiChoicePortraitInputFormItem/img/BrnMultiChoicePortraitInputFormItemIntro.png similarity index 100% rename from docs/components/form/BrnMultiChoicePortraitInputFormItem/img/BrnMultiChoicePortraitInputFormItemIntro.png rename to doc/components/form/BrnMultiChoicePortraitInputFormItem/img/BrnMultiChoicePortraitInputFormItemIntro.png diff --git a/docs/components/form/BrnNormalFormGroup/BrnNormalFormGroup.md b/doc/components/form/BrnNormalFormGroup/BrnNormalFormGroup.md similarity index 100% rename from docs/components/form/BrnNormalFormGroup/BrnNormalFormGroup.md rename to doc/components/form/BrnNormalFormGroup/BrnNormalFormGroup.md diff --git a/docs/components/form/BrnNormalFormGroup/img/BrnNormalFormGroupDemo1.png b/doc/components/form/BrnNormalFormGroup/img/BrnNormalFormGroupDemo1.png similarity index 100% rename from docs/components/form/BrnNormalFormGroup/img/BrnNormalFormGroupDemo1.png rename to doc/components/form/BrnNormalFormGroup/img/BrnNormalFormGroupDemo1.png diff --git a/docs/components/form/BrnNormalFormGroup/img/BrnNormalFormGroupDemo2.png b/doc/components/form/BrnNormalFormGroup/img/BrnNormalFormGroupDemo2.png similarity index 100% rename from docs/components/form/BrnNormalFormGroup/img/BrnNormalFormGroupDemo2.png rename to doc/components/form/BrnNormalFormGroup/img/BrnNormalFormGroupDemo2.png diff --git a/docs/components/form/BrnNormalFormGroup/img/BrnNormalFormGroupIntro.png b/doc/components/form/BrnNormalFormGroup/img/BrnNormalFormGroupIntro.png similarity index 100% rename from docs/components/form/BrnNormalFormGroup/img/BrnNormalFormGroupIntro.png rename to doc/components/form/BrnNormalFormGroup/img/BrnNormalFormGroupIntro.png diff --git a/docs/components/form/BrnPortraitRadioGroup/BrnPortraitRadioGroup.md b/doc/components/form/BrnPortraitRadioGroup/BrnPortraitRadioGroup.md similarity index 100% rename from docs/components/form/BrnPortraitRadioGroup/BrnPortraitRadioGroup.md rename to doc/components/form/BrnPortraitRadioGroup/BrnPortraitRadioGroup.md diff --git a/docs/components/form/BrnPortraitRadioGroup/img/BrnPortraitRadioGroupDemo1.png b/doc/components/form/BrnPortraitRadioGroup/img/BrnPortraitRadioGroupDemo1.png similarity index 100% rename from docs/components/form/BrnPortraitRadioGroup/img/BrnPortraitRadioGroupDemo1.png rename to doc/components/form/BrnPortraitRadioGroup/img/BrnPortraitRadioGroupDemo1.png diff --git a/docs/components/form/BrnPortraitRadioGroup/img/BrnPortraitRadioGroupDemo2.png b/doc/components/form/BrnPortraitRadioGroup/img/BrnPortraitRadioGroupDemo2.png similarity index 100% rename from docs/components/form/BrnPortraitRadioGroup/img/BrnPortraitRadioGroupDemo2.png rename to doc/components/form/BrnPortraitRadioGroup/img/BrnPortraitRadioGroupDemo2.png diff --git a/docs/components/form/BrnRadioInputFormItem/BrnRadioInputFormItem.md b/doc/components/form/BrnRadioInputFormItem/BrnRadioInputFormItem.md similarity index 100% rename from docs/components/form/BrnRadioInputFormItem/BrnRadioInputFormItem.md rename to doc/components/form/BrnRadioInputFormItem/BrnRadioInputFormItem.md diff --git a/docs/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo1.png b/doc/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo1.png similarity index 100% rename from docs/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo1.png rename to doc/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo1.png diff --git a/docs/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo2.png b/doc/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo2.png similarity index 100% rename from docs/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo2.png rename to doc/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo2.png diff --git a/docs/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo3.png b/doc/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo3.png similarity index 100% rename from docs/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo3.png rename to doc/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo3.png diff --git a/docs/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo4.png b/doc/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo4.png similarity index 100% rename from docs/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo4.png rename to doc/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemDemo4.png diff --git a/docs/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemIntro.png b/doc/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemIntro.png similarity index 100% rename from docs/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemIntro.png rename to doc/components/form/BrnRadioInputFormItem/img/BrnRadioInputFormItemIntro.png diff --git a/docs/components/form/BrnRadioPortraitInputFormItem/BrnRadioPortraitInputFormItem.md b/doc/components/form/BrnRadioPortraitInputFormItem/BrnRadioPortraitInputFormItem.md similarity index 100% rename from docs/components/form/BrnRadioPortraitInputFormItem/BrnRadioPortraitInputFormItem.md rename to doc/components/form/BrnRadioPortraitInputFormItem/BrnRadioPortraitInputFormItem.md diff --git a/docs/components/form/BrnRadioPortraitInputFormItem/img/BrnRadioPortraitInputFormItemDemo1.png b/doc/components/form/BrnRadioPortraitInputFormItem/img/BrnRadioPortraitInputFormItemDemo1.png similarity index 100% rename from docs/components/form/BrnRadioPortraitInputFormItem/img/BrnRadioPortraitInputFormItemDemo1.png rename to doc/components/form/BrnRadioPortraitInputFormItem/img/BrnRadioPortraitInputFormItemDemo1.png diff --git a/docs/components/form/BrnRadioPortraitInputFormItem/img/BrnRadioPortraitInputFormItemDemo2.png b/doc/components/form/BrnRadioPortraitInputFormItem/img/BrnRadioPortraitInputFormItemDemo2.png similarity index 100% rename from docs/components/form/BrnRadioPortraitInputFormItem/img/BrnRadioPortraitInputFormItemDemo2.png rename to doc/components/form/BrnRadioPortraitInputFormItem/img/BrnRadioPortraitInputFormItemDemo2.png diff --git a/docs/components/form/BrnRadioPortraitInputFormItem/img/BrnRadioPortraitInputFormItemIntro.png b/doc/components/form/BrnRadioPortraitInputFormItem/img/BrnRadioPortraitInputFormItemIntro.png similarity index 100% rename from docs/components/form/BrnRadioPortraitInputFormItem/img/BrnRadioPortraitInputFormItemIntro.png rename to doc/components/form/BrnRadioPortraitInputFormItem/img/BrnRadioPortraitInputFormItemIntro.png diff --git a/docs/components/form/BrnRangeInputFormItem/BrnRangeInputFormItem.md b/doc/components/form/BrnRangeInputFormItem/BrnRangeInputFormItem.md similarity index 100% rename from docs/components/form/BrnRangeInputFormItem/BrnRangeInputFormItem.md rename to doc/components/form/BrnRangeInputFormItem/BrnRangeInputFormItem.md diff --git a/docs/components/form/BrnRangeInputFormItem/img/BrnRangeInputFormItemDemo1.png b/doc/components/form/BrnRangeInputFormItem/img/BrnRangeInputFormItemDemo1.png similarity index 100% rename from docs/components/form/BrnRangeInputFormItem/img/BrnRangeInputFormItemDemo1.png rename to doc/components/form/BrnRangeInputFormItem/img/BrnRangeInputFormItemDemo1.png diff --git a/docs/components/form/BrnRangeInputFormItem/img/BrnRangeInputFormItemDemo2.png b/doc/components/form/BrnRangeInputFormItem/img/BrnRangeInputFormItemDemo2.png similarity index 100% rename from docs/components/form/BrnRangeInputFormItem/img/BrnRangeInputFormItemDemo2.png rename to doc/components/form/BrnRangeInputFormItem/img/BrnRangeInputFormItemDemo2.png diff --git a/docs/components/form/BrnRangeInputFormItem/img/BrnRangeInputFormItemIntro.png b/doc/components/form/BrnRangeInputFormItem/img/BrnRangeInputFormItemIntro.png similarity index 100% rename from docs/components/form/BrnRangeInputFormItem/img/BrnRangeInputFormItemIntro.png rename to doc/components/form/BrnRangeInputFormItem/img/BrnRangeInputFormItemIntro.png diff --git a/docs/components/form/BrnRatioInputFormItem/BrnRatioInputFormItem.md b/doc/components/form/BrnRatioInputFormItem/BrnRatioInputFormItem.md similarity index 100% rename from docs/components/form/BrnRatioInputFormItem/BrnRatioInputFormItem.md rename to doc/components/form/BrnRatioInputFormItem/BrnRatioInputFormItem.md diff --git a/docs/components/form/BrnRatioInputFormItem/img/BrnRatioInputFormItemDemo1.png b/doc/components/form/BrnRatioInputFormItem/img/BrnRatioInputFormItemDemo1.png similarity index 100% rename from docs/components/form/BrnRatioInputFormItem/img/BrnRatioInputFormItemDemo1.png rename to doc/components/form/BrnRatioInputFormItem/img/BrnRatioInputFormItemDemo1.png diff --git a/docs/components/form/BrnRatioInputFormItem/img/BrnRatioInputFormItemDemo2.png b/doc/components/form/BrnRatioInputFormItem/img/BrnRatioInputFormItemDemo2.png similarity index 100% rename from docs/components/form/BrnRatioInputFormItem/img/BrnRatioInputFormItemDemo2.png rename to doc/components/form/BrnRatioInputFormItem/img/BrnRatioInputFormItemDemo2.png diff --git a/docs/components/form/BrnRatioInputFormItem/img/BrnRatioInputFormItemIntro.png b/doc/components/form/BrnRatioInputFormItem/img/BrnRatioInputFormItemIntro.png similarity index 100% rename from docs/components/form/BrnRatioInputFormItem/img/BrnRatioInputFormItemIntro.png rename to doc/components/form/BrnRatioInputFormItem/img/BrnRatioInputFormItemIntro.png diff --git a/docs/components/form/BrnSelectAllTitle/BrnSelectAllTitle.md b/doc/components/form/BrnSelectAllTitle/BrnSelectAllTitle.md similarity index 100% rename from docs/components/form/BrnSelectAllTitle/BrnSelectAllTitle.md rename to doc/components/form/BrnSelectAllTitle/BrnSelectAllTitle.md diff --git a/docs/components/form/BrnSelectAllTitle/img/BrnSelectAllTitleDemo1.png b/doc/components/form/BrnSelectAllTitle/img/BrnSelectAllTitleDemo1.png similarity index 100% rename from docs/components/form/BrnSelectAllTitle/img/BrnSelectAllTitleDemo1.png rename to doc/components/form/BrnSelectAllTitle/img/BrnSelectAllTitleDemo1.png diff --git a/docs/components/form/BrnSelectAllTitle/img/BrnSelectAllTitleDemo2.png b/doc/components/form/BrnSelectAllTitle/img/BrnSelectAllTitleDemo2.png similarity index 100% rename from docs/components/form/BrnSelectAllTitle/img/BrnSelectAllTitleDemo2.png rename to doc/components/form/BrnSelectAllTitle/img/BrnSelectAllTitleDemo2.png diff --git a/docs/components/form/BrnSelectAllTitle/img/BrnSelectAllTitleIntro.png b/doc/components/form/BrnSelectAllTitle/img/BrnSelectAllTitleIntro.png similarity index 100% rename from docs/components/form/BrnSelectAllTitle/img/BrnSelectAllTitleIntro.png rename to doc/components/form/BrnSelectAllTitle/img/BrnSelectAllTitleIntro.png diff --git a/docs/components/form/BrnStarsFormItem/BrnStarsFormItem.md b/doc/components/form/BrnStarsFormItem/BrnStarsFormItem.md similarity index 100% rename from docs/components/form/BrnStarsFormItem/BrnStarsFormItem.md rename to doc/components/form/BrnStarsFormItem/BrnStarsFormItem.md diff --git a/docs/components/form/BrnStarsFormItem/img/BrnStarsFormItemDemo1.png b/doc/components/form/BrnStarsFormItem/img/BrnStarsFormItemDemo1.png similarity index 100% rename from docs/components/form/BrnStarsFormItem/img/BrnStarsFormItemDemo1.png rename to doc/components/form/BrnStarsFormItem/img/BrnStarsFormItemDemo1.png diff --git a/docs/components/form/BrnStarsFormItem/img/BrnStarsFormItemDemo2.png b/doc/components/form/BrnStarsFormItem/img/BrnStarsFormItemDemo2.png similarity index 100% rename from docs/components/form/BrnStarsFormItem/img/BrnStarsFormItemDemo2.png rename to doc/components/form/BrnStarsFormItem/img/BrnStarsFormItemDemo2.png diff --git a/docs/components/form/BrnStarsFormItem/img/BrnStarsFormItemIntro.png b/doc/components/form/BrnStarsFormItem/img/BrnStarsFormItemIntro.png similarity index 100% rename from docs/components/form/BrnStarsFormItem/img/BrnStarsFormItemIntro.png rename to doc/components/form/BrnStarsFormItem/img/BrnStarsFormItemIntro.png diff --git a/docs/components/form/BrnStepInputFormItem/BrnStepInputFormItem.md b/doc/components/form/BrnStepInputFormItem/BrnStepInputFormItem.md similarity index 100% rename from docs/components/form/BrnStepInputFormItem/BrnStepInputFormItem.md rename to doc/components/form/BrnStepInputFormItem/BrnStepInputFormItem.md diff --git a/docs/components/form/BrnStepInputFormItem/img/BrnStepInputFormItemDemo1.png b/doc/components/form/BrnStepInputFormItem/img/BrnStepInputFormItemDemo1.png similarity index 100% rename from docs/components/form/BrnStepInputFormItem/img/BrnStepInputFormItemDemo1.png rename to doc/components/form/BrnStepInputFormItem/img/BrnStepInputFormItemDemo1.png diff --git a/docs/components/form/BrnStepInputFormItem/img/BrnStepInputFormItemDemo2.png b/doc/components/form/BrnStepInputFormItem/img/BrnStepInputFormItemDemo2.png similarity index 100% rename from docs/components/form/BrnStepInputFormItem/img/BrnStepInputFormItemDemo2.png rename to doc/components/form/BrnStepInputFormItem/img/BrnStepInputFormItemDemo2.png diff --git a/docs/components/form/BrnStepInputFormItem/img/BrnStepInputFormItemIntro.png b/doc/components/form/BrnStepInputFormItem/img/BrnStepInputFormItemIntro.png similarity index 100% rename from docs/components/form/BrnStepInputFormItem/img/BrnStepInputFormItemIntro.png rename to doc/components/form/BrnStepInputFormItem/img/BrnStepInputFormItemIntro.png diff --git a/docs/components/form/BrnTextBlockInputFormItem/BrnTextBlockInputFormItem.md b/doc/components/form/BrnTextBlockInputFormItem/BrnTextBlockInputFormItem.md similarity index 100% rename from docs/components/form/BrnTextBlockInputFormItem/BrnTextBlockInputFormItem.md rename to doc/components/form/BrnTextBlockInputFormItem/BrnTextBlockInputFormItem.md diff --git a/docs/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo1.png b/doc/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo1.png similarity index 100% rename from docs/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo1.png rename to doc/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo1.png diff --git a/docs/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo2.png b/doc/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo2.png similarity index 100% rename from docs/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo2.png rename to doc/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo2.png diff --git a/docs/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo3.png b/doc/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo3.png similarity index 100% rename from docs/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo3.png rename to doc/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo3.png diff --git a/docs/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo4.png b/doc/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo4.png similarity index 100% rename from docs/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo4.png rename to doc/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemDemo4.png diff --git a/docs/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemIntro.png b/doc/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemIntro.png similarity index 100% rename from docs/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemIntro.png rename to doc/components/form/BrnTextBlockInputFormItem/img/BrnTextBlockInputFormItemIntro.png diff --git a/docs/components/form/BrnTextInputFormItem/BrnTextInputFormItem.md b/doc/components/form/BrnTextInputFormItem/BrnTextInputFormItem.md similarity index 100% rename from docs/components/form/BrnTextInputFormItem/BrnTextInputFormItem.md rename to doc/components/form/BrnTextInputFormItem/BrnTextInputFormItem.md diff --git a/docs/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo1.png b/doc/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo1.png similarity index 100% rename from docs/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo1.png rename to doc/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo1.png diff --git a/docs/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo2.png b/doc/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo2.png similarity index 100% rename from docs/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo2.png rename to doc/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo2.png diff --git a/docs/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo3.png b/doc/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo3.png similarity index 100% rename from docs/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo3.png rename to doc/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo3.png diff --git a/docs/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo4.png b/doc/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo4.png similarity index 100% rename from docs/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo4.png rename to doc/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemDemo4.png diff --git a/docs/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemIntro.png b/doc/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemIntro.png similarity index 100% rename from docs/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemIntro.png rename to doc/components/form/BrnTextInputFormItem/img/BrnTextInputFormItemIntro.png diff --git a/docs/components/form/BrnTextQuickSelectFormItem/BrnTextQuickSelectFormItem.md b/doc/components/form/BrnTextQuickSelectFormItem/BrnTextQuickSelectFormItem.md similarity index 100% rename from docs/components/form/BrnTextQuickSelectFormItem/BrnTextQuickSelectFormItem.md rename to doc/components/form/BrnTextQuickSelectFormItem/BrnTextQuickSelectFormItem.md diff --git a/docs/components/form/BrnTextQuickSelectFormItem/img/BrnTextQuickSelectFormItemDemo1.png b/doc/components/form/BrnTextQuickSelectFormItem/img/BrnTextQuickSelectFormItemDemo1.png similarity index 100% rename from docs/components/form/BrnTextQuickSelectFormItem/img/BrnTextQuickSelectFormItemDemo1.png rename to doc/components/form/BrnTextQuickSelectFormItem/img/BrnTextQuickSelectFormItemDemo1.png diff --git a/docs/components/form/BrnTextQuickSelectFormItem/img/BrnTextQuickSelectFormItemDemo2.png b/doc/components/form/BrnTextQuickSelectFormItem/img/BrnTextQuickSelectFormItemDemo2.png similarity index 100% rename from docs/components/form/BrnTextQuickSelectFormItem/img/BrnTextQuickSelectFormItemDemo2.png rename to doc/components/form/BrnTextQuickSelectFormItem/img/BrnTextQuickSelectFormItemDemo2.png diff --git a/docs/components/form/BrnTextQuickSelectFormItem/img/BrnTextQuickSelectFormItemIntro.png b/doc/components/form/BrnTextQuickSelectFormItem/img/BrnTextQuickSelectFormItemIntro.png similarity index 100% rename from docs/components/form/BrnTextQuickSelectFormItem/img/BrnTextQuickSelectFormItemIntro.png rename to doc/components/form/BrnTextQuickSelectFormItem/img/BrnTextQuickSelectFormItemIntro.png diff --git a/docs/components/form/BrnTextSelectFormItem/BrnTextSelectFormItem.md b/doc/components/form/BrnTextSelectFormItem/BrnTextSelectFormItem.md similarity index 100% rename from docs/components/form/BrnTextSelectFormItem/BrnTextSelectFormItem.md rename to doc/components/form/BrnTextSelectFormItem/BrnTextSelectFormItem.md diff --git a/docs/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo1.png b/doc/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo1.png similarity index 100% rename from docs/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo1.png rename to doc/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo1.png diff --git a/docs/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo2.png b/doc/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo2.png similarity index 100% rename from docs/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo2.png rename to doc/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo2.png diff --git a/docs/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo3.png b/doc/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo3.png similarity index 100% rename from docs/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo3.png rename to doc/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo3.png diff --git a/docs/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo4.png b/doc/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo4.png similarity index 100% rename from docs/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo4.png rename to doc/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemDemo4.png diff --git a/docs/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemIntro.png b/doc/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemIntro.png similarity index 100% rename from docs/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemIntro.png rename to doc/components/form/BrnTextSelectFormItem/img/BrnTextSelectFormItemIntro.png diff --git a/docs/components/form/BrnTitleFormItem/BrnTitleFormItem.md b/doc/components/form/BrnTitleFormItem/BrnTitleFormItem.md similarity index 100% rename from docs/components/form/BrnTitleFormItem/BrnTitleFormItem.md rename to doc/components/form/BrnTitleFormItem/BrnTitleFormItem.md diff --git a/docs/components/form/BrnTitleFormItem/img/BrnTitleFormItemDemo1.png b/doc/components/form/BrnTitleFormItem/img/BrnTitleFormItemDemo1.png similarity index 100% rename from docs/components/form/BrnTitleFormItem/img/BrnTitleFormItemDemo1.png rename to doc/components/form/BrnTitleFormItem/img/BrnTitleFormItemDemo1.png diff --git a/docs/components/form/BrnTitleFormItem/img/BrnTitleFormItemDemo2.png b/doc/components/form/BrnTitleFormItem/img/BrnTitleFormItemDemo2.png similarity index 100% rename from docs/components/form/BrnTitleFormItem/img/BrnTitleFormItemDemo2.png rename to doc/components/form/BrnTitleFormItem/img/BrnTitleFormItemDemo2.png diff --git a/docs/components/form/BrnTitleFormItem/img/BrnTitleFormItemDemo3.png b/doc/components/form/BrnTitleFormItem/img/BrnTitleFormItemDemo3.png similarity index 100% rename from docs/components/form/BrnTitleFormItem/img/BrnTitleFormItemDemo3.png rename to doc/components/form/BrnTitleFormItem/img/BrnTitleFormItemDemo3.png diff --git a/docs/components/form/BrnTitleFormItem/img/BrnTitleFormItemIntro.png b/doc/components/form/BrnTitleFormItem/img/BrnTitleFormItemIntro.png similarity index 100% rename from docs/components/form/BrnTitleFormItem/img/BrnTitleFormItemIntro.png rename to doc/components/form/BrnTitleFormItem/img/BrnTitleFormItemIntro.png diff --git a/docs/components/form/BrnTitleSelectInputFormItem/BrnTitleSelectInputFormItem.md b/doc/components/form/BrnTitleSelectInputFormItem/BrnTitleSelectInputFormItem.md similarity index 100% rename from docs/components/form/BrnTitleSelectInputFormItem/BrnTitleSelectInputFormItem.md rename to doc/components/form/BrnTitleSelectInputFormItem/BrnTitleSelectInputFormItem.md diff --git a/docs/components/form/BrnTitleSelectInputFormItem/img/BrnTitleSelectInputFormItemDemo1.png b/doc/components/form/BrnTitleSelectInputFormItem/img/BrnTitleSelectInputFormItemDemo1.png similarity index 100% rename from docs/components/form/BrnTitleSelectInputFormItem/img/BrnTitleSelectInputFormItemDemo1.png rename to doc/components/form/BrnTitleSelectInputFormItem/img/BrnTitleSelectInputFormItemDemo1.png diff --git a/docs/components/form/BrnTitleSelectInputFormItem/img/BrnTitleSelectInputFormItemDemo2.png b/doc/components/form/BrnTitleSelectInputFormItem/img/BrnTitleSelectInputFormItemDemo2.png similarity index 100% rename from docs/components/form/BrnTitleSelectInputFormItem/img/BrnTitleSelectInputFormItemDemo2.png rename to doc/components/form/BrnTitleSelectInputFormItem/img/BrnTitleSelectInputFormItemDemo2.png diff --git a/docs/components/form/BrnTitleSelectInputFormItem/img/BrnTitleSelectInputFormItemIntro.png b/doc/components/form/BrnTitleSelectInputFormItem/img/BrnTitleSelectInputFormItemIntro.png similarity index 100% rename from docs/components/form/BrnTitleSelectInputFormItem/img/BrnTitleSelectInputFormItemIntro.png rename to doc/components/form/BrnTitleSelectInputFormItem/img/BrnTitleSelectInputFormItemIntro.png diff --git a/docs/components/gallery/BrnGalleryDetailPage/BrnGalleryDetailPage.md b/doc/components/gallery/BrnGalleryDetailPage/BrnGalleryDetailPage.md similarity index 99% rename from docs/components/gallery/BrnGalleryDetailPage/BrnGalleryDetailPage.md rename to doc/components/gallery/BrnGalleryDetailPage/BrnGalleryDetailPage.md index 04860117..0b2cf4b8 100644 --- a/docs/components/gallery/BrnGalleryDetailPage/BrnGalleryDetailPage.md +++ b/doc/components/gallery/BrnGalleryDetailPage/BrnGalleryDetailPage.md @@ -9,7 +9,7 @@ group: 查看大图交互模式-详情页。 -关联组件： [BrnGallerySummaryPage](../brn-gallery-summary-page/brn-gallery-summary-page.md) +关联组件： [BrnGallerySummaryPage](../widgets/brn-gallery-summary-page) ## 一、效果总览 diff --git a/docs/components/gallery/BrnGalleryDetailPage/img/BrnGalleryDetailPageDemo1.jpg b/doc/components/gallery/BrnGalleryDetailPage/img/BrnGalleryDetailPageDemo1.jpg similarity index 100% rename from docs/components/gallery/BrnGalleryDetailPage/img/BrnGalleryDetailPageDemo1.jpg rename to doc/components/gallery/BrnGalleryDetailPage/img/BrnGalleryDetailPageDemo1.jpg diff --git a/docs/components/gallery/BrnGalleryDetailPage/img/BrnGalleryDetailPageDemo3.gif b/doc/components/gallery/BrnGalleryDetailPage/img/BrnGalleryDetailPageDemo3.gif similarity index 100% rename from docs/components/gallery/BrnGalleryDetailPage/img/BrnGalleryDetailPageDemo3.gif rename to doc/components/gallery/BrnGalleryDetailPage/img/BrnGalleryDetailPageDemo3.gif diff --git a/docs/components/gallery/BrnGalleryDetailPage/img/BrnGalleryDetailPageIntro.png b/doc/components/gallery/BrnGalleryDetailPage/img/BrnGalleryDetailPageIntro.png similarity index 100% rename from docs/components/gallery/BrnGalleryDetailPage/img/BrnGalleryDetailPageIntro.png rename to doc/components/gallery/BrnGalleryDetailPage/img/BrnGalleryDetailPageIntro.png diff --git a/docs/components/gallery/BrnGalleryDetailPage/img/image-20211101121347565.png b/doc/components/gallery/BrnGalleryDetailPage/img/image-20211101121347565.png similarity index 100% rename from docs/components/gallery/BrnGalleryDetailPage/img/image-20211101121347565.png rename to doc/components/gallery/BrnGalleryDetailPage/img/image-20211101121347565.png diff --git a/docs/components/gallery/BrnGallerySummaryPage/BrnGallerySummaryPage.md b/doc/components/gallery/BrnGallerySummaryPage/BrnGallerySummaryPage.md similarity index 99% rename from docs/components/gallery/BrnGallerySummaryPage/BrnGallerySummaryPage.md rename to doc/components/gallery/BrnGallerySummaryPage/BrnGallerySummaryPage.md index d49ded54..e7b44047 100644 --- a/docs/components/gallery/BrnGallerySummaryPage/BrnGallerySummaryPage.md +++ b/doc/components/gallery/BrnGallerySummaryPage/BrnGallerySummaryPage.md @@ -10,7 +10,7 @@ group: 查看大图交互模式-列表页 -相关组件 [BrnGalleryDetailPage](../brn-gallery-detail-page/brn-gallery-detail-page) +相关组件 [BrnGalleryDetailPage](../widgets/brn-gallery-detail-page) ## 一、效果总览 diff --git a/docs/components/gallery/BrnGallerySummaryPage/img/BrnGallerySummaryPageDemo.png b/doc/components/gallery/BrnGallerySummaryPage/img/BrnGallerySummaryPageDemo.png similarity index 100% rename from docs/components/gallery/BrnGallerySummaryPage/img/BrnGallerySummaryPageDemo.png rename to doc/components/gallery/BrnGallerySummaryPage/img/BrnGallerySummaryPageDemo.png diff --git a/docs/components/gallery/BrnGallerySummaryPage/img/BrnGallerySummaryPageIntro.png b/doc/components/gallery/BrnGallerySummaryPage/img/BrnGallerySummaryPageIntro.png similarity index 100% rename from docs/components/gallery/BrnGallerySummaryPage/img/BrnGallerySummaryPageIntro.png rename to doc/components/gallery/BrnGallerySummaryPage/img/BrnGallerySummaryPageIntro.png diff --git a/docs/components/guide/BrnGuide/BrnGuide.md b/doc/components/guide/BrnGuide/BrnGuide.md similarity index 100% rename from docs/components/guide/BrnGuide/BrnGuide.md rename to doc/components/guide/BrnGuide/BrnGuide.md diff --git a/docs/components/guide/BrnGuide/img/BrnGuideForceDemo.gif b/doc/components/guide/BrnGuide/img/BrnGuideForceDemo.gif similarity index 100% rename from docs/components/guide/BrnGuide/img/BrnGuideForceDemo.gif rename to doc/components/guide/BrnGuide/img/BrnGuideForceDemo.gif diff --git a/docs/components/guide/BrnGuide/img/BrnGuideIntroForceGuide.png b/doc/components/guide/BrnGuide/img/BrnGuideIntroForceGuide.png similarity index 100% rename from docs/components/guide/BrnGuide/img/BrnGuideIntroForceGuide.png rename to doc/components/guide/BrnGuide/img/BrnGuideIntroForceGuide.png diff --git a/docs/components/guide/BrnGuide/img/BrnGuideIntroSoftGuide.png b/doc/components/guide/BrnGuide/img/BrnGuideIntroSoftGuide.png similarity index 100% rename from docs/components/guide/BrnGuide/img/BrnGuideIntroSoftGuide.png rename to doc/components/guide/BrnGuide/img/BrnGuideIntroSoftGuide.png diff --git a/docs/components/guide/BrnGuide/img/BrnGuideSoftDemo.gif b/doc/components/guide/BrnGuide/img/BrnGuideSoftDemo.gif similarity index 100% rename from docs/components/guide/BrnGuide/img/BrnGuideSoftDemo.gif rename to doc/components/guide/BrnGuide/img/BrnGuideSoftDemo.gif diff --git a/docs/components/iconButton/BrnIconButton/BrnIconButton.md b/doc/components/iconButton/BrnIconButton/BrnIconButton.md similarity index 100% rename from docs/components/iconButton/BrnIconButton/BrnIconButton.md rename to doc/components/iconButton/BrnIconButton/BrnIconButton.md diff --git a/docs/components/iconButton/BrnIconButton/img/BrnIconButtonIntro.png b/doc/components/iconButton/BrnIconButton/img/BrnIconButtonIntro.png similarity index 100% rename from docs/components/iconButton/BrnIconButton/img/BrnIconButtonIntro.png rename to doc/components/iconButton/BrnIconButton/img/BrnIconButtonIntro.png diff --git a/docs/components/iconButton/BrnVerticalIconButton/BrnVerticalIconButton.md b/doc/components/iconButton/BrnVerticalIconButton/BrnVerticalIconButton.md similarity index 100% rename from docs/components/iconButton/BrnVerticalIconButton/BrnVerticalIconButton.md rename to doc/components/iconButton/BrnVerticalIconButton/BrnVerticalIconButton.md diff --git a/docs/components/iconButton/BrnVerticalIconButton/img/BrnVerticalIconButtonIntro.png b/doc/components/iconButton/BrnVerticalIconButton/img/BrnVerticalIconButtonIntro.png similarity index 100% rename from docs/components/iconButton/BrnVerticalIconButton/img/BrnVerticalIconButtonIntro.png rename to doc/components/iconButton/BrnVerticalIconButton/img/BrnVerticalIconButtonIntro.png diff --git a/docs/components/input/BrnInputText/BrnInputText.md b/doc/components/input/BrnInputText/BrnInputText.md similarity index 100% rename from docs/components/input/BrnInputText/BrnInputText.md rename to doc/components/input/BrnInputText/BrnInputText.md diff --git a/docs/components/input/BrnInputText/img/BrnInputTextDemoEmpty.png b/doc/components/input/BrnInputText/img/BrnInputTextDemoEmpty.png similarity index 100% rename from docs/components/input/BrnInputText/img/BrnInputTextDemoEmpty.png rename to doc/components/input/BrnInputText/img/BrnInputTextDemoEmpty.png diff --git a/docs/components/input/BrnInputText/img/BrnInputTextDemoFull.png b/doc/components/input/BrnInputText/img/BrnInputTextDemoFull.png similarity index 100% rename from docs/components/input/BrnInputText/img/BrnInputTextDemoFull.png rename to doc/components/input/BrnInputText/img/BrnInputTextDemoFull.png diff --git a/docs/components/input/BrnInputText/img/BrnInputTextIntro.png b/doc/components/input/BrnInputText/img/BrnInputTextIntro.png similarity index 100% rename from docs/components/input/BrnInputText/img/BrnInputTextIntro.png rename to doc/components/input/BrnInputText/img/BrnInputTextIntro.png diff --git a/docs/components/loading/BrnPageLoading/BrnPageLoading.md b/doc/components/loading/BrnPageLoading/BrnPageLoading.md similarity index 100% rename from docs/components/loading/BrnPageLoading/BrnPageLoading.md rename to doc/components/loading/BrnPageLoading/BrnPageLoading.md diff --git a/docs/components/loading/BrnPageLoading/img/BrnPageLoadingDemo1.png b/doc/components/loading/BrnPageLoading/img/BrnPageLoadingDemo1.png similarity index 100% rename from docs/components/loading/BrnPageLoading/img/BrnPageLoadingDemo1.png rename to doc/components/loading/BrnPageLoading/img/BrnPageLoadingDemo1.png diff --git a/docs/components/loading/BrnPageLoading/img/BrnPageLoadingDemo2.png b/doc/components/loading/BrnPageLoading/img/BrnPageLoadingDemo2.png similarity index 100% rename from docs/components/loading/BrnPageLoading/img/BrnPageLoadingDemo2.png rename to doc/components/loading/BrnPageLoading/img/BrnPageLoadingDemo2.png diff --git a/docs/components/normalButton/BrnBigGhostButton/BrnBigGhostButton.md b/doc/components/normalButton/BrnBigGhostButton/BrnBigGhostButton.md similarity index 72% rename from docs/components/normalButton/BrnBigGhostButton/BrnBigGhostButton.md rename to doc/components/normalButton/BrnBigGhostButton/BrnBigGhostButton.md index 4b4df7f8..a5f9a937 100644 --- a/docs/components/normalButton/BrnBigGhostButton/BrnBigGhostButton.md +++ b/doc/components/normalButton/BrnBigGhostButton/BrnBigGhostButton.md @@ -38,11 +38,11 @@ const BrnBigGhostButton({ | **参数名** | **参数类型** | 描述 | **是否必填** | **默认值** | | --- | --- | --- | --- | --- | | title | String | 按钮显示文案 | 否 | 确认 | -| onTap | VoidCallback | 点击的回调 | 否 | 无 | -| bgColor | Color | 按钮的背景色 | 否 | 主题色为5透明度的颜色 | -| width | double | 按钮的宽度 | 否 | double.infinity | -| titleColor | Color | 按钮的文字颜色 | 否 | 主题色 | -| themeData | BrnButtonConfig | button主题定制 | 否 | 无 | +| onTap | VoidCallback? | 点击的回调 | 否 | 无 | +| bgColor | Color? | 按钮的背景色 | 否 | 主题色为5透明度的颜色 | +| width | double? | 按钮的宽度 | 否 | double.infinity | +| titleColor | Color? | 按钮的文字颜色 | 否 | 主题色 | +| themeData | BrnButtonConfig? | button主题定制 | 否 | 无 | diff --git a/docs/components/normalButton/BrnBigGhostButton/img/BrnBigGhostButtonDemo.png b/doc/components/normalButton/BrnBigGhostButton/img/BrnBigGhostButtonDemo.png similarity index 100% rename from docs/components/normalButton/BrnBigGhostButton/img/BrnBigGhostButtonDemo.png rename to doc/components/normalButton/BrnBigGhostButton/img/BrnBigGhostButtonDemo.png diff --git a/docs/components/normalButton/BrnBigMainButton/BrnBigMainButton.md b/doc/components/normalButton/BrnBigMainButton/BrnBigMainButton.md similarity index 79% rename from docs/components/normalButton/BrnBigMainButton/BrnBigMainButton.md rename to doc/components/normalButton/BrnBigMainButton/BrnBigMainButton.md index 7b4c1b70..c5e7b70f 100644 --- a/docs/components/normalButton/BrnBigMainButton/BrnBigMainButton.md +++ b/doc/components/normalButton/BrnBigMainButton/BrnBigMainButton.md @@ -39,12 +39,12 @@ const BrnBigMainButton({ | **参数名** | **参数类型** | 描述 | **是否必填** | **默认值** | | --- | --- | --- | --- | --- | -| title | String | 按钮显示文案 | 否 | 确认 | -| onTap | VoidCallback | 点击的回调 | 否 | 无 | +| title | String | 按钮显示文案 | 否 | `'确认'` | +| onTap | VoidCallback? | 点击的回调 | 否 | 无 | | isEnable | bool | 按钮是否可用 | 否 | false | -| bgColor | Color | 按钮的背景色 | 否 | 主题色 | -| width | double | 按钮的宽度 | 否 | double.infinity | -| themeData | BrnButtonConfig | 按钮主题配置 | 否 | 无 | +| bgColor | Color? | 按钮的背景色 | 否 | 主题色 | +| width | double? | 按钮的宽度 | 否 | double.infinity | +| themeData | BrnButtonConfig? | 按钮主题配置 | 否 | 无 | diff --git a/docs/components/normalButton/BrnBigMainButton/img/BrnBigMainButton.png b/doc/components/normalButton/BrnBigMainButton/img/BrnBigMainButton.png similarity index 100% rename from docs/components/normalButton/BrnBigMainButton/img/BrnBigMainButton.png rename to doc/components/normalButton/BrnBigMainButton/img/BrnBigMainButton.png diff --git a/docs/components/normalButton/BrnBigMainButton/img/BrnBigMainButtonDisabled.png b/doc/components/normalButton/BrnBigMainButton/img/BrnBigMainButtonDisabled.png similarity index 100% rename from docs/components/normalButton/BrnBigMainButton/img/BrnBigMainButtonDisabled.png rename to doc/components/normalButton/BrnBigMainButton/img/BrnBigMainButtonDisabled.png diff --git a/docs/components/normalButton/BrnBigOutlineButton/BrnBigOutlineButton.md b/doc/components/normalButton/BrnBigOutlineButton/BrnBigOutlineButton.md similarity index 78% rename from docs/components/normalButton/BrnBigOutlineButton/BrnBigOutlineButton.md rename to doc/components/normalButton/BrnBigOutlineButton/BrnBigOutlineButton.md index 3c33346b..95488697 100644 --- a/docs/components/normalButton/BrnBigOutlineButton/BrnBigOutlineButton.md +++ b/doc/components/normalButton/BrnBigOutlineButton/BrnBigOutlineButton.md @@ -39,13 +39,13 @@ const BrnBigOutlineButton({ | **参数名** | **参数类型** | 描述 | **是否必填** | **默认值** | | --- | --- | --- | --- | --- | -| title | String | 按钮显示文案 | 否 | 确认 | -| onTap | VoidCallback | 点击的回调 | 否 | 无 | +| title | String | 按钮显示文案 | 否 | '确认' | +| onTap | VoidCallback? | 点击的回调 | 否 | 无 | | isEnable | bool | 按钮是否可用 | 否 | True | -| lineColor | Color | 边框颜色 | 否 | 主题色 | -| textColor | Color | 按钮文本颜色 | 否 | 黑色 | -| width | double | 按钮的宽度 | 否 | double.infinity | -| themeData | BrnButtonConfig | 按钮主题配置 | 否 | 无 | +| lineColor | Color? | 边框颜色 | 否 | 主题色 | +| textColor | Color? | 按钮文本颜色 | 否 | 黑色 | +| width | double? | 按钮的宽度 | 否 | double.infinity | +| themeData | BrnButtonConfig? | 按钮主题配置 | 否 | 无 | ## 四、效果及代码演示 diff --git a/docs/components/normalButton/BrnBigOutlineButton/img/BrnBigOutlineButton.png b/doc/components/normalButton/BrnBigOutlineButton/img/BrnBigOutlineButton.png similarity index 100% rename from docs/components/normalButton/BrnBigOutlineButton/img/BrnBigOutlineButton.png rename to doc/components/normalButton/BrnBigOutlineButton/img/BrnBigOutlineButton.png diff --git a/docs/components/normalButton/BrnBigOutlineButton/img/BrnBigOutlineButtonDisabled.png b/doc/components/normalButton/BrnBigOutlineButton/img/BrnBigOutlineButtonDisabled.png similarity index 100% rename from docs/components/normalButton/BrnBigOutlineButton/img/BrnBigOutlineButtonDisabled.png rename to doc/components/normalButton/BrnBigOutlineButton/img/BrnBigOutlineButtonDisabled.png diff --git a/docs/components/normalButton/BrnSmallMainButton/BrnSmallMainButton.md b/doc/components/normalButton/BrnSmallMainButton/BrnSmallMainButton.md similarity index 82% rename from docs/components/normalButton/BrnSmallMainButton/BrnSmallMainButton.md rename to doc/components/normalButton/BrnSmallMainButton/BrnSmallMainButton.md index 208a5334..5978b472 100644 --- a/docs/components/normalButton/BrnSmallMainButton/BrnSmallMainButton.md +++ b/doc/components/normalButton/BrnSmallMainButton/BrnSmallMainButton.md @@ -43,16 +43,16 @@ const BrnSmallMainButton({ | 参数名 | 参数类型 | 描述 | 是否必填 | 默认值 | | ---------- | --------------- | -------------- | -------- | --------------- | -| title | String | 按钮显示文案 | 否 | 确认 | -| onTap | VoidCallback | 点击的回调 | 否 | 无 | +| title | String | 按钮显示文案 | 否 | '确认' | +| onTap | VoidCallback? | 点击的回调 | 否 | 无 | | isEnable | bool | 按钮是否可用 | 否 | True | -| bgColor | Color | 按钮的背景色 | 否 | 主题色 | -| width | double | 按钮的宽度 | 否 | double.infinity | +| bgColor | Color? | 按钮的背景色 | 否 | 主题色 | +| width | double? | 按钮的宽度 | 否 | double.infinity | | textColor | Color | 文本的颜色 | 否 | 白色 | | fontWeight | FontWeight | 文本的粗细 | 否 | bold | -| fontSize | double | 文字的大小 | 否 | 14 | -| radius | double | 按钮的圆角 | 否 | 4 | -| maxWidth | double | 按钮的最大宽度 | 否 | null | +| fontSize | double? | 文字的大小 | 否 | 14 | +| radius | double? | 按钮的圆角 | 否 | 4 | +| maxWidth | double? | 按钮的最大宽度 | 否 | null | | themeData | BrnButtonConfig? | 按钮主题配置 | 否 | 无 | ## 四、代码演示 diff --git a/docs/components/normalButton/BrnSmallMainButton/img/BrnSmallMainButton.png b/doc/components/normalButton/BrnSmallMainButton/img/BrnSmallMainButton.png similarity index 100% rename from docs/components/normalButton/BrnSmallMainButton/img/BrnSmallMainButton.png rename to doc/components/normalButton/BrnSmallMainButton/img/BrnSmallMainButton.png diff --git a/docs/components/normalButton/BrnSmallMainButton/img/BrnSmallMainButtonDisabled.png b/doc/components/normalButton/BrnSmallMainButton/img/BrnSmallMainButtonDisabled.png similarity index 100% rename from docs/components/normalButton/BrnSmallMainButton/img/BrnSmallMainButtonDisabled.png rename to doc/components/normalButton/BrnSmallMainButton/img/BrnSmallMainButtonDisabled.png diff --git a/docs/components/normalButton/BrnSmallOutlineButton/BrnSmallOutlineButton.md b/doc/components/normalButton/BrnSmallOutlineButton/BrnSmallOutlineButton.md similarity index 54% rename from docs/components/normalButton/BrnSmallOutlineButton/BrnSmallOutlineButton.md rename to doc/components/normalButton/BrnSmallOutlineButton/BrnSmallOutlineButton.md index 83c3bcdd..1984ee8e 100644 --- a/docs/components/normalButton/BrnSmallOutlineButton/BrnSmallOutlineButton.md +++ b/doc/components/normalButton/BrnSmallOutlineButton/BrnSmallOutlineButton.md @@ -40,17 +40,18 @@ const BrnSmallOutlineButton({ ### 参数说明 -| 参数名 | 参数类型 | 描述 | 是否必填 | 默认值 | -| ---------- | ------------ | ------------ | -------- | --------------- | -| title | String | 按钮显示文案 | 否 | 确认 | -| onTap | VoidCallback | 点击的回调 | 否 | 无 | -| isEnable | bool | 按钮是否可用 | 否 | true | -| lineColor | Color | 边框的背景色 | 否 | 主题色 | -| width | double | 按钮的宽度 | 否 | 无 | -| textColor | Color | 文本的颜色 | 否 | 白色 | -| fontWeight | FontWeight | 文本的粗细 | 否 | FontWeight.w600 | -| fontSize | double | 文字的大小 | 否 | 14 | -| radius | double | 按钮的圆角 | 否 | 无 | +| 参数名 | 参数类型 | 描述 | 是否必填 | 默认值 | +| ---------- | ---------------- | ------------ | -------- | --------------- | +| title | String | 按钮显示文案 | 否 | '确认' | +| onTap | VoidCallback? | 点击的回调 | 否 | 无 | +| isEnable | bool | 按钮是否可用 | 否 | true | +| lineColor | Color? | 边框的背景色 | 否 | 主题色 | +| width | double? | 按钮的宽度 | 否 | 无 | +| textColor | Color? | 文本的颜色 | 否 | 白色 | +| fontWeight | FontWeight | 文本的粗细 | 否 | FontWeight.w600 | +| fontSize | double | 文字的大小 | 否 | 14 | +| radius | double? | 按钮的圆角 | 否 | 无 | +| themeData | BrnButtonConfig? | 主题定制属性 | 否 | 无 | ## 四、代码演示 diff --git a/docs/components/normalButton/BrnSmallOutlineButton/img/BrnSmallOutlineButton.png b/doc/components/normalButton/BrnSmallOutlineButton/img/BrnSmallOutlineButton.png similarity index 100% rename from docs/components/normalButton/BrnSmallOutlineButton/img/BrnSmallOutlineButton.png rename to doc/components/normalButton/BrnSmallOutlineButton/img/BrnSmallOutlineButton.png diff --git a/docs/components/normalButton/BrnSmallOutlineButton/img/BrnSmallOutlineButtonDisabled.png b/doc/components/normalButton/BrnSmallOutlineButton/img/BrnSmallOutlineButtonDisabled.png similarity index 100% rename from docs/components/normalButton/BrnSmallOutlineButton/img/BrnSmallOutlineButtonDisabled.png rename to doc/components/normalButton/BrnSmallOutlineButton/img/BrnSmallOutlineButtonDisabled.png diff --git a/doc/components/notification/BrnNoticeBar/BrnNoticeBar.md b/doc/components/notification/BrnNoticeBar/BrnNoticeBar.md new file mode 100644 index 00000000..b7ba9671 --- /dev/null +++ b/doc/components/notification/BrnNoticeBar/BrnNoticeBar.md @@ -0,0 +1,169 @@ +--- +title: BrnNoticeBar +group: + title: NoticeBar + order: 21 +--- + +# BrnNoticeBar + +通知视图，默认最小高度 36。 + +## 一、效果总览 + + +
+ + +## 二、描述 + +### 适用场景 + +展示通知或者提示信息。 + +### 交互规则 + +1. 支持十种默认样式。 +2. 支持自定义或隐藏左右图标。 +3. 文字颜色和背景颜色支持自定义。 +4. 文字较长时只显示一行，以...结尾，也可以支持跑马灯效果展示。 +5. 支持点击回调。 + +## 三、构造函数及参数说明 + +### 构造函数 + +```dart +const BrnNoticeBar( + {Key? key, + this.leftWidget, + this.showLeftIcon = true, + required this.content, + this.textColor, + this.backgroundColor, + this.rightWidget, + this.showRightIcon = true, + this.noticeStyle, + this.onNoticeTap, + this.onRightIconTap, + this.marquee = false, + this.padding, + this.minHeight = 36}) + : super(key: key); +``` + +### 参数说明 + +| 参数名 | 参数类型 | 描述 | 是否必填 | 默认值 | +| --------------- | ------------- | ------------------------------------------------------------ | -------- | ----------------------------- | +| noticeStyle | NoticeStyle? | 样式，取 NoticeStyles 里面的值 | 否 | NoticeStyles.runningWithArrow | +| content | String | 通知具体内容 | 是 | 无 | +| textColor | Color? | 文案的颜色 | 否 | 随 defaultStyle 改变 | +| backgroundColor | Color? | 通知栏的背景颜色 | 否 | 随 defaultStyle 改变 | +| leftWidget | Widget? | 左侧图标区域自定义视图 | 否 | 无 | +| showLeftIcon | bool | 是否显示左侧图标 | 否 | true | +| rightWidget | Widget? | 右侧图标区域自定义视图 | 否 | 无 | +| showRightIcon | bool | 是否显示右侧图标 | 否 | true | +| onNoticeTap | VoidCallback? | 点击通知回调 | 否 | 无 | +| onRightIconTap | VoidCallback? | 点击右侧图标回掉 | 否 | 无 | +| marquee | bool | 跑马灯 | 否 | false | +| minHeight | double | 最小高度。leftWidget、rightWidget 都为空时，限制的最小高度。可以通过该属性控制组件高度，内容会自动垂直居中。 | 否 | 36 | +| padding | EdgeInsets? | 内容的内边距 | 否 | 无 | + +### 其他参数说明 + +#### NoticeStyles + +```dart +/// NoticeStyle 举例 +class NoticeStyles { + /// 红色+失败+箭头 + static NoticeStyle failWithArrow = NoticeStyle( + BrunoTools.getAssetImage(BrnAsset.ICON_NOTICE_FAIL), + Color(0xFFFA3F3F), + Color(0xFFFEEDED), + BrunoTools.getAssetImage(BrnAsset.ICON_NOTICE_ARROW_RED)); + /// 红色+失败+关闭 + static NoticeStyle failWithClose = NoticeStyle( + BrunoTools.getAssetImage(BrnAsset.ICON_NOTICE_FAIL), + Color(0xFFFA3F3F), + Color(0xFFFEEDED), + BrunoTools.getAssetImage(BrnAsset.ICON_NOTICE_CLOSE_RED)); +} +``` + +## 四、代码演示 + +### 效果 1：正常显示 + + + +```dart +BrnNoticeBar( + content: '这是通知内容', + noticeStyle: NoticeStyles.runningWithArrow, + onNoticeTap: () { + BrnToast.show('点击通知', context); + }, + onRightIconTap: () { + BrnToast.show('点击右侧图标', context); + }, +) +``` + +### 效果 2：隐藏左右图标 + + + +```dart +BrnNoticeBar( + content: '这是通知内容', + showLeftIcon: false , + showRightIcon: false, + noticeStyle: NoticeStyles.runningWithArrow, + onNoticeTap: () { + BrnToast.show('点击通知', context); + }, + onRightIconTap: () { + BrnToast.show('点击右侧图标', context); + }, +) +``` + +### 效果 3：自定义图标和文字、背景颜色 + + + +```dart +BrnNoticeBar( + content: '这是通知内容', + textColor: BrunoColor.instance.F0Color, ///通知颜色 + backgroundColor: Colors.grey, ///背景色 + leftWidget: BrunoTools.getAssetImage(BrnAsset.ICON_MORE), ///左侧图标 + rightWidget: BrunoTools.getAssetImage(BrnAsset.ICON_MORE), ///右侧图标 + onNoticeTap: () { + BrnToast.show('点击通知', context); + }, + onRightIconTap: () { + BrnToast.show('点击右侧图标', context); + }, +) +``` + +### 效果 4：跑马灯 + +![](./img/BrnNoticeBarDemo4.gif) + +```dart +BrnNoticeBar( + content: '这是跑马灯的通知内容跑马灯的通知内容跑马灯的通知内容跑马灯的通知内容', + marquee: true, + noticeStyle: NoticeStyles.runningWithArrow, + onNoticeTap: () { + BrnToast.show('点击通知', context); + }, + onRightIconTap: () { + BrnToast.show('点击右侧图标', context); + }, +) +``` diff --git a/docs/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo1.png b/doc/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo1.png similarity index 100% rename from docs/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo1.png rename to doc/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo1.png diff --git a/docs/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo2.png b/doc/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo2.png similarity index 100% rename from docs/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo2.png rename to doc/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo2.png diff --git a/docs/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo3.png b/doc/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo3.png similarity index 100% rename from docs/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo3.png rename to doc/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo3.png diff --git a/docs/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo4.gif b/doc/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo4.gif similarity index 100% rename from docs/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo4.gif rename to doc/components/notification/BrnNoticeBar/img/BrnNoticeBarDemo4.gif diff --git a/docs/components/notification/BrnNoticeBar/img/BrnNoticeBarIntro1.png b/doc/components/notification/BrnNoticeBar/img/BrnNoticeBarIntro1.png similarity index 100% rename from docs/components/notification/BrnNoticeBar/img/BrnNoticeBarIntro1.png rename to doc/components/notification/BrnNoticeBar/img/BrnNoticeBarIntro1.png diff --git a/docs/components/notification/BrnNoticeBar/img/BrnNoticeBarIntro2.png b/doc/components/notification/BrnNoticeBar/img/BrnNoticeBarIntro2.png similarity index 100% rename from docs/components/notification/BrnNoticeBar/img/BrnNoticeBarIntro2.png rename to doc/components/notification/BrnNoticeBar/img/BrnNoticeBarIntro2.png diff --git a/doc/components/notification/BrnNoticeBarWithButton/BrnNoticeBarWithButton.md b/doc/components/notification/BrnNoticeBarWithButton/BrnNoticeBarWithButton.md new file mode 100644 index 00000000..a673433e --- /dev/null +++ b/doc/components/notification/BrnNoticeBarWithButton/BrnNoticeBarWithButton.md @@ -0,0 +1,128 @@ +--- +title: BrnNoticeBarWithButton +group: + title: NoticeBar + order: 22 +--- + +# BrnNoticeBarWithButton + +左边标签，右边按钮的通知视图。 + +## 一、效果总览 + + + +## 二、描述 + +### 适用场景 + +展示通知、提示或者任务信息，右侧支持按钮展示，整个通知栏也支持点击。 + +### 交互规则 + +1. 中间为通知文案，必传。 +2. 通知栏文字颜色和背景颜色支持自定义。 +3. 左侧为标签，标签文案为空时不显示标签控件。 +4. 右侧为按钮，点击有回调。文案为空时不显示按钮，支持自定义文字颜色和边框颜色。 +5. 左侧标签区域和右侧按钮区域支持自定义 widget。 +6. 文案过长时以 ... 截断展示，也可设置跑马灯展示。 + +## 三、构造函数及参数说明 + +### 构造函数 + +```dart +const BrnNoticeBarWithButton( + {Key? key, + required this.content, + this.backgroundColor, + this.contentTextColor, + this.leftTagText, + this.leftTagBackgroundColor, + this.leftTagTextColor, + this.rightButtonBorderColor, + this.rightButtonText, + this.rightButtonTextColor, + this.onRightButtonTap, + this.marquee = false, + this.leftWidget, + this.rightWidget, + this.padding, + this.minHeight = 54}) + : super(key: key); +``` + +### 参数说明 + +| 参数名 | 参数类型 | 描述 | 是否必填 | 默认值 | +| ---------------------- | ------------- | ------------------------------------------------------------ | -------- | ----------------- | +| content | String | 通知的具体内容 | 是 | 无 | +| backgroundColor | Color? | 通知的背景颜色 | 否 | Color(0x14FA5741) | +| contentTextColor | Color? | 通知的文字颜色 | 否 | Color(0xFF333333) | +| leftTagText | String? | 左边标签的文案，为空或者 null 时不显示标签视图 | 否 | 无 | +| leftTagTextColor | Color? | 左边标签文字的颜色 | 否 | Colors.white | +| leftTagBackgroundColor | Color? | 标签背景的颜色 | 否 | Color(0xFFFA5741) | +| leftWidget | Widget? | 自定义左侧控件 | 否 | 无 | +| rightButtonText | String? | 右侧按钮的文案，为空时不显示按钮 | 否 | | +| rightButtonTextColor | Color? | 右侧按钮文字颜色 | 否 | Color(0xFFFA5741) | +| rightButtonBorderColor | Color? | 右侧按钮边框颜色 | 否 | Color(0xFFFA5741) | +| rightWidget | Widget? | 自定义右侧控件 | 否 | | +| marquee | bool | 通知文案是否以跑马灯效果展示 | 否 | false | +| onRightButtonTap | VoidCallback? | 右侧按钮的点击回调 | 否 | | +| minHeight | double | 最小高度。leftWidget、rightWidget 都为空时，限制的最小高度。可以通过该属性控制组件高度，内容会自动垂直居中。 | 否 | 54 | +| padding | EdgeInsets? | 内容的内边距 | 否 | 无 | + +## 四、代码演示 + +### 效果 1：正常显示 + + + +```dart +BrnNoticeBarWithButton( + leftTagText: '任务', + content: '这是通知内容', + rightButtonText: '去完成', + onRightButtonTap: () { + BrnToast.show('点击右侧按钮', context); + }, +) +``` + +### 效果 2：自定义文字和背景颜色 + + + +```dart +BrnNoticeBarWithButton( + leftTagText: '任务', + leftTagBackgroundColor: Color(0xFFE0EDFF), + leftTagTextColor: Color(0xFF0984F9), + content: '这是通知内容这是通知内容这是通知内容这是通知内容这是通知内容', + backgroundColor: Color(0xFFEBFFF7), + contentTextColor: Color(0xFF00AE66), + rightButtonText: '去完成', + rightButtonBorderColor: Color(0xFF0984F9), + rightButtonTextColor: Color(0xFF0984F9), + onRightButtonTap: () { + BrnToast.show('点击右侧按钮', context); + }, +), +``` + +### 效果 3：跑马灯 + +![](./img/BrnNoticeBarWithButtonDemo3.gif) + +```dart +BrnNoticeBarWithButton( + leftTagText: '任务', + content: '这是跑马灯的通知内容跑马灯的通知内容跑马灯的通知内容跑马灯的通知内容', + rightButtonText: '去完成', + marquee: true, + onRightButtonTap: () { + BrnToast.show('点击右侧按钮', context); + }, +), +``` diff --git a/docs/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonDemo1.png b/doc/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonDemo1.png similarity index 100% rename from docs/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonDemo1.png rename to doc/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonDemo1.png diff --git a/docs/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonDemo2.png b/doc/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonDemo2.png similarity index 100% rename from docs/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonDemo2.png rename to doc/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonDemo2.png diff --git a/docs/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonDemo3.gif b/doc/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonDemo3.gif similarity index 100% rename from docs/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonDemo3.gif rename to doc/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonDemo3.gif diff --git a/docs/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonIntro.png b/doc/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonIntro.png similarity index 100% rename from docs/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonIntro.png rename to doc/components/notification/BrnNoticeBarWithButton/img/BrnNoticeBarWithButtonIntro.png diff --git a/docs/components/picker/BrnBottomPicker/BrnBottomPicker.md b/doc/components/picker/BrnBottomPicker/BrnBottomPicker.md similarity index 100% rename from docs/components/picker/BrnBottomPicker/BrnBottomPicker.md rename to doc/components/picker/BrnBottomPicker/BrnBottomPicker.md diff --git a/docs/components/picker/BrnBottomPicker/img/BrnBottomPickerDemo1.png b/doc/components/picker/BrnBottomPicker/img/BrnBottomPickerDemo1.png similarity index 100% rename from docs/components/picker/BrnBottomPicker/img/BrnBottomPickerDemo1.png rename to doc/components/picker/BrnBottomPicker/img/BrnBottomPickerDemo1.png diff --git a/docs/components/picker/BrnBottomPicker/img/BrnBottomPickerDemo2.png b/doc/components/picker/BrnBottomPicker/img/BrnBottomPickerDemo2.png similarity index 100% rename from docs/components/picker/BrnBottomPicker/img/BrnBottomPickerDemo2.png rename to doc/components/picker/BrnBottomPicker/img/BrnBottomPickerDemo2.png diff --git a/docs/components/picker/BrnBottomWritePicker/BrnBottomWritePicker.md b/doc/components/picker/BrnBottomWritePicker/BrnBottomWritePicker.md similarity index 100% rename from docs/components/picker/BrnBottomWritePicker/BrnBottomWritePicker.md rename to doc/components/picker/BrnBottomWritePicker/BrnBottomWritePicker.md diff --git a/docs/components/picker/BrnBottomWritePicker/img/BrnBottomWritePicker.png b/doc/components/picker/BrnBottomWritePicker/img/BrnBottomWritePicker.png similarity index 100% rename from docs/components/picker/BrnBottomWritePicker/img/BrnBottomWritePicker.png rename to doc/components/picker/BrnBottomWritePicker/img/BrnBottomWritePicker.png diff --git a/docs/components/picker/BrnDatePicker/BrnDatePicker.md b/doc/components/picker/BrnDatePicker/BrnDatePicker.md similarity index 100% rename from docs/components/picker/BrnDatePicker/BrnDatePicker.md rename to doc/components/picker/BrnDatePicker/BrnDatePicker.md diff --git a/docs/components/picker/BrnDatePicker/img/BrnDatePickerTime.png b/doc/components/picker/BrnDatePicker/img/BrnDatePickerTime.png similarity index 100% rename from docs/components/picker/BrnDatePicker/img/BrnDatePickerTime.png rename to doc/components/picker/BrnDatePicker/img/BrnDatePickerTime.png diff --git a/docs/components/picker/BrnDatePicker/img/BrnDatePickerYMD.png b/doc/components/picker/BrnDatePicker/img/BrnDatePickerYMD.png similarity index 100% rename from docs/components/picker/BrnDatePicker/img/BrnDatePickerYMD.png rename to doc/components/picker/BrnDatePicker/img/BrnDatePickerYMD.png diff --git a/docs/components/picker/BrnDatePicker/img/BrnDatePickerYMDHMS.png b/doc/components/picker/BrnDatePicker/img/BrnDatePickerYMDHMS.png similarity index 100% rename from docs/components/picker/BrnDatePicker/img/BrnDatePickerYMDHMS.png rename to doc/components/picker/BrnDatePicker/img/BrnDatePickerYMDHMS.png diff --git a/docs/components/picker/BrnDateRangePicker/BrnDateRangePicker.md b/doc/components/picker/BrnDateRangePicker/BrnDateRangePicker.md similarity index 100% rename from docs/components/picker/BrnDateRangePicker/BrnDateRangePicker.md rename to doc/components/picker/BrnDateRangePicker/BrnDateRangePicker.md diff --git a/docs/components/picker/BrnDateRangePicker/img/BrnDateRangePicker1.png b/doc/components/picker/BrnDateRangePicker/img/BrnDateRangePicker1.png similarity index 100% rename from docs/components/picker/BrnDateRangePicker/img/BrnDateRangePicker1.png rename to doc/components/picker/BrnDateRangePicker/img/BrnDateRangePicker1.png diff --git a/docs/components/picker/BrnDateRangePicker/img/BrnDateRangePicker2.png b/doc/components/picker/BrnDateRangePicker/img/BrnDateRangePicker2.png similarity index 100% rename from docs/components/picker/BrnDateRangePicker/img/BrnDateRangePicker2.png rename to doc/components/picker/BrnDateRangePicker/img/BrnDateRangePicker2.png diff --git a/docs/components/picker/BrnDateRangePicker/img/BrnDateRangePicker3.png b/doc/components/picker/BrnDateRangePicker/img/BrnDateRangePicker3.png similarity index 100% rename from docs/components/picker/BrnDateRangePicker/img/BrnDateRangePicker3.png rename to doc/components/picker/BrnDateRangePicker/img/BrnDateRangePicker3.png diff --git a/docs/components/picker/BrnDateRangePicker/img/BrnDateRangePickerDemo1.png b/doc/components/picker/BrnDateRangePicker/img/BrnDateRangePickerDemo1.png similarity index 100% rename from docs/components/picker/BrnDateRangePicker/img/BrnDateRangePickerDemo1.png rename to doc/components/picker/BrnDateRangePicker/img/BrnDateRangePickerDemo1.png diff --git a/docs/components/picker/BrnDateRangePicker/img/BrnDateRangePickerDemo2.png b/doc/components/picker/BrnDateRangePicker/img/BrnDateRangePickerDemo2.png similarity index 100% rename from docs/components/picker/BrnDateRangePicker/img/BrnDateRangePickerDemo2.png rename to doc/components/picker/BrnDateRangePicker/img/BrnDateRangePickerDemo2.png diff --git a/docs/components/picker/BrnDateRangePicker/img/BrnDateRangePickerDemo3.png b/doc/components/picker/BrnDateRangePicker/img/BrnDateRangePickerDemo3.png similarity index 100% rename from docs/components/picker/BrnDateRangePicker/img/BrnDateRangePickerDemo3.png rename to doc/components/picker/BrnDateRangePicker/img/BrnDateRangePickerDemo3.png diff --git a/docs/components/picker/BrnMultiColumnPicker/BrnMultiColumnPicker.md b/doc/components/picker/BrnMultiColumnPicker/BrnMultiColumnPicker.md similarity index 82% rename from docs/components/picker/BrnMultiColumnPicker/BrnMultiColumnPicker.md rename to doc/components/picker/BrnMultiColumnPicker/BrnMultiColumnPicker.md index b674bbc6..990b8f6b 100644 --- a/docs/components/picker/BrnMultiColumnPicker/BrnMultiColumnPicker.md +++ b/doc/components/picker/BrnMultiColumnPicker/BrnMultiColumnPicker.md @@ -45,12 +45,13 @@ BrnMultiColumnPicker( | entity | BrnPickerEntity | 筛选数据源 | 是 | | | maxHeight | double | Picker 展示最大高度 | 否 | 280.0 | | showSelectedCount | bool | 展示选中的条目的个数 | 否 | false | -| onConfirm | BrnOnPickerConfirm | 选择数据后回调函数 | 否 | null | -| onEntityTap | BrnOnEntityTap | 选择项目后回调函数 | 否 | null | +| onConfirm | `void BrnOnPickerConfirm(Map> results,int? firstIndex, int? secondIndex, int? thirdIndex)?` | 选择数据后回调函数 | 否 | null | +| onEntityTap | `void BrnOnEntityTap(int columnIndex, int rowIndex, BrnPickerEntity entity)?` | 选择项目后回调函数 | 否 | null | | pickerTitleConfig | BrnPickerTitleConfig | Picker 标题数据配置 | 否 | BrnPickerTitleConfig.Default | | isIncludeUnLimit | bool | 当选中”不限“的时候，返回的 reslut 结果是否包含 “不限” 选项，“不限” 选项 value 字段不能为空，上一级 key 字段不能为空 | 否 | false | -| canSelectEntryInterceptor | bool BrnOnSelectEntityInterceptor( int listIndex, int index, BrnPickerEntity entity) | 当前选项是否可以被选中:返回 true 可以被选中 false 不可以被选中 | 否 | | -| defaultFocusedIndexes | `List` | 初始化时的选中选项 | 否 | | +| canSelectEntryInterceptor | `bool BrnOnSelectEntityInterceptor( int listIndex, int index, BrnPickerEntity entity)?` | 当前选项是否可以被选中:返回 true 可以被选中 false 不可以被选中 | 否 | | +| defaultFocusedIndexes | `List?` | 初始化时的选中选项 | 否 | | +| themeData | BrnPickerConfig? | 主题定制，只有 Picker Title 部分样式生效 | 否 | | ### 其它数据结构 @@ -88,7 +89,7 @@ class BrnPickerEntity { ### 效果1： -[示例数据 list_picker.json](../../../example/assets/list_picker.json) +[示例数据 list_picker.json](https://bruno.ke.com/widgets/picker/brn-multi-column-picker/list_picker.json) image-20211115110957518 diff --git a/docs/components/picker/BrnMultiColumnPicker/img/BrnMultiColumnPickerDemo.png b/doc/components/picker/BrnMultiColumnPicker/img/BrnMultiColumnPickerDemo.png similarity index 100% rename from docs/components/picker/BrnMultiColumnPicker/img/BrnMultiColumnPickerDemo.png rename to doc/components/picker/BrnMultiColumnPicker/img/BrnMultiColumnPickerDemo.png diff --git a/docs/components/picker/BrnMultiColumnPicker/img/BrnMultiColumnPickerIntro.png b/doc/components/picker/BrnMultiColumnPicker/img/BrnMultiColumnPickerIntro.png similarity index 100% rename from docs/components/picker/BrnMultiColumnPicker/img/BrnMultiColumnPickerIntro.png rename to doc/components/picker/BrnMultiColumnPicker/img/BrnMultiColumnPickerIntro.png diff --git a/docs/components/picker/BrnMultiDataPicker/BrnMultiDataPicker.md b/doc/components/picker/BrnMultiDataPicker/BrnMultiDataPicker.md similarity index 99% rename from docs/components/picker/BrnMultiDataPicker/BrnMultiDataPicker.md rename to doc/components/picker/BrnMultiDataPicker/BrnMultiDataPicker.md index 5e7c7d61..8c2b62eb 100644 --- a/docs/components/picker/BrnMultiDataPicker/BrnMultiDataPicker.md +++ b/doc/components/picker/BrnMultiDataPicker/BrnMultiDataPicker.md @@ -5,7 +5,7 @@ group: order: 23 --- -# BrnMultiDataPicker +# BrnMultiDataPicker 适用于单列或者多列数据选择的情况 diff --git a/docs/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo1.png b/doc/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo1.png similarity index 100% rename from docs/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo1.png rename to doc/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo1.png diff --git a/docs/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo2.png b/doc/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo2.png similarity index 100% rename from docs/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo2.png rename to doc/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo2.png diff --git a/docs/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo3.png b/doc/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo3.png similarity index 100% rename from docs/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo3.png rename to doc/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo3.png diff --git a/docs/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo4.png b/doc/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo4.png similarity index 100% rename from docs/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo4.png rename to doc/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerDemo4.png diff --git a/docs/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerIntro.png b/doc/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerIntro.png similarity index 100% rename from docs/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerIntro.png rename to doc/components/picker/BrnMultiDataPicker/img/BrnMultiDataPickerIntro.png diff --git a/docs/components/picker/BrnMultiSelectListPicker/BrnMultiSelectListPicker.md b/doc/components/picker/BrnMultiSelectListPicker/BrnMultiSelectListPicker.md similarity index 79% rename from docs/components/picker/BrnMultiSelectListPicker/BrnMultiSelectListPicker.md rename to doc/components/picker/BrnMultiSelectListPicker/BrnMultiSelectListPicker.md index c14b2de8..428c861f 100644 --- a/docs/components/picker/BrnMultiSelectListPicker/BrnMultiSelectListPicker.md +++ b/doc/components/picker/BrnMultiSelectListPicker/BrnMultiSelectListPicker.md @@ -11,9 +11,9 @@ group: 相似组件有： -[BrnMultiSelectTagsPicker](../brn-multi-select-tags-picker/brn-multi-select-tags-picker)从底部弹出的 Tag 样式多选。 +[BrnMultiSelectTagsPicker](../widgets/brn-multi-select-tags-picker)从底部弹出的 Tag 样式多选。 -[BrnMultiSelectDialog](../../dialog/brn-multi-select-dialog/brn-multi-select-dialog) 从页面中部弹出多选弹窗。 +[BrnMultiSelectDialog](../widgets/brn-multi-select-dialog) 从页面中部弹出多选弹窗。 ## 一、效果总览 @@ -44,13 +44,14 @@ BrnMultiSelectListPicker({ ### 参数说明 -| 参数名 | 参数类型 | 作用 | 是否必填 | 默认值 | -| ----------------- | ------------------------------------------------------------ | --------------------------------------------- | -------- | ---------------------------- | -| items | `List` | 数据源 | 是 | | -| pickerTitleConfig | BrnPickerTitleConfig | 设置 Picker 主题 | 否 | BrnPickerTitleConfig.Default | -| onSubmit | `BrnMultiSelectListPickerSubmit = bool Function(List checkedItems)`? | 点击【完成】时回调给外部选中的数据 | 否 | | -| onItemClick | BrnMultiSelectListPickerItemClick = void Function(BuildContext context, int index)? | Item 被点击的回调 | 否 | | -| isDismissible | bool | 是否可电机外部关闭弹窗，true 点击外部关闭弹窗 | 否 | true | +| 参数名 | 参数类型 | 作用 | 是否必填 | 默认值 | +| ----------------- | ------------------------------------------------------------ | ------------------------------------------------------------ | -------- | ---------------------------- | +| items | `List` | 数据源 | 是 | | +| pickerTitleConfig | BrnPickerTitleConfig | 设置 Picker 主题 | 否 | BrnPickerTitleConfig.Default | +| onSubmit | `BrnMultiSelectListPickerSubmit = bool Function(List checkedItems)?` | 点击【完成】时回调给外部选中的数据 | 否 | | +| onItemClick | `BrnMultiSelectListPickerItemClick = void Function(BuildContext context, int index)?` | Item 被点击的回调 | 否 | | +| isDismissible | bool | 是否可电机外部关闭弹窗，true 点击外部关闭弹窗。只在`show`方法里才有 | 否 | true | +| onCancel | VoidCallback? | 点击取消时的回调 | 否 | | ### 其它数据结构 diff --git a/docs/components/picker/BrnMultiSelectListPicker/img/BrnMultiSelectListPicker.png b/doc/components/picker/BrnMultiSelectListPicker/img/BrnMultiSelectListPicker.png similarity index 100% rename from docs/components/picker/BrnMultiSelectListPicker/img/BrnMultiSelectListPicker.png rename to doc/components/picker/BrnMultiSelectListPicker/img/BrnMultiSelectListPicker.png diff --git a/docs/components/picker/BrnMultiSelectTagsPicker/BrnMultiSelectTagsPicker.md b/doc/components/picker/BrnMultiSelectTagsPicker/BrnMultiSelectTagsPicker.md similarity index 100% rename from docs/components/picker/BrnMultiSelectTagsPicker/BrnMultiSelectTagsPicker.md rename to doc/components/picker/BrnMultiSelectTagsPicker/BrnMultiSelectTagsPicker.md diff --git a/docs/components/picker/BrnMultiSelectTagsPicker/img/BrnMultiSelectTagsPickerIntro.png b/doc/components/picker/BrnMultiSelectTagsPicker/img/BrnMultiSelectTagsPickerIntro.png similarity index 100% rename from docs/components/picker/BrnMultiSelectTagsPicker/img/BrnMultiSelectTagsPickerIntro.png rename to doc/components/picker/BrnMultiSelectTagsPicker/img/BrnMultiSelectTagsPickerIntro.png diff --git a/docs/components/picker/BrnSelectTagsWithInputPicker/BrnSelectTagsWithInputPicker.md b/doc/components/picker/BrnSelectTagsWithInputPicker/BrnSelectTagsWithInputPicker.md similarity index 100% rename from docs/components/picker/BrnSelectTagsWithInputPicker/BrnSelectTagsWithInputPicker.md rename to doc/components/picker/BrnSelectTagsWithInputPicker/BrnSelectTagsWithInputPicker.md diff --git a/docs/components/picker/BrnSelectTagsWithInputPicker/img/BrnSelectTagsWithInputPicker1.png b/doc/components/picker/BrnSelectTagsWithInputPicker/img/BrnSelectTagsWithInputPicker1.png similarity index 100% rename from docs/components/picker/BrnSelectTagsWithInputPicker/img/BrnSelectTagsWithInputPicker1.png rename to doc/components/picker/BrnSelectTagsWithInputPicker/img/BrnSelectTagsWithInputPicker1.png diff --git a/docs/components/radio/BrnRadioButton/BrnRadioButton.md b/doc/components/radio/BrnRadioButton/BrnRadioButton.md similarity index 83% rename from docs/components/radio/BrnRadioButton/BrnRadioButton.md rename to doc/components/radio/BrnRadioButton/BrnRadioButton.md index a27d1482..545cb373 100644 --- a/docs/components/radio/BrnRadioButton/BrnRadioButton.md +++ b/doc/components/radio/BrnRadioButton/BrnRadioButton.md @@ -29,18 +29,18 @@ group: ### 构造函数 ```dart -const BrnRadioButton({ - Key key, - @required this.radioIndex, - @required this.onValueChangedAtIndex, - this.disable = false, - this.isSelected = false, - this.iconPadding, - this.child, - this.childOnRight = true, - this.mainAxisAlignment = MainAxisAlignment.start, - this.mainAxisSize = MainAxisSize.min, -}); +const BrnRadioButton( + {Key? key, + required this.radioIndex, + required this.onValueChangedAtIndex, + this.disable = false, + this.isSelected = false, + this.iconPadding, + this.child, + this.childOnRight = true, + this.mainAxisAlignment = MainAxisAlignment.start, + this.mainAxisSize = MainAxisSize.min, + this.behavior = HitTestBehavior.translucent}); ``` ### 参数说明 @@ -50,11 +50,12 @@ const BrnRadioButton({ | onValueChangedAtIndex | void Function(int, bool) | radio选中状态发生变化产生的回调，int 为 选项的index，bool 为选项的选中状态，true表示选中，false未选中 | 是 | 无 | | isSelected | bool | 初始选中状态 | 否 | false | | disable | bool | 选项是否禁用 | 否 | false | -| child | widget | 除了 icon 部分的自定义视图 | 否 | 无 | -| iconPadding | EdgeInsets | 选择图标的padding | 否 | EdgeInsets.all(5) | +| child | widget? | 除了 icon 部分的自定义视图 | 否 | 无 | +| iconPadding | EdgeInsets? | 选择图标的padding | 否 | EdgeInsets.all(5) | | childOnRight | bool | widget在是否在选择 icon 的右边，false 就在左边 | 否 | true | | mainAxisAlignment | MainAxisAlignment | child 视图和 icon 在row布局里面的alignment | 否 | MainAxisAlignment.start | | mainAxisSize | MainAxisSize | child 视图和 icon 在row布局里面的mainAxisSize | 否 | MainAxisSize.min | +| behavior | HitTestBehavior | 默认值HitTestBehavior.translucent，控制widget.onRadioItemClick触发的点击范围 | 否 | HitTestBehavior.translucent | ## 四、代码演示 diff --git a/docs/components/radio/BrnRadioButton/img/BrnRadioButtonIntro.png b/doc/components/radio/BrnRadioButton/img/BrnRadioButtonIntro.png similarity index 100% rename from docs/components/radio/BrnRadioButton/img/BrnRadioButtonIntro.png rename to doc/components/radio/BrnRadioButton/img/BrnRadioButtonIntro.png diff --git a/docs/components/radio/BrnRadioButton/img/BrnRadioItemDemo1.png b/doc/components/radio/BrnRadioButton/img/BrnRadioItemDemo1.png similarity index 100% rename from docs/components/radio/BrnRadioButton/img/BrnRadioItemDemo1.png rename to doc/components/radio/BrnRadioButton/img/BrnRadioItemDemo1.png diff --git a/docs/components/radio/BrnRadioButton/img/BrnRadioItemDemo3.png b/doc/components/radio/BrnRadioButton/img/BrnRadioItemDemo3.png similarity index 100% rename from docs/components/radio/BrnRadioButton/img/BrnRadioItemDemo3.png rename to doc/components/radio/BrnRadioButton/img/BrnRadioItemDemo3.png diff --git a/docs/components/ratingBar/BrnRatingStar/BrnRatingStar.md b/doc/components/ratingBar/BrnRatingStar/BrnRatingStar.md similarity index 92% rename from docs/components/ratingBar/BrnRatingStar/BrnRatingStar.md rename to doc/components/ratingBar/BrnRatingStar/BrnRatingStar.md index bcda80f2..6251c6e4 100644 --- a/docs/components/ratingBar/BrnRatingStar/BrnRatingStar.md +++ b/doc/components/ratingBar/BrnRatingStar/BrnRatingStar.md @@ -25,7 +25,7 @@ group: ```dart const BrnRatingStar({ - Key key, + Key? key, this.count = DEFAULT_COUNT, this.selectedCount = 0, this.space = DEFAULT_SPACE, @@ -41,9 +41,9 @@ const BrnRatingStar({ | count | int | 星星总数 | 否 | 5 | | selectedCount | int | 初始选中的个数 | 否 | 0 | | space | double | 星星间距 | 否 | 1.0 | -| onSelected | ValueChanged | 点击回调，设置了才能支持点击选中操作 | 否 | | +| onSelected | `ValueChanged?` | 点击回调，设置了才能支持点击选中操作 | 否 | | | canRatingZero | bool | 是否可评 0 颗星，即第一颗星是否支持反选，默认不可评 0 星 | 否 | false | -| starBuilder | BrnRatingStarBuilder | 单颗星星视图的自定义构造器 | 否 | | +| starBuilder | BrnRatingStarBuilder? | 单颗星星视图的自定义构造器 | 否 | | ## 四、代码演示 diff --git a/docs/components/ratingBar/BrnRatingStar/img/BrnRatingStarDEmo4.png b/doc/components/ratingBar/BrnRatingStar/img/BrnRatingStarDEmo4.png similarity index 100% rename from docs/components/ratingBar/BrnRatingStar/img/BrnRatingStarDEmo4.png rename to doc/components/ratingBar/BrnRatingStar/img/BrnRatingStarDEmo4.png diff --git a/docs/components/ratingBar/BrnRatingStar/img/BrnRatingStarDemo1.png b/doc/components/ratingBar/BrnRatingStar/img/BrnRatingStarDemo1.png similarity index 100% rename from docs/components/ratingBar/BrnRatingStar/img/BrnRatingStarDemo1.png rename to doc/components/ratingBar/BrnRatingStar/img/BrnRatingStarDemo1.png diff --git a/docs/components/ratingBar/BrnRatingStar/img/BrnRatingStarDemo2.png b/doc/components/ratingBar/BrnRatingStar/img/BrnRatingStarDemo2.png similarity index 100% rename from docs/components/ratingBar/BrnRatingStar/img/BrnRatingStarDemo2.png rename to doc/components/ratingBar/BrnRatingStar/img/BrnRatingStarDemo2.png diff --git a/docs/components/ratingBar/BrnRatingStar/img/BrnRatingStarDemo3.png b/doc/components/ratingBar/BrnRatingStar/img/BrnRatingStarDemo3.png similarity index 100% rename from docs/components/ratingBar/BrnRatingStar/img/BrnRatingStarDemo3.png rename to doc/components/ratingBar/BrnRatingStar/img/BrnRatingStarDemo3.png diff --git a/docs/components/ratingBar/BrnRatingStar/img/BrnRatingStarIntro.png b/doc/components/ratingBar/BrnRatingStar/img/BrnRatingStarIntro.png similarity index 100% rename from docs/components/ratingBar/BrnRatingStar/img/BrnRatingStarIntro.png rename to doc/components/ratingBar/BrnRatingStar/img/BrnRatingStarIntro.png diff --git a/docs/components/search/BrnSearchText/BrnSearchText.md b/doc/components/search/BrnSearchText/BrnSearchText.md similarity index 57% rename from docs/components/search/BrnSearchText/BrnSearchText.md rename to doc/components/search/BrnSearchText/BrnSearchText.md index 3854f892..ad21dc85 100644 --- a/docs/components/search/BrnSearchText/BrnSearchText.md +++ b/doc/components/search/BrnSearchText/BrnSearchText.md @@ -36,31 +36,33 @@ group: ```dart -BrnSearchText( - {Key key, - this.searchController, - this.maxLines = 1, - this.maxLength, - this.hintText, - this.hintStyle, - this.textStyle, - this.prefixIcon, - this.onTextChange, - this.onTextCommit, - this.onActionTap, - this.maxHeight = 60, - this.innerPadding = const EdgeInsets.only(top: 10, bottom: 10, left: 20, right: 20), - this.outSideColor = Colors.white, - this.innerColor = const Color(0xfff8f8f8), - this.normalBorder, - this.activeBorder, - this.borderRadius = const BorderRadius.all(const Radius.circular(6.0)), - this.controller, - this.focusNode, - this.autoFocus = false, - this.textInputAction, - this.onTextClear, - this.action}) +const BrnSearchText({ + Key? key, + this.searchController, + this.controller, + this.maxLines = 1, + this.maxLength, + this.hintText, + this.hintStyle, + this.textStyle, + this.prefixIcon, + this.onTextChange, + this.onTextCommit, + this.onTextClear, + this.onActionTap, + this.action, + this.maxHeight = 60, + this.innerPadding = + const EdgeInsets.only(top: 10, bottom: 10, left: 20, right: 20), + this.outSideColor = Colors.white, + this.innerColor = const Color(0xfff8f8f8), + this.normalBorder, + this.activeBorder, + this.borderRadius = const BorderRadius.all(const Radius.circular(6.0)), + this.focusNode, + this.autoFocus = false, + this.textInputAction, +}) : super(key: key); ``` @@ -68,29 +70,29 @@ BrnSearchText( | **参数名** | **参数类型** | **作用** | **是否必填** | **默认值** | | --- | --- | --- | --- | --- | -| searchController | BrnSearchTextController | 用于控制 clear Icon 和右侧 Action 的显示与隐藏。等其他复杂的操作。 | 否 | 无 | -| controller | TextEditingController | 控制输入框行为和相应监听 | 否 | 无 | +| searchController | BrnSearchTextController? | 用于控制 clear Icon 和右侧 Action 的显示与隐藏。等其他复杂的操作。 | 否 | 无 | +| controller | TextEditingController? | 控制输入框行为和相应监听 | 否 | 无 | | maxLines | int | 允许输入的最大行数 | 否 | 1 | -| maxLength | int | 允许输入的最大长度 | 否 | 无 | -| hintText | String | 输入提示语,默认为"请输入搜索内容" | 否 | "请输入搜索内容" | -| hintStyle | TextStyle | 输入提示语的样式 | 否 | TextStyle(fontSize: 16,height: 1, textBaseline: TextBaseline.alphabetic,color: Color(0xff999999),) | -| textStyle | TextStyle | 输入文本的样式 | 否 | TextStyle(textBaseline: TextBaseline.alphabetic,color: BrunoColor.instance.F0Color, fontSize: 16) | -| prefixIcon | Widget | 输入框前置的图标 | 否 | 默认为搜索图标 | -| onTextChange | BrnOnSearchTextChange | 搜索框输入内容改变时候的回调函数,str为输入内容 | 否 | 无 | -| onTextCommit | BrnOnCommit | 输入内容点击搜索后的回调，content为输入内容 | 否 | 无 | -| onTextClear | ClearTapIntercept | 拦截取消的事件。
1、返回值为true，表明用户想要拦截，则不会走默认的清除行为
2、如果返回值为false，表明用户不想要拦截，在执行了用户的行为之后，还会走默认的行为 | 否 | 无 | -| onActionTap | VoidCallback | 右侧 action 区域点击的回调 | 否 | 无 | -| action | widget | 右侧操作 widget | 否 | 无 | +| maxLength | int? | 允许输入的最大长度 | 否 | 无 | +| hintText | String? | 输入提示语,默认为"请输入搜索内容" | 否 | "请输入搜索内容" | +| hintStyle | TextStyle? | 输入提示语的样式 | 否 | TextStyle(fontSize: 16,height: 1, textBaseline: TextBaseline.alphabetic,color: Color(0xff999999),) | +| textStyle | TextStyle? | 输入文本的样式 | 否 | TextStyle(textBaseline: TextBaseline.alphabetic,color: BrunoColor.instance.F0Color, fontSize: 16) | +| prefixIcon | Widget? | 输入框前置的图标 | 否 | 默认为搜索图标 | +| onTextChange | `BrnOnSearchTextChange=void Function(String content)?` | 搜索框输入内容改变时候的回调函数,str为输入内容 | 否 | 无 | +| onTextCommit | `BrnOnCommit=void Function(String content)?` | 输入内容点击搜索后的回调，content为输入内容 | 否 | 无 | +| onTextClear | `BrnOnTextClear = bool Function()?` | 拦截取消的事件。
1、返回值为true，表明用户想要拦截，则不会走默认的清除行为
2、如果返回值为false，表明用户不想要拦截，在执行了用户的行为之后，还会走默认的行为 | 否 | 无 | +| onActionTap | VoidCallback? | 右侧 action 区域点击的回调 | 否 | 无 | +| action | widget? | 右侧操作 widget | 否 | 无 | | maxHeight | double | 搜索框的最大高 | 否 | 60 | | innerPadding | EdgeInsets | 文本内容与边框的边距，设置该字段会导致显示区域变小。 | 否 | EdgeInsets.only(top: 10, bottom: 10, left: 20, right: 20) | | outSideColor | Color | 包裹搜索框的容器背景色 | 否 | 白色 | | innerColor | Color | 搜索框内部的颜色 | 否 | Color(0xfff8f8f8) | -| normalBorder | BoxBorder | 一般状态边框 | 否 | Border.all(width: 1.0, color: widget.innerColor) | -| activeBorder | BoxBorder | 激活状态边框 | 否 | Border.all(width: 1.0, color: widget.innerColor) | +| normalBorder | BoxBorder? | 一般状态边框 | 否 | Border.all(width: 1.0, color: widget.innerColor) | +| activeBorder | BoxBorder? | 激活状态边框 | 否 | Border.all(width: 1.0, color: widget.innerColor) | | borderRadius | BorderRadius | 边框圆角 | 否 | BorderRadius.all(const Radius.circular(6.0)) | -| focusNode | FocusNode | 管理焦点 | 否 | 无 | +| focusNode | FocusNode? | 管理焦点 | 否 | 无 | | autofocus | bool | 是否自动获取焦点 | 否 | false | -| textInputAction | TextInputAction | 用于控制键盘动作 | 否 | 无 | +| textInputAction | TextInputAction? | 用于控制键盘动作 | 否 | 无 | diff --git a/docs/components/search/BrnSearchText/img/1620980916893bbbbb.gif b/doc/components/search/BrnSearchText/img/1620980916893bbbbb.gif similarity index 100% rename from docs/components/search/BrnSearchText/img/1620980916893bbbbb.gif rename to doc/components/search/BrnSearchText/img/1620980916893bbbbb.gif diff --git a/docs/components/search/BrnSearchText/img/1620981018721ccccc.gif b/doc/components/search/BrnSearchText/img/1620981018721ccccc.gif similarity index 100% rename from docs/components/search/BrnSearchText/img/1620981018721ccccc.gif rename to doc/components/search/BrnSearchText/img/1620981018721ccccc.gif diff --git a/docs/components/search/BrnSearchText/img/BrnSearchTextDemo1.gif b/doc/components/search/BrnSearchText/img/BrnSearchTextDemo1.gif similarity index 100% rename from docs/components/search/BrnSearchText/img/BrnSearchTextDemo1.gif rename to doc/components/search/BrnSearchText/img/BrnSearchTextDemo1.gif diff --git a/docs/components/search/BrnSearchText/img/BrnSearchTextDemo2.png b/doc/components/search/BrnSearchText/img/BrnSearchTextDemo2.png similarity index 100% rename from docs/components/search/BrnSearchText/img/BrnSearchTextDemo2.png rename to doc/components/search/BrnSearchText/img/BrnSearchTextDemo2.png diff --git a/docs/components/search/BrnSearchText/img/BrnSearchTextIntro.png b/doc/components/search/BrnSearchText/img/BrnSearchTextIntro.png similarity index 100% rename from docs/components/search/BrnSearchText/img/BrnSearchTextIntro.png rename to doc/components/search/BrnSearchText/img/BrnSearchTextIntro.png diff --git a/docs/components/selection/BrnFlatSelection/BrnFlatSelection.md b/doc/components/selection/BrnFlatSelection/BrnFlatSelection.md similarity index 100% rename from docs/components/selection/BrnFlatSelection/BrnFlatSelection.md rename to doc/components/selection/BrnFlatSelection/BrnFlatSelection.md diff --git a/docs/components/selection/BrnFlatSelection/img/BrnFlatSelectionDemo1.png b/doc/components/selection/BrnFlatSelection/img/BrnFlatSelectionDemo1.png similarity index 100% rename from docs/components/selection/BrnFlatSelection/img/BrnFlatSelectionDemo1.png rename to doc/components/selection/BrnFlatSelection/img/BrnFlatSelectionDemo1.png diff --git a/docs/components/selection/BrnFlatSelection/img/BrnFlatSelectionDemo2.png b/doc/components/selection/BrnFlatSelection/img/BrnFlatSelectionDemo2.png similarity index 100% rename from docs/components/selection/BrnFlatSelection/img/BrnFlatSelectionDemo2.png rename to doc/components/selection/BrnFlatSelection/img/BrnFlatSelectionDemo2.png diff --git a/docs/components/selection/BrnFlatSelection/img/BrnFlatSelectionIntro.png b/doc/components/selection/BrnFlatSelection/img/BrnFlatSelectionIntro.png similarity index 100% rename from docs/components/selection/BrnFlatSelection/img/BrnFlatSelectionIntro.png rename to doc/components/selection/BrnFlatSelection/img/BrnFlatSelectionIntro.png diff --git a/docs/components/selection/BrnSelectionView/BrnSelectionView.md b/doc/components/selection/BrnSelectionView/BrnSelectionView.md similarity index 99% rename from docs/components/selection/BrnSelectionView/BrnSelectionView.md rename to doc/components/selection/BrnSelectionView/BrnSelectionView.md index b6938eb8..67a1119c 100644 --- a/docs/components/selection/BrnSelectionView/BrnSelectionView.md +++ b/doc/components/selection/BrnSelectionView/BrnSelectionView.md @@ -9,9 +9,9 @@ group: 用于筛选数据 -相关组件 [BrnFlatSelectionWidget](../brn-flat-selection/brn-flat-selection) +相关组件 [BrnFlatSelectionWidget](../widgets/brn-flat-selection) -相关组件 [BrnSimpleSelection](../brn-simple-selection/brn-simple-selection) +相关组件 [BrnSimpleSelection](../widgets/brn-simple-selection) ## 一、效果总览 diff --git a/docs/components/selection/BrnSelectionView/img/BrnSelectionViewDemo1.png b/doc/components/selection/BrnSelectionView/img/BrnSelectionViewDemo1.png similarity index 100% rename from docs/components/selection/BrnSelectionView/img/BrnSelectionViewDemo1.png rename to doc/components/selection/BrnSelectionView/img/BrnSelectionViewDemo1.png diff --git a/docs/components/selection/BrnSelectionView/img/BrnSelectionViewDemo2.png b/doc/components/selection/BrnSelectionView/img/BrnSelectionViewDemo2.png similarity index 100% rename from docs/components/selection/BrnSelectionView/img/BrnSelectionViewDemo2.png rename to doc/components/selection/BrnSelectionView/img/BrnSelectionViewDemo2.png diff --git a/docs/components/selection/BrnSelectionView/img/BrnSelectionViewDemo4.gif b/doc/components/selection/BrnSelectionView/img/BrnSelectionViewDemo4.gif similarity index 100% rename from docs/components/selection/BrnSelectionView/img/BrnSelectionViewDemo4.gif rename to doc/components/selection/BrnSelectionView/img/BrnSelectionViewDemo4.gif diff --git a/docs/components/selection/BrnSelectionView/img/BrnSelectionViewDemo5.png b/doc/components/selection/BrnSelectionView/img/BrnSelectionViewDemo5.png similarity index 100% rename from docs/components/selection/BrnSelectionView/img/BrnSelectionViewDemo5.png rename to doc/components/selection/BrnSelectionView/img/BrnSelectionViewDemo5.png diff --git a/docs/components/selection/BrnSelectionView/img/BrnSelectionViewIntro.png b/doc/components/selection/BrnSelectionView/img/BrnSelectionViewIntro.png similarity index 100% rename from docs/components/selection/BrnSelectionView/img/BrnSelectionViewIntro.png rename to doc/components/selection/BrnSelectionView/img/BrnSelectionViewIntro.png diff --git a/docs/components/selection/BrnSelectionView/img/BrnSelectionViewIntro2.png b/doc/components/selection/BrnSelectionView/img/BrnSelectionViewIntro2.png similarity index 100% rename from docs/components/selection/BrnSelectionView/img/BrnSelectionViewIntro2.png rename to doc/components/selection/BrnSelectionView/img/BrnSelectionViewIntro2.png diff --git a/docs/components/selection/BrnSelectionView/img/BrnSelectionViewIntro3.png b/doc/components/selection/BrnSelectionView/img/BrnSelectionViewIntro3.png similarity index 100% rename from docs/components/selection/BrnSelectionView/img/BrnSelectionViewIntro3.png rename to doc/components/selection/BrnSelectionView/img/BrnSelectionViewIntro3.png diff --git a/docs/components/selection/BrnSelectionView/img/BrnSelectionViewMorePage.png b/doc/components/selection/BrnSelectionView/img/BrnSelectionViewMorePage.png similarity index 100% rename from docs/components/selection/BrnSelectionView/img/BrnSelectionViewMorePage.png rename to doc/components/selection/BrnSelectionView/img/BrnSelectionViewMorePage.png diff --git a/docs/components/selection/BrnSelectionView/img/BrnSelectionViewMorePage2.png b/doc/components/selection/BrnSelectionView/img/BrnSelectionViewMorePage2.png similarity index 100% rename from docs/components/selection/BrnSelectionView/img/BrnSelectionViewMorePage2.png rename to doc/components/selection/BrnSelectionView/img/BrnSelectionViewMorePage2.png diff --git a/docs/components/selection/BrnSelectionView/img/image-20211030160608171.png b/doc/components/selection/BrnSelectionView/img/image-20211030160608171.png similarity index 100% rename from docs/components/selection/BrnSelectionView/img/image-20211030160608171.png rename to doc/components/selection/BrnSelectionView/img/image-20211030160608171.png diff --git a/docs/components/selection/BrnSelectionView/img/image-20211101155937783.png b/doc/components/selection/BrnSelectionView/img/image-20211101155937783.png similarity index 100% rename from docs/components/selection/BrnSelectionView/img/image-20211101155937783.png rename to doc/components/selection/BrnSelectionView/img/image-20211101155937783.png diff --git a/docs/components/selection/BrnSimpleSelection/BrnSimpleSelection.md b/doc/components/selection/BrnSimpleSelection/BrnSimpleSelection.md similarity index 100% rename from docs/components/selection/BrnSimpleSelection/BrnSimpleSelection.md rename to doc/components/selection/BrnSimpleSelection/BrnSimpleSelection.md diff --git a/docs/components/selection/BrnSimpleSelection/img/simple_selection_checkbox.png b/doc/components/selection/BrnSimpleSelection/img/simple_selection_checkbox.png similarity index 100% rename from docs/components/selection/BrnSimpleSelection/img/simple_selection_checkbox.png rename to doc/components/selection/BrnSimpleSelection/img/simple_selection_checkbox.png diff --git a/docs/components/selection/BrnSimpleSelection/img/simple_selection_radio.png b/doc/components/selection/BrnSimpleSelection/img/simple_selection_radio.png similarity index 100% rename from docs/components/selection/BrnSimpleSelection/img/simple_selection_radio.png rename to doc/components/selection/BrnSimpleSelection/img/simple_selection_radio.png diff --git a/docs/components/shadowCard/BrnShadowCard/BrnShadowCard.md b/doc/components/shadowCard/BrnShadowCard/BrnShadowCard.md similarity index 78% rename from docs/components/shadowCard/BrnShadowCard/BrnShadowCard.md rename to doc/components/shadowCard/BrnShadowCard/BrnShadowCard.md index 3a04a84a..bcf9d133 100644 --- a/docs/components/shadowCard/BrnShadowCard/BrnShadowCard.md +++ b/doc/components/shadowCard/BrnShadowCard/BrnShadowCard.md @@ -25,30 +25,30 @@ group: ```dart BrnShadowCard( - {@required this.child, - this.color, - this.shadowColor, - this.padding, - this.circular = 4.0, - this.blurRadius = 5.0, - this.spreadRadius = 0, - this.offset = Offset.zero, - this.borderWidth = 0.5}); + {required this.child, + this.color = const Color(0xfffafafa), + this.shadowColor = const Color(0xffeeeeee), + this.padding = const EdgeInsets.all(0), + this.circular = 4.0, + this.blurRadius = 5.0, + this.spreadRadius = 0, + this.offset = Offset.zero, + this.borderWidth = 0.5}); ``` ### 参数说明 | **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | | ------------ | ------------------ | ----------------- | ------------ | ----------------- | -| color | Color | 背景色 | 否 | | +| color | Color | 背景色 | 否 | Color(0xfffafafa) | | shadowColor | Color | 阴影颜色 | 否 | Color(0xffeeeeee) | | offset | Offset | 阴影 xy 轴偏移量 | 否 | 0 | -| padding | EdgeInsetsGeometry | 内边距 | 否 | | +| padding | EdgeInsetsGeometry | 内边距 | 否 | EdgeInsets.all(0) | | circular | double | 圆角大小 | 否 | 4.0 | | blurRadius | double | 阴影模糊程度 | 否 | 5.0 | | spreadRadius | double | 阴影扩散程度 | 否 | 0 | | borderWidth | double | 边框宽度 | 否 | 0.5 | -| child | Widget | 需要填充的 widget | 否 | 无 | +| child | Widget | 需要填充的 widget | 是 | 无 | ## 三、代码演示 diff --git a/docs/components/shadowCard/BrnShadowCard/img/BrnShadowCardIntro.png b/doc/components/shadowCard/BrnShadowCard/img/BrnShadowCardIntro.png similarity index 100% rename from docs/components/shadowCard/BrnShadowCard/img/BrnShadowCardIntro.png rename to doc/components/shadowCard/BrnShadowCard/img/BrnShadowCardIntro.png diff --git a/docs/components/shadowCard/BrnShadowCard/img/BrnShadowCardIntroDemo1.png b/doc/components/shadowCard/BrnShadowCard/img/BrnShadowCardIntroDemo1.png similarity index 100% rename from docs/components/shadowCard/BrnShadowCard/img/BrnShadowCardIntroDemo1.png rename to doc/components/shadowCard/BrnShadowCard/img/BrnShadowCardIntroDemo1.png diff --git a/docs/components/stepBar/BrnHorizontalSteps/BrnHorizontalSteps.md b/doc/components/stepBar/BrnHorizontalSteps/BrnHorizontalSteps.md similarity index 83% rename from docs/components/stepBar/BrnHorizontalSteps/BrnHorizontalSteps.md rename to doc/components/stepBar/BrnHorizontalSteps/BrnHorizontalSteps.md index 9a6380ec..e5d627da 100644 --- a/docs/components/stepBar/BrnHorizontalSteps/BrnHorizontalSteps.md +++ b/doc/components/stepBar/BrnHorizontalSteps/BrnHorizontalSteps.md @@ -34,12 +34,19 @@ group: ### 构造函数 ```dart -BrnHorizontalSteps({this.steps, this.controller, this.doingIcon, this.completedIcon}); +const BrnHorizontalSteps({ + Key? key, + required this.steps, + this.controller, + this.doingIcon, + this.completedIcon, + }) : assert(steps.length < 6), + super(key: key); ``` ### 参数说明 -#### BrnHorizontalStepsManager方法说明 +#### BrnStepsController 方法说明 | **方法名** | **参数** | **描述** | | --- | --- | --- | @@ -63,11 +70,11 @@ BrnHorizontalSteps({this.steps, this.controller, this.doingIcon, this.completedI | 参数名称 | 参数类型 | 描述 | | --- | --- | --- | -| stepContentText | String | 步骤显示的文案 | -| stepContent | Widget | 步骤自定义视图，如果stepContentText同时存在，此属性优先级更高 | -| doingIcon | Widget | 步骤正在进行时的图标自定义视图 | -| completedIcon | Widget | 步骤完成时的图标自定义视图 | -| state | BrunoStepState | indexed/doing/complete未进行/正在进行/已完成 | +| stepContentText | String? | 步骤显示的文案 | +| stepContent | Widget? | 步骤自定义视图，如果stepContentText同时存在，此属性优先级更高 | +| doingIcon | Widget? | 步骤正在进行时的图标自定义视图 | +| completedIcon | Widget? | 步骤完成时的图标自定义视图 | +| state | BrunoStepState? | indexed/doing/complete未进行/正在进行/已完成 | ## 四、代码演示 diff --git a/docs/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps1.jpg b/doc/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps1.jpg similarity index 100% rename from docs/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps1.jpg rename to doc/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps1.jpg diff --git a/docs/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps2.jpg b/doc/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps2.jpg similarity index 100% rename from docs/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps2.jpg rename to doc/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps2.jpg diff --git a/docs/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps3.jpg b/doc/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps3.jpg similarity index 100% rename from docs/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps3.jpg rename to doc/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps3.jpg diff --git a/docs/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps4.jpg b/doc/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps4.jpg similarity index 100% rename from docs/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps4.jpg rename to doc/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps4.jpg diff --git a/docs/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps5.png b/doc/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps5.png similarity index 100% rename from docs/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps5.png rename to doc/components/stepBar/BrnHorizontalSteps/img/BrnMetaHorizontalSteps5.png diff --git a/docs/components/stepBar/BrnStepLine/BrnStepLine.md b/doc/components/stepBar/BrnStepLine/BrnStepLine.md similarity index 73% rename from docs/components/stepBar/BrnStepLine/BrnStepLine.md rename to doc/components/stepBar/BrnStepLine/BrnStepLine.md index 87efcc01..3f98843a 100644 --- a/docs/components/stepBar/BrnStepLine/BrnStepLine.md +++ b/doc/components/stepBar/BrnStepLine/BrnStepLine.md @@ -32,9 +32,9 @@ group: ### 构造函数 ```dart -BrnStepLine({ - Key key, - @required this.contentWidget, +const BrnStepLine({ + Key? key, + required this.contentWidget, this.isGrey = false, this.lineColor, this.lineWidth = 2, @@ -46,25 +46,25 @@ BrnStepLine({ this.normalColor, this.highlightColor, this.iconWidget, -}) +}) : super(key: key); ``` ### 参数说明 -| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | -| ------------------ | ------------------------ | -------------------------------------- | ------------ | ----------------- | -| contentWidget | Widget | 右侧显示的 widget | 是 | 无 | -| isGrey | bool | 是否整体是灰色：线条和 Icon， | 否 | false | -| lineColor | Color 或者 `List` | 边框线的颜色，如果是数组则分段展示线条 | 否 | 主题色 | -| lineWidth | double | 线的宽度 | 否 | 2 | -| iconTopPadding | double | icon 距离所在 Item 项顶部的 padding | 否 | 0 | -| isDashLine | bool | 是否是虚线模式 | 否 | false | -| dashLength | double | 小虚线短的长度 | 否 | 4 | -| dashSpace | double | 小虚线段之间的间隔 | 否 | 4 | -| contentLeftPadding | double | contentWidget 距离左侧的 padding | 否 | 12 | -| normalColor | Color | 普通状态(isGrey=true)的颜色 | 否 | Color(0xffeeeeee) | -| highlightColor | Color | 高亮状态(isGrey=false)的颜色 | 否 | 主题色 | -| iconWidget | Widget | 自定义 icon 的 widget | 否 | 无 | +| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | +| ------------------ | ------------ | ------------------------------------------------------------ | ------------ | ----------------- | +| contentWidget | Widget | 右侧显示的 widget | 是 | 无 | +| isGrey | bool | 是否整体是灰色：线条和 Icon | 否 | false | +| lineColor | dynamic | Color 或者 `List`,边框线的颜色，如果是数组则分段展示线条 | 否 | 主题色 | +| lineWidth | double | 线的宽度 | 否 | 2 | +| iconTopPadding | double | icon 距离所在 Item 项顶部的 padding | 否 | 0 | +| isDashLine | bool | 是否是虚线模式 | 否 | false | +| dashLength | double | 小虚线短的长度 | 否 | 4 | +| dashSpace | double | 小虚线段之间的间隔 | 否 | 4 | +| contentLeftPadding | double | contentWidget 距离左侧的 padding | 否 | 12 | +| normalColor | Color? | 普通状态(isGrey=true)的颜色 | 否 | Color(0xffeeeeee) | +| highlightColor | Color? | 高亮状态(isGrey=false)的颜色 | 否 | 主题色 | +| iconWidget | Widget? | 自定义 icon 的 widget | 否 | 无 | ## 四、代码演示 diff --git a/docs/components/stepBar/BrnStepLine/img/BrnStepLine1.png b/doc/components/stepBar/BrnStepLine/img/BrnStepLine1.png similarity index 100% rename from docs/components/stepBar/BrnStepLine/img/BrnStepLine1.png rename to doc/components/stepBar/BrnStepLine/img/BrnStepLine1.png diff --git a/docs/components/stepBar/BrnStepLine/img/BrnStepLine2.png b/doc/components/stepBar/BrnStepLine/img/BrnStepLine2.png similarity index 100% rename from docs/components/stepBar/BrnStepLine/img/BrnStepLine2.png rename to doc/components/stepBar/BrnStepLine/img/BrnStepLine2.png diff --git a/docs/components/stepBar/BrnStepLine/img/BrnStepLine3.png b/doc/components/stepBar/BrnStepLine/img/BrnStepLine3.png similarity index 100% rename from docs/components/stepBar/BrnStepLine/img/BrnStepLine3.png rename to doc/components/stepBar/BrnStepLine/img/BrnStepLine3.png diff --git a/docs/components/stepBar/BrnStepLine/img/BrnStepLine4.png b/doc/components/stepBar/BrnStepLine/img/BrnStepLine4.png similarity index 100% rename from docs/components/stepBar/BrnStepLine/img/BrnStepLine4.png rename to doc/components/stepBar/BrnStepLine/img/BrnStepLine4.png diff --git a/docs/components/tabbar/BrnTabBar/BrnTabBar.md b/doc/components/tabbar/BrnTabBar/BrnTabBar.md similarity index 100% rename from docs/components/tabbar/BrnTabBar/BrnTabBar.md rename to doc/components/tabbar/BrnTabBar/BrnTabBar.md diff --git a/docs/components/tabbar/BrnTabBar/img/BrnTabBarDemo1.png b/doc/components/tabbar/BrnTabBar/img/BrnTabBarDemo1.png similarity index 100% rename from docs/components/tabbar/BrnTabBar/img/BrnTabBarDemo1.png rename to doc/components/tabbar/BrnTabBar/img/BrnTabBarDemo1.png diff --git a/docs/components/tabbar/BrnTabBar/img/BrnTabBarDemo2.png b/doc/components/tabbar/BrnTabBar/img/BrnTabBarDemo2.png similarity index 100% rename from docs/components/tabbar/BrnTabBar/img/BrnTabBarDemo2.png rename to doc/components/tabbar/BrnTabBar/img/BrnTabBarDemo2.png diff --git a/docs/components/tabbar/BrnTabBar/img/BrnTabBarDemo3.png b/doc/components/tabbar/BrnTabBar/img/BrnTabBarDemo3.png similarity index 100% rename from docs/components/tabbar/BrnTabBar/img/BrnTabBarDemo3.png rename to doc/components/tabbar/BrnTabBar/img/BrnTabBarDemo3.png diff --git a/docs/components/tabbar/BrnTabBar/img/BrnTabBarDemo4.png b/doc/components/tabbar/BrnTabBar/img/BrnTabBarDemo4.png similarity index 100% rename from docs/components/tabbar/BrnTabBar/img/BrnTabBarDemo4.png rename to doc/components/tabbar/BrnTabBar/img/BrnTabBarDemo4.png diff --git a/docs/components/tabbar/BrnTabBar/img/BrnTabBarDemo5.png b/doc/components/tabbar/BrnTabBar/img/BrnTabBarDemo5.png similarity index 100% rename from docs/components/tabbar/BrnTabBar/img/BrnTabBarDemo5.png rename to doc/components/tabbar/BrnTabBar/img/BrnTabBarDemo5.png diff --git a/docs/components/tabbar/BrnTabBar/img/BrnTabBarDemo6.png b/doc/components/tabbar/BrnTabBar/img/BrnTabBarDemo6.png similarity index 100% rename from docs/components/tabbar/BrnTabBar/img/BrnTabBarDemo6.png rename to doc/components/tabbar/BrnTabBar/img/BrnTabBarDemo6.png diff --git a/docs/components/tabbar/BrnTabBar/img/BrnTabBarIntro.png b/doc/components/tabbar/BrnTabBar/img/BrnTabBarIntro.png similarity index 100% rename from docs/components/tabbar/BrnTabBar/img/BrnTabBarIntro.png rename to doc/components/tabbar/BrnTabBar/img/BrnTabBarIntro.png diff --git a/docs/components/tag/BrnDeleteTag/BrnDeleteTag.md b/doc/components/tag/BrnDeleteTag/BrnDeleteTag.md similarity index 66% rename from docs/components/tag/BrnDeleteTag/BrnDeleteTag.md rename to doc/components/tag/BrnDeleteTag/BrnDeleteTag.md index 4afc378e..8527c202 100644 --- a/docs/components/tag/BrnDeleteTag/BrnDeleteTag.md +++ b/doc/components/tag/BrnDeleteTag/BrnDeleteTag.md @@ -34,7 +34,7 @@ group: ```dart BrnDeleteTag( - {Key key, + {Key? key, this.tags, this.controller, this.onTagDelete, @@ -46,8 +46,17 @@ BrnDeleteTag( this.deleteIconColor, this.deleteIconSize, this.softWrap = true, - this.padding, + this.padding = const EdgeInsets.fromLTRB(20, 0, 20, 0), this.themeData}) + : super(key: key) { + themeData ??= BrnTagConfig(); + themeData = themeData!.merge(BrnTagConfig( + tagBackgroundColor: this.backgroundColor, + tagTextStyle: BrnTextStyle.withStyle(tagTextStyle))); + themeData = BrnThemeConfigurator.instance + .getConfig(configId: themeData!.configId) + .tagConfig + .merge(this.themeData); ``` @@ -56,18 +65,19 @@ BrnDeleteTag( | **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | | --- | --- | --- | --- | --- | -| tags | List | 展示的标签列表 | 是 | | -| controller | BrnDeleteTagController | 标签控制器，用于主动添加标签，如果只需要删除标签并进行回调可以不传控制器 | 否 | | -| onTagDelete | Function(List, String, int) | 点击删除某个标签后将现有的所有标签，删除的标签内容，删除的标签index回传 | 否 | | -| verticalSpacing | double | 垂直方向的间距 | 否 | 10 | -| horizontalSpacing | double | 水平方向的间距 | 否 | 10，softWrap false 时 12 | -| tagTextStyle | TextStyle | 标签的字体样式 | 否 | | -| shape | ShapeBorder | 标签的圆角 | 否 | | -| backgroundColor | Color | 标签背景色 | 否 | | -| deleteIconSize | Size | 设置删除 Icon的大小 | 否 | 默认值为内置删除 icon 的图片大小。 | -| deleteIconColor | Color | 删除图标的颜色 | 否 | | +| tags | `List?` | 展示的标签列表 | 是 | | +| controller | BrnDeleteTagController? | 标签控制器，用于主动添加标签，如果只需要删除标签并进行回调可以不传控制器 | 否 | | +| onTagDelete | `Function(List, String?, int)?` | 点击删除某个标签后将现有的所有标签，删除的标签内容，删除的标签index回传 | 否 | | +| verticalSpacing | double? | 垂直方向的间距 | 否 | 10 | +| horizontalSpacing | double? | 水平方向的间距 | 否 | 10，softWrap false 时 12 | +| tagTextStyle | TextStyle? | 标签的字体样式 | 否 | | +| shape | OutlinedBorder? | 标签的圆角 | 否 | | +| backgroundColor | Color? | 标签背景色 | 否 | | +| deleteIconSize | Size? | 设置删除 Icon的大小 | 否 | 默认值为内置删除 icon 的图片大小。 | +| deleteIconColor | Color? | 删除图标的颜色 | 否 | | | softWrap | bool | 是否为流式布局true流式，false横向滑动 | 否 | true | | padding | EdgeInsets | 内容边距 | 否 | EdgeInsets.fromLTRB(20, 0, 20, 0) | +| themeData; | BrnTagConfig? | 主题配置信息，包含标签背景色、文本颜色等字段 | 否 | | ### BrnDeleteTagController @@ -75,8 +85,8 @@ BrnDeleteTag( | 方法名 | **参数类型** | **作用** | | --- | --- | --- | -| setTags | List | 设置标签 | -| addTags | List | 将标签集合添加到现有的标签集合中 | +| setTags | `List` | 设置标签 | +| addTags | `List` | 将标签集合添加到现有的标签集合中 | | addTag | String | 添加一个标签 | | clear | Function | 清空标签 | | deleteForIndex | int | 删除某个index底下tag | diff --git a/docs/components/tag/BrnDeleteTag/img/BrnDeleteTagDemo1.png b/doc/components/tag/BrnDeleteTag/img/BrnDeleteTagDemo1.png similarity index 100% rename from docs/components/tag/BrnDeleteTag/img/BrnDeleteTagDemo1.png rename to doc/components/tag/BrnDeleteTag/img/BrnDeleteTagDemo1.png diff --git a/docs/components/tag/BrnDeleteTag/img/BrnDeleteTagDemo2.png b/doc/components/tag/BrnDeleteTag/img/BrnDeleteTagDemo2.png similarity index 100% rename from docs/components/tag/BrnDeleteTag/img/BrnDeleteTagDemo2.png rename to doc/components/tag/BrnDeleteTag/img/BrnDeleteTagDemo2.png diff --git a/docs/components/tag/BrnDeleteTag/img/BrnDeleteTagIntro.png b/doc/components/tag/BrnDeleteTag/img/BrnDeleteTagIntro.png similarity index 100% rename from docs/components/tag/BrnDeleteTag/img/BrnDeleteTagIntro.png rename to doc/components/tag/BrnDeleteTag/img/BrnDeleteTagIntro.png diff --git a/docs/components/tag/BrnSelectTag/BrnSelectTag.md b/doc/components/tag/BrnSelectTag/BrnSelectTag.md similarity index 73% rename from docs/components/tag/BrnSelectTag/BrnSelectTag.md rename to doc/components/tag/BrnSelectTag/BrnSelectTag.md index f9ecccee..8ffca7df 100644 --- a/docs/components/tag/BrnSelectTag/BrnSelectTag.md +++ b/doc/components/tag/BrnSelectTag/BrnSelectTag.md @@ -36,24 +36,40 @@ group: ```dart BrnSelectTag({ - Key key, - @required this.tags, - this.onSelect, - this.spacing = 12, - this.verticalSpacing = 10, - this.tagTextStyle, - this.selectedTagTextStyle, - this.tagBackgroundColor, - this.selectedTagBackgroundColor, - this.tagWidth, - this.tagHeight, - this.isSingleSelect = true, - this.initTagState, - this.softWrap = true, - this.alignment = Alignment.centerLeft, - this.fixWidthMode = true, - this.themeData, - }) + Key? key, + required this.tags, + this.onSelect, + this.spacing = 12, + this.verticalSpacing = 10, + this.tagTextStyle, + this.selectedTagTextStyle, + this.tagBackgroundColor, + this.selectedTagBackgroundColor, + this.tagWidth, + this.tagHeight, + this.isSingleSelect = true, + this.initTagState, + this.softWrap = true, + this.alignment = Alignment.centerLeft, + this.fixWidthMode = true, + this.themeData, +}) : super(key: key) { + if (isSingleSelect == true) { + assert(initTagState == null || (initTagState!.length <= 1)); + } + this.themeData ??= BrnTagConfig(); + this.themeData = this.themeData!.merge(BrnTagConfig( + tagBackgroundColor: this.tagBackgroundColor, + tagTextStyle: BrnTextStyle.withStyle(this.tagTextStyle), + selectTagTextStyle: BrnTextStyle.withStyle(this.selectedTagTextStyle), + tagWidth: this.tagWidth, + tagHeight: this.tagHeight, + selectedTagBackgroundColor: this.selectedTagBackgroundColor)); + this.themeData = BrnThemeConfigurator.instance + .getConfig(configId: this.themeData!.configId) + .tagConfig + .merge(this.themeData); +} ``` @@ -62,21 +78,22 @@ BrnSelectTag({ | **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | | --- | --- | --- | --- | --- | -| tags | List | 展示的标签列表 | 是 | | -| onSelect | void Function(List) | 点击标签的回调， | 否 | | +| tags | `List` | 展示的标签列表 | 是 | | +| onSelect | `void Function(List)?` | 点击标签的回调， | 否 | | | spacing | double | 水平间距 | 否 | 12 | | verticalSpacing | double | 垂直间距 | 否 | 10 | -| tagTextStyle | TextStyle | 普通标签的样式 | 否 | | -| selectedTagTextStyle | TextStyle | 选中的标签样式 | 否 | | -| tagBackgroundColor | Color | 普通标签背景色 | 否 | F0Color | -| selectedTagBackgroundColor | Color | 选中的标签背景色 | 否 | B0Color | -| tagWidth | double | 标签宽度 | 否 | 75 | -| tagHeight | double | 标签高度 | 否 | 34 | +| tagTextStyle | TextStyle? | 普通标签的样式 | 否 | | +| selectedTagTextStyle | TextStyle? | 选中的标签样式 | 否 | | +| tagBackgroundColor | Color? | 普通标签背景色 | 否 | F0Color | +| selectedTagBackgroundColor | Color? | 选中的标签背景色 | 否 | B0Color | +| tagWidth | double? | 标签宽度 | 否 | 75 | +| tagHeight | double? | 标签高度 | 否 | 34 | | isSingleSelect | bool | 是否是单选 | 否 | true | -| initTagState | List | 初始选中的标签状态 | 否 | | +| initTagState | `List?` | 初始选中的标签状态 | 否 | | | softWrap | bool | 是否为流式布局，true流式，false横向滑动 | 否 | true | | aligment | Alignment | 对齐模式，默认为靠左 | 否 | Alignment.centerLeft | | fixWidthMode | bool | 是否为宽度固定模式，true宽度固定，false宽度自适应 | 否 | true | +| themeData | BrnTagConfig? | 主题定制属性 | 否 | | diff --git a/docs/components/tag/BrnSelectTag/img/BrnSelectTagDemo1.png b/doc/components/tag/BrnSelectTag/img/BrnSelectTagDemo1.png similarity index 100% rename from docs/components/tag/BrnSelectTag/img/BrnSelectTagDemo1.png rename to doc/components/tag/BrnSelectTag/img/BrnSelectTagDemo1.png diff --git a/docs/components/tag/BrnSelectTag/img/BrnSelectTagDemo2.png b/doc/components/tag/BrnSelectTag/img/BrnSelectTagDemo2.png similarity index 100% rename from docs/components/tag/BrnSelectTag/img/BrnSelectTagDemo2.png rename to doc/components/tag/BrnSelectTag/img/BrnSelectTagDemo2.png diff --git a/docs/components/tag/BrnSelectTag/img/BrnSelectTagDemo3.png b/doc/components/tag/BrnSelectTag/img/BrnSelectTagDemo3.png similarity index 100% rename from docs/components/tag/BrnSelectTag/img/BrnSelectTagDemo3.png rename to doc/components/tag/BrnSelectTag/img/BrnSelectTagDemo3.png diff --git a/docs/components/tag/BrnSelectTag/img/BrnSelectTagDemo4.png b/doc/components/tag/BrnSelectTag/img/BrnSelectTagDemo4.png similarity index 100% rename from docs/components/tag/BrnSelectTag/img/BrnSelectTagDemo4.png rename to doc/components/tag/BrnSelectTag/img/BrnSelectTagDemo4.png diff --git a/docs/components/tag/BrnSelectTag/img/BrnSelectTagDemo5.png b/doc/components/tag/BrnSelectTag/img/BrnSelectTagDemo5.png similarity index 100% rename from docs/components/tag/BrnSelectTag/img/BrnSelectTagDemo5.png rename to doc/components/tag/BrnSelectTag/img/BrnSelectTagDemo5.png diff --git a/docs/components/tag/BrnSelectTag/img/BrnSelectTagIntro.png b/doc/components/tag/BrnSelectTag/img/BrnSelectTagIntro.png similarity index 100% rename from docs/components/tag/BrnSelectTag/img/BrnSelectTagIntro.png rename to doc/components/tag/BrnSelectTag/img/BrnSelectTagIntro.png diff --git a/docs/components/tag/BrnStateTag/BrnStateTag.md b/doc/components/tag/BrnStateTag/BrnStateTag.md similarity index 84% rename from docs/components/tag/BrnStateTag/BrnStateTag.md rename to doc/components/tag/BrnStateTag/BrnStateTag.md index 5a563544..a1ac1c18 100644 --- a/docs/components/tag/BrnStateTag/BrnStateTag.md +++ b/doc/components/tag/BrnStateTag/BrnStateTag.md @@ -24,14 +24,13 @@ group: ### 构造函数 ```dart - BrnStateTag( - {Key key, - this.tagText, - this.backgroundColor, - this.textColor, - this.tagState = TagState.waiting}) - : super(key: key) - +const BrnStateTag({ + Key? key, + required this.tagText, + this.tagState = TagState.waiting, + this.backgroundColor, + this.textColor, + }) : super(key: key); ``` ### 参数说明 @@ -40,8 +39,8 @@ group: | --------------- | ------------ | ------------------ | ------------ | ------------------ | | tagText | String | 标签显示文本 | 是 | | | tagState | TagState | 标签状态 | 否 | TagState.waiting | -| backgroundColor | Color | 自定义标签背景颜色 | 否 | 0xFFFAAD14 10%透明 | -| textColor | Color | 自定义标签文字颜色 | 否 | 0xFFFAAD14 | +| backgroundColor | Color? | 自定义标签背景颜色 | 否 | 0xFFFAAD14 10%透明 | +| textColor | Color? | 自定义标签文字颜色 | 否 | 0xFFFAAD14 | 其中 TagState 为枚举，共 5 种状态： diff --git a/docs/components/tag/BrnStateTag/img/BrnMetaStateTagIntro.png b/doc/components/tag/BrnStateTag/img/BrnMetaStateTagIntro.png similarity index 100% rename from docs/components/tag/BrnStateTag/img/BrnMetaStateTagIntro.png rename to doc/components/tag/BrnStateTag/img/BrnMetaStateTagIntro.png diff --git a/docs/components/tag/BrnStateTag/img/BrnMetaStateTagSucceed.png b/doc/components/tag/BrnStateTag/img/BrnMetaStateTagSucceed.png similarity index 100% rename from docs/components/tag/BrnStateTag/img/BrnMetaStateTagSucceed.png rename to doc/components/tag/BrnStateTag/img/BrnMetaStateTagSucceed.png diff --git a/docs/components/tag/BrnStateTag/img/BrnStateTagFailure.png b/doc/components/tag/BrnStateTag/img/BrnStateTagFailure.png similarity index 100% rename from docs/components/tag/BrnStateTag/img/BrnStateTagFailure.png rename to doc/components/tag/BrnStateTag/img/BrnStateTagFailure.png diff --git a/docs/components/tag/BrnTagCustom/BrnTagCustom.md b/doc/components/tag/BrnTagCustom/BrnTagCustom.md similarity index 77% rename from docs/components/tag/BrnTagCustom/BrnTagCustom.md rename to doc/components/tag/BrnTagCustom/BrnTagCustom.md index 36e7e37e..0dbae402 100644 --- a/docs/components/tag/BrnTagCustom/BrnTagCustom.md +++ b/doc/components/tag/BrnTagCustom/BrnTagCustom.md @@ -24,19 +24,19 @@ group: ### 构造函数 ```dart - BrnTagCustom({ - Key key, - this.tagText, - this.textColor, - this.backgroundColor, - this.tagBorderRadius, - this.textPadding, - this.border, - this.fontSize = 11, - this.fontWeight = FontWeight.normal, - this.maxWidth = double.infinity, - }) : super(key: key); - +BrnTagCustom({ + Key? key, + required this.tagText, + this.textColor, + this.backgroundColor, + this.tagBorderRadius = const BorderRadius.all(Radius.circular(2)), + this.textPadding = + const EdgeInsets.only(bottom: 0.5, left: 3, right: 3, top: 0), + this.border, + this.fontSize = 11, + this.fontWeight = FontWeight.normal, + this.maxWidth = double.infinity, +}) : super(key: key); ``` ### 参数说明 @@ -44,13 +44,14 @@ group: | **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | | --------------- | ------------ | ------------------ | ------------ | ---------------------------------- | | tagText | String | 标签显示文本 | 是 | | -| backgroundColor | Color | 标签背景色 | 否 | 主题色 | -| textColor | Color | 文本颜色 | 否 | F4Color | +| backgroundColor | Color? | 标签背景色 | 否 | 主题色 | +| textColor | Color? | 文本颜色 | 否 | F4Color | | tagBorderRadius | BorderRadius | 标签圆角 | 否 | 圆角为 2 | | textPadding | EdgetInsets | 标签文字的 padding | 否 | EdgeInsets.symmetric(horizontal:2) | | fontSize | double | 标签文字的大小 | 否 | 11 | | fontWeight | FontWeight | 文字的粗细 | 否 | FontWeight.normal | | maxWidth | Double | 标签高度 | 否 | double.infinity | +| border | Border? | 标签边框 | 否 | 无 | ## 四、代码演示 diff --git a/docs/components/tag/BrnTagCustom/img/BrnTagCustomDemo1.png b/doc/components/tag/BrnTagCustom/img/BrnTagCustomDemo1.png similarity index 100% rename from docs/components/tag/BrnTagCustom/img/BrnTagCustomDemo1.png rename to doc/components/tag/BrnTagCustom/img/BrnTagCustomDemo1.png diff --git a/docs/components/tag/BrnTagCustom/img/BrnTagCustomDemo2.png b/doc/components/tag/BrnTagCustom/img/BrnTagCustomDemo2.png similarity index 100% rename from docs/components/tag/BrnTagCustom/img/BrnTagCustomDemo2.png rename to doc/components/tag/BrnTagCustom/img/BrnTagCustomDemo2.png diff --git a/docs/components/tag/BrnTagCustom/img/BrnTagCustomDemo3.png b/doc/components/tag/BrnTagCustom/img/BrnTagCustomDemo3.png similarity index 100% rename from docs/components/tag/BrnTagCustom/img/BrnTagCustomDemo3.png rename to doc/components/tag/BrnTagCustom/img/BrnTagCustomDemo3.png diff --git a/docs/components/text/BrnEnhanceNumberCard/BrnEnhanceNumberCard.md b/doc/components/text/BrnEnhanceNumberCard/BrnEnhanceNumberCard.md similarity index 91% rename from docs/components/text/BrnEnhanceNumberCard/BrnEnhanceNumberCard.md rename to doc/components/text/BrnEnhanceNumberCard/BrnEnhanceNumberCard.md index 507a2666..3554fab2 100644 --- a/docs/components/text/BrnEnhanceNumberCard/BrnEnhanceNumberCard.md +++ b/doc/components/text/BrnEnhanceNumberCard/BrnEnhanceNumberCard.md @@ -34,9 +34,9 @@ group: ### 构造函数 -``` +```dart BrnEnhanceNumberCard({ - Key key, + Key? key, this.itemChildren, this.rowCount = 3, this.runningSpace, @@ -45,19 +45,20 @@ BrnEnhanceNumberCard({ this.backgroundColor = Colors.white, this.itemTextAlign = TextAlign.left, this.themeData, -}) +}) : super(key: key); ``` ### 参数说明 | **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | | --- | --- | --- | --- | --- | -| itemChildren | List | 待展示的信息 | 否 | 无 | +| itemChildren | `List?` | 待展示的信息 | 否 | 无 | | rowCount | int | 每行展示的item的数量 | 否 | 3 | -| runningSpace | double | 如果超过一行，则展示行间距则 | 否 | 16 | -| itemRunningSpace | double | Item的上半部分和下半部分的间距 | 否 | 8 | +| runningSpace | double? | 如果超过一行，则展示行间距则 | 否 | 16 | +| itemRunningSpace | double? | Item的上半部分和下半部分的间距 | 否 | 8 | | padding | EdgeInsets | 元件左右侧的边距 | 否 | EdgeInsets.only(left: 20, right: 20) | | backgroundColor | Color | 背景色 默认为白色 | 否 | Colors.white | | itemTextAlign | TextAlign | 文本内容对齐方式 | 否 | TextAlign.left | +| themeData | BrnEnhanceNumberCardConfig? | 主题定制属性 | 否 | 无 | @@ -67,7 +68,7 @@ BrnEnhanceNumberCard({ ![image-20211031143416320](./img/BrnEnhanceNumberCardDemo1.png) -``` +```dart BrnMetaNumberInfoWidget( itemChildren: [ BrnMetaNumberInfoItemModel( @@ -104,7 +105,7 @@ BrnEnhanceNumberCard( -``` +```dart BrnMetaNumberInfoWidget( rowCount: 2, itemChildren: [ @@ -126,7 +127,7 @@ BrnMetaNumberInfoWidget( ![image-20211031144401720](./img/BrnEnhanceNumberCardDemo4.png) -``` +```dart BrnEnhanceNumberCard( rowCount: 3, itemChildren: [ @@ -157,7 +158,7 @@ BrnEnhanceNumberCard( ### 效果5：其他展示效果 ![image-20211031144549311](./img/BrnEnhanceNumberCardDemo5.png) -``` +```dart BrnEnhanceNumberCard( rowCount: 3, itemChildren: [ diff --git a/docs/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo1.png b/doc/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo1.png similarity index 100% rename from docs/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo1.png rename to doc/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo1.png diff --git a/docs/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo2.png b/doc/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo2.png similarity index 100% rename from docs/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo2.png rename to doc/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo2.png diff --git a/docs/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo3.png b/doc/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo3.png similarity index 100% rename from docs/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo3.png rename to doc/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo3.png diff --git a/docs/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo4.png b/doc/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo4.png similarity index 100% rename from docs/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo4.png rename to doc/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo4.png diff --git a/docs/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo5.png b/doc/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo5.png similarity index 100% rename from docs/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo5.png rename to doc/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardDemo5.png diff --git a/docs/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardIntro.png b/doc/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardIntro.png similarity index 100% rename from docs/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardIntro.png rename to doc/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardIntro.png diff --git a/docs/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardIntro1.png b/doc/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardIntro1.png similarity index 100% rename from docs/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardIntro1.png rename to doc/components/text/BrnEnhanceNumberCard/img/BrnEnhanceNumberCardIntro1.png diff --git a/docs/components/text/BrnExpandableText/BrnExpandableText.md b/doc/components/text/BrnExpandableText/BrnExpandableText.md similarity index 54% rename from docs/components/text/BrnExpandableText/BrnExpandableText.md rename to doc/components/text/BrnExpandableText/BrnExpandableText.md index 621062a6..82ffb9a0 100644 --- a/docs/components/text/BrnExpandableText/BrnExpandableText.md +++ b/doc/components/text/BrnExpandableText/BrnExpandableText.md @@ -24,25 +24,25 @@ group: ### 构造函数 ```dart -BrnExpandableText( - {Key key, - @required this.text, - this.maxLines = 1000000, - this.textStyle, - this.onExpanded, - this.color}) - : super(key: key) +const BrnExpandableText( + {Key? key, + required this.text, + this.maxLines = 1000000, + this.textStyle, + this.onExpanded, + this.color}) + : super(key: key); ``` ### 参数说明 -| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | -| ---------- | ------------------- | ---------------- | ------------ | --------------- | -| text | String | 待显示的文案 | 是 | | -| maxLines | int | 最大可展示的行数 | 否 | 1000000 | -| textStyle | TextStyle | 文本显示的样式 | 否 | 14 号的 F0 字体 | -| onExpanded | void Function(bool) | 展开收起的回调 | 否 | 无 | -| color | Colors | 背景色 | 否 | 白色 | +| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | +| ---------- | ---------------------- | ---------------- | ------------ | --------------- | +| text | String | 待显示的文案 | 是 | | +| maxLines | int? | 最大可展示的行数 | 否 | 1000000 | +| textStyle | TextStyle? | 文本显示的样式 | 否 | 14 号的 F0 字体 | +| onExpanded | `void Function(bool)?` | 展开收起的回调 | 否 | 无 | +| color | Colors? | 背景色 | 否 | 白色 | ## 四、代码演示 diff --git a/docs/components/text/BrnExpandableText/img/BrnExpandableTextIntro1.png b/doc/components/text/BrnExpandableText/img/BrnExpandableTextIntro1.png similarity index 100% rename from docs/components/text/BrnExpandableText/img/BrnExpandableTextIntro1.png rename to doc/components/text/BrnExpandableText/img/BrnExpandableTextIntro1.png diff --git a/docs/components/text/BrnExpandableText/img/BrnExpandableTextIntro2.png b/doc/components/text/BrnExpandableText/img/BrnExpandableTextIntro2.png similarity index 100% rename from docs/components/text/BrnExpandableText/img/BrnExpandableTextIntro2.png rename to doc/components/text/BrnExpandableText/img/BrnExpandableTextIntro2.png diff --git a/docs/components/text/BrnPairInfoTable/BrnPairInfoTable.md b/doc/components/text/BrnPairInfoTable/BrnPairInfoTable.md similarity index 100% rename from docs/components/text/BrnPairInfoTable/BrnPairInfoTable.md rename to doc/components/text/BrnPairInfoTable/BrnPairInfoTable.md diff --git a/docs/components/text/BrnPairInfoTable/img/BrnPairInfoTableDemo3.png b/doc/components/text/BrnPairInfoTable/img/BrnPairInfoTableDemo3.png similarity index 100% rename from docs/components/text/BrnPairInfoTable/img/BrnPairInfoTableDemo3.png rename to doc/components/text/BrnPairInfoTable/img/BrnPairInfoTableDemo3.png diff --git a/docs/components/text/BrnPairInfoTable/img/BrnPairInfoTableDemo4.png b/doc/components/text/BrnPairInfoTable/img/BrnPairInfoTableDemo4.png similarity index 100% rename from docs/components/text/BrnPairInfoTable/img/BrnPairInfoTableDemo4.png rename to doc/components/text/BrnPairInfoTable/img/BrnPairInfoTableDemo4.png diff --git a/docs/components/text/BrnPairInfoTable/img/BrnPairInfoTableDemo5.png b/doc/components/text/BrnPairInfoTable/img/BrnPairInfoTableDemo5.png similarity index 100% rename from docs/components/text/BrnPairInfoTable/img/BrnPairInfoTableDemo5.png rename to doc/components/text/BrnPairInfoTable/img/BrnPairInfoTableDemo5.png diff --git a/docs/components/text/BrnPairInfoTable/img/BrnPairInfoTableIntro1.png b/doc/components/text/BrnPairInfoTable/img/BrnPairInfoTableIntro1.png similarity index 100% rename from docs/components/text/BrnPairInfoTable/img/BrnPairInfoTableIntro1.png rename to doc/components/text/BrnPairInfoTable/img/BrnPairInfoTableIntro1.png diff --git a/docs/components/text/BrnPairInfoTable/img/BrnPairInfoTableIntro2.png b/doc/components/text/BrnPairInfoTable/img/BrnPairInfoTableIntro2.png similarity index 100% rename from docs/components/text/BrnPairInfoTable/img/BrnPairInfoTableIntro2.png rename to doc/components/text/BrnPairInfoTable/img/BrnPairInfoTableIntro2.png diff --git a/docs/components/text/BrnPairInfoTable/img/BrnPairInfoTableIntro3.png b/doc/components/text/BrnPairInfoTable/img/BrnPairInfoTableIntro3.png similarity index 100% rename from docs/components/text/BrnPairInfoTable/img/BrnPairInfoTableIntro3.png rename to doc/components/text/BrnPairInfoTable/img/BrnPairInfoTableIntro3.png diff --git a/docs/components/text/BrnRichInfoGrid/BrnRichInfoGrid.md b/doc/components/text/BrnRichInfoGrid/BrnRichInfoGrid.md similarity index 69% rename from docs/components/text/BrnRichInfoGrid/BrnRichInfoGrid.md rename to doc/components/text/BrnRichInfoGrid/BrnRichInfoGrid.md index 70044c2d..7053cd34 100644 --- a/docs/components/text/BrnRichInfoGrid/BrnRichInfoGrid.md +++ b/doc/components/text/BrnRichInfoGrid/BrnRichInfoGrid.md @@ -27,7 +27,7 @@ group: ```dart BrnRichInfoGrid({ - Key key, + Key? key, this.pairInfoList, this.padding, this.rowSpace, @@ -40,14 +40,15 @@ BrnRichInfoGrid({ ### 参数说明 -| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | -| -------------- | ------------------ | ----------------- | ------------ | ---------------- | -| pairInfoList | List | 待展示的文本信息 | 是 | 无 | -| padding | EdgeInsetsGeometry | 字体大小 | 否 | 无 | -| rowSpace | double | 纵向间距 | 否 | 4 | -| space | double | 横向间距 | 否 | 2 | -| itemHeight | double | item 的高度 | 否 | 和文字相关的行高 | -| crossAxisCount | int | GridView 分为几列 | 否 | 2 | +| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | +| -------------- | -------------------------- | ----------------- | ------------ | ---------------- | +| pairInfoList | `List?` | 待展示的文本信息 | 是 | 无 | +| padding | EdgeInsetsGeometry? | 字体大小 | 否 | 无 | +| rowSpace | double? | 纵向间距 | 否 | 4 | +| space | double? | 横向间距 | 否 | 2 | +| itemHeight | double? | item 的高度 | 否 | 和文字相关的行高 | +| crossAxisCount | int | GridView 分为几列 | 否 | 2 | +| themeData | BrnPairRichInfoGridConfig? | 主题定制属性 | 否 | 无 | ## 四、代码演示 diff --git a/docs/components/text/BrnRichInfoGrid/img/BrnRichInfoGridDemo1.png b/doc/components/text/BrnRichInfoGrid/img/BrnRichInfoGridDemo1.png similarity index 100% rename from docs/components/text/BrnRichInfoGrid/img/BrnRichInfoGridDemo1.png rename to doc/components/text/BrnRichInfoGrid/img/BrnRichInfoGridDemo1.png diff --git a/docs/components/text/BrnRichInfoGrid/img/BrnRichInfoGridDemo2.png b/doc/components/text/BrnRichInfoGrid/img/BrnRichInfoGridDemo2.png similarity index 100% rename from docs/components/text/BrnRichInfoGrid/img/BrnRichInfoGridDemo2.png rename to doc/components/text/BrnRichInfoGrid/img/BrnRichInfoGridDemo2.png diff --git a/docs/components/tips/BrnPopupWindow/BrnPopupWindow.md b/doc/components/tips/BrnPopupWindow/BrnPopupWindow.md similarity index 95% rename from docs/components/tips/BrnPopupWindow/BrnPopupWindow.md rename to doc/components/tips/BrnPopupWindow/BrnPopupWindow.md index 45938484..0313b8a1 100644 --- a/docs/components/tips/BrnPopupWindow/BrnPopupWindow.md +++ b/doc/components/tips/BrnPopupWindow/BrnPopupWindow.md @@ -124,10 +124,12 @@ RaisedButton( ![image-20211028170442805](./img/BrnPopupWindowDemo3.png) +注意：onItemClick 必须返回 true 或 false 决定是否拦截点击事件， 如果为 true 拦截事件，则内部不再走 pop 消失逻辑。 ```dart BrnPopupListWindow.showPopListWindow(context, _leftKeylist0, data: ['选项一', '选项二', '选项三'], onItemClick: (index, item) { BrnToast.show(item, context); + return false; }, hasCloseIcon: true); ``` diff --git a/docs/components/tips/BrnPopupWindow/img/BrnPopupWindowDemo1.png b/doc/components/tips/BrnPopupWindow/img/BrnPopupWindowDemo1.png similarity index 100% rename from docs/components/tips/BrnPopupWindow/img/BrnPopupWindowDemo1.png rename to doc/components/tips/BrnPopupWindow/img/BrnPopupWindowDemo1.png diff --git a/docs/components/tips/BrnPopupWindow/img/BrnPopupWindowDemo2.png b/doc/components/tips/BrnPopupWindow/img/BrnPopupWindowDemo2.png similarity index 100% rename from docs/components/tips/BrnPopupWindow/img/BrnPopupWindowDemo2.png rename to doc/components/tips/BrnPopupWindow/img/BrnPopupWindowDemo2.png diff --git a/docs/components/tips/BrnPopupWindow/img/BrnPopupWindowDemo3.png b/doc/components/tips/BrnPopupWindow/img/BrnPopupWindowDemo3.png similarity index 100% rename from docs/components/tips/BrnPopupWindow/img/BrnPopupWindowDemo3.png rename to doc/components/tips/BrnPopupWindow/img/BrnPopupWindowDemo3.png diff --git a/docs/components/tips/BrnPopupWindow/img/BrnPopupWindowIntro.png b/doc/components/tips/BrnPopupWindow/img/BrnPopupWindowIntro.png similarity index 100% rename from docs/components/tips/BrnPopupWindow/img/BrnPopupWindowIntro.png rename to doc/components/tips/BrnPopupWindow/img/BrnPopupWindowIntro.png diff --git a/doc/components/title/BrnActionCardTitle/BrnActionCardTitle.md b/doc/components/title/BrnActionCardTitle/BrnActionCardTitle.md new file mode 100644 index 00000000..249073ef --- /dev/null +++ b/doc/components/title/BrnActionCardTitle/BrnActionCardTitle.md @@ -0,0 +1,64 @@ +--- +title: BrnActionCardTitle +group: + title: CardTitle + order: 8 +--- + +# BrnActionCardTitle + +带右侧箭头的卡片标题 + +## 一、效果总览 + + + +## 二、描述 + +### 适用场景 + +卡片标题或者在 ListView 中的一行，点击可以进入下一个详情页 + +## 三、构造函数及参数说明 + +### 构造函数 + +```dart +BrnActionCardTitle({ + Key? key, + required this.title, + this.accessoryText, + this.onTap, + this.subTitle, + this.subTitleWidget, + this.themeData, + }) : super(key: key); +``` + +### 参数说明 + +| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | +| -------------- | ------------------- | ----------------------------------- | ------------ | ---------- | +| title | String | 标题文本 | 是 | | +| subTitle | String？ | 标题右侧的小文字 | 否 | | +| subTitleWidget | Widget? | 标题右侧的显示 widget | 否 | | +| accessoryText | String? | 箭头左边的文字 | 否 | | +| onTap | VoidCallback? | 整个标题点击的事件 | 否 | | +| themeData | BrnCardTitleConfig? | 标题主题配置详见 BrnCardTitleConfig | 否 | | + +## 四、代码演示 + +### 效果 1：带评分和标签 + +  + +```dart +BrnActionCardTitle( + title: '标题', + subTitle: '0/30', + accessoryText: '文案', + onTap: () { + BrnToast.show('BrnActionCardTitle is clicked', context); + }, +) +``` diff --git a/docs/components/title/BrnActionCardTitle/img/BrnActionCardTitleDemo.png b/doc/components/title/BrnActionCardTitle/img/BrnActionCardTitleDemo.png similarity index 100% rename from docs/components/title/BrnActionCardTitle/img/BrnActionCardTitleDemo.png rename to doc/components/title/BrnActionCardTitle/img/BrnActionCardTitleDemo.png diff --git a/doc/components/title/BrnCommonCardTitle/BrnCommonCardTitle.md b/doc/components/title/BrnCommonCardTitle/BrnCommonCardTitle.md new file mode 100644 index 00000000..3b4f7453 --- /dev/null +++ b/doc/components/title/BrnCommonCardTitle/BrnCommonCardTitle.md @@ -0,0 +1,102 @@ +--- +title: BrnCommonCardTitle +group: + title: CardTitle + order: 8 +--- + +# BrnCommonCardTitle + +普通卡片标题主要用于卡片标题或者在 ListView 中的一行 + +## 一、效果总览 + + + +## 二、描述 + +### 适用场景 + +卡片标题或者在 ListView 中的一行 + +## 三、构造函数及参数说明 + +### 构造函数 + +```dart +BrnCommonCardTitle( + {Key? key, + required this.title, + this.accessoryText, + this.accessoryWidget, + this.onTap, + this.subTitleWidget, + this.detailTextString, + this.detailColor, + this.alignment, + this.padding, + this.themeData}) + : super(key: key); +``` + +### 参数说明 + +| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | +| ---------------- | --------------------- | ----------------------------------- | ------------ | ----------------- | +| title | String | 标题文本 | 是 | | +| subTitleWidget | Widget? | 标题右侧的显示 widget | 否 | | +| accessoryText | String? | 最右侧的文字 | 否 | | +| accessoryWidget | Widget? | 最右侧的 widget | 否 | | +| onTap | VoidCallback? | 整个标题点击的事件 | 否 | | +| detailTextString | String? | 标题下面的文字 | 否 | | +| detailColor | Color? | 标题下方文字颜色 | 否 | Color(0xFF222222) | +| alignment | PlaceholderAlignment? | title 的流式文本的对齐方式 | 否 | | +| padding | EdgeInsetsGeometry? | 内容的间距 | 否 | | +| themeData | BrnCardTitleConfig? | 标题配置，详情见 BrnCardTitleConfig | 否 | | + +## 四、代码演示 + +### 效果 1：带评分和标签 + + + +```dart +BrnCommonCardTitle( + title: '非箭头Title', + accessoryWidget: BrnMetaStateTag(tagText: '状态标签'), + subTitleWidget: BrnMetaStartRatingIndicator(rating: 4), + onTap: () { + BrnToast.show('BrnMetaPlainCardTitle is clicked', context); + }, +) +``` + +### 效果 2：带评分、标签和副标题 + + + +```dart +BrnCommonCardTitle( + title: '非箭头Title', + accessoryWidget: BrnMetaStateTag(tagText: '状态标签'), + subTitleWidget: BrnMetaStartRatingIndicator(rating: 4), + detailTextString: '副标题副标题副标题', + onTap: () { + BrnToast.show('BrnMetaPlainCardTitle is clicked', context); + }, +) +``` + +### 效果 3：标题和副文本 + + + +```dart +BrnCommonCardTitle( + title: '非箭头Title', + accessoryText: '辅助文本', + onTap: () { + BrnToast.show('BrnMetaPlainCardTitle is clicked', context); + }, +) +``` diff --git a/docs/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleDemo1.png b/doc/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleDemo1.png similarity index 100% rename from docs/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleDemo1.png rename to doc/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleDemo1.png diff --git a/docs/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleDemo2.png b/doc/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleDemo2.png similarity index 100% rename from docs/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleDemo2.png rename to doc/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleDemo2.png diff --git a/docs/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleDemo3.png b/doc/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleDemo3.png similarity index 100% rename from docs/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleDemo3.png rename to doc/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleDemo3.png diff --git a/docs/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleIntro.png b/doc/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleIntro.png similarity index 100% rename from docs/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleIntro.png rename to doc/components/title/BrnCommonCardTitle/img/BrnCommonCardTitleIntro.png diff --git a/docs/components/title/BrnSubSwitchTitle/BrnSubSwitchTitle.md b/doc/components/title/BrnSubSwitchTitle/BrnSubSwitchTitle.md similarity index 82% rename from docs/components/title/BrnSubSwitchTitle/BrnSubSwitchTitle.md rename to doc/components/title/BrnSubSwitchTitle/BrnSubSwitchTitle.md index 3db295b2..46857066 100644 --- a/docs/components/title/BrnSubSwitchTitle/BrnSubSwitchTitle.md +++ b/doc/components/title/BrnSubSwitchTitle/BrnSubSwitchTitle.md @@ -31,13 +31,13 @@ group: ```dart const BrnSubSwitchTitle({ - Key key, - @required this.nameList, - this.defaultSelectIndex = 0, - this.onSelect, - this.padding, - this.controller, -}) : super(key: key); + Key? key, + required this.nameList, + this.defaultSelectIndex = 0, + this.onSelect, + this.padding, + this.controller, + }) : super(key: key); ``` ### 参数说明 @@ -45,9 +45,9 @@ const BrnSubSwitchTitle({ | --- | --- | --- | --- | --- | | nameList | `List` | 标题的文案列表 | 是 | 无 | | defaultSelectIndex | int | 默认选中的 index | 否 | 0 | -| onSelect | void Function(int index) | 选择指定标题的回调 | 否 | 无 | -| padding | EdgeInsets | 二级标题的padding | 否 | EdgeInsets.only(right: 20) | -| controller | TabController | 控制tab切换，默认不需要传递 | 否 | 无 | +| onSelect | `void Function(int index)?` | 选择指定标题的回调 | 否 | 无 | +| padding | EdgeInsets? | 二级标题的padding | 否 | EdgeInsets.only(right: 20) | +| controller | TabController? | 控制tab切换，默认不需要传递 | 否 | 无 | ## 四、代码演示 diff --git a/docs/components/title/BrnSubSwitchTitle/img/BrnSubSwitchTitleDemo1.png b/doc/components/title/BrnSubSwitchTitle/img/BrnSubSwitchTitleDemo1.png similarity index 100% rename from docs/components/title/BrnSubSwitchTitle/img/BrnSubSwitchTitleDemo1.png rename to doc/components/title/BrnSubSwitchTitle/img/BrnSubSwitchTitleDemo1.png diff --git a/docs/components/title/BrnSubSwitchTitle/img/BrnSubSwitchTitleDemo2.gif b/doc/components/title/BrnSubSwitchTitle/img/BrnSubSwitchTitleDemo2.gif similarity index 100% rename from docs/components/title/BrnSubSwitchTitle/img/BrnSubSwitchTitleDemo2.gif rename to doc/components/title/BrnSubSwitchTitle/img/BrnSubSwitchTitleDemo2.gif diff --git a/docs/components/title/BrnSwitchTitle/BrnSwitchTitle.md b/doc/components/title/BrnSwitchTitle/BrnSwitchTitle.md similarity index 84% rename from docs/components/title/BrnSwitchTitle/BrnSwitchTitle.md rename to doc/components/title/BrnSwitchTitle/BrnSwitchTitle.md index ff0ae874..22b5b092 100644 --- a/docs/components/title/BrnSwitchTitle/BrnSwitchTitle.md +++ b/doc/components/title/BrnSwitchTitle/BrnSwitchTitle.md @@ -31,8 +31,8 @@ group: ```dart const BrnSwitchTitle( - {Key key, - @required this.nameList, + {Key? key, + required this.nameList, this.defaultSelectIndex = 0, this.onSelect, this.indicatorWeight = 2.0, @@ -49,13 +49,13 @@ const BrnSwitchTitle( | --- | --- | --- | --- | --- | | nameList | `List` | 标题的文案列表 | 是 | 无 | | defaultSelectIndex | int | 默认选中的 index | 否 | 0 | -| onSelect | void Function(int index) | 标题选中时的回调 | 否 | 无 | -| controller | TabController | 控制tab切换，默认不需要传递 | 否 | 无 | +| onSelect | `void Function(int index)?` | 标题选中时的回调 | 否 | 无 | +| controller | TabController? | 控制tab切换，默认不需要传递 | 否 | 无 | | padding | EdgeInsets | 标题的 padding | 否 | 默认 `EdgeInsets.fromLTRB(0, 14, 20, 14)` | | indicatorWeight | double | 下划线的高度 | 否 | 默认是 2 | | indicatorWidth | double | 下划线的宽度。indicatorWidth 要大于等于 indicatorWeight。 | 否 | 默认是 24 | -| selectedTextStyle | TextStyle | 标题选中时的样式 | 否 | `TextStyle(fontWeight: FontWeight.w600,fontSize: 18)` | -| unselectedTextStyle | TextStyle | 标题未选中时的样式 | 否 | `TextStyle(fontWeight: FontWeight.w600,fontSize: 18)` | +| selectedTextStyle | TextStyle? | 标题选中时的样式 | 否 | `TextStyle(fontWeight: FontWeight.w600,fontSize: 18)` | +| unselectedTextStyle | TextStyle? | 标题未选中时的样式 | 否 | `TextStyle(fontWeight: FontWeight.w600,fontSize: 18)` | ## 四、代码演示 diff --git a/docs/components/title/BrnSwitchTitle/img/BrnSwitchTitleDemo1.png b/doc/components/title/BrnSwitchTitle/img/BrnSwitchTitleDemo1.png similarity index 100% rename from docs/components/title/BrnSwitchTitle/img/BrnSwitchTitleDemo1.png rename to doc/components/title/BrnSwitchTitle/img/BrnSwitchTitleDemo1.png diff --git a/docs/components/title/BrnSwitchTitle/img/BrnSwitchTitleDemo2.gif b/doc/components/title/BrnSwitchTitle/img/BrnSwitchTitleDemo2.gif similarity index 100% rename from docs/components/title/BrnSwitchTitle/img/BrnSwitchTitleDemo2.gif rename to doc/components/title/BrnSwitchTitle/img/BrnSwitchTitleDemo2.gif diff --git a/docs/components/toast/BrnToast/BrnToast.md b/doc/components/toast/BrnToast/BrnToast.md similarity index 100% rename from docs/components/toast/BrnToast/BrnToast.md rename to doc/components/toast/BrnToast/BrnToast.md diff --git a/docs/components/toast/BrnToast/img/brn_toast_fail.png b/doc/components/toast/BrnToast/img/brn_toast_fail.png similarity index 100% rename from docs/components/toast/BrnToast/img/brn_toast_fail.png rename to doc/components/toast/BrnToast/img/brn_toast_fail.png diff --git a/docs/components/toast/BrnToast/img/brn_toast_intro.png b/doc/components/toast/BrnToast/img/brn_toast_intro.png similarity index 100% rename from docs/components/toast/BrnToast/img/brn_toast_intro.png rename to doc/components/toast/BrnToast/img/brn_toast_intro.png diff --git a/docs/components/toast/BrnToast/img/brn_toast_normal.png b/doc/components/toast/BrnToast/img/brn_toast_normal.png similarity index 100% rename from docs/components/toast/BrnToast/img/brn_toast_normal.png rename to doc/components/toast/BrnToast/img/brn_toast_normal.png diff --git a/docs/components/toast/BrnToast/img/brn_toast_success.png b/doc/components/toast/BrnToast/img/brn_toast_success.png similarity index 100% rename from docs/components/toast/BrnToast/img/brn_toast_success.png rename to doc/components/toast/BrnToast/img/brn_toast_success.png diff --git a/docs/contribution.md b/doc/contribution.md similarity index 100% rename from docs/contribution.md rename to doc/contribution.md diff --git a/docs/sketch.md b/doc/sketch.md similarity index 100% rename from docs/sketch.md rename to doc/sketch.md diff --git a/docs/start.md b/doc/start.md similarity index 100% rename from docs/start.md rename to doc/start.md diff --git a/docs/theme.md b/doc/theme.md similarity index 100% rename from docs/theme.md rename to doc/theme.md diff --git a/docs/components/checkbox/BrnCheckbox/img/BrnRadioItemDemo1.png b/docs/components/checkbox/BrnCheckbox/img/BrnRadioItemDemo1.png deleted file mode 100644 index 2d20284d..00000000 Binary files a/docs/components/checkbox/BrnCheckbox/img/BrnRadioItemDemo1.png and /dev/null differ diff --git a/docs/components/checkbox/BrnCheckbox/img/BrnRadioItemDemo2.png b/docs/components/checkbox/BrnCheckbox/img/BrnRadioItemDemo2.png deleted file mode 100644 index fae44f44..00000000 Binary files a/docs/components/checkbox/BrnCheckbox/img/BrnRadioItemDemo2.png and /dev/null differ diff --git a/docs/components/checkbox/BrnCheckbox/img/BrnRadioItemIntro.png b/docs/components/checkbox/BrnCheckbox/img/BrnRadioItemIntro.png deleted file mode 100644 index 633d0a5a..00000000 Binary files a/docs/components/checkbox/BrnCheckbox/img/BrnRadioItemIntro.png and /dev/null differ diff --git a/docs/components/dialog/BrnSingleSelectDialog/img/BrnSingleSelectDialog.png b/docs/components/dialog/BrnSingleSelectDialog/img/BrnSingleSelectDialog.png deleted file mode 100644 index a727361c..00000000 Binary files a/docs/components/dialog/BrnSingleSelectDialog/img/BrnSingleSelectDialog.png and /dev/null differ diff --git a/docs/components/notification/BrnNoticeBar/BrnNoticeBar.md b/docs/components/notification/BrnNoticeBar/BrnNoticeBar.md deleted file mode 100644 index 09520f97..00000000 --- a/docs/components/notification/BrnNoticeBar/BrnNoticeBar.md +++ /dev/null @@ -1,170 +0,0 @@ ---- -title: BrnNoticeBar -group: - title: NoticeBar - order: 21 ---- - -# BrnNoticeBar - -通知视图，默认最小高度 36。 - -## 一、效果总览 - - -
- - -## 二、描述 - -### 适用场景 - -展示通知或者提示信息。 - -### 交互规则 - -1. 支持十种默认样式。 -2. 支持自定义或隐藏左右图标。 -3. 文字颜色和背景颜色支持自定义。 -4. 文字较长时只显示一行，以...结尾，也可以支持跑马灯效果展示。 -5. 支持点击回调。 - -## 三、构造函数及参数说明 - -### 构造函数 - -```dart -const BrnNoticeBar( - {Key key, - this.leftWidget, - this.showLeftIcon = true, - @required this.content, - this.textColor, - this.backgroundColor, - this.rightWidget, - this.showRightIcon = true, - this.noticeStyle, - this.onNoticeTap, - this.onRightIconTap, - this.marquee = false, - this.padding, - this.minHeight = 36}) - : assert(content != null), - super(key: key); -``` - -### 参数说明 - -| 参数名 | 参数类型 | 描述 | 是否必填 | 默认值 | -| --------------- | ------------ | ------------------------------------------------------------------------------------------------------------ | -------- | ----------------------------- | -| noticeStyle | NoticeStyle | 样式，取 NoticeStyles 里面的值 | 否 | NoticeStyles.runningWithArrow | -| content | String | 通知具体内容 | 是 | 无 | -| textColor | Color | 文案的颜色 | 否 | 随 defaultStyle 改变 | -| backgroundColor | Color | 通知栏的背景颜色 | 否 | 随 defaultStyle 改变 | -| leftWidget | Widget | 左侧图标区域自定义视图 | 否 | 无 | -| showLeftIcon | bool | 是否显示左侧图标 | 否 | true | -| rightWidget | Widget | 右侧图标区域自定义视图 | 否 | 无 | -| showRightIcon | bool | 是否显示右侧图标 | 否 | true | -| onNoticeTap | VoidCallback | 点击通知回调 | 否 | 无 | -| onRightIconTap | VoidCallback | 点击右侧图标回掉 | 否 | 无 | -| marquee | bool | 跑马灯 | 否 | false | -| minHeight | double | 最小高度。leftWidget、rightWidget 都为空时，限制的最小高度。可以通过该属性控制组件高度，内容会自动垂直居中。 | 否 | 36 | -| padding | EdgeInsets | 内容的内边距 | 否 | 无 | - -### 其他参数说明 - -#### NoticeStyles - -```dart -/// NoticeStyle 举例 -class NoticeStyles { - /// 红色+失败+箭头 - static NoticeStyle failWithArrow = NoticeStyle( - BrunoTools.getAssetImage(BrnAsset.ICON_NOTICE_FAIL), - Color(0xFFFA3F3F), - Color(0xFFFEEDED), - BrunoTools.getAssetImage(BrnAsset.ICON_NOTICE_ARROW_RED)); - /// 红色+失败+关闭 - static NoticeStyle failWithClose = NoticeStyle( - BrunoTools.getAssetImage(BrnAsset.ICON_NOTICE_FAIL), - Color(0xFFFA3F3F), - Color(0xFFFEEDED), - BrunoTools.getAssetImage(BrnAsset.ICON_NOTICE_CLOSE_RED)); -} -``` - -## 四、代码演示 - -### 效果 1：正常显示 - - - -```dart -BrnNoticeBar( - content: '这是通知内容', - noticeStyle: NoticeStyles.runningWithArrow, - onNoticeTap: () { - BrnToast.show('点击通知', context); - }, - onRightIconTap: () { - BrnToast.show('点击右侧图标', context); - }, -) -``` - -### 效果 2：隐藏左右图标 - - - -```dart -BrnNoticeBar( - content: '这是通知内容', - showLeftIcon: false , - showRightIcon: false, - noticeStyle: NoticeStyles.runningWithArrow, - onNoticeTap: () { - BrnToast.show('点击通知', context); - }, - onRightIconTap: () { - BrnToast.show('点击右侧图标', context); - }, -) -``` - -### 效果 3：自定义图标和文字、背景颜色 - - - -```dart -BrnNoticeBar( - content: '这是通知内容', - textColor: BrunoColor.instance.F0Color, ///通知颜色 - backgroundColor: Colors.grey, ///背景色 - leftWidget: BrunoTools.getAssetImage(BrnAsset.ICON_MORE), ///左侧图标 - rightWidget: BrunoTools.getAssetImage(BrnAsset.ICON_MORE), ///右侧图标 - onNoticeTap: () { - BrnToast.show('点击通知', context); - }, - onRightIconTap: () { - BrnToast.show('点击右侧图标', context); - }, -) -``` - -### 效果 4：跑马灯 - -![](./img/BrnNoticeBarDemo4.gif) - -```dart -BrnNoticeBar( - content: '这是跑马灯的通知内容跑马灯的通知内容跑马灯的通知内容跑马灯的通知内容', - marquee: true, - noticeStyle: NoticeStyles.runningWithArrow, - onNoticeTap: () { - BrnToast.show('点击通知', context); - }, - onRightIconTap: () { - BrnToast.show('点击右侧图标', context); - }, -) -``` diff --git a/docs/components/notification/BrnNoticeBarWithButton/BrnNoticeBarWithButton.md b/docs/components/notification/BrnNoticeBarWithButton/BrnNoticeBarWithButton.md deleted file mode 100644 index 3cce9b45..00000000 --- a/docs/components/notification/BrnNoticeBarWithButton/BrnNoticeBarWithButton.md +++ /dev/null @@ -1,129 +0,0 @@ ---- -title: BrnNoticeBarWithButton -group: - title: NoticeBar - order: 22 ---- - -# BrnNoticeBarWithButton - -左边标签，右边按钮的通知视图。 - -## 一、效果总览 - - - -## 二、描述 - -### 适用场景 - -展示通知、提示或者任务信息，右侧支持按钮展示，整个通知栏也支持点击。 - -### 交互规则 - -1. 中间为通知文案，必传。 -2. 通知栏文字颜色和背景颜色支持自定义。 -3. 左侧为标签，标签文案为空时不显示标签控件。 -4. 右侧为按钮，点击有回调。文案为空时不显示按钮，支持自定义文字颜色和边框颜色。 -5. 左侧标签区域和右侧按钮区域支持自定义 widget。 -6. 文案过长时以 ... 截断展示，也可设置跑马灯展示。 - -## 三、构造函数及参数说明 - -### 构造函数 - -```dart -const BrnNoticeBarWithButton( - {Key key, - @required this.contentStr, - this.bgColor, - this.contentTextColor, - this.leftTagTxt, - this.leftTagBgColor, - this.leftTagTxtColor, - this.rightBtnBorderColor, - this.rightBtnTxt, - this.rightBtnTxtColor, - this.onRightBtnTap, - this.marquee = false, - this.leftWidget, - this.rightWidget, - this.padding, - this.minHeight = 54}) - : assert(contentStr != null), - super(key: key); -``` - -### 参数说明 - -| 参数名 | 参数类型 | 描述 | 是否必填 | 默认值 | -| ---------------------- | ------------ | ------------------------------------------------------------------------------------------------------------ | -------- | ----------------- | -| content | String | 通知的具体内容 | 是 | 无 | -| backgroundColor | Color | 通知的背景颜色 | 否 | Color(0x14FA5741) | -| contentTextColor | Color | 通知的文字颜色 | 否 | Color(0xFF333333) | -| leftTagText | String | 左边标签的文案，为空或者 null 时不显示标签视图 | 否 | 无 | -| leftTagTextColor | Color | 左边标签文字的颜色 | 否 | Colors.white | -| leftTagBackgroundColor | Color | 标签背景的颜色 | 否 | Color(0xFFFA5741) | -| leftWidget | Widget | 自定义左侧控件 | 否 | 无 | -| rightButtonText | String | 右侧按钮的文案，为空时不显示按钮 | 否 | | -| rightButtonTextColor | Color | 右侧按钮文字颜色 | 否 | Color(0xFFFA5741) | -| rightButtonBorderColor | Color | 右侧按钮边框颜色 | 否 | Color(0xFFFA5741) | -| rightWidget | Widget | 自定义右侧控件 | 否 | | -| marquee | bool | 通知文案是否以跑马灯效果展示 | 否 | false | -| onRightButtonTap | VoidCallback | 右侧按钮的点击回调 | 否 | | -| minHeight | double | 最小高度。leftWidget、rightWidget 都为空时，限制的最小高度。可以通过该属性控制组件高度，内容会自动垂直居中。 | 否 | 54 | -| padding | EdgeInsets | 内容的内边距 | 否 | 无 | - -## 四、代码演示 - -### 效果 1：正常显示 - - - -```dart -BrnNoticeBarWithButton( - leftTagText: '任务', - content: '这是通知内容', - rightButtonText: '去完成', - onRightButtonTap: () { - BrnToast.show('点击右侧按钮', context); - }, -) -``` - -### 效果 2：自定义文字和背景颜色 - - - -```dart -BrnNoticeBarWithButton( - leftTagText: '任务', - leftTagBackgroundColor: Color(0xFFE0EDFF), - leftTagTextColor: Color(0xFF0984F9), - content: '这是通知内容这是通知内容这是通知内容这是通知内容这是通知内容', - backgroundColor: Color(0xFFEBFFF7), - contentTextColor: Color(0xFF00AE66), - rightButtonText: '去完成', - rightButtonBorderColor: Color(0xFF0984F9), - rightButtonTextColor: Color(0xFF0984F9), - onRightButtonTap: () { - BrnToast.show('点击右侧按钮', context); - }, -), -``` - -### 效果 3：跑马灯 - -![](./img/BrnNoticeBarWithButtonDemo3.gif) - -```dart -BrnNoticeBarWithButton( - leftTagText: '任务', - content: '这是跑马灯的通知内容跑马灯的通知内容跑马灯的通知内容跑马灯的通知内容', - rightButtonText: '去完成', - marquee: true, - onRightButtonTap: () { - BrnToast.show('点击右侧按钮', context); - }, -), -``` diff --git a/docs/components/title/BrnActionCardTitle/BrnActionCardTitle.md b/docs/components/title/BrnActionCardTitle/BrnActionCardTitle.md deleted file mode 100644 index 77801099..00000000 --- a/docs/components/title/BrnActionCardTitle/BrnActionCardTitle.md +++ /dev/null @@ -1,65 +0,0 @@ ---- -title: BrnActionCardTitle -group: - title: CardTitle - order: 8 ---- - -# BrnActionCardTitle - -带右侧箭头的卡片标题 - -## 一、效果总览 - - - -## 二、描述 - -### 适用场景 - -卡片标题或者在 ListView 中的一行，点击可以进入下一个详情页 - -## 三、构造函数及参数说明 - -### 构造函数 - -```dart -BrnActionCardTitle({ - Key key, - @required this.title, - this.accessoryText, - this.onTap, - this.subTitle, - this.subTitleWidget, - this.themeData, - }) : assert(null != title), - super(key: key); -``` - -### 参数说明 - -| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | -| -------------- | ------------------ | ----------------------------------- | ------------ | ---------- | -| title | String | 标题文本 | 是 | | -| subTitle | String | 标题右侧的小文字 | 否 | | -| subTitleWidget | Widget | 标题右侧的显示 widget | 否 | | -| accessoryText | String | 箭头左边的文字 | 否 | | -| onTap | VoidCallback | 整个标题点击的事件 | 否 | | -| themeData | BrnCardTitleConfig | 标题主题配置详见 BrnCardTitleConfig | 否 | | - -## 四、代码演示 - -### 效果 1：带评分和标签 - -  - -```dart -BrnActionCardTitle( - title: '标题', - subTitle: '0/30', - accessoryText: '文案', - onTap: () { - BrnToast.show('BrnActionCardTitle is clicked', context); - }, -) -``` diff --git a/docs/components/title/BrnCommonCardTitle/BrnCommonCardTitle.md b/docs/components/title/BrnCommonCardTitle/BrnCommonCardTitle.md deleted file mode 100644 index 4fb48c77..00000000 --- a/docs/components/title/BrnCommonCardTitle/BrnCommonCardTitle.md +++ /dev/null @@ -1,102 +0,0 @@ ---- -title: BrnCommonCardTitle -group: - title: CardTitle - order: 8 ---- - -# BrnCommonCardTitle - -普通卡片标题主要用于卡片标题或者在 ListView 中的一行 - -## 一、效果总览 - - - -## 二、描述 - -### 适用场景 - -卡片标题或者在 ListView 中的一行 - -## 三、构造函数及参数说明 - -### 构造函数 - -```dart -BrnCommonCardTitle( - {Key key, - @required this.title, - this.accessoryText, - this.accessoryWidget, - this.onTap, - this.subTitleWidget, - this.detailTextString, - this.detailColor, - this.alignment, - this.padding, - this.themeData}) - : super(key: key); -``` - -### 参数说明 - -| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | -| ---------------- | -------------------- | ----------------------------------- | ------------ | ----------------- | -| title | String | 标题文本 | 是 | | -| subTitleWidget | Widget | 标题右侧的显示 widget | 否 | | -| accessoryText | String | 最右侧的文字 | 否 | | -| accessoryWidget | Widget | 最右侧的 widget | 否 | | -| onTap | VoidCallback | 整个标题点击的事件 | 否 | | -| detailTextString | String | 标题下面的文字 | 否 | | -| detailColor | Color | 标题下方文字颜色 | 否 | Color(0xFF222222) | -| alignment | PlaceholderAlignment | title 的流式文本的对齐方式 | 否 | | -| padding | EdgeInsetsGeometry | 内容的间距 | 否 | | -| themeData | BrnCardTitleConfig | 标题配置，详情见 BrnCardTitleConfig | 否 | | - -## 四、代码演示 - -### 效果 1：带评分和标签 - - - -```dart -BrnCommonCardTitle( - title: '非箭头Title', - accessoryWidget: BrnMetaStateTag(tagText: '状态标签'), - subTitleWidget: BrnMetaStartRatingIndicator(rating: 4), - onTap: () { - BrnToast.show('BrnMetaPlainCardTitle is clicked', context); - }, -) -``` - -### 效果 2：带评分、标签和副标题 - - - -```dart -BrnCommonCardTitle( - title: '非箭头Title', - accessoryWidget: BrnMetaStateTag(tagText: '状态标签'), - subTitleWidget: BrnMetaStartRatingIndicator(rating: 4), - detailTextString: '副标题副标题副标题', - onTap: () { - BrnToast.show('BrnMetaPlainCardTitle is clicked', context); - }, -) -``` - -### 效果 3：标题和副文本 - - - -```dart -BrnCommonCardTitle( - title: '非箭头Title', - accessoryText: '辅助文本', - onTap: () { - BrnToast.show('BrnMetaPlainCardTitle is clicked', context); - }, -) -``` diff --git a/example/lib/main.dart b/example/lib/main.dart index 202b0652..f1993428 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,3 +1,5 @@ + + import 'package:example/sample/home/home.dart'; import 'package:flutter/material.dart'; @@ -11,7 +13,7 @@ class MyApp extends StatelessWidget { return MaterialApp( title: 'Flutter Example', theme: ThemeData( - primarySwatch: Colors.orange, + primarySwatch: Colors.grey, ), home: HomePage(), ); diff --git a/example/lib/sample/components/actionsheet/actionsheet_entry_page.dart b/example/lib/sample/components/actionsheet/actionsheet_entry_page.dart index 88d57b90..f279eac8 100644 --- a/example/lib/sample/components/actionsheet/actionsheet_entry_page.dart +++ b/example/lib/sample/components/actionsheet/actionsheet_entry_page.dart @@ -1,3 +1,5 @@ + + import 'dart:async'; import 'package:bruno/bruno.dart'; diff --git a/example/lib/sample/components/actionsheet/actionsheet_selected_list_custom_example.dart b/example/lib/sample/components/actionsheet/actionsheet_selected_list_custom_example.dart index e2fc5ba2..283dc591 100644 --- a/example/lib/sample/components/actionsheet/actionsheet_selected_list_custom_example.dart +++ b/example/lib/sample/components/actionsheet/actionsheet_selected_list_custom_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/bottom_tabbar/bottom_tabbar_example.dart b/example/lib/sample/components/bottom_tabbar/bottom_tabbar_example.dart index 1c1d5f5d..80473add 100644 --- a/example/lib/sample/components/bottom_tabbar/bottom_tabbar_example.dart +++ b/example/lib/sample/components/bottom_tabbar/bottom_tabbar_example.dart @@ -23,6 +23,9 @@ class BottomTabbarExampleState extends State /// test3 int _selectedIndexTest3 = 0; + /// test4 + int _selectedIndexTest4 = 0; + /// 未读消息数量 String badgeNo1 = '100'; @@ -74,12 +77,23 @@ class BottomTabbarExampleState extends State }); } + /// test4 + void _onItemSelectedTest4(int index) { + setState(() { + /// 置为当前选中item的索引值 + _selectedIndexTest4 = index; + }); + } + @override Widget build(BuildContext context) { return MaterialApp( home: Scaffold( appBar: BrnAppBar( title: 'BottomTabBar', + backLeadCallback: (){ + Navigator.pop(context); + }, ), /// 首先定义一个BottomTabBar容器 @@ -96,32 +110,47 @@ class BottomTabbarExampleState extends State items: [ // 定义每个BottomTabBarItem，子属性请看源码 BrnBottomTabBarItem( - icon: - Image(image: AssetImage("assets/icons/navbar_house.png")), - activeIcon: - Image(image: AssetImage("assets/icons/navbar_house.png")), + icon: Image(image: AssetImage("assets/icons/navbar_house.png")), + activeIcon: Image( + image: AssetImage("assets/icons/navbar_house.png"), + color: Colors.blue, + ), title: Text(titles[0])), BrnBottomTabBarItem( - icon: - Image(image: AssetImage("assets/icons/navbar_house.png")), + icon: Image(image: AssetImage("assets/icons/navbar_house.png")), + activeIcon: Image( + image: AssetImage("assets/icons/navbar_house.png"), + color: Colors.blue, + ), title: Text(titles[1])), BrnBottomTabBarItem( - icon: - Image(image: AssetImage("assets/icons/navbar_house.png")), + icon: Image(image: AssetImage("assets/icons/navbar_house.png")), + activeIcon: Image( + image: AssetImage("assets/icons/navbar_house.png"), + color: Colors.blue, + ), title: Text(titles[2])), BrnBottomTabBarItem( - icon: - Image(image: AssetImage("assets/icons/navbar_house.png")), - activeIcon: - Image(image: AssetImage("assets/icons/navbar_house.png")), + icon: Image(image: AssetImage("assets/icons/navbar_house.png")), + activeIcon: Image( + image: AssetImage("assets/icons/navbar_house.png"), + color: Colors.blue, + ), title: Text(titles[3])), BrnBottomTabBarItem( - icon: - Image(image: AssetImage("assets/icons/navbar_house.png")), - title: Text(titles[4])), + icon: Image(image: AssetImage("assets/icons/navbar_house.png")), + activeIcon: Image( + image: AssetImage("assets/icons/navbar_house.png"), + color: Colors.blue, + ), + title: Text(titles[4]), + ), BrnBottomTabBarItem( - icon: - Image(image: AssetImage("assets/icons/navbar_house.png")), + icon: Image(image: AssetImage("assets/icons/navbar_house.png")), + activeIcon: Image( + image: AssetImage("assets/icons/navbar_house.png"), + color: Colors.blue, + ), title: Text(titles[5])), ], ), @@ -136,66 +165,69 @@ class BottomTabbarExampleState extends State currentIndex: _selectedIndexTest1, onTap: _onItemSelectedTest1, items: [ - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text(titles[0])), + BrnBottomTabBarItem(icon: Icon(icons[0]), title: Text(titles[0])), ], ), Padding( padding: const EdgeInsets.all(12.0), - child: Text('极限条件测试2，有8个item'), + child: Text('有 2 个 item'), ), BrnBottomTabBar( fixedColor: Colors.blue, currentIndex: _selectedIndexTest2, onTap: _onItemSelectedTest2, items: [ - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text(titles[0])), - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text(titles[0])), - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text(titles[0])), - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text(titles[0])), - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text(titles[0])), - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text(titles[0])), - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text(titles[0])), - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text(titles[0])), + BrnBottomTabBarItem(icon: Icon(icons[0]), title: Text(titles[0])), + BrnBottomTabBarItem(icon: Icon(icons[0]), title: Text(titles[0])), ], ), Padding( padding: const EdgeInsets.all(12.0), - child: Text('极限条件测试3，text比较长的情况'), + child: Text('极限条件测试2，有8个item'), ), BrnBottomTabBar( fixedColor: Colors.blue, currentIndex: _selectedIndexTest3, onTap: _onItemSelectedTest3, + items: _getTabBarItems(count: 8), + ), + Padding( + padding: const EdgeInsets.all(12.0), + child: Text('极限条件测试3，text比较长的情况'), + ), + BrnBottomTabBar( + fixedColor: Colors.blue, + currentIndex: _selectedIndexTest4, + onTap: _onItemSelectedTest4, items: [ - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text("1111111111")), - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text("2222222222")), - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text("3333333333")), - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text("4444444444")), - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text("5555555555")), - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text("6666666666")), - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text("7777777777")), - BrnBottomTabBarItem( - icon: Icon(icons[0]), title: Text("8888888888")), + BrnBottomTabBarItem(icon: Icon(icons[0]), title: Text("1111111111")), + BrnBottomTabBarItem(icon: Icon(icons[0]), title: Text("2222222222")), + BrnBottomTabBarItem(icon: Icon(icons[0]), title: Text("3333333333")), + BrnBottomTabBarItem(icon: Icon(icons[0]), title: Text("4444444444")), + BrnBottomTabBarItem(icon: Icon(icons[0]), title: Text("5555555555")), + BrnBottomTabBarItem(icon: Icon(icons[0]), title: Text("6666666666")), + BrnBottomTabBarItem(icon: Icon(icons[0]), title: Text("7777777777")), + BrnBottomTabBarItem(icon: Icon(icons[0]), title: Text("8888888888")), ], ), ], )), ); } + + List _getTabBarItems({int count = 1}) { + return List.generate( + count, + (index) => BrnBottomTabBarItem( + icon: Icon( + icons[0], + color: Colors.grey, + ), + title: Text(titles[0]), + activeIcon: Icon( + icons[0], + color: Colors.blue, + ), + )); + } } diff --git a/example/lib/sample/components/button/brn_text_button_panel_example.dart b/example/lib/sample/components/button/brn_text_button_panel_example.dart index 50cf4e80..388bf47c 100644 --- a/example/lib/sample/components/button/brn_text_button_panel_example.dart +++ b/example/lib/sample/components/button/brn_text_button_panel_example.dart @@ -104,7 +104,9 @@ class BrnTextButtonPanelExample extends StatelessWidget { nameList: ['操作1', '操作2', '操作3', '操作4', '操作5', '操作6'], popDirection: BrnPopupDirection.top, onTap: (index) { - BrnToast.show('第$index个操作', context); + BrnDialogManager.showSingleButtonDialog(context, message: 'index $index clicked!', label: 'OK', onTap: (){ + Navigator.pop(context); + }); }, ), Text( diff --git a/example/lib/sample/components/button/common_collection_example.dart b/example/lib/sample/components/button/common_collection_example.dart index ebab07a9..da249615 100644 --- a/example/lib/sample/components/button/common_collection_example.dart +++ b/example/lib/sample/components/button/common_collection_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/calendar/calendarview_example.dart b/example/lib/sample/components/calendar/calendarview_example.dart index 1c11a899..25e9f568 100644 --- a/example/lib/sample/components/calendar/calendarview_example.dart +++ b/example/lib/sample/components/calendar/calendarview_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/card/brn_shadow_example.dart b/example/lib/sample/components/card/brn_shadow_example.dart index c29197ad..304612a0 100644 --- a/example/lib/sample/components/card/brn_shadow_example.dart +++ b/example/lib/sample/components/card/brn_shadow_example.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/bruno.dart'; diff --git a/example/lib/sample/components/card/bubble/brn_expanded_bubble_example.dart b/example/lib/sample/components/card/bubble/brn_expanded_bubble_example.dart index 687f33f0..a25114e6 100644 --- a/example/lib/sample/components/card/bubble/brn_expanded_bubble_example.dart +++ b/example/lib/sample/components/card/bubble/brn_expanded_bubble_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/card/bubble/bubble_entry_page.dart b/example/lib/sample/components/card/bubble/bubble_entry_page.dart index 386008be..139d169c 100644 --- a/example/lib/sample/components/card/bubble/bubble_entry_page.dart +++ b/example/lib/sample/components/card/bubble/bubble_entry_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/components/card/bubble/common_bubble_example.dart'; import 'package:example/sample/components/card/bubble/brn_expanded_bubble_example.dart'; diff --git a/example/lib/sample/components/card/bubble/common_bubble_example.dart b/example/lib/sample/components/card/bubble/common_bubble_example.dart index 06d53c24..569dfbab 100644 --- a/example/lib/sample/components/card/bubble/common_bubble_example.dart +++ b/example/lib/sample/components/card/bubble/common_bubble_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/card/content/brn_two_rich_content_example.dart b/example/lib/sample/components/card/content/brn_two_rich_content_example.dart index 6062e2f0..c0529614 100644 --- a/example/lib/sample/components/card/content/brn_two_rich_content_example.dart +++ b/example/lib/sample/components/card/content/brn_two_rich_content_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/card/content/brn_two_text_content_example.dart b/example/lib/sample/components/card/content/brn_two_text_content_example.dart index c2dc745b..747e0a28 100644 --- a/example/lib/sample/components/card/content/brn_two_text_content_example.dart +++ b/example/lib/sample/components/card/content/brn_two_text_content_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/card/content/keyvalue_align_content_example.dart b/example/lib/sample/components/card/content/keyvalue_align_content_example.dart index 39fd8fc7..7dd923de 100644 --- a/example/lib/sample/components/card/content/keyvalue_align_content_example.dart +++ b/example/lib/sample/components/card/content/keyvalue_align_content_example.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/bruno.dart'; diff --git a/example/lib/sample/components/card/content/number_item_example.dart b/example/lib/sample/components/card/content/number_item_example.dart index 0579e485..94c252f2 100644 --- a/example/lib/sample/components/card/content/number_item_example.dart +++ b/example/lib/sample/components/card/content/number_item_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/card/content/text_content_entry_page.dart b/example/lib/sample/components/card/content/text_content_entry_page.dart index 590e88e2..a38c6a4b 100644 --- a/example/lib/sample/components/card/content/text_content_entry_page.dart +++ b/example/lib/sample/components/card/content/text_content_entry_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/components/card/content/keyvalue_align_content_example.dart'; import 'package:example/sample/components/card/content/keyvalue_close_content_example.dart'; diff --git a/example/lib/sample/components/card/content/text_value_arrow_example.dart b/example/lib/sample/components/card/content/text_value_arrow_example.dart index 143ad29e..5fa3f073 100644 --- a/example/lib/sample/components/card/content/text_value_arrow_example.dart +++ b/example/lib/sample/components/card/content/text_value_arrow_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/card_title/brn_action_title_example.dart b/example/lib/sample/components/card_title/brn_action_title_example.dart index 67bb132f..b2931881 100644 --- a/example/lib/sample/components/card_title/brn_action_title_example.dart +++ b/example/lib/sample/components/card_title/brn_action_title_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/card_title/brn_common_title_example.dart b/example/lib/sample/components/card_title/brn_common_title_example.dart index 060b2f09..fd5bd176 100644 --- a/example/lib/sample/components/card_title/brn_common_title_example.dart +++ b/example/lib/sample/components/card_title/brn_common_title_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/card_title/title_example.dart b/example/lib/sample/components/card_title/title_example.dart index 66b73224..084cce7a 100644 --- a/example/lib/sample/components/card_title/title_example.dart +++ b/example/lib/sample/components/card_title/title_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/components/card_title/brn_action_title_example.dart'; import 'package:example/sample/components/card_title/brn_common_title_example.dart'; diff --git a/example/lib/sample/components/charts/chart_entry_example.dart b/example/lib/sample/components/charts/chart_entry_example.dart index 7afea5dc..ecc56a58 100644 --- a/example/lib/sample/components/charts/chart_entry_example.dart +++ b/example/lib/sample/components/charts/chart_entry_example.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/bruno.dart'; diff --git a/example/lib/sample/components/charts/doughnut_chart_example.dart b/example/lib/sample/components/charts/doughnut_chart_example.dart index 6b67a20b..b66069b2 100644 --- a/example/lib/sample/components/charts/doughnut_chart_example.dart +++ b/example/lib/sample/components/charts/doughnut_chart_example.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/bruno.dart'; diff --git a/example/lib/sample/components/charts/line/brn_broken_line_example.dart b/example/lib/sample/components/charts/line/brn_broken_line_example.dart index cbb7929f..7a5759e0 100644 --- a/example/lib/sample/components/charts/line/brn_broken_line_example.dart +++ b/example/lib/sample/components/charts/line/brn_broken_line_example.dart @@ -77,7 +77,7 @@ class _BrokenLineExampleState extends State { lineColor: Colors.green, ) ], - size: Size(MediaQuery.of(context).size.width * 1 - 100 * 2, + size: Size(MediaQuery.of(context).size.width, MediaQuery.of(context).size.height / 5 * 1.6 - 20 * 2), isShowXHintLine: true, xDialValues: _getXDialValuesForExample1(brokenData), diff --git a/example/lib/sample/components/charts/line/db_data_node_model.dart b/example/lib/sample/components/charts/line/db_data_node_model.dart index cc84cf5b..48c2957b 100644 --- a/example/lib/sample/components/charts/line/db_data_node_model.dart +++ b/example/lib/sample/components/charts/line/db_data_node_model.dart @@ -1,5 +1,7 @@ /// @desc 看板卡片中用于描述数据指标的模型，也能用于数据块的定义，内部嵌套了一个itemList + + class DBDataNodeModel { String? key; String? name; diff --git a/example/lib/sample/components/charts/progress_bar_chart_example.dart b/example/lib/sample/components/charts/progress_bar_chart_example.dart index 7f987101..0baa6afb 100644 --- a/example/lib/sample/components/charts/progress_bar_chart_example.dart +++ b/example/lib/sample/components/charts/progress_bar_chart_example.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/charts/progress_chart_entry_page.dart b/example/lib/sample/components/charts/progress_chart_entry_page.dart index bb0b34c9..6d71c9dc 100644 --- a/example/lib/sample/components/charts/progress_chart_entry_page.dart +++ b/example/lib/sample/components/charts/progress_chart_entry_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/dialog/dialog_entry_page.dart b/example/lib/sample/components/dialog/dialog_entry_page.dart index e88cb2e2..a4be831e 100644 --- a/example/lib/sample/components/dialog/dialog_entry_page.dart +++ b/example/lib/sample/components/dialog/dialog_entry_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/home/list_item.dart'; import 'package:flutter/material.dart'; @@ -288,6 +290,7 @@ class DialogEntryPage extends StatelessWidget { return BrnSingleSelectDialog( isClose: true, title: '请选择无效客源原因', + messageText: '请您评价该条线索请您评价该条线索请您评价该条线索请您评价该条线索请您评价该条线索', conditions: conditions, checkedItem: conditions[selectedIndex], submitText: '提交', diff --git a/example/lib/sample/components/empty/abnormal_entry_page.dart b/example/lib/sample/components/empty/abnormal_entry_page.dart index a0fa3ffa..3cfddc66 100644 --- a/example/lib/sample/components/empty/abnormal_entry_page.dart +++ b/example/lib/sample/components/empty/abnormal_entry_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/components/empty/abnormal_state_example.dart'; import 'package:example/sample/home/list_item.dart'; diff --git a/example/lib/sample/components/empty/abnormal_state_example.dart b/example/lib/sample/components/empty/abnormal_state_example.dart index c1c209f8..9ec98bd5 100644 --- a/example/lib/sample/components/empty/abnormal_state_example.dart +++ b/example/lib/sample/components/empty/abnormal_state_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/all_item_style_example.dart b/example/lib/sample/components/form/all_item_style_example.dart index f5df6702..07630cad 100644 --- a/example/lib/sample/components/form/all_item_style_example.dart +++ b/example/lib/sample/components/form/all_item_style_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/components/form/group_example/expansion_group_example.dart'; import 'package:example/sample/components/form/group_example/group_add_example.dart'; diff --git a/example/lib/sample/components/form/group_example/expansion_group_example.dart b/example/lib/sample/components/form/group_example/expansion_group_example.dart index 248937bb..9d2f2d98 100644 --- a/example/lib/sample/components/form/group_example/expansion_group_example.dart +++ b/example/lib/sample/components/form/group_example/expansion_group_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/group_example/group_add_example.dart b/example/lib/sample/components/form/group_example/group_add_example.dart index 7516c930..2e810ecf 100644 --- a/example/lib/sample/components/form/group_example/group_add_example.dart +++ b/example/lib/sample/components/form/group_example/group_add_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/group_example/normal_group_example.dart b/example/lib/sample/components/form/group_example/normal_group_example.dart index 8edefddd..5b4b133a 100644 --- a/example/lib/sample/components/form/group_example/normal_group_example.dart +++ b/example/lib/sample/components/form/group_example/normal_group_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/items_example/base_title_example.dart b/example/lib/sample/components/form/items_example/base_title_example.dart index 2686d863..576aff20 100644 --- a/example/lib/sample/components/form/items_example/base_title_example.dart +++ b/example/lib/sample/components/form/items_example/base_title_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/items_example/multi_choice_example.dart b/example/lib/sample/components/form/items_example/multi_choice_example.dart index a9b6e64f..43101a49 100644 --- a/example/lib/sample/components/form/items_example/multi_choice_example.dart +++ b/example/lib/sample/components/form/items_example/multi_choice_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/items_example/multi_choice_protrait_example.dart b/example/lib/sample/components/form/items_example/multi_choice_protrait_example.dart index 1935a264..222ddec0 100644 --- a/example/lib/sample/components/form/items_example/multi_choice_protrait_example.dart +++ b/example/lib/sample/components/form/items_example/multi_choice_protrait_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/items_example/radio_input_example.dart b/example/lib/sample/components/form/items_example/radio_input_example.dart index f4393c5f..3cb8b43c 100644 --- a/example/lib/sample/components/form/items_example/radio_input_example.dart +++ b/example/lib/sample/components/form/items_example/radio_input_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/items_example/radio_protrait_example.dart b/example/lib/sample/components/form/items_example/radio_protrait_example.dart index 03cb1d39..a537edb4 100644 --- a/example/lib/sample/components/form/items_example/radio_protrait_example.dart +++ b/example/lib/sample/components/form/items_example/radio_protrait_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/items_example/range_input_example.dart b/example/lib/sample/components/form/items_example/range_input_example.dart index e11a6e6b..0e207851 100644 --- a/example/lib/sample/components/form/items_example/range_input_example.dart +++ b/example/lib/sample/components/form/items_example/range_input_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/items_example/ratio_input_example.dart b/example/lib/sample/components/form/items_example/ratio_input_example.dart index d90e38f4..5d374d59 100644 --- a/example/lib/sample/components/form/items_example/ratio_input_example.dart +++ b/example/lib/sample/components/form/items_example/ratio_input_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/items_example/select_all_title_example.dart b/example/lib/sample/components/form/items_example/select_all_title_example.dart index 82003344..fb1bfbce 100644 --- a/example/lib/sample/components/form/items_example/select_all_title_example.dart +++ b/example/lib/sample/components/form/items_example/select_all_title_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/items_example/star_example.dart b/example/lib/sample/components/form/items_example/star_example.dart index be97c7ce..8bf0f6be 100644 --- a/example/lib/sample/components/form/items_example/star_example.dart +++ b/example/lib/sample/components/form/items_example/star_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; 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 index 7ea9ce04..3b828923 100644 --- a/example/lib/sample/components/form/items_example/step_input_example.dart +++ b/example/lib/sample/components/form/items_example/step_input_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/items_example/text_block_input_example.dart b/example/lib/sample/components/form/items_example/text_block_input_example.dart index 046d002a..9d05ba9f 100644 --- a/example/lib/sample/components/form/items_example/text_block_input_example.dart +++ b/example/lib/sample/components/form/items_example/text_block_input_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/items_example/text_input_example.dart b/example/lib/sample/components/form/items_example/text_input_example.dart index 6c04ed6f..2e3037d8 100644 --- a/example/lib/sample/components/form/items_example/text_input_example.dart +++ b/example/lib/sample/components/form/items_example/text_input_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/form/items_example/text_quick_select_input_example.dart b/example/lib/sample/components/form/items_example/text_quick_select_input_example.dart index ade62644..e4a8ede0 100644 --- a/example/lib/sample/components/form/items_example/text_quick_select_input_example.dart +++ b/example/lib/sample/components/form/items_example/text_quick_select_input_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; diff --git a/example/lib/sample/components/form/items_example/text_select_example.dart b/example/lib/sample/components/form/items_example/text_select_example.dart index 2f1ebfb3..7a689bbd 100644 --- a/example/lib/sample/components/form/items_example/text_select_example.dart +++ b/example/lib/sample/components/form/items_example/text_select_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; diff --git a/example/lib/sample/components/form/items_example/title_example.dart b/example/lib/sample/components/form/items_example/title_example.dart index 227cd61a..8bcd8bb2 100644 --- a/example/lib/sample/components/form/items_example/title_example.dart +++ b/example/lib/sample/components/form/items_example/title_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; 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 index 5af6a75a..afaff9d7 100644 --- a/example/lib/sample/components/form/items_example/title_select_example.dart +++ b/example/lib/sample/components/form/items_example/title_select_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; diff --git a/example/lib/sample/components/gallery/gallery_detail_example.dart b/example/lib/sample/components/gallery/gallery_detail_example.dart index 453bfb3c..1406e68a 100644 --- a/example/lib/sample/components/gallery/gallery_detail_example.dart +++ b/example/lib/sample/components/gallery/gallery_detail_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/gallery/gallery_detail_page_theme_example.dart b/example/lib/sample/components/gallery/gallery_detail_page_theme_example.dart index 9924ff3f..f62dc760 100644 --- a/example/lib/sample/components/gallery/gallery_detail_page_theme_example.dart +++ b/example/lib/sample/components/gallery/gallery_detail_page_theme_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/components/gallery/gallery_detail_example.dart'; import 'package:example/sample/home/list_item.dart'; diff --git a/example/lib/sample/components/gallery/gallery_example.dart b/example/lib/sample/components/gallery/gallery_example.dart index 127387f4..7f5e6616 100644 --- a/example/lib/sample/components/gallery/gallery_example.dart +++ b/example/lib/sample/components/gallery/gallery_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/components/gallery/gallery_detail_page_theme_example.dart'; import 'package:example/sample/home/list_item.dart'; diff --git a/example/lib/sample/components/guide/force_guide_example.dart b/example/lib/sample/components/guide/force_guide_example.dart index cb14364c..f8996bac 100644 --- a/example/lib/sample/components/guide/force_guide_example.dart +++ b/example/lib/sample/components/guide/force_guide_example.dart @@ -1,3 +1,5 @@ + + import 'dart:async'; import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/guide/guide_entry_page.dart b/example/lib/sample/components/guide/guide_entry_page.dart index ac312e6e..7b991338 100644 --- a/example/lib/sample/components/guide/guide_entry_page.dart +++ b/example/lib/sample/components/guide/guide_entry_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/components/guide/force_guide_example.dart'; import 'package:example/sample/components/guide/soft_intro_example.dart'; diff --git a/example/lib/sample/components/guide/soft_intro_example.dart b/example/lib/sample/components/guide/soft_intro_example.dart index d4dfd4aa..bce101cd 100644 --- a/example/lib/sample/components/guide/soft_intro_example.dart +++ b/example/lib/sample/components/guide/soft_intro_example.dart @@ -1,3 +1,5 @@ + + import 'dart:async'; import 'package:bruno/bruno.dart'; diff --git a/example/lib/sample/components/input/input_example.dart b/example/lib/sample/components/input/input_example.dart index 98853e93..1b15e211 100644 --- a/example/lib/sample/components/input/input_example.dart +++ b/example/lib/sample/components/input/input_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; diff --git a/example/lib/sample/components/line/dashed_line_example.dart b/example/lib/sample/components/line/dashed_line_example.dart index ec287905..38fbb1b6 100644 --- a/example/lib/sample/components/line/dashed_line_example.dart +++ b/example/lib/sample/components/line/dashed_line_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/loading/loading_widget_example.dart b/example/lib/sample/components/loading/loading_widget_example.dart index f1f64c84..53b9aa05 100644 --- a/example/lib/sample/components/loading/loading_widget_example.dart +++ b/example/lib/sample/components/loading/loading_widget_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/navbar/appbar_entry_page.dart b/example/lib/sample/components/navbar/appbar_entry_page.dart index 31f4f747..b800a595 100644 --- a/example/lib/sample/components/navbar/appbar_entry_page.dart +++ b/example/lib/sample/components/navbar/appbar_entry_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/home/list_item.dart'; import 'package:example/sample/components/navbar/nav_bar_example_page.dart'; diff --git a/example/lib/sample/components/navbar/nav_bar_example_page.dart b/example/lib/sample/components/navbar/nav_bar_example_page.dart index 57a696d8..1f7e0cdd 100644 --- a/example/lib/sample/components/navbar/nav_bar_example_page.dart +++ b/example/lib/sample/components/navbar/nav_bar_example_page.dart @@ -245,7 +245,14 @@ class _NavBarPageState extends State with TickerProviderStateMixin { key: actionKey, iconPressed: () { BrnPopupListWindow.showPopListWindow(context, actionKey, - offset: 10, data: ["aaaa", "bbbbb"]); + offset: 10, data: ["aaaa", "bbbbb"], onItemClick: (index, item){ + BrnDialogManager.showConfirmDialog(context, cancel: 'cancel', confirm: 'confirm', message: 'message', onCancel: (){ + Navigator.pop(context); + }); + return true; + }, onDismiss: (){ + BrnToast.show('onDismiss', context); + }); }, ), ); @@ -510,6 +517,13 @@ class _NavBarPageState extends State with TickerProviderStateMixin { context, keyLeading, data: ["aaaa", "bbbbb"], + onItemClick: (index, data) { + BrnDialogManager.showConfirmDialog(context, cancel: 'cancel', confirm: 'confirm', message: 'message'); + return true; + }, + onDismiss: (){ + BrnToast.show('onDismiss', context); + }, ); }, //输入框 文本内容变化的监听 @@ -568,7 +582,12 @@ class _NavBarPageState extends State with TickerProviderStateMixin { leadClickCallback: (controller, update) { //controller 是文本控制器，通过controller 可以拿到输入的内容 以及 对输入的内容更改 //update 是setState方法的方法命，update() 就可以刷新输入框 - BrnPopupListWindow.showPopListWindow(context, keyLeading, data: ["aaaa", "bbbbb"], offset: 10); + BrnPopupListWindow.showPopListWindow( + context, + keyLeading, + data: ["aaaa", "bbbbb"], + offset: 10 + ); }, //输入框 文本内容变化的监听 searchBarInputChangeCallback: (input) { diff --git a/example/lib/sample/components/noticebar/brn_notice_bar_example.dart b/example/lib/sample/components/noticebar/brn_notice_bar_example.dart index 9b8f45f7..a4e25dd1 100644 --- a/example/lib/sample/components/noticebar/brn_notice_bar_example.dart +++ b/example/lib/sample/components/noticebar/brn_notice_bar_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/components/noticebar/notice_bar_with_button_example.dart'; import 'package:example/sample/home/list_item.dart'; diff --git a/example/lib/sample/components/noticebar/notice_bar_example.dart b/example/lib/sample/components/noticebar/notice_bar_example.dart index 438dc52a..073ac2c4 100644 --- a/example/lib/sample/components/noticebar/notice_bar_example.dart +++ b/example/lib/sample/components/noticebar/notice_bar_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/noticebar/notice_bar_with_button_example.dart b/example/lib/sample/components/noticebar/notice_bar_with_button_example.dart index 8a3243ca..c74d5a17 100644 --- a/example/lib/sample/components/noticebar/notice_bar_with_button_example.dart +++ b/example/lib/sample/components/noticebar/notice_bar_with_button_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/picker/cutomer_bottom_picker_example.dart b/example/lib/sample/components/picker/cutomer_bottom_picker_example.dart index 144f9981..e63e6188 100644 --- a/example/lib/sample/components/picker/cutomer_bottom_picker_example.dart +++ b/example/lib/sample/components/picker/cutomer_bottom_picker_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/home/list_item.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/picker/date_picker_example.dart b/example/lib/sample/components/picker/date_picker_example.dart index 151c0064..e13609b8 100644 --- a/example/lib/sample/components/picker/date_picker_example.dart +++ b/example/lib/sample/components/picker/date_picker_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/home/list_item.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/picker/multi_picker_example.dart b/example/lib/sample/components/picker/multi_picker_example.dart index fc9d09dd..ad50ea05 100644 --- a/example/lib/sample/components/picker/multi_picker_example.dart +++ b/example/lib/sample/components/picker/multi_picker_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/home/list_item.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/picker/picker_entry_page.dart b/example/lib/sample/components/picker/picker_entry_page.dart index f0b2414b..ea5a3e0b 100644 --- a/example/lib/sample/components/picker/picker_entry_page.dart +++ b/example/lib/sample/components/picker/picker_entry_page.dart @@ -1,3 +1,5 @@ + + import 'dart:convert'; import 'package:bruno/bruno.dart'; diff --git a/example/lib/sample/components/popup/overlay_window_example.dart b/example/lib/sample/components/popup/overlay_window_example.dart index 6ff8abab..6e560dc0 100644 --- a/example/lib/sample/components/popup/overlay_window_example.dart +++ b/example/lib/sample/components/popup/overlay_window_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/popup/popwindow_example.dart b/example/lib/sample/components/popup/popwindow_example.dart index 26db9315..82ff008c 100644 --- a/example/lib/sample/components/popup/popwindow_example.dart +++ b/example/lib/sample/components/popup/popwindow_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/rating/rating_example.dart b/example/lib/sample/components/rating/rating_example.dart index 87c763b7..cce7d37a 100644 --- a/example/lib/sample/components/rating/rating_example.dart +++ b/example/lib/sample/components/rating/rating_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/scroll_anchor/scroll_actor_tab_example.dart b/example/lib/sample/components/scroll_anchor/scroll_actor_tab_example.dart index 85ede17d..5ac76358 100644 --- a/example/lib/sample/components/scroll_anchor/scroll_actor_tab_example.dart +++ b/example/lib/sample/components/scroll_anchor/scroll_actor_tab_example.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/bruno.dart'; diff --git a/example/lib/sample/components/selectcity/selected_city_example.dart b/example/lib/sample/components/selectcity/selected_city_example.dart index 62d9bf9d..bc735ba5 100644 --- a/example/lib/sample/components/selectcity/selected_city_example.dart +++ b/example/lib/sample/components/selectcity/selected_city_example.dart @@ -1,3 +1,5 @@ + + import 'dart:convert'; import 'package:bruno/bruno.dart'; diff --git a/example/lib/sample/components/selection/filter_entity.dart b/example/lib/sample/components/selection/filter_entity.dart index 4dd9b1d7..e76b9c6d 100644 --- a/example/lib/sample/components/selection/filter_entity.dart +++ b/example/lib/sample/components/selection/filter_entity.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; class BrnFilterEntity { diff --git a/example/lib/sample/components/selection/flat_selection_five_tags_example.dart b/example/lib/sample/components/selection/flat_selection_five_tags_example.dart index a7ed89d6..68b12f1e 100644 --- a/example/lib/sample/components/selection/flat_selection_five_tags_example.dart +++ b/example/lib/sample/components/selection/flat_selection_five_tags_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; @@ -39,7 +41,7 @@ class _SelectionViewExamplePageState @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar(title: Text(widget._title)), + appBar: BrnAppBar(title: widget._title), body: SingleChildScrollView( child: Column( children: [ diff --git a/example/lib/sample/components/selection/flat_selection_four_tags_example.dart b/example/lib/sample/components/selection/flat_selection_four_tags_example.dart index c1a2b819..b657ea1f 100644 --- a/example/lib/sample/components/selection/flat_selection_four_tags_example.dart +++ b/example/lib/sample/components/selection/flat_selection_four_tags_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; @@ -39,7 +41,7 @@ class _SelectionViewExamplePageState @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar(title: Text(widget._title)), + appBar:BrnAppBar(title: widget._title), body: SingleChildScrollView( child: Column( children: [ diff --git a/example/lib/sample/components/selection/flat_selection_three_tags_example.dart b/example/lib/sample/components/selection/flat_selection_three_tags_example.dart index 85b76582..5639b8ef 100644 --- a/example/lib/sample/components/selection/flat_selection_three_tags_example.dart +++ b/example/lib/sample/components/selection/flat_selection_three_tags_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; @@ -39,7 +41,7 @@ class _SelectionViewExamplePageState @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar(title: Text(widget._title)), + appBar: BrnAppBar(title: widget._title), body: SingleChildScrollView( child: Column( children: [ diff --git a/example/lib/sample/components/selection/selection_entry_page.dart b/example/lib/sample/components/selection/selection_entry_page.dart index 8e72069b..5a445a8f 100644 --- a/example/lib/sample/components/selection/selection_entry_page.dart +++ b/example/lib/sample/components/selection/selection_entry_page.dart @@ -1,3 +1,5 @@ + + import 'dart:convert'; import 'package:bruno/bruno.dart'; diff --git a/example/lib/sample/components/selection/selection_flat_entry_page.dart b/example/lib/sample/components/selection/selection_flat_entry_page.dart index 1ffe82cc..b7eba5cd 100644 --- a/example/lib/sample/components/selection/selection_flat_entry_page.dart +++ b/example/lib/sample/components/selection/selection_flat_entry_page.dart @@ -1,3 +1,5 @@ + + import 'dart:convert'; import 'package:bruno/bruno.dart'; diff --git a/example/lib/sample/components/selection/selectionview_custom_floating_layer_example.dart b/example/lib/sample/components/selection/selectionview_custom_floating_layer_example.dart index 35575acc..36b50b09 100644 --- a/example/lib/sample/components/selection/selectionview_custom_floating_layer_example.dart +++ b/example/lib/sample/components/selection/selectionview_custom_floating_layer_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/components/card/bubble/common_bubble_example.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/selection/selectionview_customhandle_filter_example_page.dart b/example/lib/sample/components/selection/selectionview_customhandle_filter_example_page.dart index dbdc9e05..e4c8b032 100644 --- a/example/lib/sample/components/selection/selectionview_customhandle_filter_example_page.dart +++ b/example/lib/sample/components/selection/selectionview_customhandle_filter_example_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/selection/selectionview_customview_example_page.dart b/example/lib/sample/components/selection/selectionview_customview_example_page.dart index c813cb3a..dda5e422 100644 --- a/example/lib/sample/components/selection/selectionview_customview_example_page.dart +++ b/example/lib/sample/components/selection/selectionview_customview_example_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/selection/selectionview_date_filter_example_page.dart b/example/lib/sample/components/selection/selectionview_date_filter_example_page.dart index 6402c166..3c4e7000 100644 --- a/example/lib/sample/components/selection/selectionview_date_filter_example_page.dart +++ b/example/lib/sample/components/selection/selectionview_date_filter_example_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/selection/selectionview_date_range_example_page.dart b/example/lib/sample/components/selection/selectionview_date_range_example_page.dart index 8366c525..cea484f0 100644 --- a/example/lib/sample/components/selection/selectionview_date_range_example_page.dart +++ b/example/lib/sample/components/selection/selectionview_date_range_example_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/selection/selectionview_interceptor_example.dart b/example/lib/sample/components/selection/selectionview_interceptor_example.dart index 07899418..001aa1f1 100644 --- a/example/lib/sample/components/selection/selectionview_interceptor_example.dart +++ b/example/lib/sample/components/selection/selectionview_interceptor_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/selection/selectionview_limit_max_selected_count_example.dart b/example/lib/sample/components/selection/selectionview_limit_max_selected_count_example.dart index 2a8a7ca3..658114d0 100644 --- a/example/lib/sample/components/selection/selectionview_limit_max_selected_count_example.dart +++ b/example/lib/sample/components/selection/selectionview_limit_max_selected_count_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/selection/selectionview_more_filter_example_page.dart b/example/lib/sample/components/selection/selectionview_more_filter_example_page.dart index 80dce9dc..047ea14f 100644 --- a/example/lib/sample/components/selection/selectionview_more_filter_example_page.dart +++ b/example/lib/sample/components/selection/selectionview_more_filter_example_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/selection/selectionview_multi_list_example_page.dart b/example/lib/sample/components/selection/selectionview_multi_list_example_page.dart index 931ad873..27d80b7b 100644 --- a/example/lib/sample/components/selection/selectionview_multi_list_example_page.dart +++ b/example/lib/sample/components/selection/selectionview_multi_list_example_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/selection/selectionview_multi_range_example_page.dart b/example/lib/sample/components/selection/selectionview_multi_range_example_page.dart index 83992978..2815cab8 100644 --- a/example/lib/sample/components/selection/selectionview_multi_range_example_page.dart +++ b/example/lib/sample/components/selection/selectionview_multi_range_example_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/selection/selectionview_simple_multi_check_example_page.dart b/example/lib/sample/components/selection/selectionview_simple_multi_check_example_page.dart index 6f00de3c..1c9d9229 100755 --- a/example/lib/sample/components/selection/selectionview_simple_multi_check_example_page.dart +++ b/example/lib/sample/components/selection/selectionview_simple_multi_check_example_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/components/selection/filter_entity.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/selection/selectionview_simple_single_list_example_page.dart b/example/lib/sample/components/selection/selectionview_simple_single_list_example_page.dart index 862908bb..ae4309ec 100755 --- a/example/lib/sample/components/selection/selectionview_simple_single_list_example_page.dart +++ b/example/lib/sample/components/selection/selectionview_simple_single_list_example_page.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/components/selection/filter_entity.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/step/step_example.dart b/example/lib/sample/components/step/step_example.dart index 8deaf0ca..03d7833d 100644 --- a/example/lib/sample/components/step/step_example.dart +++ b/example/lib/sample/components/step/step_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/components/step/brn_horizontal_step_example.dart'; import 'package:example/sample/components/step/step_line_example.dart'; diff --git a/example/lib/sample/components/step/step_line_example.dart b/example/lib/sample/components/step/step_line_example.dart index 00fedb66..7aa3faab 100644 --- a/example/lib/sample/components/step/step_line_example.dart +++ b/example/lib/sample/components/step/step_line_example.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/bruno.dart'; diff --git a/example/lib/sample/components/sugsearch/search_text_example.dart b/example/lib/sample/components/sugsearch/search_text_example.dart index cd0a7779..536df14f 100644 --- a/example/lib/sample/components/sugsearch/search_text_example.dart +++ b/example/lib/sample/components/sugsearch/search_text_example.dart @@ -1,3 +1,4 @@ + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/switch/checkbox_example.dart b/example/lib/sample/components/switch/checkbox_example.dart index 8345f68b..192a2e87 100644 --- a/example/lib/sample/components/switch/checkbox_example.dart +++ b/example/lib/sample/components/switch/checkbox_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/switch/radio_example.dart b/example/lib/sample/components/switch/radio_example.dart index 6c665189..6026c241 100644 --- a/example/lib/sample/components/switch/radio_example.dart +++ b/example/lib/sample/components/switch/radio_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/tabbar/brn_switch_title_example.dart b/example/lib/sample/components/tabbar/brn_switch_title_example.dart index 489ec409..c38d529b 100644 --- a/example/lib/sample/components/tabbar/brn_switch_title_example.dart +++ b/example/lib/sample/components/tabbar/brn_switch_title_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/tabbar/brn_tab_example.dart b/example/lib/sample/components/tabbar/brn_tab_example.dart index 1511776b..28171f91 100644 --- a/example/lib/sample/components/tabbar/brn_tab_example.dart +++ b/example/lib/sample/components/tabbar/brn_tab_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/home/list_item.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/tabbar/brn_tabbar_sticky_example.dart b/example/lib/sample/components/tabbar/brn_tabbar_sticky_example.dart index 2bb396df..07b682e4 100644 --- a/example/lib/sample/components/tabbar/brn_tabbar_sticky_example.dart +++ b/example/lib/sample/components/tabbar/brn_tabbar_sticky_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/tabbar/sub_switch_title_example.dart b/example/lib/sample/components/tabbar/sub_switch_title_example.dart index 0b0afa6a..5bf4bbfa 100644 --- a/example/lib/sample/components/tabbar/sub_switch_title_example.dart +++ b/example/lib/sample/components/tabbar/sub_switch_title_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/tag/border_tag_example.dart b/example/lib/sample/components/tag/border_tag_example.dart index 27cb4313..bf6f3192 100644 --- a/example/lib/sample/components/tag/border_tag_example.dart +++ b/example/lib/sample/components/tag/border_tag_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/tag/custom_tag_example.dart b/example/lib/sample/components/tag/custom_tag_example.dart index 1948b926..f6367f0f 100644 --- a/example/lib/sample/components/tag/custom_tag_example.dart +++ b/example/lib/sample/components/tag/custom_tag_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/tag/select_tag_example.dart b/example/lib/sample/components/tag/select_tag_example.dart index 4cb04c3d..38956798 100644 --- a/example/lib/sample/components/tag/select_tag_example.dart +++ b/example/lib/sample/components/tag/select_tag_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/tag/state_tag_example.dart b/example/lib/sample/components/tag/state_tag_example.dart index 55738b38..8b97ae18 100644 --- a/example/lib/sample/components/tag/state_tag_example.dart +++ b/example/lib/sample/components/tag/state_tag_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/tag/tag_example.dart b/example/lib/sample/components/tag/tag_example.dart index a856bef0..a067974b 100644 --- a/example/lib/sample/components/tag/tag_example.dart +++ b/example/lib/sample/components/tag/tag_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/components/tag/border_tag_example.dart'; import 'package:example/sample/components/tag/custom_tag_example.dart'; diff --git a/example/lib/sample/components/tag/tag_row_example.dart b/example/lib/sample/components/tag/tag_row_example.dart index ed035494..510eec30 100644 --- a/example/lib/sample/components/tag/tag_row_example.dart +++ b/example/lib/sample/components/tag/tag_row_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/components/toast/toast_example.dart b/example/lib/sample/components/toast/toast_example.dart index 113e9af5..bb34191c 100644 --- a/example/lib/sample/components/toast/toast_example.dart +++ b/example/lib/sample/components/toast/toast_example.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/home/card_data_config.dart b/example/lib/sample/home/card_data_config.dart index 09498288..e3ee0a88 100644 --- a/example/lib/sample/home/card_data_config.dart +++ b/example/lib/sample/home/card_data_config.dart @@ -1,3 +1,5 @@ + + import 'dart:convert'; import 'package:bruno/bruno.dart'; diff --git a/example/lib/sample/home/expandable_container_widget.dart b/example/lib/sample/home/expandable_container_widget.dart index 4013d6d9..d181f177 100644 --- a/example/lib/sample/home/expandable_container_widget.dart +++ b/example/lib/sample/home/expandable_container_widget.dart @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. + + import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; diff --git a/example/lib/sample/home/group_card.dart b/example/lib/sample/home/group_card.dart index 91d1e8dd..0296a77d 100644 --- a/example/lib/sample/home/group_card.dart +++ b/example/lib/sample/home/group_card.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/home/list_item.dart'; import 'package:example/sample/home/card_data_config.dart'; diff --git a/example/lib/sample/home/home.dart b/example/lib/sample/home/home.dart index d9654146..5e5b2132 100644 --- a/example/lib/sample/home/home.dart +++ b/example/lib/sample/home/home.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:example/sample/home/card_data_config.dart'; import 'package:example/sample/home/group_card.dart'; @@ -9,7 +11,7 @@ class HomePage extends StatelessWidget { Widget build(BuildContext context) { return Scaffold( appBar: BrnAppBar( - title: Text("UI组件"), + title: 'UI组件', leading: null, automaticallyImplyLeading: false, ), diff --git a/example/lib/sample/home/list_item.dart b/example/lib/sample/home/list_item.dart index dfca9ee1..e37c9332 100644 --- a/example/lib/sample/home/list_item.dart +++ b/example/lib/sample/home/list_item.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/bruno.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/sample/theme/config_test_utils.dart b/example/lib/sample/theme/config_test_utils.dart index e2373a85..cffa9237 100644 --- a/example/lib/sample/theme/config_test_utils.dart +++ b/example/lib/sample/theme/config_test_utils.dart @@ -1,3 +1,5 @@ + + import 'dart:ui'; import 'package:bruno/bruno.dart'; diff --git a/example/web/assets/FontManifest.json b/example/web/assets/FontManifest.json new file mode 100644 index 00000000..ac26bd3f --- /dev/null +++ b/example/web/assets/FontManifest.json @@ -0,0 +1,10 @@ +[ + { + "family": "MaterialIcons", + "fonts": [ + { + "asset": "fonts/MaterialIcons-Regular.otf" + } + ] + } +] \ No newline at end of file diff --git a/example/web/assets/fonts/MaterialIcons-Regular.otf b/example/web/assets/fonts/MaterialIcons-Regular.otf new file mode 100644 index 00000000..3246ad55 Binary files /dev/null and b/example/web/assets/fonts/MaterialIcons-Regular.otf differ diff --git a/example/web/favicon.png b/example/web/favicon.png new file mode 100644 index 00000000..00158cec Binary files /dev/null and b/example/web/favicon.png differ diff --git a/example/web/icons/icon-192.png b/example/web/icons/icon-192.png new file mode 100644 index 00000000..f1d902f4 Binary files /dev/null and b/example/web/icons/icon-192.png differ diff --git a/example/web/icons/icon-512.png b/example/web/icons/icon-512.png new file mode 100644 index 00000000..624294c2 Binary files /dev/null and b/example/web/icons/icon-512.png differ diff --git a/example/web/index.html b/example/web/index.html new file mode 100644 index 00000000..f32bf8da --- /dev/null +++ b/example/web/index.html @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/example/web/main.dart b/example/web/main.dart new file mode 100644 index 00000000..002f07d0 --- /dev/null +++ b/example/web/main.dart @@ -0,0 +1,7 @@ + +// TODO: change `my_app` to refer to your app package name. +import 'package:example/main.dart' as app; + +main() async { + app.main(); +} \ No newline at end of file diff --git a/example/web/manifest.json b/example/web/manifest.json new file mode 100644 index 00000000..e10777ee --- /dev/null +++ b/example/web/manifest.json @@ -0,0 +1,23 @@ +{ + "name": "Bruno Demo", + "short_name": "Bruno", + "start_url": ".", + "display": "Bruno", + "background_color": "#FFFFFFFF", + "theme_color": "#0175C2", + "description": "Bruno 是基于一整套设计体系的 Flutter 组件库。An enterprise-class package of Flutter components for mobile applications.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + } + ] +} diff --git a/lib/src/components/button/brn_big_ghost_button.dart b/lib/src/components/button/brn_big_ghost_button.dart index e2292cd8..c75d2369 100644 --- a/lib/src/components/button/brn_big_ghost_button.dart +++ b/lib/src/components/button/brn_big_ghost_button.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/button/brn_normal_button.dart'; import 'package:bruno/src/theme/brn_theme.dart'; import 'package:flutter/material.dart'; @@ -49,8 +51,7 @@ class BrnBigGhostButton extends StatelessWidget { BrnButtonConfig defaultThemeConfig = themeData ?? BrnButtonConfig(); defaultThemeConfig = BrnThemeConfigurator.instance .getConfig(configId: defaultThemeConfig.configId) - .buttonConfig - .merge(defaultThemeConfig); + .buttonConfig.merge(defaultThemeConfig); return BrnNormalButton( borderRadius: BorderRadius.circular(defaultThemeConfig.bigButtonRadius), diff --git a/lib/src/components/button/brn_big_main_button.dart b/lib/src/components/button/brn_big_main_button.dart index 8331ab92..26e5b8cd 100644 --- a/lib/src/components/button/brn_big_main_button.dart +++ b/lib/src/components/button/brn_big_main_button.dart @@ -61,8 +61,7 @@ class BrnBigMainButton extends StatelessWidget { defaultThemeConfig = BrnThemeConfigurator.instance .getConfig(configId: defaultThemeConfig.configId) - .buttonConfig - .merge(defaultThemeConfig); + .buttonConfig.merge(defaultThemeConfig); return BrnNormalButton( constraints: BoxConstraints.tightFor( diff --git a/lib/src/components/button/brn_big_outline_button.dart b/lib/src/components/button/brn_big_outline_button.dart index 0983da85..b6b6804d 100644 --- a/lib/src/components/button/brn_big_outline_button.dart +++ b/lib/src/components/button/brn_big_outline_button.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/button/brn_big_ghost_button.dart'; import 'package:bruno/src/components/button/brn_normal_button.dart'; import 'package:bruno/src/theme/brn_theme.dart'; @@ -66,8 +68,7 @@ class BrnBigOutlineButton extends StatelessWidget { defaultThemeConfig = BrnThemeConfigurator.instance .getConfig(configId: defaultThemeConfig.configId) - .buttonConfig - .merge(defaultThemeConfig); + .buttonConfig.merge(defaultThemeConfig); Color? _lineColor = lineColor ?? defaultThemeConfig.commonConfig.borderColorBase; diff --git a/lib/src/components/button/brn_icon_button.dart b/lib/src/components/button/brn_icon_button.dart index a83f1074..b99f456b 100644 --- a/lib/src/components/button/brn_icon_button.dart +++ b/lib/src/components/button/brn_icon_button.dart @@ -93,9 +93,7 @@ class _BrnIconButtonState extends State { children: [ // 图片 Container( - height: widget.iconHeight, - width: widget.iconWidth, - child: widget.iconWidget), + height: widget.iconHeight, width: widget.iconWidth, child: widget.iconWidget), Padding( padding: EdgeInsets.only(top: widget.padding), child: Text( diff --git a/lib/src/components/button/brn_small_main_button.dart b/lib/src/components/button/brn_small_main_button.dart index f2e46757..5e56228c 100644 --- a/lib/src/components/button/brn_small_main_button.dart +++ b/lib/src/components/button/brn_small_main_button.dart @@ -71,8 +71,7 @@ class BrnSmallMainButton extends StatelessWidget { .buttonConfig .merge(defaultThemeConfig); - TextPainter textPainter = - TextPainter(textScaleFactor: MediaQuery.of(context).textScaleFactor); + TextPainter textPainter = TextPainter(textScaleFactor: MediaQuery.of(context).textScaleFactor); return LayoutBuilder( builder: (_, con) { @@ -116,8 +115,7 @@ class BrnSmallMainButton extends StatelessWidget { backgroundColor: bgColor ?? defaultThemeConfig.commonConfig.brandPrimary, disableBackgroundColor: Color(0xFFCCCCCC), - borderRadius: BorderRadius.all( - Radius.circular(defaultThemeConfig.smallButtonRadius)), + borderRadius: BorderRadius.all(Radius.circular(defaultThemeConfig.smallButtonRadius)), onTap: onTap, textStyle: style, ); diff --git a/lib/src/components/button/brn_small_outline_button.dart b/lib/src/components/button/brn_small_outline_button.dart index 3c170e8c..aa18319e 100644 --- a/lib/src/components/button/brn_small_outline_button.dart +++ b/lib/src/components/button/brn_small_outline_button.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/src/components/button/brn_normal_button.dart'; @@ -79,8 +81,7 @@ class BrnSmallOutlineButton extends StatelessWidget { )); defaultThemeConfig = BrnThemeConfigurator.instance .getConfig(configId: defaultThemeConfig.configId) - .buttonConfig - .merge(defaultThemeConfig); + .buttonConfig.merge(defaultThemeConfig); TextPainter textPainter = TextPainter(textScaleFactor: MediaQuery.of(context).textScaleFactor); diff --git a/lib/src/components/button/collection/brn_bottom_button_panel.dart b/lib/src/components/button/collection/brn_bottom_button_panel.dart index ebd2c1e5..403835ec 100644 --- a/lib/src/components/button/collection/brn_bottom_button_panel.dart +++ b/lib/src/components/button/collection/brn_bottom_button_panel.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/button/brn_vertical_icon_button.dart'; import 'package:bruno/src/theme/brn_theme_configurator.dart'; import 'package:flutter/material.dart'; @@ -224,9 +226,7 @@ class BrnBottomButtonPanel extends StatelessWidget { ? Colors.white : BrnThemeConfigurator.instance .getConfig() - .commonConfig - .colorTextBaseInverse - .withOpacity(0.7), + .commonConfig.colorTextBaseInverse.withOpacity(0.7), ), ), )), @@ -267,9 +267,7 @@ class BrnBottomButtonPanel extends StatelessWidget { ? Colors.white : BrnThemeConfigurator.instance .getConfig() - .commonConfig - .colorTextBaseInverse - .withOpacity(0.7), + .commonConfig.colorTextBaseInverse.withOpacity(0.7), ), ), )), diff --git a/lib/src/components/button/collection/brn_button_panel.dart b/lib/src/components/button/collection/brn_button_panel.dart index 3592b25d..5e26e4e2 100644 --- a/lib/src/components/button/collection/brn_button_panel.dart +++ b/lib/src/components/button/collection/brn_button_panel.dart @@ -197,14 +197,8 @@ class _BrnButtonPanelState extends State { maxLines: 1, style: TextStyle( color: _secondaryButtonList[index + 2].isEnable - ? BrnThemeConfigurator.instance - .getConfig() - .commonConfig - .colorTextBase - : BrnThemeConfigurator.instance - .getConfig() - .commonConfig - .colorTextHint, + ? BrnThemeConfigurator.instance.getConfig().commonConfig.colorTextBase + : BrnThemeConfigurator.instance.getConfig().commonConfig.colorTextHint, fontSize: 16)); }, popDirection: widget.popDirection, diff --git a/lib/src/components/button/collection/brn_multiple_bottom_button.dart b/lib/src/components/button/collection/brn_multiple_bottom_button.dart index d8b5f0ba..393f8eee 100644 --- a/lib/src/components/button/collection/brn_multiple_bottom_button.dart +++ b/lib/src/components/button/collection/brn_multiple_bottom_button.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/radio/brn_checkbox.dart'; import 'package:bruno/src/constants/brn_asset_constants.dart'; import 'package:bruno/src/theme/brn_theme_configurator.dart'; diff --git a/lib/src/components/button/collection/brn_text_button_panel.dart b/lib/src/components/button/collection/brn_text_button_panel.dart index 893ed31d..74b3d6a6 100644 --- a/lib/src/components/button/collection/brn_text_button_panel.dart +++ b/lib/src/components/button/collection/brn_text_button_panel.dart @@ -61,9 +61,7 @@ class _BrnTextButtonPanelState extends State { List widgetList = []; //文本按钮不超过4个，就全不显示 //超过4个的话，就只显示3个，剩下的显示在更多里 - int length = widget.nameList.length <= _maxNum - ? widget.nameList.length - : _maxNum - 1; + int length = widget.nameList.length <= _maxNum ? widget.nameList.length : _maxNum - 1; for (int textIndex = 0; textIndex < length; textIndex++) { Widget operationWidget = _operationWidgetAtIndex(textIndex); widgetList.add(operationWidget); @@ -101,10 +99,7 @@ class _BrnTextButtonPanelState extends State { style: TextStyle( fontSize: 14, fontWeight: FontWeight.w500, - color: BrnThemeConfigurator.instance - .getConfig() - .commonConfig - .brandPrimary), + color: BrnThemeConfigurator.instance.getConfig().commonConfig.brandPrimary), ); return GestureDetector( @@ -161,9 +156,11 @@ class _BrnTextButtonPanelState extends State { offset: 10, popDirection: widget.popDirection, data: list, onItemClick: (index, item) { + Navigator.pop(context); if (widget.onTap != null) { widget.onTap!(index + 3); } + return true; }, onDismiss: () { setState(() { _isExpanded = false; diff --git a/lib/src/components/calendar/brn_calendar_view.dart b/lib/src/components/calendar/brn_calendar_view.dart index 0607d263..119bdb62 100644 --- a/lib/src/components/calendar/brn_calendar_view.dart +++ b/lib/src/components/calendar/brn_calendar_view.dart @@ -613,17 +613,18 @@ class _CustomCalendarViewState extends State { if (date.isAfter(_currentEndSelectedDate!)) { _currentEndSelectedDate = date; } - setState(() { - try { - if (widget.rangeDateChange != null) { - widget.rangeDateChange!(DateTimeRange( - start: _currentStartSelectedDate!, - end: _currentEndSelectedDate!, - )); - } - } catch (_) {} - }); } + + setState(() { + if (_currentStartSelectedDate != null && + _currentEndSelectedDate != null && + widget.rangeDateChange != null) { + widget.rangeDateChange!(DateTimeRange( + start: _currentStartSelectedDate!, + end: _currentEndSelectedDate!, + )); + } + }); } String _getChinaWeekName(int weekOfDay) { diff --git a/lib/src/components/card/bubble_card/brn_bubble_text.dart b/lib/src/components/card/bubble_card/brn_bubble_text.dart index a7b8c0b9..85e10402 100644 --- a/lib/src/components/card/bubble_card/brn_bubble_text.dart +++ b/lib/src/components/card/bubble_card/brn_bubble_text.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/text/brn_expandable_text.dart'; import 'package:bruno/src/theme/brn_theme_configurator.dart'; import 'package:flutter/material.dart'; diff --git a/lib/src/components/card/bubble_card/brn_insert_info.dart b/lib/src/components/card/bubble_card/brn_insert_info.dart index cb0ec4c0..a1872aa4 100644 --- a/lib/src/components/card/bubble_card/brn_insert_info.dart +++ b/lib/src/components/card/bubble_card/brn_insert_info.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/theme/brn_theme_configurator.dart'; import 'package:bruno/src/utils/brn_tools.dart'; import 'package:flutter/material.dart'; 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 index 13d765bc..155db31f 100644 --- 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,3 +1,5 @@ + + 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'; diff --git a/lib/src/components/card/content_card/brn_pair_info_rich_grid.dart b/lib/src/components/card/content_card/brn_pair_info_rich_grid.dart index 1ee1bfea..4a7ccb51 100644 --- a/lib/src/components/card/content_card/brn_pair_info_rich_grid.dart +++ b/lib/src/components/card/content_card/brn_pair_info_rich_grid.dart @@ -1,3 +1,5 @@ + + import 'dart:ui' as ui; import 'package:bruno/src/constants/brn_asset_constants.dart'; diff --git a/lib/src/components/charts/brn_progress_chart/brn_progress_chart.dart b/lib/src/components/charts/brn_progress_chart/brn_progress_chart.dart index cd15e8f1..30a27266 100644 --- a/lib/src/components/charts/brn_progress_chart/brn_progress_chart.dart +++ b/lib/src/components/charts/brn_progress_chart/brn_progress_chart.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/charts/brn_progress_chart/brn_progress_chart_painter.dart'; import 'package:flutter/material.dart'; diff --git a/lib/src/components/charts/brn_progress_chart/brn_progress_chart_painter.dart b/lib/src/components/charts/brn_progress_chart/brn_progress_chart_painter.dart index de391f0d..396e6981 100644 --- a/lib/src/components/charts/brn_progress_chart/brn_progress_chart_painter.dart +++ b/lib/src/components/charts/brn_progress_chart/brn_progress_chart_painter.dart @@ -1,3 +1,5 @@ + + import 'package:flutter/material.dart'; class BrnProgressChartPainter extends CustomPainter { diff --git a/lib/src/components/dialog/brn_multi_select_dialog.dart b/lib/src/components/dialog/brn_multi_select_dialog.dart index d85ebe5c..40e979e8 100644 --- a/lib/src/components/dialog/brn_multi_select_dialog.dart +++ b/lib/src/components/dialog/brn_multi_select_dialog.dart @@ -244,11 +244,9 @@ class MultiSelectPickerWidgetState extends State { if (!BrunoTools.isEmpty(widget.messageText)) { return Padding( padding: EdgeInsets.only(bottom: 8, left: 20, right: 20), - child: Center( - child: Text( - widget.messageText!, - style: cContentTextStyle, - ), + child: Text( + widget.messageText!, + style: cContentTextStyle, ), ); } diff --git a/lib/src/components/dialog/brn_single_select.dart b/lib/src/components/dialog/brn_single_select.dart index 96d5726b..1f3554e5 100644 --- a/lib/src/components/dialog/brn_single_select.dart +++ b/lib/src/components/dialog/brn_single_select.dart @@ -6,6 +6,8 @@ import 'package:bruno/src/theme/configs/brn_dialog_config.dart'; import 'package:bruno/src/utils/brn_tools.dart'; import 'package:flutter/material.dart'; +import 'brn_dialog.dart'; + typedef BrnSingleSelectOnSubmitCallback = Function(String? data); typedef BrnSingleSelectOnItemClickCallback = void Function( BuildContext dialogContext, int index); @@ -18,6 +20,12 @@ class BrnSingleSelectDialog extends Dialog { /// 弹窗标题 final String title; + /// 描述文案，优先级较 messageWidget 低，优先使用 messageWidget + final String? messageText; + + /// 描述widget + final Widget? messageWidget; + /// 时间区间最大值 final List conditions; @@ -48,6 +56,8 @@ class BrnSingleSelectDialog extends Dialog { const BrnSingleSelectDialog( {this.isClose: true, this.title: "", + this.messageText, + this.messageWidget, required this.conditions, this.submitText: "提交", this.submitBgColor, @@ -63,6 +73,8 @@ class BrnSingleSelectDialog extends Dialog { return BrnSingleSelectDialogWidget( isClose: isClose, title: title, + messageText: messageText, + messageWidget: messageWidget, conditions: conditions, submitText: submitText, onSubmitClick: onSubmitClick, @@ -79,6 +91,8 @@ class BrnSingleSelectDialog extends Dialog { class BrnSingleSelectDialogWidget extends StatefulWidget { final bool isClose; final String title; + final String? messageText; + final Widget? messageWidget; final List? conditions; final String submitText; final BrnSingleSelectOnSubmitCallback? onSubmitClick; @@ -97,6 +111,8 @@ class BrnSingleSelectDialogWidget extends StatefulWidget { BrnSingleSelectDialogWidget( {this.isClose = true, this.title = "", + this.messageText, + this.messageWidget, this.conditions, this.submitText = "", this.submitBgColor, @@ -151,6 +167,7 @@ class BrnSingleSelectDialogWidgetState widget.themeData!), ), ), + _generateContentWidget(), Container( constraints: BoxConstraints(maxHeight: 300), child: widget.isCustomFollowScroll @@ -250,6 +267,29 @@ class BrnSingleSelectDialogWidgetState ))); } + /// 内容widget 以 messageWidget 为准， + /// 若无则以 messageText 生成widget 填充， + /// 都没设置则为空 Container + Widget _generateContentWidget() { + if (widget.messageWidget != null) + return Padding( + padding: EdgeInsets.only(bottom: 8, left: 20, right: 20), + child: widget.messageWidget, + ); + + if (!BrunoTools.isEmpty(widget.messageText)) { + return Padding( + padding: EdgeInsets.only(bottom: 8, left: 20, right: 20), + child: Text( + widget.messageText!, + style: cContentTextStyle, + ), + ); + } + return Container(); + } + + Widget _buildItem(BuildContext context, int index) { if (widget.conditions == null) { return Container(); diff --git a/lib/src/components/form/base/brn_form_item_type.dart b/lib/src/components/form/base/brn_form_item_type.dart index 9b38866b..ffeeacc1 100644 --- a/lib/src/components/form/base/brn_form_item_type.dart +++ b/lib/src/components/form/base/brn_form_item_type.dart @@ -1,3 +1,5 @@ + + class BrnPrefixIconType { static const String normal = "type_normal"; static const String add = "type_add"; diff --git a/lib/src/components/form/items/general/brn_quick_select_input_item.dart b/lib/src/components/form/items/general/brn_quick_select_input_item.dart index c7233fe6..917b1a3a 100644 --- a/lib/src/components/form/items/general/brn_quick_select_input_item.dart +++ b/lib/src/components/form/items/general/brn_quick_select_input_item.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/form/base/brn_form_item_type.dart'; import 'package:bruno/src/components/form/utils/brn_form_util.dart'; import 'package:bruno/src/theme/brn_theme_configurator.dart'; diff --git a/lib/src/components/form/items/general/brn_radio_input_item.dart b/lib/src/components/form/items/general/brn_radio_input_item.dart index 7c63144e..dbee1724 100644 --- a/lib/src/components/form/items/general/brn_radio_input_item.dart +++ b/lib/src/components/form/items/general/brn_radio_input_item.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/src/components/form/base/brn_form_item_type.dart'; diff --git a/lib/src/components/form/items/general/brn_range_input_item.dart b/lib/src/components/form/items/general/brn_range_input_item.dart index 10c48293..6fe02c1c 100644 --- a/lib/src/components/form/items/general/brn_range_input_item.dart +++ b/lib/src/components/form/items/general/brn_range_input_item.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/form/base/brn_form_item_type.dart'; import 'package:bruno/src/components/form/utils/brn_form_util.dart'; import 'package:bruno/src/theme/brn_theme_configurator.dart'; diff --git a/lib/src/components/form/items/general/brn_ratio_input_item.dart b/lib/src/components/form/items/general/brn_ratio_input_item.dart index a48da5ee..c6142b23 100644 --- a/lib/src/components/form/items/general/brn_ratio_input_item.dart +++ b/lib/src/components/form/items/general/brn_ratio_input_item.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/form/base/brn_form_item_type.dart'; import 'package:bruno/src/components/form/utils/brn_form_util.dart'; import 'package:bruno/src/theme/brn_theme_configurator.dart'; diff --git a/lib/src/components/form/items/general/brn_star_input_item.dart b/lib/src/components/form/items/general/brn_star_input_item.dart index 449332a7..8ead2dbd 100644 --- a/lib/src/components/form/items/general/brn_star_input_item.dart +++ b/lib/src/components/form/items/general/brn_star_input_item.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/form/base/brn_form_item_type.dart'; import 'package:bruno/src/components/form/base/input_item_interface.dart'; import 'package:bruno/src/components/form/utils/brn_form_util.dart'; diff --git a/lib/src/components/form/items/general/brn_text_select_item.dart b/lib/src/components/form/items/general/brn_text_select_item.dart index 8f64bb0f..975bfac4 100644 --- a/lib/src/components/form/items/general/brn_text_select_item.dart +++ b/lib/src/components/form/items/general/brn_text_select_item.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/src/components/form/base/brn_form_item_type.dart'; @@ -155,8 +157,7 @@ class BrnTextSelectFormItemState extends State { Widget build(BuildContext context) { return Container( color: Colors.white, - padding: BrnFormUtil.computeItemEdgeInsets2( - widget.prefixIconType, widget.isRequire), + padding: BrnFormUtil.itemEdgeInsets(widget.themeData!), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -200,8 +201,8 @@ class BrnTextSelectFormItemState extends State { children: [ Flexible( child: Container( - padding: BrnFormUtil.computeEdgeInsets2( - widget.prefixIconType, widget.isRequire), + padding: BrnFormUtil.titleEdgeInsets(widget.prefixIconType, + widget.isRequire, widget.themeData!), child: Row( children: [ BrnFormUtil.buildPrefixIcon( @@ -241,7 +242,6 @@ class BrnTextSelectFormItemState extends State { BrnFormUtil.notifyTap(context, widget.onTap); }, child: Container( - padding: EdgeInsets.only(top: 14), child: Row( mainAxisAlignment: MainAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.start, @@ -317,8 +317,8 @@ class BrnTextSelectFormItemState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - padding: BrnFormUtil.computeEdgeInsets2( - widget.prefixIconType, widget.isRequire), + padding: BrnFormUtil.titleEdgeInsets(widget.prefixIconType, + widget.isRequire, widget.themeData!), child: Row( children: [ BrnFormUtil.buildPrefixIcon(widget.prefixIconType, widget.isEdit, diff --git a/lib/src/components/form/items/group/brn_expandable_group.dart b/lib/src/components/form/items/group/brn_expandable_group.dart index 25331038..33419c5b 100644 --- a/lib/src/components/form/items/group/brn_expandable_group.dart +++ b/lib/src/components/form/items/group/brn_expandable_group.dart @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. + + import 'package:bruno/src/components/form/utils/brn_form_util.dart'; import 'package:bruno/src/constants/brn_asset_constants.dart'; import 'package:bruno/src/theme/brn_theme_configurator.dart'; diff --git a/lib/src/components/form/items/group/element_expand_widget.dart b/lib/src/components/form/items/group/element_expand_widget.dart index 2fb1dd1e..2d082ed1 100644 --- a/lib/src/components/form/items/group/element_expand_widget.dart +++ b/lib/src/components/form/items/group/element_expand_widget.dart @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. + + import 'package:bruno/src/components/form/utils/brn_form_util.dart'; import 'package:bruno/src/theme/brn_theme_configurator.dart'; import 'package:bruno/src/theme/configs/brn_form_config.dart'; diff --git a/lib/src/components/form/items/misc/brn_add_label_item.dart b/lib/src/components/form/items/misc/brn_add_label_item.dart index 1aa01d18..731c179d 100644 --- a/lib/src/components/form/items/misc/brn_add_label_item.dart +++ b/lib/src/components/form/items/misc/brn_add_label_item.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/form/base/brn_form_item_type.dart'; import 'package:bruno/src/components/form/utils/brn_form_util.dart'; import 'package:bruno/src/theme/brn_theme_configurator.dart'; diff --git a/lib/src/components/form/items/title/brn_base_title_item.dart b/lib/src/components/form/items/title/brn_base_title_item.dart index 8f9df785..ee883d75 100644 --- a/lib/src/components/form/items/title/brn_base_title_item.dart +++ b/lib/src/components/form/items/title/brn_base_title_item.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/form/utils/brn_form_util.dart'; import 'package:bruno/src/theme/brn_theme_configurator.dart'; import 'package:bruno/src/theme/configs/brn_form_config.dart'; diff --git a/lib/src/components/form/utils/brn_form_util.dart b/lib/src/components/form/utils/brn_form_util.dart index 8098acb6..d1b9b0f3 100644 --- a/lib/src/components/form/utils/brn_form_util.dart +++ b/lib/src/components/form/utils/brn_form_util.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/form/base/brn_form_item_type.dart'; import 'package:bruno/src/components/form/base/input_item_interface.dart'; import 'package:bruno/src/constants/brn_asset_constants.dart'; @@ -155,20 +157,6 @@ class BrnFormUtil { return BrunoTools.getAssetImage(BrnAsset.iconQuestion); } - /// 设置录入项总的padding, 不包括顶部和底部padding - static EdgeInsets computeItemEdgeInsets2(String type, bool isRequire) { - return EdgeInsets.fromLTRB(0, 0, 20, 14); - } - - /// 设置内容行padding, 包括顶部和底部padding - static EdgeInsets computeEdgeInsets2(String type, bool isRequire) { - if (isRequire && type == BrnPrefixIconType.normal) { - return EdgeInsets.only(left: 10, top: 14); - } - - return EdgeInsets.only(left: 20, top: 14); - } - static EdgeInsets computeErrorEdgeInsets(String type, bool isRequire) { return EdgeInsets.only( left: 20, diff --git a/lib/src/components/gallery/config/brn_controller.dart b/lib/src/components/gallery/config/brn_controller.dart index 2e51bd14..fffb4c9f 100644 --- a/lib/src/components/gallery/config/brn_controller.dart +++ b/lib/src/components/gallery/config/brn_controller.dart @@ -1,3 +1,5 @@ + + import 'package:flutter/material.dart'; /// 控制页面刷新，并跳转到指定的 index diff --git a/lib/src/components/picker/base/brn_picker.dart b/lib/src/components/picker/base/brn_picker.dart index 2ac02551..c44c3037 100644 --- a/lib/src/components/picker/base/brn_picker.dart +++ b/lib/src/components/picker/base/brn_picker.dart @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. + + import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; diff --git a/lib/src/components/picker/base/brn_picker_title.dart b/lib/src/components/picker/base/brn_picker_title.dart index 157c5fac..7079cbbf 100755 --- a/lib/src/components/picker/base/brn_picker_title.dart +++ b/lib/src/components/picker/base/brn_picker_title.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/picker/time_picker/brn_date_picker_constants.dart'; import 'package:bruno/src/components/picker/base/brn_picker_title_config.dart'; import 'package:bruno/src/theme/brn_theme.dart'; diff --git a/lib/src/components/picker/base/brn_picker_title_config.dart b/lib/src/components/picker/base/brn_picker_title_config.dart index 004d07d2..84d0cafc 100755 --- a/lib/src/components/picker/base/brn_picker_title_config.dart +++ b/lib/src/components/picker/base/brn_picker_title_config.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/picker/base/brn_picker_constants.dart'; import 'package:flutter/material.dart'; diff --git a/lib/src/components/picker/brn_bottom_picker.dart b/lib/src/components/picker/brn_bottom_picker.dart index ce6cacea..91a531c9 100644 --- a/lib/src/components/picker/brn_bottom_picker.dart +++ b/lib/src/components/picker/brn_bottom_picker.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/picker/base/brn_picker_title.dart'; import 'package:bruno/src/components/picker/base/brn_picker_title_config.dart'; import 'package:bruno/src/components/picker/brn_picker_cliprrect.dart'; diff --git a/lib/src/components/picker/brn_bottom_write_picker.dart b/lib/src/components/picker/brn_bottom_write_picker.dart index 0575875e..c5a5cbaf 100644 --- a/lib/src/components/picker/brn_bottom_write_picker.dart +++ b/lib/src/components/picker/brn_bottom_write_picker.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/picker/base/brn_picker_title_config.dart'; import 'package:bruno/src/components/picker/brn_bottom_picker.dart'; import 'package:bruno/src/theme/brn_theme_configurator.dart'; diff --git a/lib/src/components/picker/brn_mulit_select_tags_picker.dart b/lib/src/components/picker/brn_mulit_select_tags_picker.dart index 83476849..dd16cff6 100644 --- a/lib/src/components/picker/brn_mulit_select_tags_picker.dart +++ b/lib/src/components/picker/brn_mulit_select_tags_picker.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/picker/base/brn_picker_title_config.dart'; import 'package:bruno/src/components/picker/brn_tags_common_picker.dart'; import 'package:bruno/src/components/picker/brn_tags_picker_config.dart'; diff --git a/lib/src/components/picker/brn_multi_picker.dart b/lib/src/components/picker/brn_multi_picker.dart index 73ecdcfb..5b2ab14b 100644 --- a/lib/src/components/picker/brn_multi_picker.dart +++ b/lib/src/components/picker/brn_multi_picker.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/picker/base/brn_picker.dart'; import 'package:bruno/src/components/picker/base/brn_picker_title.dart'; import 'package:bruno/src/components/picker/base/brn_picker_title_config.dart'; diff --git a/lib/src/components/picker/brn_select_tags_with_input_picker.dart b/lib/src/components/picker/brn_select_tags_with_input_picker.dart index 7f4c0f1c..23f93c8c 100644 --- a/lib/src/components/picker/brn_select_tags_with_input_picker.dart +++ b/lib/src/components/picker/brn_select_tags_with_input_picker.dart @@ -228,6 +228,7 @@ class _BrnSelectTagsWithInputPickerWidgetState } } + this._sourceTags = tagItems; // 重新排序，name 越长，越靠后 this._sourceTags.sort((left, right) { diff --git a/lib/src/components/picker/brn_tags_common_picker.dart b/lib/src/components/picker/brn_tags_common_picker.dart index 592c5fa0..d6cb4a5e 100644 --- a/lib/src/components/picker/brn_tags_common_picker.dart +++ b/lib/src/components/picker/brn_tags_common_picker.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/picker/base/brn_picker_title.dart'; import 'package:bruno/src/components/picker/base/brn_picker_title_config.dart'; import 'package:bruno/src/components/picker/brn_picker_cliprrect.dart'; diff --git a/lib/src/components/picker/brn_tags_picker_config.dart b/lib/src/components/picker/brn_tags_picker_config.dart index e379fc8f..1303df3c 100644 --- a/lib/src/components/picker/brn_tags_picker_config.dart +++ b/lib/src/components/picker/brn_tags_picker_config.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/theme/brn_theme_configurator.dart'; import 'package:flutter/material.dart'; diff --git a/lib/src/components/picker/multi_range_picker/bean/brn_multi_column_picker_entity.dart b/lib/src/components/picker/multi_range_picker/bean/brn_multi_column_picker_entity.dart index de1983f6..ab22d14a 100644 --- a/lib/src/components/picker/multi_range_picker/bean/brn_multi_column_picker_entity.dart +++ b/lib/src/components/picker/multi_range_picker/bean/brn_multi_column_picker_entity.dart @@ -16,8 +16,7 @@ enum PickerWindowType { class BrnPickerEntity { String? uniqueId; //唯一的id - String? - type; //类型 目前支持的类型有不限（unlimit）、单选（radio）、复选（checkbox）, 最终被解析成 PickerFilterType 类型 + String? type; //类型 目前支持的类型有不限（unlimit）、单选（radio）、复选（checkbox）, 最终被解析成 PickerFilterType 类型 String? key; //回传给服务器 String? value; //回传给服务器 String name; //显示的文案 @@ -173,7 +172,7 @@ class BrnPickerEntity { if (secondColumn.length > 0) { for (BrnPickerEntity secondEntity in secondColumn) { List thirdColumn = - this.currentSelectListForEntity(secondEntity); + this.currentSelectListForEntity(secondEntity); results.addAll(thirdColumn); } } diff --git a/lib/src/components/picker/multi_range_picker/brn_multi_column_converter.dart b/lib/src/components/picker/multi_range_picker/brn_multi_column_converter.dart index c97cf9df..2b8f6f03 100644 --- a/lib/src/components/picker/multi_range_picker/brn_multi_column_converter.dart +++ b/lib/src/components/picker/multi_range_picker/brn_multi_column_converter.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/picker/multi_range_picker/bean/brn_multi_column_picker_entity.dart'; import 'package:bruno/src/components/picker/multi_range_picker/brn_multi_column_picker_util.dart'; import 'package:bruno/src/utils/brn_tools.dart'; diff --git a/lib/src/components/picker/multi_range_picker/brn_multi_column_list.dart b/lib/src/components/picker/multi_range_picker/brn_multi_column_list.dart index 3deeb02c..6297610c 100644 --- a/lib/src/components/picker/multi_range_picker/brn_multi_column_list.dart +++ b/lib/src/components/picker/multi_range_picker/brn_multi_column_list.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/picker/multi_range_picker/bean/brn_multi_column_picker_entity.dart'; import 'package:bruno/src/components/picker/multi_range_picker/brn_multi_column_picker.dart'; import 'package:bruno/src/components/picker/multi_range_picker/brn_multi_column_picker_util.dart'; diff --git a/lib/src/components/picker/multi_range_picker/brn_multi_column_picker.dart b/lib/src/components/picker/multi_range_picker/brn_multi_column_picker.dart index b726aa17..e070c441 100644 --- a/lib/src/components/picker/multi_range_picker/brn_multi_column_picker.dart +++ b/lib/src/components/picker/multi_range_picker/brn_multi_column_picker.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/picker/base/brn_picker_title.dart'; import 'package:bruno/src/components/picker/base/brn_picker_title_config.dart'; import 'package:bruno/src/components/picker/brn_picker_cliprrect.dart'; diff --git a/lib/src/components/picker/multi_range_picker/brn_multi_column_picker_util.dart b/lib/src/components/picker/multi_range_picker/brn_multi_column_picker_util.dart index e9210c49..27017e2e 100644 --- a/lib/src/components/picker/multi_range_picker/brn_multi_column_picker_util.dart +++ b/lib/src/components/picker/multi_range_picker/brn_multi_column_picker_util.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/picker/multi_range_picker/bean/brn_multi_column_picker_entity.dart'; /// BrnMultiColumnPicker相关工具类 diff --git a/lib/src/components/picker/multi_range_picker/btn_multi_column_picker_item.dart b/lib/src/components/picker/multi_range_picker/btn_multi_column_picker_item.dart index ad27b5b9..521a3652 100644 --- a/lib/src/components/picker/multi_range_picker/btn_multi_column_picker_item.dart +++ b/lib/src/components/picker/multi_range_picker/btn_multi_column_picker_item.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/picker/multi_range_picker/bean/brn_multi_column_picker_entity.dart'; import 'package:bruno/src/components/picker/multi_range_picker/brn_multi_column_picker_util.dart'; import 'package:bruno/src/constants/brn_asset_constants.dart'; diff --git a/lib/src/components/picker/multi_select_bottom_picker/brn_multi_select_data.dart b/lib/src/components/picker/multi_select_bottom_picker/brn_multi_select_data.dart index 9d9eebab..a48143db 100644 --- a/lib/src/components/picker/multi_select_bottom_picker/brn_multi_select_data.dart +++ b/lib/src/components/picker/multi_select_bottom_picker/brn_multi_select_data.dart @@ -1,3 +1,5 @@ + + class BrnMultiSelectBottomPickerItem { String code; //选项编号 diff --git a/lib/src/components/picker/multi_select_bottom_picker/brn_multi_select_list_picker.dart b/lib/src/components/picker/multi_select_bottom_picker/brn_multi_select_list_picker.dart index d3c4587e..88dced65 100644 --- a/lib/src/components/picker/multi_select_bottom_picker/brn_multi_select_list_picker.dart +++ b/lib/src/components/picker/multi_select_bottom_picker/brn_multi_select_list_picker.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/line/brn_line.dart'; import 'package:bruno/src/components/picker/base/brn_picker_constants.dart'; import 'package:bruno/src/components/picker/base/brn_picker_title.dart'; diff --git a/lib/src/components/picker/time_picker/date_picker/brn_date_widget.dart b/lib/src/components/picker/time_picker/date_picker/brn_date_widget.dart index d25336eb..39c1e0d6 100755 --- a/lib/src/components/picker/time_picker/date_picker/brn_date_widget.dart +++ b/lib/src/components/picker/time_picker/date_picker/brn_date_widget.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/src/components/picker/base/brn_picker.dart'; diff --git a/lib/src/components/picker/time_picker/date_picker/brn_datetime_widget.dart b/lib/src/components/picker/time_picker/date_picker/brn_datetime_widget.dart index 88c42a12..18a6e077 100755 --- a/lib/src/components/picker/time_picker/date_picker/brn_datetime_widget.dart +++ b/lib/src/components/picker/time_picker/date_picker/brn_datetime_widget.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/src/components/picker/base/brn_picker.dart'; diff --git a/lib/src/components/picker/time_picker/date_picker/brn_time_widget.dart b/lib/src/components/picker/time_picker/date_picker/brn_time_widget.dart index 8dcbabbf..1e9e0491 100755 --- a/lib/src/components/picker/time_picker/date_picker/brn_time_widget.dart +++ b/lib/src/components/picker/time_picker/date_picker/brn_time_widget.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/src/components/picker/base/brn_picker.dart'; diff --git a/lib/src/components/picker/time_picker/date_range_picker/brn_date_range_widget.dart b/lib/src/components/picker/time_picker/date_range_picker/brn_date_range_widget.dart index 0ddeb116..e5f311b1 100755 --- a/lib/src/components/picker/time_picker/date_range_picker/brn_date_range_widget.dart +++ b/lib/src/components/picker/time_picker/date_range_picker/brn_date_range_widget.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/src/components/picker/base/brn_picker.dart'; diff --git a/lib/src/components/picker/time_picker/date_range_picker/brn_time_range_side_widget.dart b/lib/src/components/picker/time_picker/date_range_picker/brn_time_range_side_widget.dart index f01f2e0a..d1841e8e 100755 --- a/lib/src/components/picker/time_picker/date_range_picker/brn_time_range_side_widget.dart +++ b/lib/src/components/picker/time_picker/date_range_picker/brn_time_range_side_widget.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/src/components/picker/base/brn_picker.dart'; diff --git a/lib/src/components/picker/time_picker/date_range_picker/brn_time_range_widget.dart b/lib/src/components/picker/time_picker/date_range_picker/brn_time_range_widget.dart index 698de779..ef48138d 100755 --- a/lib/src/components/picker/time_picker/date_range_picker/brn_time_range_widget.dart +++ b/lib/src/components/picker/time_picker/date_range_picker/brn_time_range_widget.dart @@ -1,3 +1,5 @@ + + import 'dart:math'; import 'package:bruno/src/components/picker/base/brn_picker.dart'; diff --git a/lib/src/components/popup/brn_measure_size.dart b/lib/src/components/popup/brn_measure_size.dart index 4715b456..d2e08eaf 100644 --- a/lib/src/components/popup/brn_measure_size.dart +++ b/lib/src/components/popup/brn_measure_size.dart @@ -37,7 +37,6 @@ class MeasureSize extends SingleChildRenderObjectWidget { required this.onChange, required Widget child, }) : super(key: key, child: child); - @override RenderObject createRenderObject(BuildContext context) { return MeasureSizeRenderObject(onChange); diff --git a/lib/src/components/popup/brn_popup_window.dart b/lib/src/components/popup/brn_popup_window.dart index 3ae42acb..4d39d410 100644 --- a/lib/src/components/popup/brn_popup_window.dart +++ b/lib/src/components/popup/brn_popup_window.dart @@ -66,9 +66,6 @@ class BrnPopupWindow extends StatefulWidget { /// 箭头图标水平方向的绝对偏移量，为 null 时则自动计算 final double? arrowOffset; - /// popUpWindow 消失回调，此回调会在 pop 之后执行 - final VoidCallback? onDismiss; - /// popWindow 距离底部的距离小于此值的时候， /// 自动将 popWindow 在 targetView 上面弹出 final double turnOverFromBottom; @@ -91,7 +88,6 @@ class BrnPopupWindow extends StatefulWidget { this.canWrap = false, this.spaceMargin = 20, this.arrowOffset, - this.onDismiss, this.turnOverFromBottom = 50.0}) : super(key: key); @@ -157,7 +153,6 @@ class BrnPopupWindow extends StatefulWidget { canWrap: canWrap, spaceMargin: spaceMargin, arrowOffset: arrowOffset, - onDismiss: dismissCallback, turnOverFromBottom: turnOverFromBottom, ))); } @@ -254,9 +249,6 @@ class _BrnPopupWindowState extends State { behavior: HitTestBehavior.translucent, onTap: () { Navigator.pop(context); - if (widget.onDismiss != null) { - widget.onDismiss!(); - } }, child: Material( color: Colors.transparent, @@ -270,9 +262,6 @@ class _BrnPopupWindowState extends State { ), ), onWillPop: () { - if (widget.onDismiss != null) { - widget.onDismiss!(); - } return Future.value(true); }), ); @@ -466,10 +455,11 @@ class BrnPopupRoute extends PopupRoute { Duration get transitionDuration => _duration; } -/// popup 中每个 Item 被点击时的回调， +/// popup 中每个 Item 被点击时的回调，并决定是否拦截点击事件 /// [index] Item 的索引 /// [item] Item 内容 -typedef BrnPopupListItemClick = Function(int index, String item); +/// 返回 true 则拦截点击事件，不再走 pop 逻辑 +typedef BrnPopupListItemClick = bool Function(int index, String item); /// popup 用于构造自定义的 Item /// [index] Item 的索引 @@ -484,17 +474,19 @@ class BrnPopupListWindow { /// [popDirection] 箭头的方向 /// [itemBuilder] 自定义 item 构造方法 /// [onItemClick] item 点击回调 - static void showButtonPanelPopList(context, GlobalKey popKey, - {List? data, - BrnPopupDirection popDirection = BrnPopupDirection.bottom, - BrnPopupListItemBuilder? itemBuilder, - BrnPopupListItemClick? onItemClick}) { + /// [onItemClickInterceptor] item 点击拦截回调 + /// [onDismiss] popUpWindow消失回调 + static void showButtonPanelPopList( + context, + GlobalKey popKey, { + List? data, + BrnPopupDirection popDirection = BrnPopupDirection.bottom, + BrnPopupListItemBuilder? itemBuilder, + BrnPopupListItemClick? onItemClick, + VoidCallback? onDismiss, + }) { TextStyle textStyle = TextStyle( - color: BrnThemeConfigurator.instance - .getConfig() - .commonConfig - .colorTextBase, - fontSize: 16); + color: BrnThemeConfigurator.instance.getConfig().commonConfig.colorTextBase, fontSize: 16); double arrowHeight = 6.0; Color borderColor = Color(0xffCCCCCC); Color backgroundColor = Colors.white; @@ -505,10 +497,8 @@ class BrnPopupListWindow { double maxHeight = 200; double borderRadius = 4; bool hasCloseIcon = true; - assert(popKey.currentContext != null && - popKey.currentContext!.findRenderObject() != null); - if (popKey.currentContext == null || - popKey.currentContext!.findRenderObject() == null) return; + assert(popKey.currentContext != null && popKey.currentContext!.findRenderObject() != null); + if (popKey.currentContext == null || popKey.currentContext!.findRenderObject() == null) return; Navigator.push( context, BrnPopupRoute( @@ -522,18 +512,23 @@ class BrnPopupListWindow { offset: offset, widget: BrunoTools.isEmpty(data) ? Container( - constraints: - BoxConstraints(maxWidth: maxWidth, maxHeight: maxHeight), + constraints: BoxConstraints(maxWidth: maxWidth, maxHeight: maxHeight), ) : Container( - constraints: - BoxConstraints(maxWidth: maxWidth, maxHeight: maxHeight), + constraints: BoxConstraints(maxWidth: maxWidth, maxHeight: maxHeight), child: SingleChildScrollView( child: Container( padding: EdgeInsets.only(top: 6, bottom: 6), child: Column( - children: _getItems(context, minWidth, maxWidth, - itemBuilder, textStyle, data!, onItemClick, null), + children: + _getItems(context, minWidth, maxWidth, itemBuilder, textStyle, data!, + (index, item) { + if (onItemClick != null) { + bool isIntercept = onItemClick(index, item); + if (isIntercept) return; + } + Navigator.pop(context, {'index': index, 'item': item}); + }), ), ), ), @@ -542,7 +537,11 @@ class BrnPopupListWindow { borderRadius: borderRadius, borderColor: borderColor, spaceMargin: spaceMargin, - ))); + ))).then((result) { + if (onDismiss != null) { + onDismiss(); + } + }); } /// 显示Popup List Window @@ -551,6 +550,7 @@ class BrnPopupListWindow { /// [popDirection] 箭头的方向 /// [offset] 距离targetView偏移量 /// [onItemClick] item 点击回调 + /// [onItemClickInterceptor] item 点击拦截回调 /// [onDismiss] popUpWindow消失回调 static void showPopListWindow(context, GlobalKey popKey, {List? data, @@ -558,10 +558,8 @@ class BrnPopupListWindow { double offset = 0, BrnPopupListItemClick? onItemClick, VoidCallback? onDismiss}) { - assert(popKey.currentContext != null && - popKey.currentContext!.findRenderObject() != null); - if (popKey.currentContext == null || - popKey.currentContext!.findRenderObject() == null) return; + assert(popKey.currentContext != null && popKey.currentContext!.findRenderObject() != null); + if (popKey.currentContext == null || popKey.currentContext!.findRenderObject() == null) return; double arrowHeight = 6.0; double borderRadius = 4; @@ -570,21 +568,16 @@ class BrnPopupListWindow { double maxWidth = 150; double maxHeight = 200; double? arrowOffset; - Color borderColor = - BrnThemeConfigurator.instance.getConfig().commonConfig.dividerColorBase; + Color borderColor = BrnThemeConfigurator.instance.getConfig().commonConfig.dividerColorBase; Color backgroundColor = Colors.white; TextStyle textStyle = TextStyle( - color: BrnThemeConfigurator.instance - .getConfig() - .commonConfig - .colorTextBase, - fontSize: 14); + color: BrnThemeConfigurator.instance.getConfig().commonConfig.colorTextBase, fontSize: 14); bool hasCloseIcon = true; Navigator.push( - context, - BrnPopupRoute( - child: BrnPopupWindow( + context, + BrnPopupRoute( + child: BrnPopupWindow( context, arrowHeight: arrowHeight, popKey: popKey, @@ -595,18 +588,22 @@ class BrnPopupListWindow { offset: offset, widget: BrunoTools.isEmpty(data) ? Container( - constraints: - BoxConstraints(maxWidth: maxWidth, maxHeight: maxHeight), + constraints: BoxConstraints(maxWidth: maxWidth, maxHeight: maxHeight), ) : Container( - constraints: - BoxConstraints(maxWidth: maxWidth, maxHeight: maxHeight), + constraints: BoxConstraints(maxWidth: maxWidth, maxHeight: maxHeight), child: SingleChildScrollView( child: Container( padding: EdgeInsets.only(top: 6, bottom: 6), child: Column( - children: _getItems(context, minWidth, maxWidth, null, - textStyle, data!, onItemClick, onDismiss), + children: _getItems(context, minWidth, maxWidth, null, textStyle, data!, + (index, item) { + if (onItemClick != null) { + bool isIntercept = onItemClick(index, item); + if (isIntercept) return; + } + Navigator.pop(context); + }), ), ), ), @@ -615,8 +612,13 @@ class BrnPopupListWindow { borderRadius: borderRadius, borderColor: borderColor, spaceMargin: spaceMargin, - onDismiss: onDismiss, - ))); + ), + ), + ).then((result) { + if (onDismiss != null) { + onDismiss(); + } + }); } static List _getItems( @@ -626,8 +628,7 @@ class BrnPopupListWindow { BrnPopupListItemBuilder? itemBuilder, TextStyle textStyle, List data, - BrnPopupListItemClick? onItemClick, - VoidCallback? onDismiss) { + void Function(int index, String item) onItemClick) { double textMaxWidth = _getMaxWidth(textStyle, data); if (textMaxWidth + 52 < minWidth) { textMaxWidth = minWidth; @@ -639,14 +640,7 @@ class BrnPopupListWindow { return data.map((f) { return GestureDetector( onTap: () { - if (onItemClick != null) { - dynamic isIntercept = onItemClick(data.indexOf(f), f); - if ((isIntercept is bool) && isIntercept) return; - } - Navigator.pop(context); - if (onDismiss != null) { - onDismiss(); - } + onItemClick(data.indexOf(f), f); }, child: Container( width: textMaxWidth, diff --git a/lib/src/components/scroll_anchor/brn_scroll_anchor_tab.dart b/lib/src/components/scroll_anchor/brn_scroll_anchor_tab.dart index 2e4636b8..9a096a21 100644 --- a/lib/src/components/scroll_anchor/brn_scroll_anchor_tab.dart +++ b/lib/src/components/scroll_anchor/brn_scroll_anchor_tab.dart @@ -1,3 +1,5 @@ + + import 'dart:async'; import 'package:bruno/src/components/tabbar/normal/brn_tab_bar.dart'; diff --git a/lib/src/components/tabbar/bottom/brn_bottom_tab_bar_item.dart b/lib/src/components/tabbar/bottom/brn_bottom_tab_bar_item.dart index 98d6ebd1..2ce74ff9 100644 --- a/lib/src/components/tabbar/bottom/brn_bottom_tab_bar_item.dart +++ b/lib/src/components/tabbar/bottom/brn_bottom_tab_bar_item.dart @@ -5,23 +5,31 @@ import 'package:flutter/material.dart'; /// 特别注意：Tab的右上角小红点可能不符合UI规范，可以使用BrnBadge小红点组件 class BrnBottomTabBarItem { const BrnBottomTabBarItem({ - required this.icon, this.title, + required this.icon, Widget? activeIcon, + this.selectedTextStyle, + this.unSelectedTextStyle, this.backgroundColor, this.badge, this.badgeNo, this.maxBadgeNo = 99, }) : activeIcon = activeIcon ?? icon; + /// Tab标题名 + final Widget? title; + /// 未选中时的icon final Widget icon; /// 选中时的icon final Widget activeIcon; - /// Tab标题名 - final Widget? title; + /// tab 选中文本样式 + final TextStyle? selectedTextStyle; + + /// tab 未选中文本样式 + final TextStyle? unSelectedTextStyle; /// 背景色 final Color? backgroundColor; diff --git a/lib/src/components/tabbar/bottom/brn_bottom_tab_bar_main.dart b/lib/src/components/tabbar/bottom/brn_bottom_tab_bar_main.dart index 893edf79..70776a9e 100644 --- a/lib/src/components/tabbar/bottom/brn_bottom_tab_bar_main.dart +++ b/lib/src/components/tabbar/bottom/brn_bottom_tab_bar_main.dart @@ -1,7 +1,11 @@ + + import 'dart:collection' show Queue; import 'dart:math' as math; +import 'package:bruno/bruno.dart'; import 'package:bruno/src/components/tabbar/bottom/brn_bottom_tab_bar_item.dart'; +import 'package:bruno/src/theme/configs/brn_all_config.dart'; import 'package:flutter/material.dart'; /// 定义一些UI常量,根据UI稿进行填写 @@ -77,246 +81,9 @@ class BrnBottomTabBar extends StatefulWidget { _BottomTabBarState createState() => _BottomTabBarState(); } -/// 表示底部导航栏中的单个tile，它的目的是进入一个伸缩页面 -class _BottomNavigationTile extends StatelessWidget { - const _BottomNavigationTile( - this.type, - this.item, - this.animation, - this.iconSize, { - this.onTap, - this.colorTween, - this.flex, - this.selected = false, - this.indexLabel, - this.isAnimation = true, - this.isInkResponse = true, - this.badgeColor, - }); - - final BrnBottomTabBarDisplayType type; - final BrnBottomTabBarItem item; - final Animation animation; - final double iconSize; - final VoidCallback? onTap; - final ColorTween? colorTween; - final double? flex; - final bool selected; - final String? indexLabel; - final bool isAnimation; - final bool isInkResponse; - final Color? badgeColor; - - /// 构建icon - Widget _buildIcon() { - double? tweenStart; - Color? iconColor; - switch (type) { - case BrnBottomTabBarDisplayType.fixed: - tweenStart = 8.0; - iconColor = colorTween?.evaluate(animation); - break; - case BrnBottomTabBarDisplayType.shifting: - tweenStart = 16.0; - iconColor = Colors.blue; - break; - } - return Align( - alignment: Alignment.topCenter, - heightFactor: 1.0, - child: Container( - margin: EdgeInsets.only( - top: isAnimation - ? Tween( - begin: tweenStart, - end: _kTopMargin, - ).evaluate(animation) - : _kTopMargin, - ), - child: IconTheme( - data: IconThemeData( - color: iconColor, - size: iconSize, - ), - child: selected ? item.activeIcon : item.icon, - ), - ), - ); - } - - /// 构建固定Label - /// 修改icon与text间距在这里修改 - Widget _buildFixedLabel() { - double scale = isAnimation - ? Tween( - begin: _kInactiveFontSize / _kActiveFontSize, - end: 1.0, - ).evaluate(animation) - : 1.0; - return Align( - alignment: Alignment.bottomCenter, - heightFactor: 1.0, - child: Container( - margin: const EdgeInsets.only( - bottom: _kBottomMargin, top: _kMiddleInterval), - child: DefaultTextStyle.merge( - style: TextStyle( - fontSize: _kActiveFontSize, - color: colorTween?.evaluate(animation), - ), - - /// 使用矩阵变化控制字体大小 - child: Transform( - transform: Matrix4.diagonal3Values( - scale, - scale, - scale, - ), - alignment: Alignment.bottomCenter, - child: item.title, - ), - ), - ), - ); - } - - /// 构建可变Label - Widget _buildShiftingLabel() { - return Align( - alignment: Alignment.bottomCenter, - heightFactor: 1.0, - child: Container( - margin: EdgeInsets.only( - bottom: Tween( - /// 在规范中，他们只是删除了非活动项目的标签，并指定了16dp的底部边距， - /// 我们不想移除标签因为我们想淡入淡出它，所以这修改了底部边距来考虑到这一点。 - begin: 2.0, - end: _kBottomMargin, - ).evaluate(animation), - ), - child: FadeTransition( - alwaysIncludeSemantics: true, - opacity: animation, - child: DefaultTextStyle.merge( - style: const TextStyle( - fontSize: _kActiveFontSize, - color: Colors.blue, - ), - child: item.title!, - ), - ), - ), - ); - } - - /// 构建未读消息弹窗 - Widget? _buildBadge() { - if (item.badge == null && (item.badgeNo == null || item.badgeNo!.isEmpty)) { - return Container(); - } - if (item.badge != null) { - return item.badge; - } - return Container( - width: 24, - padding: EdgeInsets.fromLTRB(0, 2, 0, 2), - alignment: Alignment.center, - decoration: BoxDecoration( - color: badgeColor, - shape: BoxShape.rectangle, - borderRadius: BorderRadius.all(Radius.circular(10))), - child: Text( - /// 设置未读数 > item.maxBadgeNo 则报加+ 默认 99 - _getUnReadText(), - style: TextStyle(fontSize: 10, color: Colors.white), - ), - ); - } - - String _getUnReadText() { - int _badgeNo = 0; - try { - if (item.badgeNo != null) { - _badgeNo = int.parse(item.badgeNo!); - } - } catch (e) { - debugPrint('badgeNo has FormatException'); - } - return '${_badgeNo > item.maxBadgeNo ? '${item.maxBadgeNo}+' : _badgeNo}'; - } - - /// 构建底字体缩放动画 - /// label: 传入的文字组件 - Widget _buildInkWidget(Widget? label) { - if (isInkResponse) { - return InkResponse( - onTap: onTap, - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - mainAxisSize: MainAxisSize.min, - children: [ - _buildIcon(), - label!, - ], - ), - ); - } - return GestureDetector( - onTap: onTap, - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - mainAxisSize: MainAxisSize.min, - children: [ - _buildIcon(), - label!, - ], - )); - } - - @override - Widget build(BuildContext context) { - /// 为了在动画过程中使用flex容器来增长平铺块，我们 - /// 需要将flex分配中的更改划分为更小的块 - /// 制作流畅的动画。我们通过将flex值相乘来实现这一点 - /// (这是一个整数)乘以一个大数。 - late int size; - Widget? label; - switch (type) { - case BrnBottomTabBarDisplayType.fixed: - size = 1; - label = _buildFixedLabel(); - break; - case BrnBottomTabBarDisplayType.shifting: - size = (flex! * 1000.0).round(); - label = _buildShiftingLabel(); - break; - } - - return Expanded( - flex: size, - child: Semantics( - container: true, - header: true, - selected: selected, - child: Stack( - children: [ - Positioned(right: 4, top: 4, child: _buildBadge()!), - _buildInkWidget(label), - Semantics( - label: indexLabel, - ) - ], - ), - ), - ); - } -} /// 底部导航栏中状态控制类 -class _BottomTabBarState extends State - with TickerProviderStateMixin { +class _BottomTabBarState extends State with TickerProviderStateMixin { List _controllers = []; late List _animations; @@ -580,6 +347,244 @@ class _BottomTabBarState extends State } } + +/// 表示底部导航栏中的单个tile，它的目的是进入一个伸缩页面 +class _BottomNavigationTile extends StatelessWidget { + + const _BottomNavigationTile( + this.type, + this.item, + this.animation, + this.iconSize, { + this.onTap, + this.colorTween, + this.flex, + this.selected = false, + this.indexLabel, + this.isAnimation = true, + this.isInkResponse = true, + this.badgeColor, + }); + + final BrnBottomTabBarDisplayType type; + final BrnBottomTabBarItem item; + final Animation animation; + final double iconSize; + final VoidCallback? onTap; + final ColorTween? colorTween; + final double? flex; + final bool selected; + final String? indexLabel; + final bool isAnimation; + final bool isInkResponse; + final Color? badgeColor; + + @override + Widget build(BuildContext context) { + /// 为了在动画过程中使用flex容器来增长平铺块，我们 + /// 需要将flex分配中的更改划分为更小的块 + /// 制作流畅的动画。我们通过将flex值相乘来实现这一点 + /// (这是一个整数)乘以一个大数。 + late int size; + Widget? label; + switch (type) { + case BrnBottomTabBarDisplayType.fixed: + size = 1; + label = _buildFixedLabel(); + break; + case BrnBottomTabBarDisplayType.shifting: + size = (flex! * 1000.0).round(); + label = _buildShiftingLabel(); + break; + } + + return Expanded( + flex: size, + child: Semantics( + container: true, + header: true, + selected: selected, + child: Stack( + children: [ + Positioned(right: 4, top: 4, child: _buildBadge()!), + _buildInkWidget(label), + Semantics( + label: indexLabel, + ) + ], + ), + ), + ); + } + + + /// 构建icon + Widget _buildIcon() { + double? tweenStart; + Color? iconColor; + switch (type) { + case BrnBottomTabBarDisplayType.fixed: + tweenStart = 8.0; + iconColor = colorTween?.evaluate(animation); + break; + case BrnBottomTabBarDisplayType.shifting: + tweenStart = 16.0; + iconColor = Colors.blue; + break; + } + return Align( + alignment: Alignment.topCenter, + heightFactor: 1.0, + child: Container( + margin: EdgeInsets.only( + top: isAnimation + ? Tween( + begin: tweenStart, + end: _kTopMargin, + ).evaluate(animation) + : _kTopMargin, + ), + child: IconTheme( + data: IconThemeData( + color: iconColor, + size: iconSize, + ), + child: selected ? item.activeIcon : item.icon, + ), + ), + ); + } + + /// 构建固定Label + /// 修改icon与text间距在这里修改 + Widget _buildFixedLabel() { + double scale = isAnimation + ? Tween( + begin: _kInactiveFontSize / _kActiveFontSize, + end: 1.0, + ).evaluate(animation) + : 1.0; + return Align( + alignment: Alignment.bottomCenter, + heightFactor: 1.0, + child: Container( + margin: const EdgeInsets.only( + bottom: _kBottomMargin, top: _kMiddleInterval), + child: DefaultTextStyle.merge( + style: TextStyle( + fontSize: _kActiveFontSize, + color: colorTween?.evaluate(animation), + ), + + /// 使用矩阵变化控制字体大小 + child: Transform( + transform: Matrix4.diagonal3Values( + scale, + scale, + scale, + ), + alignment: Alignment.bottomCenter, + child: item.title, + ), + ), + ), + ); + } + + /// 构建可变Label + Widget _buildShiftingLabel() { + return Align( + alignment: Alignment.bottomCenter, + heightFactor: 1.0, + child: Container( + margin: EdgeInsets.only( + bottom: Tween( + /// 在规范中，他们只是删除了非活动项目的标签，并指定了16dp的底部边距， + /// 我们不想移除标签因为我们想淡入淡出它，所以这修改了底部边距来考虑到这一点。 + begin: 2.0, + end: _kBottomMargin, + ).evaluate(animation), + ), + child: DefaultTextStyle.merge( + style: TextStyle( + fontSize: _kActiveFontSize, + color: selected ? BrnThemeConfigurator.instance.getConfig().commonConfig.brandPrimary + : BrnThemeConfigurator.instance.getConfig().commonConfig.colorTextBase, + ).merge(selected ? item.selectedTextStyle : item.unSelectedTextStyle), + child: item.title!, + ), + ), + ); + } + + /// 构建未读消息弹窗 + Widget? _buildBadge() { + if (item.badge == null && (item.badgeNo == null || item.badgeNo!.isEmpty)) { + return Container(); + } + if (item.badge != null) { + return item.badge; + } + return Container( + width: 24, + padding: EdgeInsets.fromLTRB(0, 2, 0, 2), + alignment: Alignment.center, + decoration: BoxDecoration( + color: badgeColor, + shape: BoxShape.rectangle, + borderRadius: BorderRadius.all(Radius.circular(10))), + child: Text( + /// 设置未读数 > item.maxBadgeNo 则报加+ 默认 99 + _getUnReadText(), + style: TextStyle(fontSize: 10, color: Colors.white), + ), + ); + } + + String _getUnReadText() { + int _badgeNo = 0; + try { + if (item.badgeNo != null) { + _badgeNo = int.parse(item.badgeNo!); + } + } catch (e) { + debugPrint('badgeNo has FormatException'); + } + return '${_badgeNo > item.maxBadgeNo ? '${item.maxBadgeNo}+' : _badgeNo}'; + } + + /// 构建底字体缩放动画 + /// label: 传入的文字组件 + Widget _buildInkWidget(Widget? label) { + if (isInkResponse) { + return InkResponse( + onTap: onTap, + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisSize: MainAxisSize.min, + children: [ + _buildIcon(), + label!, + ], + ), + ); + } + return GestureDetector( + onTap: onTap, + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisSize: MainAxisSize.min, + children: [ + _buildIcon(), + label!, + ], + )); + } +} + + /// 简介：TabBarItem点击飞溅动画私有类 /// 功能：实现点击飞溅动画 class _Circle { @@ -631,6 +636,7 @@ class _Circle { } } + /// 绘制动画色彩飞溅的圆圈 class _RadialPainter extends CustomPainter { _RadialPainter({ diff --git a/lib/src/components/tabbar/indicator/brn_custom_width_indicator.dart b/lib/src/components/tabbar/indicator/brn_custom_width_indicator.dart index 316451cf..ceb08dbb 100644 --- a/lib/src/components/tabbar/indicator/brn_custom_width_indicator.dart +++ b/lib/src/components/tabbar/indicator/brn_custom_width_indicator.dart @@ -1,3 +1,5 @@ + + import 'package:flutter/material.dart'; class CustomWidthUnderlineTabIndicator extends Decoration { diff --git a/lib/src/components/tabbar/indicator/brn_fixed_underline_decoration.dart b/lib/src/components/tabbar/indicator/brn_fixed_underline_decoration.dart index 2cae9c14..b7f15bc1 100644 --- a/lib/src/components/tabbar/indicator/brn_fixed_underline_decoration.dart +++ b/lib/src/components/tabbar/indicator/brn_fixed_underline_decoration.dart @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. + + import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; diff --git a/lib/src/components/tabbar/indicator/brn_triangle_decoration.dart b/lib/src/components/tabbar/indicator/brn_triangle_decoration.dart index 19b2854f..ed6219cf 100644 --- a/lib/src/components/tabbar/indicator/brn_triangle_decoration.dart +++ b/lib/src/components/tabbar/indicator/brn_triangle_decoration.dart @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. + + import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/lib/src/components/tabbar/normal/brn_sub_switch_title.dart b/lib/src/components/tabbar/normal/brn_sub_switch_title.dart index a1089175..47d43f5c 100644 --- a/lib/src/components/tabbar/normal/brn_sub_switch_title.dart +++ b/lib/src/components/tabbar/normal/brn_sub_switch_title.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/theme/brn_theme_configurator.dart'; import 'package:flutter/material.dart'; diff --git a/lib/src/components/tabbar/normal/brn_switch_title.dart b/lib/src/components/tabbar/normal/brn_switch_title.dart index 64c5d175..8c3873b8 100644 --- a/lib/src/components/tabbar/normal/brn_switch_title.dart +++ b/lib/src/components/tabbar/normal/brn_switch_title.dart @@ -1,3 +1,5 @@ + + import 'package:bruno/src/components/line/brn_line.dart'; import 'package:bruno/src/components/tabbar/indicator/brn_custom_width_indicator.dart'; import 'package:bruno/src/theme/brn_theme_configurator.dart'; diff --git a/lib/src/components/tabbar/normal/brn_tab_bar.dart b/lib/src/components/tabbar/normal/brn_tab_bar.dart index 3cf9cb09..1e813c4f 100644 --- a/lib/src/components/tabbar/normal/brn_tab_bar.dart +++ b/lib/src/components/tabbar/normal/brn_tab_bar.dart @@ -246,14 +246,14 @@ class BrnTabBarState extends State { color: widget.themeData!.backgroundColor, child: widget.showMore ? Row( - children: [ - Container( - width: MediaQuery.of(context).size.width - _moreSpacing, - child: _buildTabBar(), - ), - showMoreWidget(context) - ], - ) + children: [ + Container( + width: MediaQuery.of(context).size.width - _moreSpacing, + child: _buildTabBar(), + ), + showMoreWidget(context) + ], + ) : _buildTabBar(), ); } @@ -788,12 +788,12 @@ class _TabBarOverlayWidgetState extends State<_TabBarOverlayWidget> { class BadgeTab { BadgeTab( {this.key, - this.text, - this.badgeNum, - this.topText, - this.badgeText, - this.showRedBadge = false, - this.isAutoDismiss = true}); + this.text, + this.badgeNum, + this.topText, + this.badgeText, + this.showRedBadge = false, + this.isAutoDismiss = true}); final Key? key; diff --git a/lib/src/components/tabbar/normal/brn_tabbar_controller.dart b/lib/src/components/tabbar/normal/brn_tabbar_controller.dart index 4e088960..b0337c54 100644 --- a/lib/src/components/tabbar/normal/brn_tabbar_controller.dart +++ b/lib/src/components/tabbar/normal/brn_tabbar_controller.dart @@ -1,3 +1,5 @@ + + import 'dart:async'; import 'package:flutter/material.dart'; diff --git a/lib/src/components/toast/brn_toast.dart b/lib/src/components/toast/brn_toast.dart index 78b5468f..d9a314d9 100644 --- a/lib/src/components/toast/brn_toast.dart +++ b/lib/src/components/toast/brn_toast.dart @@ -55,7 +55,7 @@ class BrnToast { BuildContext context, { Duration? duration, Color? background, - TextStyle? textStyle, + TextStyle textStyle = const TextStyle(fontSize: 16, color: Colors.white), double? radius, Image? preIcon, double? verticalOffset, diff --git a/lib/src/constants/brn_constants.dart b/lib/src/constants/brn_constants.dart index 3bb520ac..f08bee66 100644 --- a/lib/src/constants/brn_constants.dart +++ b/lib/src/constants/brn_constants.dart @@ -85,4 +85,4 @@ class BrnButtonConstant { /// 默认垂直间距 static const double verticalPadding = 8; -} +} \ No newline at end of file diff --git a/lib/src/theme/base/brn_base_config.dart b/lib/src/theme/base/brn_base_config.dart index f1829984..ccb9ad60 100644 --- a/lib/src/theme/base/brn_base_config.dart +++ b/lib/src/theme/base/brn_base_config.dart @@ -46,5 +46,7 @@ abstract class BrnBaseConfig { BrnCommonConfig get commonConfig => _currentLevelCommonConfig ?? - BrnThemeConfigurator.instance.getConfig(configId: configId).commonConfig; + BrnThemeConfigurator.instance + .getConfig(configId: configId) + .commonConfig; }