openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-23 07:01:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

高级组件filter exceptionPrompt bugfix

Browse Source 
Signed-off-by: 郭英利 <guoyingli2@h-partners.com>
This commit is contained in:
郭英利 2024-11-08 16:35:54 +08:00
parent d2486bdbab
commit e81e7be10d
4 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
advanced_ui_component/exceptionprompt/interfaces/exceptionprompt.js
View File

@ -210,7 +210,7 @@ export class ExceptionPrompt extends ViewPU {
if (this.options.actionText) {
this.ifElseBranchUpdateFunction(0, () => {
this.observeComponentCreation2((elmtId, isInitialRender) => {
Button.createWithChild({ stateEffect: true, type: ButtonType.Normal });
Button.createWithChild({ stateEffect: false, type: ButtonType.Normal });
Button.backgroundColor(this.touchBackgroundColor);
Button.width(this.options.actionText ? 144 : 0);
Button.borderRadius({

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

@ -78,7 +78,7 @@ export struct ExceptionPrompt {
})
if (this.options.actionText) {
Button({ stateEffect: true, type: ButtonType.Normal }) {
Button({ stateEffect: false, type: ButtonType.Normal }) {
Row() {
Text(this.options.actionText)
.fontSize($r('sys.float.ohos_id_text_size_body2'))

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

@ -90,6 +90,7 @@ let ObservedBoolean = class ObservedBoolean {
ObservedBoolean = __decorate([
Observed
], ObservedBoolean);
export { ObservedBoolean };
let ObservedNumber = class ObservedNumber {
constructor(value) {
@ -99,6 +100,7 @@ let ObservedNumber = class ObservedNumber {
ObservedNumber = __decorate([
Observed
], ObservedNumber);
class GradientMask extends ViewPU {
constructor(parent, params, __localStorage, elmtId = -1, paramsLambda = undefined, extraInfo) {
super(parent, __localStorage, elmtId, extraInfo);
@ -1723,6 +1725,10 @@ export class Filter extends ViewPU {
if (this.selectedFilters) {
for (let i = 0; i < this.selectedFilters.length; i++) {
if (this.selectedFilters[i].value !== null) {
if (typeof this.selectedFilters[i].value !== 'string') {
this.selectedFilters[i].value =
getContext()?.resourceManager?.getStringSync(this.selectedFilters[i].value);
}
if (i === 0) {
this.floatFilterBarText += this.selectedFilters[i].value;
} else {
@ -1874,7 +1880,7 @@ export class Filter extends ViewPU {
},
rowIndex: rowIndex,
}, undefined, elmtId, () => {
}, { page: 'library/src/main/ets/components/mainpage/filter.ets', line: 811, col: 9 });
}, { page: 'library/src/main/ets/components/mainpage/filter.ets', line: 815, col: 9 });
ViewPU.create(componentCall);
let paramsLambda = () => {
return {
@ -1949,7 +1955,7 @@ export class Filter extends ViewPU {
},
rowIndex: rowIndex,
}, undefined, elmtId, () => {
}, { page: 'library/src/main/ets/components/mainpage/filter.ets', line: 840, col: 9 });
}, { page: 'library/src/main/ets/components/mainpage/filter.ets', line: 844, col: 9 });
ViewPU.create(componentCall);
let paramsLambda = () => {
return {
@ -2299,7 +2305,7 @@ export class Filter extends ViewPU {
}, undefined, elmtId, () => {
}, {
page: 'library/src/main/ets/components/mainpage/filter.ets',
line: 1002,
line: 1006,
col: 11
});
ViewPU.create(componentCall);
@ -2327,7 +2333,7 @@ export class Filter extends ViewPU {
x1: 0,
y1: LIST_ROW_HEIGHT / 2
}, undefined, elmtId, () => {
}, { page: 'library/src/main/ets/components/mainpage/filter.ets', line: 1009, col: 9 });
}, { page: 'library/src/main/ets/components/mainpage/filter.ets', line: 1013, col: 9 });
ViewPU.create(componentCall);
let paramsLambda = () => {
return {

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

@ -45,7 +45,6 @@ const GRADIENT_WIDTH: number = 16
const MAX_FONT_SCALE: number = 2;
const ERROR_CODE: number = 0x3900;
export enum FilterType {
MULTI_LINE_FILTER,
LIST_FILTER
@ -246,6 +245,7 @@ struct ListFilterRow {
y1: LIST_ROW_HEIGHT / 2
})
}
GradientMask({
x0: GRADIENT_WIDTH,
y0: LIST_ROW_HEIGHT / 2,
@ -334,7 +334,8 @@ struct MultiFilterRow {
return curLineSum
}
@Builder DownAndUpArrow() {
@Builder
DownAndUpArrow() {
Row() {
Image(this.isArrowIconDown.value ? $r('sys.media.ohos_ic_public_arrow_down') : $r('sys.media.ohos_ic_public_arrow_up'))
.width(ARROW_IMG_SIZE)
@ -725,6 +726,10 @@ export struct Filter {
if (this.selectedFilters) {
for (let i = 0; i < this.selectedFilters.length; i++) {
if (this.selectedFilters[i].value !== null) {
if (typeof this.selectedFilters[i].value !== 'string') {
this.selectedFilters[i].value =
getContext()?.resourceManager?.getStringSync(this.selectedFilters[i].value as Resource);
}
if (i === 0) {
this.floatFilterBarText += this.selectedFilters[i].value
} else {
@ -805,7 +810,8 @@ export struct Filter {
}
}
@Builder ListFilter() {
@Builder
ListFilter() {
Column() {
ForEach(this.multiFilters, (filter: FilterParams, rowIndex: number) => {
ListFilterRow({
@ -834,7 +840,8 @@ export struct Filter {
})
}
@Builder MultiLineFilter() {
@Builder
MultiLineFilter() {
Column() {
ForEach(this.multiFilters, (filterItem: FilterParams, rowIndex: number) => {
MultiFilterRow({
@ -898,7 +905,8 @@ export struct Filter {
this.refreshFloatFilterBarText()
}
@Builder AdditionFilterList() {
@Builder
AdditionFilterList() {
if (this.additionFilters && this.additionFilters.name && this.additionFilters.options &&
this.additionFilters.options.length !== 0) {
Stack({ alignContent: Alignment.End }) {
@ -1006,6 +1014,7 @@ export struct Filter {
y1: LIST_ROW_HEIGHT / 2
})
}
GradientMask({
x0: GRADIENT_WIDTH,
y0: LIST_ROW_HEIGHT / 2,
@ -1018,7 +1027,8 @@ export struct Filter {
}
@Builder FilterHeader() {
@Builder
FilterHeader() {
Column() {
if (this.filterType === FilterType.LIST_FILTER) {
this.ListFilter()
@ -1055,7 +1065,8 @@ export struct Filter {
})
}
@Builder FloatFilterHeader() {
@Builder
FloatFilterHeader() {
Column() {
Scroll() {
Column() {
@ -1080,8 +1091,8 @@ export struct Filter {
.zIndex(2)
}
@Builder FloatFilterBar() {
@Builder
FloatFilterBar() {
Row() {
Column() {
Row() {