From fdca81e0b85057a2419dd66af94be432172b6752 Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 15 Dec 2022 11:38:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- .../ets/default/baseUtil/RdbStoreUtil.ets | 1 + .../src/main/ets/components/CusDialogComp.ets | 19 ++++++------ .../src/main/ets/components/NoteContent.ets | 10 ++++--- .../main/ets/components/NoteContentComp.ets | 27 +++++++++-------- .../components/NoteContentCompPortrait.ets | 4 +-- .../src/main/ets/components/NoteListComp.ets | 26 ++++++++-------- .../default/src/main/ets/pages/MyNoteHome.ets | 30 +++++++++---------- .../src/main/ets/pages/NoteHomePortrait.ets | 6 ++-- product/default/src/main/module.json5 | 2 +- 9 files changed, 65 insertions(+), 60 deletions(-) diff --git a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets index 49e0f2c..97e98b1 100644 --- a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets @@ -200,6 +200,7 @@ export default { let title = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.Title)) let uuid = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.Uuid)) let folder_uuid = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.FolderUuid)) + // 暂时备忘录二次白屏问题，后续数据库解决 let content_text = ''; let content_img = ''; try { diff --git a/features/src/main/ets/components/CusDialogComp.ets b/features/src/main/ets/components/CusDialogComp.ets index b13d911..2914636 100644 --- a/features/src/main/ets/components/CusDialogComp.ets +++ b/features/src/main/ets/components/CusDialogComp.ets @@ -33,7 +33,7 @@ export struct NewOrEditFolderDialog { private editFolderUuid: string = "" private dialogType: number = 0 // 0表示新建文件夹 1表示修改文件夹 @State isExisted: boolean = false - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') + @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') @Consume('SelectedColor') selectedColor: string build() { @@ -136,7 +136,7 @@ export struct NewOrEditFolderDialog { .margin({ bottom: 16, left: 12, right: 12 }) } - aboutToAppear(): void{ + aboutToAppear(): void { var currentFolder: FolderData = FolderUtil.getFolderData(this.AllFolderArray, this.editFolderUuid) // 获取当前选中的文件夹 if (currentFolder == null) { return @@ -179,9 +179,9 @@ struct ColorCircleComp { @CustomDialog export struct DeleteDialog { - @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') + @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] + @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') + @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') @Consume('SelectedNoteData') selectedNoteData: NoteData @Consume('SelectedFolderData') selectedFolderData: FolderData private multiSelect: boolean = false @@ -271,7 +271,7 @@ export struct DeleteDialog { @Component struct NoteDataMoveItemComp { @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = [] + @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = [] private folderItem: FolderData dividerShow: boolean = true @@ -326,7 +326,7 @@ export struct NoteDataMoveDialog { noteDataMoveDialogCtl: CustomDialogController onConfirm: (folderUuid: string) => void NoteDataMoveArray: FolderData[] - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = [] + @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = [] aboutToAppear() { this.NoteDataMoveArray = this.AllFolderArray.slice(2, this.AllFolderArray.length); @@ -659,8 +659,7 @@ export struct EditTitleDialog { editTitleDialog: CustomDialogController confirm: (newTitle: string) => void @State inputName: string = "" - @State isEquivalentVal: boolean= true - + @State isEquivalentVal: boolean = true build() { Column() { @@ -717,7 +716,7 @@ export struct EditTitleDialog { this.editTitleDialog.close() // @ts-ignore inputMethod.getController().stopInputSession(); - if (this.inputName.replace(/\s+/g,'') == '') { + if (this.inputName.replace(/\s+/g, '') == '') { return } else { this.confirm(this.inputName) diff --git a/features/src/main/ets/components/NoteContent.ets b/features/src/main/ets/components/NoteContent.ets index a231ce1..f98a558 100644 --- a/features/src/main/ets/components/NoteContent.ets +++ b/features/src/main/ets/components/NoteContent.ets @@ -197,7 +197,9 @@ export struct NoteContent { } else { this.controllerShow.runJavaScript({ script: "changeSizeToTablet()" }) } - this.controllerShow.runJavaScript({ script: "hiddenButton()" }) + if (AppStorage.Get('breakPoint') !== 'sm') { + this.controllerShow.runJavaScript({ script: "hiddenButton()" }) + } LogUtil.info(TAG, "finish loadurl") if (this.selectedNoteData) { let self = this @@ -251,7 +253,7 @@ export struct NoteContent { aboutToDisappear(): void { NoteUtil.refreshAll() - AppStorage.Set("refreshCurrentNote",true) + AppStorage.Set("refreshCurrentNote", true) clearInterval(timeID) LogUtil.info(TAG, "aboutToDisappear") } @@ -289,7 +291,7 @@ export struct ToolBarComp { LogUtil.info(TAG, "zoom, clearInterval timeID : " + timeID) clearInterval(timeID) } - AppStorage.Set("refreshCurrentNote",true) + AppStorage.Set("refreshCurrentNote", true) router.back() NoteUtil.refreshAll() }) @@ -378,7 +380,7 @@ export struct ToolBarComp { }) this.issave = 1 // 保存笔记信息到数据库 - this.controllerShow.runJavaScript({script:"getHtmlContent()"}) + this.controllerShow.runJavaScript({ script: "getHtmlContent()" }) }) } } diff --git a/features/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets index aea3ed2..abcc67e 100644 --- a/features/src/main/ets/components/NoteContentComp.ets +++ b/features/src/main/ets/components/NoteContentComp.ets @@ -235,7 +235,9 @@ export struct NoteContentComp { } else { this.controllerShow.runJavaScript({ script: "changeSizeToTablet()" }) } - this.controllerShow.runJavaScript({ script: "hiddenButton()" }) + if (AppStorage.Get('breakPoint') !== 'sm') { + this.controllerShow.runJavaScript({ script: "hiddenButton()" }) + } LogUtil.info(TAG, "finish loadurl") if (this.selectedNoteData) { let self = this @@ -473,16 +475,6 @@ export struct ToolBarComp { autoCancel: false, customStyle: true, }) - editContentDialogCtl: CustomDialogController = new CustomDialogController({ - builder: EditContentDialog({ confirm: this.confirm.bind(this) }), - alignment: DialogAlignment.Bottom, - autoCancel: true, - customStyle: true, - }) - - confirm(excuteJs: string) { - this.controllerShow.runJavaScript({ script: excuteJs }) - } onDeleteConfirm() { if (this.selectedFolderData.uuid != SysDefFolderUuid.RecentDeletes) { @@ -510,6 +502,17 @@ export struct ToolBarComp { AppStorage.SetOrCreate('isUpdate', true) } + editContentDialogCtl: CustomDialogController = new CustomDialogController({ + builder: EditContentDialog({ confirm: this.confirm.bind(this) }), + alignment: DialogAlignment.Bottom, + autoCancel: true, + customStyle: true, + }) + + confirm(excuteJs: string) { + this.controllerShow.runJavaScript({ script: excuteJs }) + } + build() { Flex({ direction: FlexDirection.Row, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { @@ -661,7 +664,7 @@ export struct ToolBarComp { }) this.issave = 1 // 保存笔记信息到数据库 - this.controllerShow.runJavaScript({script:"getHtmlContent()"}) + this.controllerShow.runJavaScript({ script: "getHtmlContent()" }) }) } } diff --git a/features/src/main/ets/components/NoteContentCompPortrait.ets b/features/src/main/ets/components/NoteContentCompPortrait.ets index 8e22365..fe05a6f 100644 --- a/features/src/main/ets/components/NoteContentCompPortrait.ets +++ b/features/src/main/ets/components/NoteContentCompPortrait.ets @@ -210,7 +210,7 @@ export struct NoteContentCompPortrait { OperationUtils.copy(imageUri).then((uriPath) => { var path = "file://" + uriPath LogUtil.info(TAG, 'image uri is:' + path) - this.controllerShow.runJavaScript({ script: "RICH_EDITOR.getFocus()" }) + this.controllerShow.runJavaScript({ script: "javascript:RICH_EDITOR.getFocus()" }) this.controllerShow.runJavaScript({ script: "javascript:RICH_EDITOR.insertImage('" + path + "')" }) }) } @@ -301,8 +301,8 @@ export struct NoteContentCompPortrait { } aboutToDisappear(): void { - NoteUtil.refreshAll() clearInterval(time_id) + NoteUtil.refreshAll() LogUtil.info(TAG, "aboutToDisappear") } } diff --git a/features/src/main/ets/components/NoteListComp.ets b/features/src/main/ets/components/NoteListComp.ets index 8a3b3fe..f8c7cb0 100644 --- a/features/src/main/ets/components/NoteListComp.ets +++ b/features/src/main/ets/components/NoteListComp.ets @@ -141,7 +141,7 @@ struct NoteOverViewComp { alignItems: ItemAlign.Start }) { Text(FolderUtil.getFolderText(this.selectedFolderData)) - .id(this.isUpdate+'') + .id(this.isUpdate + '') .maxLines(1) .fontSize(30) .fontColor($r("app.color.all_notes_font_color")) @@ -149,7 +149,7 @@ struct NoteOverViewComp { .textOverflow({ overflow: TextOverflow.Ellipsis }) Row() { Text(FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid).toString()) - .id(this.isUpdate+'') + .id(this.isUpdate + '') .maxLines(1) .fontSize(14) .fontColor($r("app.color.num_of_notes_font_color")) @@ -217,11 +217,11 @@ export struct NoteItemComp { @Consume('selectedAll') selectedAll: boolean @Consume('PortraitModel') portraitModel: boolean @State isChecked: boolean = undefined - @Consume('Longpress')@Watch('isLongPress') longpress: boolean + @Consume('Longpress') @Watch('isLongPress') longpress: boolean @StorageLink('isUpdate') isUpdate: boolean = false - isLongPress(){ - if(this.longpress){ + isLongPress() { + if (this.longpress) { this.isChecked = false } } @@ -238,7 +238,7 @@ export struct NoteItemComp { Column({ space: 2 }) { Row({ space: 8 }) { Image($r("app.media.verticalBar")) - .id(this.isUpdate+'') + .id(this.isUpdate + '') .height(16) .width(4) .fillColor(NoteUtil.getVerticalBarBgColor(AppStorage.Get('AllFolderArray'), this.noteItem.folder_uuid)) @@ -250,7 +250,7 @@ export struct NoteItemComp { Row({ space: 4 }) { Text(DateUtil.formateDateForNoteTitle(new Date(this.noteItem.modified_time))) - .id(this.isUpdate+'') + .id(this.isUpdate + '') .maxLines(1) .fontSize(14) .fontColor($r("app.color.list_modified_time_font_color")) @@ -272,7 +272,7 @@ export struct NoteItemComp { Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { Stack({ alignContent: Alignment.Center }) { Image(this.noteItem.content_img) - .id(this.isUpdate+'') + .id(this.isUpdate + '') .height(47) .width(47) .borderRadius(12) @@ -288,7 +288,7 @@ export struct NoteItemComp { .width(24) .height(24) .visibility(this.updateAndGetChecked() ? Visibility.Visible : Visibility.None) - .id(this.isUpdate+'') + .id(this.isUpdate + '') }.width(24) .height(24) .visibility(this.longpress ? Visibility.Visible : Visibility.None) @@ -425,7 +425,7 @@ export struct NoteItemListComp { Flex() { SearchComp() } - .id(this.isUpdate+'') + .id(this.isUpdate + '') .width("100%") .padding({ left: 24, right: 24, bottom: 12 }) .visibility((FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0) ? Visibility.None : Visibility.Visible) @@ -454,7 +454,7 @@ export struct NoteItemListComp { .fontColor($r("app.color.Empty_page_font_color")) } } - .id(this.isUpdate+'') + .id(this.isUpdate + '') .width('100%') .height('100%') .padding({ bottom: 120 }) @@ -474,7 +474,7 @@ export struct NoteItemListComp { } }, noteItem => JSON.stringify(noteItem)) } - .id(this.isUpdate+'') + .id(this.isUpdate + '') .margin((FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0) ? { bottom: 0 } : { @@ -758,7 +758,7 @@ export struct SearchComp { this.search = false // 退出键盘 // @ts-ignore - inputMethod.getController().stopInputSession() + inputMethod.getController().stopInputSession(); AppStorage.SetOrCreate('Search', this.search) }) diff --git a/product/default/src/main/ets/pages/MyNoteHome.ets b/product/default/src/main/ets/pages/MyNoteHome.ets index 8be45be..2aa9133 100644 --- a/product/default/src/main/ets/pages/MyNoteHome.ets +++ b/product/default/src/main/ets/pages/MyNoteHome.ets @@ -32,12 +32,12 @@ export struct MyNoteHomeComp { private controllerShow: WebController = new WebController() private context = getContext(this) TAG = "MyNoteHomeComp_Tablet" + @StorageLink('breakPoint') @Watch('onBreakPointChange') breakPoints: string = 'lg' - @StorageLink('breakPoint')@Watch('onBreakPointChange') breakPoints: string = 'lg' - onBreakPointChange(){ - if(this.breakPoints == 'sm' || this.breakPoints == 'md'){ + onBreakPointChange() { + if (this.breakPoints == 'sm' || this.breakPoints == 'md') { this.portraitModel = true - }else{ + } else { this.portraitModel = false } } @@ -60,9 +60,9 @@ export struct MyNoteHomeComp { aboutToAppear(): void { LogUtil.info(this.TAG, "aboutToAppear") this.breakPoints = AppStorage.Get('breakPoint') - if(this.breakPoints == 'sm' || this.breakPoints == 'md'){ + if (this.breakPoints == 'sm' || this.breakPoints == 'md') { this.portraitModel = true - }else{ + } else { this.portraitModel = false } if (this.context == undefined || this.context == null) { @@ -126,15 +126,15 @@ export struct MyNoteHomeComp { onPageShow(): void { LogUtil.info(this.TAG, "onPageShow") - // continue from tablet - let continueFromTablet = AppStorage.Get('ContinueFromTablet') - LogUtil.info(this.TAG, "onPageShow, continueFromTablet : " + continueFromTablet) - let noteContentHomeExist = AppStorage.Get('NoteContentHomeExist') - LogUtil.info(this.TAG, "onPageShow, noteContentHomeExist : " + noteContentHomeExist) - if (continueFromTablet && !noteContentHomeExist) { - router.push({ uri: 'pages/NoteContentHome' }) - AppStorage.SetOrCreate('ContinueFromTablet', false) - } + // continue from tablet + let continueFromTablet = AppStorage.Get('ContinueFromTablet') + LogUtil.info(this.TAG, "onPageShow, continueFromTablet : " + continueFromTablet) + let noteContentHomeExist = AppStorage.Get('NoteContentHomeExist') + LogUtil.info(this.TAG, "onPageShow, noteContentHomeExist : " + noteContentHomeExist) + if (continueFromTablet && !noteContentHomeExist) { + router.push({ uri: 'pages/NoteContentHome' }) + AppStorage.SetOrCreate('ContinueFromTablet', false) + } this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0) } diff --git a/product/default/src/main/ets/pages/NoteHomePortrait.ets b/product/default/src/main/ets/pages/NoteHomePortrait.ets index b7e09f9..042273b 100644 --- a/product/default/src/main/ets/pages/NoteHomePortrait.ets +++ b/product/default/src/main/ets/pages/NoteHomePortrait.ets @@ -60,7 +60,7 @@ export struct NoteHomePortraitComp { .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) //Folder list display area - Row(){ + Row() { Stack() { FolderListBackGround() FolderListComp() @@ -81,11 +81,11 @@ export struct NoteHomePortraitComp { .width(StyleConstants.PERCENTAGE_100).height(StyleConstants.PERCENTAGE_100) } - aboutToAppear(): void{ + aboutToAppear(): void { LogUtil.info(this.TAG, "aboutToAppear") } - aboutToDisappear(): void{ + aboutToDisappear(): void { LogUtil.info(this.TAG, "aboutToDisappear") } } \ No newline at end of file diff --git a/product/default/src/main/module.json5 b/product/default/src/main/module.json5 index 884c1bd..def5ff9 100644 --- a/product/default/src/main/module.json5 +++ b/product/default/src/main/module.json5 @@ -44,7 +44,7 @@ { "name": "ohos.permission.DISTRIBUTED_DATASYNC", "reason": "$string:distributed_dataSync_permission" - } + }, ], "deliveryWithInstall": true, "installationFree": false, -- Gitee From 93b76942caff615f122a2914af7d8719da8a6564 Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 15 Dec 2022 14:50:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets index 97e98b1..5f7ca5c 100644 --- a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets @@ -200,7 +200,7 @@ export default { let title = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.Title)) let uuid = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.Uuid)) let folder_uuid = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.FolderUuid)) - // 暂时备忘录二次白屏问题，后续数据库解决 + // 暂时规避备忘录二次打开白屏问题，后续数据库解决 let content_text = ''; let content_img = ''; try { -- Gitee