From 7779442886619d8cb9eb43d3a0210bffc7fbf7ae Mon Sep 17 00:00:00 2001 From: wangzhiyu12 Date: Fri, 22 Jul 2022 18:38:14 +0800 Subject: [PATCH 1/2] fix bug Signed-off-by: wangzhiyu12 --- .../src/main/ets/components/NoteContent.ets | 105 ++++++------- .../main/ets/components/NoteContentComp.ets | 138 ++++++++++-------- .../components/NoteContentCompPortrait.ets | 75 +++++----- 3 files changed, 172 insertions(+), 146 deletions(-) diff --git a/common/component/src/main/ets/components/NoteContent.ets b/common/component/src/main/ets/components/NoteContent.ets index 609558c..8de6541 100644 --- a/common/component/src/main/ets/components/NoteContent.ets +++ b/common/component/src/main/ets/components/NoteContent.ets @@ -17,20 +17,20 @@ import DateUtil from '@ohos/utils/src/main/ets/default/baseUtil/DateUtil' import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil' import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData' import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData' -import {TableName, NoteTableColumn, SysDefFolderUuid, Favorite, Delete +import { TableName, NoteTableColumn, SysDefFolderUuid, Favorite, Delete } from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants' -import {EditContentDialog, DeleteDialog, EditTitleDialog} from './CusDialogComp' +import { EditContentDialog, DeleteDialog, EditTitleDialog } from './CusDialogComp' import FolderUtil from '@ohos/utils/src/main/ets/default/baseUtil/FolderUtil' import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil' import prompt from '@system.prompt' import featureAbility from '@ohos.ability.featureAbility' -import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' +import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import OperationUtils from '@ohos/utils/src/main/ets/default/baseUtil/OperationUtils' import mediaquery from '@ohos.mediaquery' import router from '@system.router'; import inputMethod from '@ohos.inputmethod'; -import {folderTextMap} from '@ohos/utils/src/main/ets/default/model/NoteBaseData' +import { folderTextMap } from '@ohos/utils/src/main/ets/default/model/NoteBaseData' const TAG = "NoteContent" @@ -44,7 +44,6 @@ export struct NoteContent { @Provide('EditModel') editModel: boolean = false controllerShow: WebController private editContentFlag = false - noteContent = { callbackhtml: (html) => { LogUtil.info(TAG, 'note uuid is:' + this.selectedNoteData.uuid) @@ -57,7 +56,7 @@ export struct NoteContent { RdbStoreUtil.update(this.selectedNoteData.toNoteObject(), predicates_note, null) LogUtil.info(TAG, 'update note success:' + this.selectedNoteData.uuid) AppStorage.SetOrCreate('NewNote', this.selectedNoteData) - AppStorage.SetOrCreate('needRefresh',true) + AppStorage.SetOrCreate('needRefresh', true) // save continue data let continueNote: string = JSON.stringify(this.selectedNoteData.toNoteObject()) AppStorage.SetOrCreate('ContinueNote', continueNote) @@ -107,7 +106,9 @@ export struct NoteContent { this.editContentFlag = true } LogUtil.info(TAG, "finish loadurl") - this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')" }) + this.controllerShow.runJavaScript({ + script: "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')" + }) }) .zoomAccess(false) .height('70%') @@ -117,11 +118,12 @@ export struct NoteContent { .width(StyleConstants.PERCENTAGE_100) .onClick(() => { // 添加定时器：3s自动保存 - if (timeID == undefined) { - timeID = setInterval(() => { - this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" }) - }, 3000) + if (timeID) { + clearInterval(timeID) } + timeID = setInterval(() => { + this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" }) + }, 3000) LogUtil.info(TAG, "setInterval timeID : " + timeID) this.issave = 0 this.editModel = true @@ -150,7 +152,6 @@ export struct ToolBarComp { @Consume('Issave') issave: number @Consume('EditModel') editModel: boolean controllerShow: WebController - editContentDialogCtl: CustomDialogController = new CustomDialogController({ builder: EditContentDialog({ confirm: this.confirm.bind(this) }), alignment: DialogAlignment.Bottom, @@ -250,11 +251,13 @@ export struct ToolBarComp { imageUri = uri; } // 拷贝 - if(imageUri != null && imageUri != "") { + if (imageUri != null && imageUri != "") { OperationUtils.copy(imageUri).then((uriPath) => { var path = "file://" + uriPath LogUtil.info(TAG, 'image uri is:' + path) - this.controllerShow.runJavaScript({script:"javascript:RICH_EDITOR.insertImage('" + path + "')"}) + this.controllerShow.runJavaScript({ + script: "javascript:RICH_EDITOR.insertImage('" + path + "')" + }) }) } } @@ -369,46 +372,48 @@ export struct NoteContentOverViewComp { } build() { - Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap, - justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { - Row() { - Text(this.selectedNoteData.title) - .fontSize(30) - .margin({ left: 12, right: 24 }) - .onClick(() => { - clearInterval(timeID) - this.editTitleDialogCtl.open() - }) - }.height(40) - .width(StyleConstants.PERCENTAGE_100) + if (this.selectedNoteData) { + Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap, + justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { + Row() { + Text(this.selectedNoteData.title) + .fontSize(30) + .margin({ left: 12, right: 24 }) + .onClick(() => { + clearInterval(timeID) + this.editTitleDialogCtl.open() + }) + }.height(40) + .width(StyleConstants.PERCENTAGE_100) - Row() { - Text(DateUtil.formateDateForNoteContent(new Date(this.selectedNoteData.modified_time))) - .fontSize(12) - .padding({ top: 4, bottom: 4 }) - .fontColor($r("app.color.modified_time_font_color")) - .margin({ left: 12 }) Row() { - Text(FolderUtil.getFolderText(FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid)) == - folderTextMap["sys_def_myFavorites_uuid"] ? folderTextMap["sys_def_unClassified_uuid"] : - FolderUtil.getFolderText(FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid))) + Text(DateUtil.formateDateForNoteContent(new Date(this.selectedNoteData.modified_time))) .fontSize(12) - .fontColor($r("app.color.list_modified_time_font_color")) - Image($r('app.media.triangle')) - .width(6) - .height(12) - .margin({ left: 4 }) - } - .padding({ left: 8, right: 8, top: 4, bottom: 4 }) - .margin({ left: 8 }) - .borderRadius(16) - .backgroundColor(NoteUtil.getNoteBgColor(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid, SysDefFolderUuid.AllNotes, false)) - .bindMenu(this.MenuBuilder) - }.alignItems(VerticalAlign.Top).height(40).width(StyleConstants.PERCENTAGE_100) + .padding({ top: 4, bottom: 4 }) + .fontColor($r("app.color.modified_time_font_color")) + .margin({ left: 12 }) + Row() { + Text(FolderUtil.getFolderText(FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid)) == + folderTextMap["sys_def_myFavorites_uuid"] ? folderTextMap["sys_def_unClassified_uuid"] : + FolderUtil.getFolderText(FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid))) + .fontSize(12) + .fontColor($r("app.color.list_modified_time_font_color")) + Image($r('app.media.triangle')) + .width(6) + .height(12) + .margin({ left: 4 }) + } + .padding({ left: 8, right: 8, top: 4, bottom: 4 }) + .margin({ left: 8 }) + .borderRadius(16) + .backgroundColor(NoteUtil.getNoteBgColor(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid, SysDefFolderUuid.AllNotes, false)) + .bindMenu(this.MenuBuilder) + }.alignItems(VerticalAlign.Top).height(40).width(StyleConstants.PERCENTAGE_100) + } + .opacity(this.selectedNoteData.is_deleted == Delete.Yes ? 0.4 : 1) + .width(StyleConstants.PERCENTAGE_100) + .height(80) } - .opacity(this.selectedNoteData.is_deleted == Delete.Yes ? 0.4 : 1) - .width(StyleConstants.PERCENTAGE_100) - .height(80) } } diff --git a/common/component/src/main/ets/components/NoteContentComp.ets b/common/component/src/main/ets/components/NoteContentComp.ets index 67c023b..53bcccc 100644 --- a/common/component/src/main/ets/components/NoteContentComp.ets +++ b/common/component/src/main/ets/components/NoteContentComp.ets @@ -17,25 +17,27 @@ import DateUtil from '@ohos/utils/src/main/ets/default/baseUtil/DateUtil' import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil' import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData' import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData' -import {TableName, NoteTableColumn, SysDefFolderUuid, Favorite, Delete} from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' +import { TableName, NoteTableColumn, SysDefFolderUuid, Favorite, Delete +} from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants' -import {EditContentDialog, DeleteDialog, EditTitleDialog} from './CusDialogComp' +import { EditContentDialog, DeleteDialog, EditTitleDialog } from './CusDialogComp' import FolderUtil from '@ohos/utils/src/main/ets/default/baseUtil/FolderUtil' import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil' import prompt from '@system.prompt' import featureAbility from '@ohos.ability.featureAbility' -import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' +import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import OperationUtils from '@ohos/utils/src/main/ets/default/baseUtil/OperationUtils' import mediaquery from '@ohos.mediaquery' import inputMethod from '@ohos.inputmethod'; -import {folderTextMap} from '@ohos/utils/src/main/ets/default/model/NoteBaseData' +import { folderTextMap } from '@ohos/utils/src/main/ets/default/model/NoteBaseData' const TAG = "NoteContentComp" -var timeId : number +var timeId: number // Note content component let inSetValue = AppStorage.Link('inSetValue') + @Component export struct NoteContentComp { @Consume('SelectedNoteData') selectedNoteData: NoteData @@ -106,8 +108,8 @@ export struct NoteContentComp { }, callbackGetSize: (size) => { - if(size) { - AppStorage.Set('inSetValue', parseInt(size.slice(0,-2)) - 12) + if (size) { + AppStorage.Set('inSetValue', parseInt(size.slice(0, -2)) - 12) } } } @@ -140,7 +142,9 @@ export struct NoteContentComp { this.editContentFlag = true } LogUtil.info(TAG, "finish loadurl") - this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')" }) + this.controllerShow.runJavaScript({ + script: "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')" + }) // 初次加载为为小屏预览模式 if (this.sectionStatus != 1) { this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setInputEnabled(false)" }) @@ -164,9 +168,11 @@ export struct NoteContentComp { this.sectionStatus = 1 this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setInputEnabled(true)" }) // 添加定时器：3s自动保存 - timeId = setInterval(() => { - this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" }) - }, 3000) + if (timeId) { + timeId = setInterval(() => { + this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" }) + }, 3000) + } LogUtil.info(TAG, "setInterval timeId : " + timeId) // save continue data AppStorage.SetOrCreate('ContinueSection', this.sectionStatus) @@ -178,6 +184,7 @@ export struct NoteContentComp { } .height(StyleConstants.PERCENTAGE_100) .visibility(FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0 ? Visibility.Hidden : Visibility.Visible) + Column() { } .height("100%") @@ -198,7 +205,6 @@ export struct NoteContentComp { clearInterval(timeId) LogUtil.info(TAG, "aboutToDisappear") } - } @Component @@ -224,6 +230,7 @@ export struct NoteContentOverViewComp { this.NoteDataMoveArray = this.AllFolderArray.slice(2, this.AllFolderArray.length); this.NoteDataMoveArray.push(this.AllFolderArray[1]); } + aboutToAppear() { this.NoteDataMoveArray = this.AllFolderArray.slice(2, this.AllFolderArray.length); this.NoteDataMoveArray.push(this.AllFolderArray[1]); @@ -249,9 +256,11 @@ export struct NoteContentOverViewComp { let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) predicates_note.equalTo(NoteTableColumn.Uuid, this.selectedNoteData.uuid) RdbStoreUtil.update(this.selectedNoteData.toNoteObject(), predicates_note, null) - if(this.sectionStatus != 1) { + if (this.sectionStatus != 1) { this.selectedNoteData = NoteUtil.getFirstNoteData(this.AllNoteArray, this.selectedFolderData.uuid) - this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')" }) + this.controllerShow.runJavaScript({ + script: "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')" + }) this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0) } else { this.selectedFolderData = FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), item.uuid) @@ -272,52 +281,54 @@ export struct NoteContentOverViewComp { } build() { - Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap, - justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { - Row() { - Text(this.selectedNoteData.title) - .fontSize(30) - .margin({ left: 0, right: 24 }) - .onClick(() => { - this.editModel = true - this.sectionStatus = 1 - clearInterval(timeId) - this.editTitleDialogCtl.open() - // save continue data - AppStorage.SetOrCreate('ContinueSection', this.sectionStatus) - LogUtil.info(TAG, "NoteContentComp, set continue section success") - }) - }.height(40) - .width(StyleConstants.PERCENTAGE_100) + if (this.selectedNoteData) { + Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap, + justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { + Row() { + Text(this.selectedNoteData.title) + .fontSize(30) + .margin({ left: 0, right: 24 }) + .onClick(() => { + this.editModel = true + this.sectionStatus = 1 + clearInterval(timeId) + this.editTitleDialogCtl.open() + // save continue data + AppStorage.SetOrCreate('ContinueSection', this.sectionStatus) + LogUtil.info(TAG, "NoteContentComp, set continue section success") + }) + }.height(40) + .width(StyleConstants.PERCENTAGE_100) - Row() { - Text(DateUtil.formateDateForNoteContent(new Date(this.selectedNoteData.modified_time))) - .fontSize(12) - .padding({ top: 4, bottom: 4 }) - .fontColor($r("app.color.modified_time_font_color")) - .margin({ left: 0 }) Row() { - Text(FolderUtil.getFolderText(FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid)) == - folderTextMap["sys_def_myFavorites_uuid"] ? folderTextMap["sys_def_unClassified_uuid"] : - FolderUtil.getFolderText(FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid))) + Text(DateUtil.formateDateForNoteContent(new Date(this.selectedNoteData.modified_time))) .fontSize(12) - .fontColor($r("app.color.list_modified_time_font_color")) - .padding({ top: 1 }) - Image($r('app.media.triangle')) - .width(6) - .height(12) - .margin({ left: 4 }) - } - .padding({ left: 8, right: 8, top: 4, bottom: 4 }) - .margin({ left: 8 }) - .borderRadius(16) - .backgroundColor(NoteUtil.getNoteBgColor(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid, SysDefFolderUuid.AllNotes, false)) - .bindMenu(this.MenuBuilder) - }.alignItems(VerticalAlign.Top).height(40).width(StyleConstants.PERCENTAGE_100) + .padding({ top: 4, bottom: 4 }) + .fontColor($r("app.color.modified_time_font_color")) + .margin({ left: 0 }) + Row() { + Text(FolderUtil.getFolderText(FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid)) == + folderTextMap["sys_def_myFavorites_uuid"] ? folderTextMap["sys_def_unClassified_uuid"] : + FolderUtil.getFolderText(FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid))) + .fontSize(12) + .fontColor($r("app.color.list_modified_time_font_color")) + .padding({ top: 1 }) + Image($r('app.media.triangle')) + .width(6) + .height(12) + .margin({ left: 4 }) + } + .padding({ left: 8, right: 8, top: 4, bottom: 4 }) + .margin({ left: 8 }) + .borderRadius(16) + .backgroundColor(NoteUtil.getNoteBgColor(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid, SysDefFolderUuid.AllNotes, false)) + .bindMenu(this.MenuBuilder) + }.alignItems(VerticalAlign.Top).height(40).width(StyleConstants.PERCENTAGE_100) + } + .opacity(this.selectedNoteData.is_deleted == Delete.Yes ? 0.4 : 1) + .width(StyleConstants.PERCENTAGE_100) + .height(80) } - .opacity(this.selectedNoteData.is_deleted == Delete.Yes ? 0.4 : 1) - .width(StyleConstants.PERCENTAGE_100) - .height(80) } } @@ -335,7 +346,6 @@ export struct ToolBarComp { @Consume('Issave') issave: number controllerShow: WebController private context = getContext(this) - noteDataDeleteDialogCtl: CustomDialogController = new CustomDialogController({ builder: DeleteDialog({ onConfirm: this.onDeleteConfirm.bind(this) }), alignment: DialogAlignment.Center, @@ -440,7 +450,9 @@ export struct ToolBarComp { RdbStoreUtil.update(this.selectedNoteData.toNoteObject(), predicates_note, null) this.selectedNoteData = NoteUtil.getFirstNoteData(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) - this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')" }) + this.controllerShow.runJavaScript({ + script: "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')" + }) // save continue data let continueNote: string = JSON.stringify(this.selectedNoteData.toNoteObject()) AppStorage.SetOrCreate('ContinueNote', continueNote) @@ -501,11 +513,13 @@ export struct ToolBarComp { imageUri = uri; } // 拷贝 - if(imageUri != null && imageUri != "") { + if (imageUri != null && imageUri != "") { OperationUtils.copy(imageUri).then((uriPath) => { var path = "file://" + uriPath LogUtil.info(TAG, 'image uri is:' + path) - this.controllerShow.runJavaScript({script:"javascript:RICH_EDITOR.insertImage('" + path + "')"}) + this.controllerShow.runJavaScript({ + script: "javascript:RICH_EDITOR.insertImage('" + path + "')" + }) }) } } @@ -578,7 +592,9 @@ export struct ToolBarComp { RdbStoreUtil.update(this.selectedNoteData.toNoteObject(), predicates_note, null) if (this.selectedFolderData.uuid === SysDefFolderUuid.MyFavorites) { this.selectedNoteData = NoteUtil.getFirstNoteData(AppStorage.Get('AllNoteArray'), SysDefFolderUuid.MyFavorites) - this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')" }) + this.controllerShow.runJavaScript({ + script: "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')" + }) // save continue data let continueNote: string = JSON.stringify(this.selectedNoteData.toNoteObject()) AppStorage.SetOrCreate('ContinueNote', continueNote) diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index bec867c..663a8c8 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -29,7 +29,7 @@ import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import OperationUtils from '@ohos/utils/src/main/ets/default/baseUtil/OperationUtils' import router from '@system.router' import inputMethod from '@ohos.inputmethod'; -import {folderTextMap} from '@ohos/utils/src/main/ets/default/model/NoteBaseData' +import { folderTextMap } from '@ohos/utils/src/main/ets/default/model/NoteBaseData' var time_id: number @@ -121,6 +121,9 @@ export struct NoteContentCompPortrait { .flexShrink(1) .onClick(() => { // 添加定时器：3s自动保存 + if (time_id) { + clearInterval(time_id) + } time_id = setInterval(() => { this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" }) }, 3000) @@ -212,43 +215,45 @@ export struct NoteContentOverViewComp { } build() { - Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap, - justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { - Row() { - Text(this.selectedNoteData.title).fontSize(30).fontWeight(FontWeight.Medium) - .onClick(() => { - clearInterval(time_id) - this.editTitleDialogCtl.open() - }) - }.height(40) - .width(StyleConstants.PERCENTAGE_100) + if (this.selectedNoteData) { + Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap, + justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { + Row() { + Text(this.selectedNoteData.title).fontSize(30).fontWeight(FontWeight.Medium) + .onClick(() => { + clearInterval(time_id) + this.editTitleDialogCtl.open() + }) + }.height(40) + .width(StyleConstants.PERCENTAGE_100) - Row() { - Text(DateUtil.formateDateForNoteContent(new Date(this.selectedNoteData.modified_time))) - .fontSize(12) - .padding({ top: 4, bottom: 4 }) - .fontColor($r("app.color.modified_time_font_color")) Row() { - Text(FolderUtil.getFolderText(FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid)) == - folderTextMap["sys_def_myFavorites_uuid"] ? folderTextMap["sys_def_unClassified_uuid"] : - FolderUtil.getFolderText(FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid))) - .fontColor($r('app.color.folder_color_99182431')) + Text(DateUtil.formateDateForNoteContent(new Date(this.selectedNoteData.modified_time))) .fontSize(12) - Image($r('app.media.triangle')) - .width(6) - .height(12) - .margin({ left: 4 }) - } - .padding({ left: 8, right: 8, top: 4, bottom: 4 }) - .margin({ left: 8 }) - .borderRadius(16) - .backgroundColor(NoteUtil.getNoteBgColor(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid, SysDefFolderUuid.AllNotes, false)) - .bindMenu(this.MenuBuilder) - }.alignItems(VerticalAlign.Top).height(40).width(StyleConstants.PERCENTAGE_100) + .padding({ top: 4, bottom: 4 }) + .fontColor($r("app.color.modified_time_font_color")) + Row() { + Text(FolderUtil.getFolderText(FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid)) == + folderTextMap["sys_def_myFavorites_uuid"] ? folderTextMap["sys_def_unClassified_uuid"] : + FolderUtil.getFolderText(FolderUtil.getFolderData(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid))) + .fontColor($r('app.color.folder_color_99182431')) + .fontSize(12) + Image($r('app.media.triangle')) + .width(6) + .height(12) + .margin({ left: 4 }) + } + .padding({ left: 8, right: 8, top: 4, bottom: 4 }) + .margin({ left: 8 }) + .borderRadius(16) + .backgroundColor(NoteUtil.getNoteBgColor(AppStorage.Get('AllFolderArray'), this.selectedNoteData.folder_uuid, SysDefFolderUuid.AllNotes, false)) + .bindMenu(this.MenuBuilder) + }.alignItems(VerticalAlign.Top).height(40).width(StyleConstants.PERCENTAGE_100) + } + .opacity(this.selectedNoteData.is_deleted == Delete.Yes ? 0.4 : 1) + .width(StyleConstants.PERCENTAGE_100) + .height(82) } - .opacity(this.selectedNoteData.is_deleted == Delete.Yes ? 0.4 : 1) - .width(StyleConstants.PERCENTAGE_100) - .height(82) } } @@ -323,7 +328,7 @@ export struct ToolBarComp { LogUtil.info(TAG, 'ToolBarComp, set continue note success') }) Image($r('app.media.delete')).height(24).width(24) - .onClick(()=>{ + .onClick(() => { this.noteDataDeleteDialogCtl.open() }) }.width(72) -- Gitee From daa7cf08eb2e3d95c527043a894cdb41bc66c6af Mon Sep 17 00:00:00 2001 From: wangzhiyu12 Date: Mon, 25 Jul 2022 10:01:40 +0800 Subject: [PATCH 2/2] fix bug Signed-off-by: wangzhiyu12 --- .../component/src/main/ets/components/NoteContentComp.ets | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/component/src/main/ets/components/NoteContentComp.ets b/common/component/src/main/ets/components/NoteContentComp.ets index 53bcccc..863df3f 100644 --- a/common/component/src/main/ets/components/NoteContentComp.ets +++ b/common/component/src/main/ets/components/NoteContentComp.ets @@ -169,10 +169,11 @@ export struct NoteContentComp { this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setInputEnabled(true)" }) // 添加定时器：3s自动保存 if (timeId) { - timeId = setInterval(() => { - this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" }) - }, 3000) + clearInterval(timeId) } + timeId = setInterval(() => { + this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" }) + }, 3000) LogUtil.info(TAG, "setInterval timeId : " + timeId) // save continue data AppStorage.SetOrCreate('ContinueSection', this.sectionStatus) -- Gitee