Skip to content

Commit

Permalink
BrnSingleSelectDialog add attribute messageText and messageWidget (#133
Browse files Browse the repository at this point in the history
)

* Null safe (#13)

* remove useless comments

* remove useless dependencies

* adapt brn_expandable_text.dart null-safe

* upgrade dependencies:collection to stable

* migrate constants to null safety

* migrate brn_multi_click_util to null safety

* migrate font util to null safety

* migrate brn_text_style to null safety

* migrate brn picker constants to null safety

* migrate brn appBar theme to null safety

* optimize bruno theme's import (#16)

* ♻️  [NNBD] Part 1. Migrate configs (#28)

* ♻️ [NNBD] Part 2. Migrate utils (#30)

* ♻️ Migrate utils to NNBD

* 🎨 Improve the color getter

* 🎨 BrnSearchText (#36)

* Theme: 优化单例实现,初步优化 BrnAllThemeConfig 属性获取不为 null

* refactor:优化theme,暴露非null引用

* theme:去除无用信息及优化部分代码

* theme:增加属性类型

* Theme: 优化单例实现,初步优化 BrnAllThemeConfig 属性获取不为 null (#40)

* Theme: 优化单例实现,初步优化 BrnAllThemeConfig 属性获取不为 null

* refactor:优化theme,暴露非null引用

* theme:去除无用信息及优化部分代码

* theme:增加属性类型

* 🎨 utils-EventBus添加null-safe (#23)

* 🎨 utils-EventBus添加null-safe

* 🎨 修改theme配置功能及utils/brn_tools工具函数 null-safe

* 🎨 EventBus添加null-safe(其他提交请忽略,输入回退)

Co-authored-by: 大脸儿 <[email protected]>

* refactor brn_toast (#33)

* refactor brn_toast

* refactor brn_toast

* 优化修复 EventBus

* 优化 EventBus  单例实现 (#43)

* Theme: 优化单例实现,初步优化 BrnAllThemeConfig 属性获取不为 null

* refactor:优化theme,暴露非null引用

* theme:去除无用信息及优化部分代码

* theme:增加属性类型

* 优化修复 EventBus

* brn_toast time change to seconds (#45)

* migrate brn_loading to null safety (#32)

* migrate brn_loading to null safety

* mv loading content to brnString constants

* optimization brn_theme_configurator instance constructor (#47)

* 迁移example ,优化常量命名,增加export

* migrate brn_empty_status.dart

* Migrate BrnStateTag、BrnTagCustom、BrnSelectTag、BrnDeleteTag to null-safe (#46)

* [null-safe]: BrnStateTag、BrnTagCustom、BrnSelectTag、BrnDeleteTag 空安全适配

* perf: BrnDeleteTag null-safe

* 删除 BrnThemeImg

* fix:tagConfig merge方法增加判空处理

* fix:revert tagConfig

* fix:BrnAbnormalStateWidget空处理

* reset and migrated package [rating] to null-safety. (#42)

* 迁移example ,优化常量命名,增加export (#51)

* Theme: 优化单例实现,初步优化 BrnAllThemeConfig 属性获取不为 null

* refactor:优化theme,暴露非null引用

* theme:去除无用信息及优化部分代码

* theme:增加属性类型

* 优化修复 EventBus

* 迁移example ,优化常量命名,增加export

* migrate brn_empty_status.dart

* 删除 BrnThemeImg

* fix:tagConfig merge方法增加判空处理

* fix:revert tagConfig

* fix:BrnAbnormalStateWidget空处理

* 空安全报错修改 (#55)

* 空安全报错修改

* 优化sketch教程为视频教程

* Migrated  package [selectcity] to null-safety (#56)

* reset and migrated package [rating] to null-safety.

* Migrated package [selectcity] to null-safety

* 修改ISuspensionBean抽象类相关子类的空字段问题。

* Migrated package [noticebar] to null-safety

* migrate card_title to null safety (#59)

* migrate card_title to null-safety

* [fix] brn_action_card_title: _sub widget is not null

* [optimize] empty widget use SizedBox instead of Container

* replace empty widget SizedBox to SizedBox.shrink

* Migrated package [radio] to null-safety (#62)

* reset and migrated package [rating] to null-safety.

* Migrated package [selectcity] to null-safety

* 修改ISuspensionBean抽象类相关子类的空字段问题。

* Migrated package [noticebar] to null-safety

* 1.Migrated package [radio] to null-safety;
2.Modified not-need-nullable param in brn_single_select_city_page.dart;

* Migrated tabbar to null-safety

* Migrated package [guide] to null-safety (#65)

* reset and migrated package [rating] to null-safety.

* Migrated package [selectcity] to null-safety

* 修改ISuspensionBean抽象类相关子类的空字段问题。

* Migrated package [noticebar] to null-safety

* 1.Migrated package [radio] to null-safety;
2.Modified not-need-nullable param in brn_single_select_city_page.dart;

* Migrated package [guide] to null-safety

* 🚀 Use the latest Podfile for the example (#68)

* Null safe calendar (#64)

* migrate calendar widget to null safety

* brn_calendar_view fix _currentStartSelectedDate is not null

* brn_calendar_view: simplify borderRadius usage

* calendar widget late _displayMode

* calendar widget add two constructors with date change

* Card Components Null safe adapter (#53)

* feat: support fvm

* feat: Card components null-safey adpater

* refactor: make code simple and clean

* refactor: make code simple and clean

* Migrated scroll_anchor to null-safety

* fix #71 (#77)

* fix content_card themeData is not null (#79)

* Null safe of all buttons (#20)

* icon button 增加null safe

* null safe for normal button

* null safe for normal button

* null safe for button

* null safe for all button

* merge

* rebase

* rebase

* merge

* optimization

* GlobalKey is not null

* optimization

* reset popup window

* showButtonPanelPopList

Co-authored-by: foreturn <[email protected]>

* Migrated package [navbar][input] to null-safety (#75)

* reset and migrated package [rating] to null-safety.

* Migrated package [selectcity] to null-safety

* 修改ISuspensionBean抽象类相关子类的空字段问题。

* Migrated package [noticebar] to null-safety

* 1.Migrated package [radio] to null-safety;
2.Modified not-need-nullable param in brn_single_select_city_page.dart;

* Migrated package [guide] to null-safety

* Migrated package [navbar][input] to null-safety

* Optimized codes in brn_appbar.dart

* Restore partial modification

* fix:修复迁移tabar问题

* Migrated tabbar & scroll_anchor to null-safety (#66)

* Theme: 优化单例实现,初步优化 BrnAllThemeConfig 属性获取不为 null

* refactor:优化theme,暴露非null引用

* theme:去除无用信息及优化部分代码

* theme:增加属性类型

* 优化修复 EventBus

* 迁移example ,优化常量命名,增加export

* migrate brn_empty_status.dart

* 删除 BrnThemeImg

* fix:tagConfig merge方法增加判空处理

* fix:revert tagConfig

* fix:BrnAbnormalStateWidget空处理

* Migrated tabbar to null-safety

* Migrated scroll_anchor to null-safety

* fix:修复迁移tabar问题

* Migrate Selection to null-safe (#54)

* [null-safe]: BrnStateTag、BrnTagCustom、BrnSelectTag、BrnDeleteTag 空安全适配

* perf: BrnDeleteTag null-safe

* Migrate Selection to null-safe

* Migrate Selection to null-safe

* perf:  ItemEntity name 字段的初始化

* Migrate Selection to null-safe

* migrate form to null safety

* fix:修复tabbar报错及selection警告信息

* Migrated package [dialog] to null-safety (#81)

* reset and migrated package [rating] to null-safety.

* Migrated package [selectcity] to null-safety

* 修改ISuspensionBean抽象类相关子类的空字段问题。

* Migrated package [noticebar] to null-safety

* 1.Migrated package [radio] to null-safety;
2.Modified not-need-nullable param in brn_single_select_city_page.dart;

* Migrated package [guide] to null-safety

* Migrated package [navbar][input] to null-safety

* Optimized codes in brn_appbar.dart

* Restore partial modification

* Migrated package [dialog] to null-safety

* Modified some params's default value or  nullable type

* migrate brn_horizontal_steps、brn_step_line to null safety (#89)

* migrate charts to null safety (#80)

* migrate DoughuntChart to null safety

* migrate progress bar chart to null safety

* update progress bar chart document

* migrate progress chart to null safety

* migrate radar chart to null safety

* migrate funnel chart to null safety

* migrate broken line chart to null safety

* fix progress bar chart some value is required

* fix progress bar chart some value is required

* fix brn_line_paint _path is not null

* fix brn_funnel_chart properties is not null

* fix brn_radar_chart properties is not null

* fix brn_line_painter not null values

* fix brn_progress_bar_chart error

* brn_broken_line some properties is not null value

* replace empty Container to SizedBox.shrink

* update progress_bar_chart null safety value by hand

* update broken_line null safety values by hand

* update funnel_chart null safety value by hand

* make LineCanvasModel immutable

* migrate actionsheet into null-safe (#73)

* migrate actionsheet into null-safe

* sheet: code review

Co-authored-by: yuanjunliang <[email protected]>

* fix:修复迁移问题

* fix:优化迁移部分问题key和style非空问题

* migrate form to null safety (#86)

* Theme: 优化单例实现,初步优化 BrnAllThemeConfig 属性获取不为 null

* refactor:优化theme,暴露非null引用

* theme:去除无用信息及优化部分代码

* theme:增加属性类型

* 优化修复 EventBus

* 迁移example ,优化常量命名,增加export

* migrate brn_empty_status.dart

* 删除 BrnThemeImg

* fix:tagConfig merge方法增加判空处理

* fix:revert tagConfig

* fix:BrnAbnormalStateWidget空处理

* Migrated tabbar to null-safety

* Migrated scroll_anchor to null-safety

* fix:修复迁移tabar问题

* migrate form to null safety

* fix:修复tabbar报错及selection警告信息

* fix:修复迁移问题

* fix:优化迁移部分问题key和style非空问题

* migrate picker to null safety

* migrate popup to null safety (#69)

* migrate popup to null safety

* fix MeasureSize null safe problems

* fix popup migrate to null-safety review problems

* migrate gallery to null safety (#90)

* migrate gallery to null safety

* change the type error

* remove @

* change String? to String

* fix:修复picker空安全迁移问题

* migrate appraise dir to null safety (#84)

* migrate appraise dir to null safety

* fix appraise migrate to null-safety review problems

* fix:修复list没指定泛型及if判断错误问题

* fix:migrate dashed line to null safty

* migrate picker to null safety (#91)

* Theme: 优化单例实现,初步优化 BrnAllThemeConfig 属性获取不为 null

* refactor:优化theme,暴露非null引用

* theme:去除无用信息及优化部分代码

* theme:增加属性类型

* 优化修复 EventBus

* 迁移example ,优化常量命名,增加export

* migrate brn_empty_status.dart

* 删除 BrnThemeImg

* fix:tagConfig merge方法增加判空处理

* fix:revert tagConfig

* fix:BrnAbnormalStateWidget空处理

* Migrated tabbar to null-safety

* Migrated scroll_anchor to null-safety

* fix:修复迁移tabar问题

* migrate form to null safety

* fix:修复tabbar报错及selection警告信息

* fix:修复迁移问题

* fix:优化迁移部分问题key和style非空问题

* migrate picker to null safety

* fix:修复picker空安全迁移问题

* fix:修复list没指定泛型及if判断错误问题

* fix:migrate dashed line to null safty

* migrate example to null safty

* fix:修复部分example warning

* fix:修复demo报错问题

* fix:追加未跟踪修复

* fix:优化部分接口可空参数为非空

* Perf:Button Null safe (#93)

* perf: Migrate Button Null-Safe

* perf:优化 HorizontalStep Null-Safe

* fix: null exception when parse json to entity

* perf Button Null-Safe,
fix NullException
perf  more layer  icon  color when item selected

* migrate example to null safety (#94)

* Theme: 优化单例实现,初步优化 BrnAllThemeConfig 属性获取不为 null

* refactor:优化theme,暴露非null引用

* theme:去除无用信息及优化部分代码

* theme:增加属性类型

* 优化修复 EventBus

* 迁移example ,优化常量命名,增加export

* migrate brn_empty_status.dart

* 删除 BrnThemeImg

* fix:tagConfig merge方法增加判空处理

* fix:revert tagConfig

* fix:BrnAbnormalStateWidget空处理

* Migrated tabbar to null-safety

* Migrated scroll_anchor to null-safety

* fix:修复迁移tabar问题

* migrate form to null safety

* fix:修复tabbar报错及selection警告信息

* fix:修复迁移问题

* fix:优化迁移部分问题key和style非空问题

* migrate picker to null safety

* fix:修复picker空安全迁移问题

* fix:修复list没指定泛型及if判断错误问题

* fix:migrate dashed line to null safty

* migrate example to null safty

* fix:修复部分example warning

* fix:修复demo报错问题

* fix:追加未跟踪修复

* fix:优化部分接口可空参数为非空

Co-authored-by: violinday <[email protected]>

* fix:修复tabar showmore overflow 问题 #98 以及 tabbar 标签颜色默认设置倒置问题

* Fix #98 问题及优化部分代码 (#99)

* Theme: 优化单例实现,初步优化 BrnAllThemeConfig 属性获取不为 null

* refactor:优化theme,暴露非null引用

* theme:去除无用信息及优化部分代码

* theme:增加属性类型

* 优化修复 EventBus

* 迁移example ,优化常量命名,增加export

* migrate brn_empty_status.dart

* 删除 BrnThemeImg

* fix:tagConfig merge方法增加判空处理

* fix:revert tagConfig

* fix:BrnAbnormalStateWidget空处理

* Migrated tabbar to null-safety

* Migrated scroll_anchor to null-safety

* fix:修复迁移tabar问题

* migrate form to null safety

* fix:修复tabbar报错及selection警告信息

* fix:修复迁移问题

* fix:优化迁移部分问题key和style非空问题

* migrate picker to null safety

* fix:修复picker空安全迁移问题

* fix:修复list没指定泛型及if判断错误问题

* fix:migrate dashed line to null safty

* migrate example to null safty

* fix:修复部分example warning

* fix:修复demo报错问题

* fix:追加未跟踪修复

* fix:优化部分接口可空参数为非空

* fix:修复tabar showmore overflow 问题 #98 以及 tabbar 标签颜色默认设置倒置问题

Co-authored-by: violinday <[email protected]>

* refactor:优化 BrnInputItemType 常量命名

* refactor:优化枚举值命名

* fix:修改docs目录下form相关常量命名及所有枚举命名

* 优化 BrnInputItemType 常量命名 (#100)

* Theme: 优化单例实现,初步优化 BrnAllThemeConfig 属性获取不为 null

* refactor:优化theme,暴露非null引用

* theme:去除无用信息及优化部分代码

* theme:增加属性类型

* 优化修复 EventBus

* 迁移example ,优化常量命名,增加export

* migrate brn_empty_status.dart

* 删除 BrnThemeImg

* fix:tagConfig merge方法增加判空处理

* fix:revert tagConfig

* fix:BrnAbnormalStateWidget空处理

* Migrated tabbar to null-safety

* Migrated scroll_anchor to null-safety

* fix:修复迁移tabar问题

* migrate form to null safety

* fix:修复tabbar报错及selection警告信息

* fix:修复迁移问题

* fix:优化迁移部分问题key和style非空问题

* migrate picker to null safety

* fix:修复picker空安全迁移问题

* fix:修复list没指定泛型及if判断错误问题

* fix:migrate dashed line to null safty

* migrate example to null safty

* fix:修复部分example warning

* fix:修复demo报错问题

* fix:追加未跟踪修复

* fix:优化部分接口可空参数为非空

* fix:修复tabar showmore overflow 问题 #98 以及 tabbar 标签颜色默认设置倒置问题

* refactor:优化 BrnInputItemType 常量命名

* refactor:优化枚举值命名

* fix:修改docs目录下form相关常量命名及所有枚举命名

Co-authored-by: violinday <[email protected]>

* refactor: 更新 changelog

* refactor:BrnBubbleText 增加属性 bgColor、textStyle,修复demo  actionSheet、gallery、selection、picker错误

* fix:修复changelog 错误,brn_gallery_summary_page.dart 中标题空处理

* fix:修复部分问题

* fix:修复部分问题

* migrate docs to null-safety

* feat:changelog 增加 BrnHorizontalStepsManager 改动

* fix:优化changelog

* BrnSingleSelectDialog add attribute messageText and messageWidget

* update BrnSingleSelectDialog.md

* update BrnSingleSelectDialog.md attribute desc

Co-authored-by: laiiihz <[email protected]>
Co-authored-by: LAIIIHZ <[email protected]>
Co-authored-by: Alex Li <[email protected]>
Co-authored-by: kalifun <[email protected]>
Co-authored-by: kkkman22 <[email protected]>
Co-authored-by: 大脸儿 <[email protected]>
Co-authored-by: leftcoding <[email protected]>
Co-authored-by: violinday <[email protected]>
Co-authored-by: jojinshallar <[email protected]>
Co-authored-by: HappyImp <[email protected]>
Co-authored-by: Kenneth <[email protected]>
Co-authored-by: donywan <[email protected]>
Co-authored-by: foreturn <[email protected]>
Co-authored-by: Junl <[email protected]>
Co-authored-by: yuanjunliang <[email protected]>
Co-authored-by: Nayuta403 <[email protected]>
  • Loading branch information
17 people authored Mar 14, 2022
1 parent fa6a233 commit 066fb54
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 52 deletions.
101 changes: 54 additions & 47 deletions docs/components/dialog/BrnSingleSelectDialog/BrnSingleSelectDialog.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ group:
const BrnSingleSelectDialog(
{this.isClose: true,
this.title: "",
this.messageText,
this.messageWidget,
required this.conditions,
this.submitText: "提交",
this.submitBgColor,
Expand All @@ -44,6 +46,8 @@ const BrnSingleSelectDialog(
| ------------------------ | ----------------------------------- | --------------------------------------------------------- | ------------ | ---------- |
| isClose | bool | 用于控制弹窗是否相应电机外部关闭,true 关闭,false 不关闭 || true |
| title | String | 弹窗标题名称 || "" |
| messageText | String? | 描述文案,优先级较 messageWidget 低,优先使用 messageWidget || |
| messageWidget | Widget? | 描述 Widget || |
| conditions | List<String> | 备选项数组 || |
| checkedItem | String | 选中的选项名称 || |
| submitText | String | 确定/提交 按钮文案 || |
Expand All @@ -60,6 +64,7 @@ const BrnSingleSelectDialog(

<img src="./img/BrnSingleSelectDialog.png" style="zoom: 33%;" />


```dart
String hintText = "感兴趣待跟进";
int selectedIndex = 0;
Expand All @@ -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);
});
},
));
```
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ class DialogEntryPage extends StatelessWidget {
return BrnSingleSelectDialog(
isClose: true,
title: '请选择无效客源原因',
messageText: '请您评价该条线索请您评价该条线索请您评价该条线索请您评价该条线索请您评价该条线索',
conditions: conditions,
checkedItem: conditions[selectedIndex],
submitText: '提交',
Expand Down
8 changes: 3 additions & 5 deletions lib/src/components/dialog/brn_multi_select_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,9 @@ class MultiSelectPickerWidgetState extends State<MultiSelect> {
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,
),
);
}
Expand Down
40 changes: 40 additions & 0 deletions lib/src/components/dialog/brn_single_select.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -18,6 +20,12 @@ class BrnSingleSelectDialog extends Dialog {
/// 弹窗标题
final String title;

/// 描述文案,优先级较 messageWidget 低,优先使用 messageWidget
final String? messageText;

/// 描述widget
final Widget? messageWidget;

/// 时间区间最大值
final List<String> conditions;

Expand Down Expand Up @@ -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,
Expand All @@ -63,6 +73,8 @@ class BrnSingleSelectDialog extends Dialog {
return BrnSingleSelectDialogWidget(
isClose: isClose,
title: title,
messageText: messageText,
messageWidget: messageWidget,
conditions: conditions,
submitText: submitText,
onSubmitClick: onSubmitClick,
Expand All @@ -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<String>? conditions;
final String submitText;
final BrnSingleSelectOnSubmitCallback? onSubmitClick;
Expand All @@ -97,6 +111,8 @@ class BrnSingleSelectDialogWidget extends StatefulWidget {
BrnSingleSelectDialogWidget(
{this.isClose = true,
this.title = "",
this.messageText,
this.messageWidget,
this.conditions,
this.submitText = "",
this.submitBgColor,
Expand Down Expand Up @@ -151,6 +167,7 @@ class BrnSingleSelectDialogWidgetState
widget.themeData!),
),
),
_generateContentWidget(),
Container(
constraints: BoxConstraints(maxHeight: 300),
child: widget.isCustomFollowScroll
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit 066fb54

Please sign in to comment.