diff --git a/common/component/src/main/ets/components/CusDialogComp.ets b/common/component/src/main/ets/components/CusDialogComp.ets index 6b81fb6..b43a83f 100644 --- a/common/component/src/main/ets/components/CusDialogComp.ets +++ b/common/component/src/main/ets/components/CusDialogComp.ets @@ -390,7 +390,7 @@ export struct EditContentDialog { @Consume('SelectedNoteData') selectedNoteData: NoteData private circleColor: string private fontSize: number - @StorageLink('CloseEditContentDialog') CloseEditContentDialog: boolean = AppStorage.Link('CloseEditContentDialog') + @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog') aboutToAppear() { this.confirm("javascript:RICH_EDITOR.getFontSizes()") @@ -578,7 +578,7 @@ export struct EditContentDialog { .fillColor('#99182431') .onClick(() => { this.editContentDialogCtl.close() - this.CloseEditContentDialog = true + this.closeEditContentDialog = true }) } .height(36) @@ -728,7 +728,7 @@ export struct EditContentDialogPortrait { confirm: (excuteJs: string) => void @State selectFontColor: string = fontColorArray[0] @Consume('SelectedNoteData') selectedNoteData: NoteData - @StorageLink('CloseEditContentDialog') CloseEditContentDialog: boolean = AppStorage.Link('CloseEditContentDialog') + @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog') private circleColor: string private fontSize: number @@ -746,7 +746,7 @@ export struct EditContentDialogPortrait { .fillColor($r("app.color.font_stylecolor_AD182431")) .onClick(() => { this.editContentDialogCtl.close() - this.CloseEditContentDialog = true + this.closeEditContentDialog = true }) } .height(48) diff --git a/common/component/src/main/ets/components/NoteContent.ets b/common/component/src/main/ets/components/NoteContent.ets index 1c64c50..2dfceca 100644 --- a/common/component/src/main/ets/components/NoteContent.ets +++ b/common/component/src/main/ets/components/NoteContent.ets @@ -39,7 +39,7 @@ var timeID: number @Component export struct NoteContent { - @StorageLink('CloseEditContentDialog') CloseEditContentDialog: boolean = AppStorage.Link('CloseEditContentDialog') + @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog') @Provide('SelectedNoteData') selectedNoteData: NoteData = AppStorage.Get('NewNote') @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') @Provide('Issave') issave: number = 0 @@ -156,7 +156,7 @@ export struct NoteContent { clearInterval(timeID) } timeID = setInterval(() => { - if(this.CloseEditContentDialog){ + if(this.closeEditContentDialog){ this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" }) } }, 3000) @@ -183,7 +183,7 @@ export struct NoteContent { @Component export struct ToolBarComp { - @StorageLink('CloseEditContentDialog') CloseEditContentDialog: boolean = AppStorage.Link('CloseEditContentDialog') + @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog') @Consume('SelectedNoteData') selectedNoteData: NoteData @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') @Consume('Issave') issave: number @@ -198,7 +198,7 @@ export struct ToolBarComp { }) existApp() { - this.CloseEditContentDialog = true + this.closeEditContentDialog = true } confirm(excuteJs: string) { @@ -265,7 +265,7 @@ export struct ToolBarComp { // 退出键盘 inputMethod.getInputMethodController().stopInput(); LogUtil.info(TAG, 'editContentDialogCtl start') - this.CloseEditContentDialog = false + this.closeEditContentDialog = false this.editContentDialogCtl.open() }) }.width(42) diff --git a/common/component/src/main/ets/components/NoteContentComp.ets b/common/component/src/main/ets/components/NoteContentComp.ets index 760d99b..9c72c66 100644 --- a/common/component/src/main/ets/components/NoteContentComp.ets +++ b/common/component/src/main/ets/components/NoteContentComp.ets @@ -49,7 +49,7 @@ export struct NoteContentComp { @Consume('LastSectionStatus') lastSectionStatus: number @Consume('Issave') issave: number @Consume('Search') search: boolean - @StorageLink('CloseEditContentDialog') CloseEditContentDialog: boolean = AppStorage.Link('CloseEditContentDialog') + @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog') controllerShow: WebController private editContentFlag = false @State uri1: string = "" @@ -207,7 +207,7 @@ export struct NoteContentComp { clearInterval(timeId) } timeId = setInterval(() => { - if(this.CloseEditContentDialog){ + if(this.closeEditContentDialog){ this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" }) } }, 3000) @@ -384,7 +384,7 @@ export struct ToolBarComp { @Consume('Issave') issave: number controllerShow: WebController private context = getContext(this) - @StorageLink('CloseEditContentDialog') CloseEditContentDialog: boolean = AppStorage.Link('CloseEditContentDialog') + @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog') noteDataDeleteDialogCtl: CustomDialogController = new CustomDialogController({ builder: DeleteDialog({ onConfirm: this.onDeleteConfirm.bind(this) }), alignment: DialogAlignment.Center, @@ -426,7 +426,7 @@ export struct ToolBarComp { }) exisApp() { - this.CloseEditContentDialog = true + this.closeEditContentDialog = true } confirm(excuteJs: string) { @@ -539,7 +539,7 @@ export struct ToolBarComp { .onClick(() => { // 退出键盘 inputMethod.getInputMethodController().stopInput(); - this.CloseEditContentDialog = false + this.closeEditContentDialog = false this.editContentDialogCtl.open() }) }.width(42) diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index 7a3c2ec..8a45875 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -52,7 +52,7 @@ export struct NoteContentCompPortrait { @Provide('SelectedFolderData') selectedFolderData: FolderData = AppStorage.Get("NewFolder") @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') @Provide('EditModel') editModel: boolean = false - @StorageLink('CloseEditContentDialog') CloseEditContentDialog: boolean = AppStorage.Link('CloseEditContentDialog') + @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog') controllerShow: WebController private editContentFlag = false noteContent = { @@ -158,7 +158,7 @@ export struct NoteContentCompPortrait { } // 添加定时器:3s自动保存 time_id = setInterval(() => { - if(this.CloseEditContentDialog){ + if(this.closeEditContentDialog){ this.controllerShow.runJavaScript({ script: "scheduledSaveContent()" }) } }, 3000) @@ -519,7 +519,7 @@ export struct EditNoteCompForPortrait { @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('SelectedNoteData') selectedNoteData: NoteData; @Consume('EditModel') editModel: boolean - @StorageLink('CloseEditContentDialog') CloseEditContentDialog: boolean = AppStorage.Link('CloseEditContentDialog') + @StorageLink('closeEditContentDialog') closeEditContentDialog: boolean = AppStorage.Link('closeEditContentDialog') controllerShow: WebController editContentDialogCtl: CustomDialogController = new CustomDialogController({ builder: EditContentDialogPortrait({ confirm: this.confirm.bind(this) }), @@ -530,7 +530,7 @@ export struct EditNoteCompForPortrait { }) exissApp() { - this.CloseEditContentDialog = true + this.closeEditContentDialog = true } confirm(excuteJs: string) { @@ -564,7 +564,7 @@ export struct EditNoteCompForPortrait { .height(24) .responseRegion({ x: -15.0, y: -15.0, width: 54, height: 54 }) .onClick(() => { - this.CloseEditContentDialog = false + this.closeEditContentDialog = false this.editContentDialogCtl.open() }) Text($r("app.string.style")) diff --git a/product/tablet/src/main/ets/MainAbility/MainAbility.ts b/product/tablet/src/main/ets/MainAbility/MainAbility.ts index 8d621a7..ab7ebf1 100644 --- a/product/tablet/src/main/ets/MainAbility/MainAbility.ts +++ b/product/tablet/src/main/ets/MainAbility/MainAbility.ts @@ -25,7 +25,7 @@ export default class MainAbility extends Ability { private Tag = "MainAbility_Tablet" onCreate(want, launchParam) { - AppStorage.SetOrCreate('CloseEditContentDialog', true) + AppStorage.SetOrCreate('closeEditContentDialog', true) LogUtil.info(this.Tag, " onCreate, launchReason is " + launchParam.launchReason) LogUtil.info(this.Tag, " onCreate, deviceType" + deviceInfo.deviceType) if (deviceInfo.deviceType === 'phone' || deviceInfo.deviceType === 'default') {