From aeef09e527b565f4427daa7aee0eae825739133a Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Fri, 16 Jun 2023 15:13:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanchenxuan --- .../src/main/ets/common/components/search.ets | 2 +- .../main/ets/pages/application-tertiary.ets | 18 +++++++++--------- .../ets/pages/authority-tertiary-groups.ets | 16 ++++++++-------- .../src/main/ets/pages/authority-tertiary.ets | 16 ++++++++-------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/permissionmanager/src/main/ets/common/components/search.ets b/permissionmanager/src/main/ets/common/components/search.ets index 182cdc6..3254ed3 100644 --- a/permissionmanager/src/main/ets/common/components/search.ets +++ b/permissionmanager/src/main/ets/common/components/search.ets @@ -42,7 +42,7 @@ export struct textInput { this.applicationItem = this.oldApplicationItem; } else { this.applicationItem = this.oldApplicationItem.filter((item) => { - return item.labelId.indexOf(value) > -1; + return item.label.indexOf(value) > -1; }) } if (this.applicationItem.length) { diff --git a/permissionmanager/src/main/ets/pages/application-tertiary.ets b/permissionmanager/src/main/ets/pages/application-tertiary.ets index 157554c..adf4aca 100644 --- a/permissionmanager/src/main/ets/pages/application-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/application-tertiary.ets @@ -47,12 +47,12 @@ class MeidaDocObj { } }; // permission information class class MediaListObj { - labelId: string - iconId: string + label: string + icon: string versionName: string - constructor(labelId: string, iconId: string, versionName: string,) { - this.labelId = labelId - this.iconId = iconId + constructor(label: string, icon: string, versionName: string,) { + this.label = label + this.icon = icon this.versionName = versionName } }; // Permission application information class @@ -133,8 +133,8 @@ struct mediaDocumentPage { struct mediaDocumentItem { @State mediaDocListItem: MeidaDocObj[] = []; // Permission information array @State mediaListItem: MediaListObj = { - labelId: '', - iconId: '', + label: '', + icon: '', versionName: '', }; // application info array @Link isCheckList: boolean[]; // Permission status array @@ -263,13 +263,13 @@ struct mediaDocumentItem { Column() { Row() { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { - Image(this.mediaListItem.iconId) + Image(this.mediaListItem.icon) .width(Constants.TERTIARY_IMAGE_WIDTH) .height(Constants.TERTIARY_IMAGE_HEIGHT) .margin({ left: Constants.TERTIARY_IMAGE_MARGIN_LEFT, right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) Column() { Row() { - Text(this.mediaListItem.labelId) + Text(this.mediaListItem.label) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets index 5f3bae8..b374788 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets @@ -43,8 +43,8 @@ let globalIsOn: any = router.getParams()['globalIsOn']; // return title name class ApplicationObj { bundleName: string - labelId: string - iconId: string + label: string + icon: string index: number accessTokenId: number permission: string @@ -52,16 +52,16 @@ class ApplicationObj { sortId: string constructor( bundleName: string, - labelId: string, - iconId: string, + label: string, + icon: string, index: number, accessTokenId: number, permission: string, alphabeticalIndex: string, sortId: string) { this.bundleName = bundleName - this.labelId = labelId - this.iconId = iconId + this.label = label + this.icon = icon this.index = index this.accessTokenId = accessTokenId this.permission = permission @@ -168,11 +168,11 @@ struct applicationItem { Column() { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { - Image(item.iconId) + Image(item.icon) .customizeImage(Constants.AUTHORITY_IMAGE_WIDTH, Constants.AUTHORITY_IMAGE_HEIGHT) .margin({ right: Constants.AUTHORITY_IMAGE_MARGIN_RIGHT }) Column() { - Text(item.labelId) + Text(item.label) .width(Constants.MAXIMUM_HEADER_WIDTH) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary.ets b/permissionmanager/src/main/ets/pages/authority-tertiary.ets index 5057b5d..fd5a5c6 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary.ets @@ -34,23 +34,23 @@ var TAG = 'PermissionManager_MainAbility:'; let routerData: any = router.getParams()['routerData']; // Routing jump data let backTitle = router.getParams()['backTitle']; // return title name class ApplicationObj { - labelId: string - iconId: string + label: string + icon: string index: number accessTokenId: number permission: string alphabeticalIndex: string sortId: string constructor( - labelId: string, - iconId: string, + label: string, + icon: string, index: number, accessTokenId: number, permission: string, alphabeticalIndex: string, sortId: string) { - this.labelId = labelId - this.iconId = iconId + this.label = label + this.icon = icon this.index = index this.accessTokenId = accessTokenId this.permission = permission @@ -109,11 +109,11 @@ struct applicationItem { Column() { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { - Image(item.iconId) + Image(item.icon) .customizeImage(Constants.AUTHORITY_IMAGE_WIDTH, Constants.AUTHORITY_IMAGE_HEIGHT) .margin({ right: Constants.AUTHORITY_IMAGE_MARGIN_RIGHT }) Column() { - Text(item.labelId) + Text(item.label) .width(Constants.MAXIMUM_HEADER_WIDTH) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis })