From 31c5f692155977801d51edf57088f27b1c076bfc Mon Sep 17 00:00:00 2001 From: ylh <1679938015@qq.com> Date: Thu, 28 Apr 2022 14:37:38 +0800 Subject: [PATCH] Highlight --- AppScope/app.json5 | 2 +- build-profile.json5 | 15 ++++++++++ common/component/package.json | 28 ++++++++--------- .../main/ets/components/NoteContentComp.ets | 4 +-- .../components/NoteContentCompPortrait.ets | 12 ++++---- common/utils/package.json | 26 ++++++++-------- product/phone/package.json | 30 +++++++++---------- product/tablet/package.json | 30 +++++++++---------- 8 files changed, 82 insertions(+), 65 deletions(-) diff --git a/AppScope/app.json5 b/AppScope/app.json5 index 0a0494f..e4ccabe 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -15,7 +15,7 @@ { "app": { - "bundleName": "com.ohos.note", + "bundleName": "com.ohos.note1.test4", "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", diff --git a/build-profile.json5 b/build-profile.json5 index df83ecd..ad48705 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -20,6 +20,21 @@ "products": [ { "name": "default", + "signingConfig": "default" + } + ], + "signingConfigs": [ + { + "name": "default", + "material": { + "certpath": "C:\\Users\\jwzhang\\.ohos\\config\\openharmony\\auto_ohos.cer", + "storePassword": "00000018A2042047E41F8E9870DC44CA2D97334408808E30E6D8C7E593043CF120810727326E9BD3", + "keyAlias": "debugKey", + "keyPassword": "00000018DB700917719F1646113A62D82809DD590D7F7DA5A45A8F91DD5635AFEB89D9926F165451", + "profile": "C:\\Users\\jwzhang\\.ohos\\config\\openharmony\\auto_ohos_default_com.ohos.note1.test4.p7b", + "signAlg": "SHA256withECDSA", + "storeFile": "C:\\Users\\jwzhang\\.ohos\\config\\openharmony\\auto_ohos.p12" + } } ] }, diff --git a/common/component/package.json b/common/component/package.json index 95679aa..a378052 100644 --- a/common/component/package.json +++ b/common/component/package.json @@ -1,17 +1,17 @@ { - "license": "ISC", - "types": "", - "devDependencies": {}, - "name": "@ohos/component", - "description": "a npm package which contains arkUI2.0 page", - "ohos": { - "org": "" + "license":"ISC", + "types":"", + "devDependencies":{}, + "name":"@ohos/component", + "description":"a npm package which contains arkUI2.0 page", + "ohos":{ + "org":"" }, - "main": "index.ets", - "repository": {}, - "version": "1.0.0", - "dependencies": { - "@ohos/utils": "file:../utils", - "@ohos/source": "file:../resources" + "main":"index.ets", + "repository":{}, + "version":"1.0.0", + "dependencies":{ + "@ohos/utils":"file:../utils", + "@ohos/source":"file:../resources" } -} +} \ No newline at end of file diff --git a/common/component/src/main/ets/components/NoteContentComp.ets b/common/component/src/main/ets/components/NoteContentComp.ets index a3777bb..7a150eb 100644 --- a/common/component/src/main/ets/components/NoteContentComp.ets +++ b/common/component/src/main/ets/components/NoteContentComp.ets @@ -268,11 +268,11 @@ export struct NoteContentOverViewComp { .fontSize(12) .padding({ top: 4, bottom: 4 }) .fontColor($r("app.color.modified_time_font_color")) - .margin({ left: 12 }) + .margin({ left: 12 }) Row() { Text(FolderUtil.getFolderText(FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid))) .fontSize(12) - .fontColor($r("app.color.list_modified_time_font_color")) + .fontColor($r("app.color.list_modified_time_font_color")) Image($r('app.media.triangle')) .width(6) .height(12) diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index 9929710..75b7c62 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -169,7 +169,7 @@ export struct NoteContentOverViewComp { List() { ForEach(this.AllFolderArray, (item) => { ListItem() { - NoteDataMoveItemComp({ folderItem: item }) + NoteDataMoveItemCompMenu({ folderItem: item, uuid: this.selectedNoteData.folder_uuid }) } .onClick(() => { this.selectedNoteData.folder_uuid = item.uuid @@ -219,7 +219,8 @@ export struct NoteContentOverViewComp { .margin({ left: 8 }) .borderRadius(16) .backgroundColor(NoteUtil.getNoteBgColor(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid, SysDefFolderUuid.AllNotes, false)) - .bindMenu(this.MenuBuilder) + // 传递当前显示的分类uuid + .bindMenu(this.MenuBuilder()) }.alignItems(VerticalAlign.Top).height(40).width(StyleConstants.PERCENTAGE_100) } .opacity(this.selectedNoteData.is_deleted == Delete.Yes ? 0.4 : 1) @@ -497,10 +498,11 @@ export struct EditNoteCompForPortrait { } @Component -struct NoteDataMoveItemComp { +struct NoteDataMoveItemCompMenu { @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = [] - private folderItem: FolderData + folderItem: FolderData + uuid: String build() { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.Center }) { @@ -517,7 +519,7 @@ struct NoteDataMoveItemComp { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.SpaceBetween }) { Text(FolderUtil.getFolderText(this.folderItem)) .fontSize(16) - .fontColor(FolderUtil.getFolderIconColor(this.AllFolderArray, this.folderItem.uuid, false)) + .fontColor(FolderUtil.getFolderIconColor(this.AllFolderArray, this.folderItem.uuid == this.uuid ? this.folderItem.uuid : '', false)) .textAlign(TextAlign.Center) .maxLines(1) .textOverflow({ overflow: TextOverflow.Ellipsis }) diff --git a/common/utils/package.json b/common/utils/package.json index 6581745..acf594b 100644 --- a/common/utils/package.json +++ b/common/utils/package.json @@ -1,16 +1,16 @@ { - "license": "ISC", - "types": "", - "devDependencies": {}, - "name": "@ohos/utils", - "description": "a npm package which contains arkUI2.0 page", - "ohos": { - "org": "" + "license":"ISC", + "types":"", + "devDependencies":{}, + "name":"@ohos/utils", + "description":"a npm package which contains arkUI2.0 page", + "ohos":{ + "org":"" }, - "main": "index.ets", - "repository": {}, - "version": "1.0.0", - "dependencies": { - "@ohos/source": "file:../resources" + "main":"index.ets", + "repository":{}, + "version":"1.0.0", + "dependencies":{ + "@ohos/source":"file:../resources" } -} +} \ No newline at end of file diff --git a/product/phone/package.json b/product/phone/package.json index 4e725b2..e161814 100644 --- a/product/phone/package.json +++ b/product/phone/package.json @@ -1,18 +1,18 @@ { - "license": "ISC", - "devDependencies": {}, - "name": "phone", - "ohos": { - "org": "huawei", - "directoryLevel": "module", - "buildTool": "hvigor" + "license":"ISC", + "devDependencies":{}, + "name":"phone", + "ohos":{ + "org":"huawei", + "directoryLevel":"module", + "buildTool":"hvigor" }, - "description": "example description", - "repository": {}, - "version": "1.0.0", - "dependencies": { - "@ohos/utils": "file:../../common/utils", - "@ohos/component": "file:../../common/component", - "@ohos/source": "file:../../common/resources" + "description":"example description", + "repository":{}, + "version":"1.0.0", + "dependencies":{ + "@ohos/utils":"file:../../common/utils", + "@ohos/component":"file:../../common/component", + "@ohos/source":"file:../../common/resources" } -} +} \ No newline at end of file diff --git a/product/tablet/package.json b/product/tablet/package.json index a398728..4cfedc4 100644 --- a/product/tablet/package.json +++ b/product/tablet/package.json @@ -1,18 +1,18 @@ { - "license": "ISC", - "devDependencies": {}, - "name": "tablet", - "ohos": { - "org": "huawei", - "directoryLevel": "module", - "buildTool": "hvigor" + "license":"ISC", + "devDependencies":{}, + "name":"tablet", + "ohos":{ + "org":"huawei", + "directoryLevel":"module", + "buildTool":"hvigor" }, - "description": "example description", - "repository": {}, - "version": "1.0.0", - "dependencies": { - "@ohos/utils": "file:../../common/utils", - "@ohos/component": "file:../../common/component", - "@ohos/source": "file:../../common/resources" + "description":"example description", + "repository":{}, + "version":"1.0.0", + "dependencies":{ + "@ohos/utils":"file:../../common/utils", + "@ohos/component":"file:../../common/component", + "@ohos/source":"file:../../common/resources" } -} +} \ No newline at end of file -- Gitee