Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

优化 BrnInputItemType 常量命名 #100

Merged
merged 52 commits into from
Feb 17, 2022
Merged

优化 BrnInputItemType 常量命名 #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
d2a37e0
Theme: 优化单例实现，初步优化 BrnAllThemeConfig 属性获取不为 null
zhoujuanjuan Dec 27, 2021
75a2be3
refactor:优化theme,暴露非null引用
zhoujuanjuan Dec 27, 2021
f97bf07
theme:去除无用信息及优化部分代码
zhoujuanjuan Dec 28, 2021
44ba17a
theme:增加属性类型
zhoujuanjuan Dec 28, 2021
cad7451
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Dec 31, 2021
c19203f
优化修复 EventBus
zhoujuanjuan Dec 31, 2021
c96cdd3
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 4, 2022
2c99d35
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 4, 2022
c7ae392
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 5, 2022
6e0834b
迁移example ，优化常量命名，增加export
zhoujuanjuan Jan 4, 2022
5db665d
migrate brn_empty_status.dart
zhoujuanjuan Jan 5, 2022
7c12fc8
删除 BrnThemeImg
zhoujuanjuan Jan 6, 2022
0b75394
Merge remote-tracking branch 'upstream/null-safe' into null-safe
zhoujuanjuan Jan 6, 2022
c00cfd5
fix:tagConfig merge方法增加判空处理
zhoujuanjuan Jan 6, 2022
ada5216
fix:revert tagConfig
zhoujuanjuan Jan 7, 2022
beec378
fix:BrnAbnormalStateWidget空处理
zhoujuanjuan Jan 7, 2022
b852eb6
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 7, 2022
e69a944
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 10, 2022
e31532f
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 11, 2022
162fcfe
Migrated tabbar to null-safety
zhoujuanjuan Jan 11, 2022
2bd473f
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 12, 2022
103ab13
Migrated scroll_anchor to null-safety
zhoujuanjuan Jan 11, 2022
2b141fd
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 13, 2022
04b7a3e
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 17, 2022
5748da7
fix:修复迁移tabar问题
zhoujuanjuan Jan 17, 2022
8c25d72
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 18, 2022
1c33fd9
migrate form to null safety
zhoujuanjuan Jan 18, 2022
07c308a
fix：修复tabbar报错及selection警告信息
zhoujuanjuan Jan 18, 2022
fdf45af
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 19, 2022
e1749fe
Merge remote-tracking branch 'upstream/null-safe' into null-safe
zhoujuanjuan Jan 24, 2022
0b4c168
fix:修复迁移问题
zhoujuanjuan Jan 24, 2022
3f3b4d3
fix:优化迁移部分问题key和style非空问题
zhoujuanjuan Jan 24, 2022
1b89f72
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 24, 2022
8b9e3ab
migrate picker to null safety
zhoujuanjuan Jan 24, 2022
fbe085a
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 25, 2022
2d7fcc1
fix:修复picker空安全迁移问题
zhoujuanjuan Jan 25, 2022
a23e201
fix:修复list没指定泛型及if判断错误问题
zhoujuanjuan Jan 26, 2022
4fa42f7
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 26, 2022
33ed04a
fix:migrate dashed line to null safty
zhoujuanjuan Jan 26, 2022
4300e62
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Jan 26, 2022
069436d
migrate example to null safty
zhoujuanjuan Jan 26, 2022
3e28aa4
fix:修复部分example warning
zhoujuanjuan Jan 26, 2022
00f8a47
fix:修复demo报错问题
zhoujuanjuan Jan 27, 2022
8b17ba3
fix:追加未跟踪修复
zhoujuanjuan Jan 27, 2022
a526542
fix:优化部分接口可空参数为非空
zhoujuanjuan Jan 27, 2022
966b63e
Merge branch 'null-safe' into null-safe
violinday Feb 7, 2022
7028763
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Feb 14, 2022
4c62a0c
fix:修复tabar showmore overflow 问题 #98 以及 tabbar 标签颜色默认设置倒置问题
zhoujuanjuan Feb 16, 2022
dcc5731
refactor:优化 BrnInputItemType 常量命名
zhoujuanjuan Feb 16, 2022
fb34dc0
Merge branch 'LianjiaTech:null-safe' into null-safe
zhoujuanjuan Feb 16, 2022
6b10b9c
refactor:优化枚举值命名
zhoujuanjuan Feb 16, 2022
589daf1
fix:修改docs目录下form相关常量命名及所有枚举命名
zhoujuanjuan Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/components/abnormalCard/BrnAbnormalStateWidget/BrnAbnormalStateWidget.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ BrnAbnormalStateWidget({
| img | Image | 图片 | 否 | |
| title | String | 标题 | 否 | |
| content | String | 内容 | 否 | |
| operateAreaType | enum OperateAreaType { SingleButton, DoubleButton, TextButton } | 操作区类型。SingleButton 为【单按钮】效果 DoubleButton 为【双按钮】效果 TextButton 为【文字链】效果 | 否 | OperateAreaType.TextButton |
| operateAreaType | enum OperateAreaType { singleButton, doubleButton, textButton } | 操作区类型。SingleButton 为【单按钮】效果 DoubleButton 为【双按钮】效果 TextButton 为【文字链】效果 | 否 | OperateAreaType.TextButton |
| operateTexts | List | | | |
| action | BrnEmptyStatusIndexedActionClickCallback = void Function(int index)index 点击的位置 | 点击回调，在 SingleButton 类型或者 enablePageTap = true 点击空白区域时返回 0；其他根据点击的位置返回。 | 否 | |
| enablePageTap | bool | 空白区域是否可点击 | 否 | false |
Expand Down
2 changes: 1 addition & 1 deletion docs/components/form/BrnAddLabel/BrnAddLabel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ BrnAddLabel({
| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | **备注** |
| --- | --- | --- | --- | --- | --- |
| label | String | 录入项的唯一标识，主要用于录入类型页面框架中 | 否 | 无 | |
| type | Stirng | 录入项类型，主要用于录入类型页面框架中 | 否 | BrnInputItemType.LABEL_ADD | 外部可根据此字段判断表单项类型 |
| type | Stirng | 录入项类型，主要用于录入类型页面框架中 | 否 | BrnInputItemType.labelAdd | 外部可根据此字段判断表单项类型 |
| title | String | 录入项标题 | 否 | '' | |
| isEdit | bool | 录入项 是否可编辑 | 否 | true | true：可编辑false：禁用 |
| onTap | VoidCallback | 可操作区点击回调 | 否 | 无 | |
Expand Down
2 changes: 1 addition & 1 deletion docs/components/form/BrnExpandFormGroup/BrnExpandFormGroup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ BrnExpandFormGroup({
| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | **备注** |
| --- | --- | --- | --- | --- | --- |
| label | String | 录入项的唯一标识，主要用于录入类型页面框架中 | 否 | 无 | |
| type | Stirng | 录入项类型，主要用于录入类型页面框架中 | 否 | BrnInputItemType.NORMAL_GROUP_TYPE | 外部可根据此字段判断表单项类型 |
| type | Stirng | 录入项类型，主要用于录入类型页面框架中 | 否 | BrnInputItemType.normalGroupType | 外部可根据此字段判断表单项类型 |
| title | String | 录入项标题 | 否 | '' | |
| subTitle | String | 录入项子标题 | 否 | 无 | |
| tipLabel | String | 录入项提示（问号图标&文案） 用户点击时触发onTip回调。 | 否 | 备注中类型3 | 1. 设置"空字符串"时展示问号图标 2. 设置"非空字符串"时展示问号图标&文案 3. 若不赋值或赋值为null时，不显示提示项 |
Expand Down
8 changes: 4 additions & 4 deletions docs/components/form/BrnMultiChoiceInputFormItem/BrnMultiChoiceInputFormItem.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ BrnMultiChoiceInputFormItem({
this.title: "",
this.subTitle,
this.tipLabel,
this.prefixIconType: BrnPrefixIconType.TYPE_NORMAL,
this.prefixIconType: BrnPrefixIconType.normal,
this.error: "",
this.isEdit: true,
this.isRequire: true,
Expand All @@ -72,11 +72,11 @@ BrnMultiChoiceInputFormItem({
| **参数名** | 参数类型 | **描述** | **是否必填** | **默认值** | **备注** |
| --- | --- | --- | --- | --- | --- |
| label | String | 录入项的唯一标识，主要用于录入类型页面框架中 | 否 | 无 | |
| type | Stirng | 录入项类型，主要用于录入类型页面框架中 | 否 | BrnInputItemType<br/>.MULTI_CHOICE_PORTRAIT_INPUT_TYPE | 外部可根据此字段判断表单项类型 |
| type | Stirng | 录入项类型，主要用于录入类型页面框架中 | 否 | BrnInputItemType.multiChoicePortraitInputType | 外部可根据此字段判断表单项类型 |
| title | String | 录入项标题 | 否 | '' | |
| subTitle | String | 录入项子标题 | 否 | 无 | |
| tipLabel | String | 录入项提示（问号图标&文案） 用户点击时触发 onTip 回调。 | 否 | 备注中类型 3 | 1. 设置"空字符串"时展示问号图标 2. 设置"非空字符串"时展示问号图标&文案 3. 若不赋值或赋值为 null 时，不显示提示项 |
| prefixIconType | String | 录入项前缀图标样式 "添加项" "删除项" 详见 **BrnPrefixIconType** 类 | 否 | BrnPrefixIconType.TYPE_NORMAL | 1. 不展示图标：BrnPrefixIconType.TYPE_NORMAL2. 展示加号图标：BrnPrefixIconType.TYPE_ADD3. 展示减号图标：BrnPrefixIconType.TYPE_REMOVE |
| prefixIconType | String | 录入项前缀图标样式 "添加项" "删除项" 详见 **BrnPrefixIconType** 类 | 否 | BrnPrefixIconType.normal | 1. 不展示图标：BrnPrefixIconType.normal2. 展示加号图标：BrnPrefixIconType.add3. 展示减号图标：BrnPrefixIconType.remove |
| error | String | 录入项错误提示 | 否 | '' | |
| isRequire | bool | 录入项是否为必填项（展示\*图标） 默认为 false 不必填 | 否 | false | |
| isEdit | bool | 录入项 是否可编辑 | 否 | true | true：可编辑 false：禁用 |
Expand Down Expand Up @@ -137,7 +137,7 @@ BrnMultiChoiceInputFormItem(

```dart
BrnMultiChoiceInputFormItem(
prefixIconType: BrnPrefixIconType.TYPE_ADD,
prefixIconType: BrnPrefixIconType.add,
isRequire: true,
error: "必填项不能为空",
title: "自然到访保护期",
Expand Down
14 changes: 7 additions & 7 deletions ...form/BrnMultiChoicePortraitInputFormItem/BrnMultiChoicePortraitInputFormItem.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ BrnMultiChoicePortraitInputFormItem(
this.title: "",
this.subTitle,
this.tipLabel,
this.prefixIconType: BrnPrefixIconType.TYPE_NORMAL,
this.prefixIconType: BrnPrefixIconType.normal,
this.error: "",
this.isEdit: true,
this.isRequire: false,
Expand All @@ -73,11 +73,11 @@ this.themeData = BrnThemeConfigurator.instance
| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | **备注** |
| --- | --- | --- | --- | --- | --- |
| label | String | 录入项的唯一标识，主要用于录入类型页面框架中 | 否 | 无 | |
| type | Stirng | 录入项类型，主要用于录入类型页面框架中 | 否 | BrnInputItemType.MULTI_CHOICE_PORTRAIT_INPUT_TYPE | 外部可根据此字段判断表单项类型 |
| type | Stirng | 录入项类型，主要用于录入类型页面框架中 | 否 | BrnInputItemType.multiChoicePortraitInputType | 外部可根据此字段判断表单项类型 |
| title | String | 录入项标题 | 否 | '' | |
| subTitle | String | 录入项子标题 | 否 | 无 | |
| tipLabel | String | 录入项提示（问号图标&文案） 用户点击时触发onTip回调。 | 否 | 备注中类型3 | 1. 设置"空字符串"时展示问号图标 2. 设置"非空字符串"时展示问号图标&文案 3. 若不赋值或赋值为null时，不显示提示项 |
| prefixIconType | String | 录入项前缀图标样式 "添加项" "删除项" 详见 **BrnPrefixIconType** 类 | 否 | BrnPrefixIconType.TYPE\_NORMAL | 1. 不展示图标：BrnPrefixIconType.TYPE\_NORMAL 2. 展示加号图标：BrnPrefixIconType.TYPE\_ADD 3. 展示减号图标：BrnPrefixIconType.TYPE\_REMOVE |
| prefixIconType | String | 录入项前缀图标样式 "添加项" "删除项" 详见 **BrnPrefixIconType** 类 | 否 | BrnPrefixIconType.normal | 1. 不展示图标：BrnPrefixIconType.normal 2. 展示加号图标：BrnPrefixIconType.add 3. 展示减号图标：BrnPrefixIconType.remove |
| error | String | 录入项错误提示 | 否 | '' | |
| isRequire | bool | 录入项是否为必填项（展示`*`图标） 默认为 false 不必填 | 否 | false | |
| isEdit | bool | 录入项 是否可编辑 | 否 | true | true：可编辑false：禁用 |
Expand All @@ -94,9 +94,9 @@ this.themeData = BrnThemeConfigurator.instance
###### BrnPrefixIconType:
```dart
class BrnPrefixIconType {
static const String TYPE_NORMAL = "type_normal";
static const String TYPE_ADD = "type_add";
static const String TYPE_REMOVE = "type_remove";
static const String normal = "type_normal";
static const String add = "type_add";
static const String remove = "type_remove";
}
```
## 四、代码演示
Expand Down Expand Up @@ -138,7 +138,7 @@ BrnMultiChoicePortraitInputFormItem(

```dart
BrnMultiChoicePortraitInputFormItem(
prefixIconType: BrnPrefixIconType.TYPE_REMOVE,
prefixIconType: BrnPrefixIconType.remove,
isRequire: true,
error: "必填项不能为空",
title: "自然到访保护期",
Expand Down
2 changes: 1 addition & 1 deletion docs/components/form/BrnNormalFormGroup/BrnNormalFormGroup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ BrnNormalFormGroup({
| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | **备注** |
| --- | --- | --- | --- | --- | --- |
| label | String | 录入项的唯一标识，主要用于录入类型页面框架中 | 否 | 无 | |
| type | String | 录入项类型，主要用于录入类型页面框架中 | 否 | BrnInputItemType.NORMAL_GROUP_TYPE | 外部可用此字段判断表单类型 |
| type | String | 录入项类型，主要用于录入类型页面框架中 | 否 | BrnInputItemType.normalGroupType | 外部可用此字段判断表单类型 |
| title | String | 录入项标题 | 否 | 无 | |
| subTitle | String | 录入项子标题 | 否 | 无 | |
| tipLabel | String | 录入项提示（问号图标&文案） 用户点击时触发onTip回调。 | 否 | null | 1. 若赋值为 空字符串（""）时仅展示"问号"图标，2. 若赋值为非空字符串时 展示"问号图标&文案"，3. 若不赋值或赋值为null时 不显示提示项 |
Expand Down
19 changes: 9 additions & 10 deletions docs/components/form/BrnRadioInputFormItem/BrnRadioInputFormItem.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ BrnRadioInputFormItem(
this.title: "",
this.subTitle,
this.tipLabel,
this.prefixIconType: BrnPrefixIconType.TYPE_NORMAL,
this.prefixIconType: BrnPrefixIconType.normal,
this.error: "",
this.isEdit: true,
this.isRequire: false,
Expand All @@ -78,11 +78,10 @@ BrnRadioInputFormItem(
| **参数名** | **参数类型** | **描述** | **是否必填** | **默认值** | **备注** |
| --- | --- | --- | --- | --- | --- |
| label | String | 录入项的唯一标识，主要用于录入类型页面框架中 | 否 | 无 | |
| type | Stirng | 录入项类型，主要用于录入类型页面框架中 | 否 | BrnInputItemType.TYPE_NORMAL | 外部可根据此字段判断表单项类型 |
| title | String | 录入项标题 | 否 | '' | |
| subTitle | String | 录入项子标题 | 否 | 无 | |
| tipLabel | String | 录入项提示（问号图标&文案） 用户点击时触发onTip回调。 | 否 | 备注中类型3 | 1. 设置"空字符串"时展示问号图标 2. 设置"非空字符串"时展示问号图标&文案 3. 若不赋值或赋值为null时，不显示提示项 |
| prefixIconType | String | 录入项前缀图标样式 "添加项" "删除项" 详见 **BrnPrefixIconType** 类 | 否 | BrnPrefixIconType.TYPE_NORMAL | 1. 不展示图标：BrnPrefixIconType.TYPE_NORMAL 2. 展示加号图标：BrnPrefixIconType.TYPE_ADD3. 展示减号图标：BrnPrefixIconType.TYPE_REMOVE |
| prefixIconType | String | 录入项前缀图标样式 "添加项" "删除项" 详见 **BrnPrefixIconType** 类 | 否 | BrnPrefixIconType.normal | 1. 不展示图标：BrnPrefixIconType.normal 2. 展示加号图标：BrnPrefixIconType.add3. 展示减号图标：BrnPrefixIconType.remove |
| error | String | 录入项错误提示 | 否 | '' | |
| isRequire | bool | 录入项是否为必填项（展示*图标） 默认为 false 不必填 | 否 | false | |
| isEdit | bool | 录入项 是否可编辑 | 否 | true | true：可编辑false：禁用 |
Expand All @@ -103,10 +102,10 @@ BrnRadioInputFormItem(


```dart
class BrnPrefixIconType {
static const String TYPE_NORMAL = "type_normal";
static const String TYPE_ADD = "type_add";
static const String TYPE_REMOVE = "type_remove";
class BrnPrefixIconType {
static const String normal = "type_normal";
static const String add = "type_add";
static const String remove = "type_remove";
}
```
## 四、代码演示
Expand Down Expand Up @@ -142,7 +141,7 @@ BrnRadioInputFormItem(
![](./img/BrnRadioInputFormItemDemo2.png)
```dart
BrnRadioInputFormItem(
prefixIconType: BrnPrefixIconType.TYPE_ADD,
prefixIconType: BrnPrefixIconType.add,
isRequire: true,
error: "必填项不能为空",
title: "自然到访保护期",
Expand Down Expand Up @@ -173,7 +172,7 @@ BrnRadioInputFormItem(
![](./img/BrnRadioInputFormItemDemo3.png)
```dart
BrnRadioInputFormItem(
prefixIconType: BrnPrefixIconType.TYPE_REMOVE,
prefixIconType: BrnPrefixIconType.remove,
isRequire: true,
title: "自然到访保护期",
subTitle: "这里是副标题",
Expand Down Expand Up @@ -203,7 +202,7 @@ BrnRadioInputFormItem(
![](./img/BrnRadioInputFormItemDemo4.png)
```dart
BrnRadioInputFormItem.autoLayout(
prefixIconType: BrnPrefixIconType.TYPE_REMOVE,
prefixIconType: BrnPrefixIconType.remove,
isRequire: true,
error: "必填项不能为空",
title: "autoLayout",
Expand Down
Loading