openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-30 18:52:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!40073 高级组件Filter ExceptionPrompt codecheck修改

Browse Source 
Merge pull request !40073 from 郭英利/master
This commit is contained in:
openharmony_ci 2024-08-13 02:35:41 +00:00 committed by Gitee
commit 72b373ba61
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
advanced_ui_component/exceptionprompt/source/exceptionprompt.ets
View File

@ -156,7 +156,7 @@ export struct ExceptionPrompt {
aboutToAppear() {
try {
let uiContent: UIContext = this.getUIContext();
this.isFollowingSystemFontScale= uiContent.isFollowingSystemFontScale();
this.isFollowingSystemFontScale = uiContent.isFollowingSystemFontScale();
this.maxAppFontScale = uiContent.getMaxFontScale();
} catch (err) {
let code: number = (err as BusinessError).code;

14
advanced_ui_component/filter/interfaces/filter.js
View File

@ -279,7 +279,7 @@ class ListFilterRow extends ViewPU {
const option = _item;
this.observeComponentCreation2((elmtId, isInitialRender) => {
If.create();
if (colIndex == 0) {
if (colIndex === 0) {
this.ifElseBranchUpdateFunction(0, () => {
{
const itemCreation = (elmtId, isInitialRender) => {
@ -416,7 +416,7 @@ class ListFilterRow extends ViewPU {
}
});
ListItem.margin({ start: LengthMetrics.vp(colIndex === 0 ? -TEXT_HOT_AREA_WIDTH : 0) });
ListItem.tabIndex(colIndex == 0 ? this.rowIndex : -1);
ListItem.tabIndex(colIndex === 0 ? this.rowIndex : -1);
};
const deepRenderFunction = (elmtId, isInitialRender) => {
itemCreation(elmtId, isInitialRender);
@ -1790,7 +1790,7 @@ export class Filter extends ViewPU {
Column.align(Alignment.Start);
Column.onAreaChange((_oldValue, newValue) => {
if (!this.isFloatShowAllFilterWithoutAnimation && !this.isFloatBarShowWithoutAnimation) {
if (this.additionFilters != null) {
if (this.additionFilters !== null) {
this.filterDynamicHeight =
parseInt(newValue.height.toString(), 0) + LIST_ROW_HEIGHT + FILTER_TOP_PADDING;
} else {
@ -1858,7 +1858,7 @@ export class Filter extends ViewPU {
Column.create();
Column.width(PERCENT_100);
Column.onAreaChange((_oldValue, newValue) => {
if (this.additionFilters != null) {
if (this.additionFilters !== null) {
this.filterDynamicHeight =
parseInt(newValue.height.toString(), 0) + LIST_ROW_HEIGHT + FILTER_TOP_PADDING;
} else {
@ -2006,7 +2006,7 @@ export class Filter extends ViewPU {
this.observeComponentCreation2((elmtId, isInitialRender) => {
If.create();
if (this.additionFilters && this.additionFilters.name && this.additionFilters.options &&
this.additionFilters.options.length != 0) {
this.additionFilters.options.length !== 0) {
this.ifElseBranchUpdateFunction(0, () => {
this.observeComponentCreation2((elmtId, isInitialRender) => {
Stack.create({ alignContent: Alignment.End });
@ -2204,7 +2204,7 @@ export class Filter extends ViewPU {
ListItem.onClick(() => {
this.additionItemClick(index);
});
ListItem.tabIndex(index == 0 ? this.multiFilters.length : -1);
ListItem.tabIndex(index === 0 ? this.multiFilters.length : -1);
};
const deepRenderFunction = (elmtId, isInitialRender) => {
itemCreation(elmtId, isInitialRender);
@ -2597,7 +2597,7 @@ export class Filter extends ViewPU {
List.height(PERCENT_100);
List.edgeEffect(EdgeEffect.Spring);
List.onScroll((_scrollOffset, scrollState) => {
if (this.isFloatShowAllFilterWithoutAnimation && scrollState == ScrollState.Scroll) {
if (this.isFloatShowAllFilterWithoutAnimation && scrollState === ScrollState.Scroll) {
this.isFloatBarShowWithoutAnimation = true;
this.isFloatShowAllFilterWithoutAnimation = false;
Context.animateTo({

19
advanced_ui_component/filter/source/filter.ets
View File

@ -134,7 +134,7 @@ struct ListFilterRow {
Stack({ alignContent: Alignment.Start }) {
List() {
ForEach(this.filterRow.options, (option: Array<ResourceStr>, colIndex: number) => {
if (colIndex == 0) {
if (colIndex === 0) {
ListItem()
.width($r('sys.float.ohos_id_max_padding_start'))
.height(LIST_ROW_HEIGHT)
@ -206,7 +206,7 @@ struct ListFilterRow {
}
})
.margin({ start: LengthMetrics.vp(colIndex === 0 ? -TEXT_HOT_AREA_WIDTH : 0) })
.tabIndex(colIndex == 0 ? this.rowIndex : -1)
.tabIndex(colIndex === 0 ? this.rowIndex : -1)
})
}
.listDirection(Axis.Horizontal)
@ -482,7 +482,8 @@ struct MultiFilterRow {
.height(LIST_ROW_HEIGHT)
.fontColor(this.colorRow[colIndex])
.fontWeight(this.fontWeightRow[colIndex])
.backgroundColor(this.isBackgroundHoverRow[colIndex] ? this.backgroundColorRow[colIndex] : TRANS_COLOR)
.backgroundColor(this.isBackgroundHoverRow[colIndex] ?
this.backgroundColorRow[colIndex] : TRANS_COLOR)
.onClick(() => {
this.onItemClick(colIndex)
})
@ -634,7 +635,7 @@ export struct Filter {
this.initParams();
try {
let uiContent: UIContext = this.getUIContext();
this.isFollowingSystemFontScale= uiContent.isFollowingSystemFontScale();
this.isFollowingSystemFontScale = uiContent.isFollowingSystemFontScale();
this.maxAppFontScale = uiContent.getMaxFontScale();
} catch (err) {
let code: number = (err as BusinessError).code;
@ -777,7 +778,7 @@ export struct Filter {
.align(Alignment.Start)
.onAreaChange((_oldValue: Area, newValue: Area) => {
if (!this.isFloatShowAllFilterWithoutAnimation && !this.isFloatBarShowWithoutAnimation) {
if (this.additionFilters != null) {
if (this.additionFilters !== null) {
this.filterDynamicHeight = parseInt(newValue.height.toString(), 0) + LIST_ROW_HEIGHT + FILTER_TOP_PADDING
} else {
this.filterDynamicHeight = parseInt(newValue.height.toString(), 0) + FILTER_TOP_PADDING
@ -810,7 +811,7 @@ export struct Filter {
})
}.width(PERCENT_100)
.onAreaChange((_oldValue: Area, newValue: Area) => {
if (this.additionFilters != null) {
if (this.additionFilters !== null) {
this.filterDynamicHeight = parseInt(newValue.height.toString(), 0) + LIST_ROW_HEIGHT + FILTER_TOP_PADDING
} else {
this.filterDynamicHeight = parseInt(newValue.height.toString(), 0) + FILTER_TOP_PADDING
@ -854,7 +855,7 @@ export struct Filter {
@Builder AdditionFilterList() {
if (this.additionFilters && this.additionFilters.name && this.additionFilters.options &&
this.additionFilters.options.length != 0) {
this.additionFilters.options.length !== 0) {
Stack({ alignContent: Alignment.End }) {
Stack({ alignContent: Alignment.Start }) {
List() {
@ -945,7 +946,7 @@ export struct Filter {
.onClick(() => {
this.additionItemClick(index)
})
.tabIndex(index == 0 ? this.multiFilters.length : -1)
.tabIndex(index === 0 ? this.multiFilters.length : -1)
})
}
.listDirection(Axis.Horizontal)
@ -1171,7 +1172,7 @@ export struct Filter {
.height(PERCENT_100)
.edgeEffect(EdgeEffect.Spring)
.onScroll((_scrollOffset: number, scrollState: ScrollState) => {
if (this.isFloatShowAllFilterWithoutAnimation && scrollState == ScrollState.Scroll) {
if (this.isFloatShowAllFilterWithoutAnimation && scrollState === ScrollState.Scroll) {
this.isFloatBarShowWithoutAnimation = true
this.isFloatShowAllFilterWithoutAnimation = false
animateTo({