From b7da2af93962b0d5472956b2a4badda56658c4e1 Mon Sep 17 00:00:00 2001 From: zhanghong Date: Mon, 11 Nov 2024 09:46:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=87=E5=BF=98=E5=BD=95js?= =?UTF-8?q?crash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghong --- features/src/main/ets/components/FolderListComp.ets | 2 +- features/src/main/ets/components/NoteContent.ets | 2 +- .../src/main/ets/components/NoteContentComp.ets | 2 +- .../main/ets/components/NoteContentCompPortrait.ets | 5 +++-- features/src/main/ets/components/NoteListComp.ets | 13 +++++++------ product/default/src/main/ets/pages/NoteHome.ets | 3 ++- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/features/src/main/ets/components/FolderListComp.ets b/features/src/main/ets/components/FolderListComp.ets index 013946d..963c5af 100644 --- a/features/src/main/ets/components/FolderListComp.ets +++ b/features/src/main/ets/components/FolderListComp.ets @@ -189,7 +189,7 @@ struct FolderItemComp { @Consume('Longpress') longpress: boolean @Consume('SelectedColor') selectedColor: string @Consume('PortraitModel') portraitModel: boolean - controllerShow: WebviewController + controllerShow: webview.WebviewController = new webview.WebviewController(); @State isLongPress: boolean = false TAG = "FolderItemComp" @StorageLink('isUpdate') isUpdate: boolean = false diff --git a/features/src/main/ets/components/NoteContent.ets b/features/src/main/ets/components/NoteContent.ets index 82a52ed..5e2a17d 100644 --- a/features/src/main/ets/components/NoteContent.ets +++ b/features/src/main/ets/components/NoteContent.ets @@ -272,7 +272,7 @@ export struct ToolBarComp { @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') @Consume('Issave') issave: number @Consume('EditModel') editModel: boolean - controllerShow: WebviewController + controllerShow: webview.WebviewController = new webview.WebviewController(); editContentDialogCtl: CustomDialogController = new CustomDialogController({ builder: EditContentDialog({ confirm: this.confirm.bind(this) }), alignment: DialogAlignment.Bottom, diff --git a/features/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets index 4bbc63f..b0cc798 100644 --- a/features/src/main/ets/components/NoteContentComp.ets +++ b/features/src/main/ets/components/NoteContentComp.ets @@ -350,7 +350,7 @@ export struct NoteContentOverViewComp { @Consume('RefreshFlag') refreshFlag: number @StorageLink('isUpdate') isUpdate: boolean = false NoteDataMoveArray: FolderData[] - controllerShow: WebviewController + controllerShow: webview.WebviewController = new webview.WebviewController(); editTitleDialogCtl: CustomDialogController = new CustomDialogController({ builder: EditTitleDialog({ confirm: this.confirm.bind(this) }), alignment: DialogAlignment.Center, diff --git a/features/src/main/ets/components/NoteContentCompPortrait.ets b/features/src/main/ets/components/NoteContentCompPortrait.ets index ebf835b..0426a20 100644 --- a/features/src/main/ets/components/NoteContentCompPortrait.ets +++ b/features/src/main/ets/components/NoteContentCompPortrait.ets @@ -36,6 +36,7 @@ import router from '@system.router' import inputMethod from '@ohos.inputMethod'; import { folderTextMap } from '@ohos/utils/src/main/ets/default/model/NoteBaseData' import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; +import webview from '@ohos.web.webview'; var time_id: number @@ -57,7 +58,7 @@ export struct NoteContentCompPortrait { @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') @Provide('EditModel') editModel: boolean = false @StorageLink('dpi') dpi: number = 240 - controllerShow: WebviewController + controllerShow: webview.WebviewController = new webview.WebviewController(); private editContentFlag = false private isClickBack: boolean = false @StorageLink('ScrollTopPercent') scrollTopPercent: number = 0.0 @@ -483,7 +484,7 @@ export struct ToolBarComp { @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('EditModel') editModel: boolean @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') - controllerShow: WebviewController + controllerShow: webview.WebviewController = new webview.WebviewController(); onDeleteConfirm() { if (this.selectedFolderData.uuid != SysDefFolderUuid.RecentDeletes) { diff --git a/features/src/main/ets/components/NoteListComp.ets b/features/src/main/ets/components/NoteListComp.ets index 0095c1d..e34fc7a 100644 --- a/features/src/main/ets/components/NoteListComp.ets +++ b/features/src/main/ets/components/NoteListComp.ets @@ -34,6 +34,7 @@ import SearchModel from '@ohos/utils/src/main/ets/default/model/searchModel/Sear import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import router from '@ohos.router'; import inputMethod from '@ohos.inputMethod'; +import webview from '@ohos.web.webview'; const TAG = "NoteListComp" @@ -157,7 +158,7 @@ export struct NoteListComp { @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('Search') search: boolean - controllerShow: WebviewController + controllerShow: webview.WebviewController = new webview.WebviewController(); @Consume('AsideWidth') asideWidth: number build() { @@ -204,7 +205,7 @@ struct NoteOverViewComp { @Consume('ExpandStatus') expandStatus: boolean @Consume('Search') search: boolean @Consume('PortraitModel') portraitModel: boolean - controllerShow: WebviewController + controllerShow: webview.WebviewController = new webview.WebviewController(); @State noteNumber: number = undefined @StorageLink('isUpdate') @Watch('notesNumberChange') isUpdate: boolean = false @Consume('AsideWidth') asideWidth: number @@ -321,7 +322,7 @@ struct NoteOverViewComp { export struct NoteItemComp { public noteItem: NoteData public spans: any[] - controllerShow: WebviewController + controllerShow: webview.WebviewController = new webview.WebviewController(); @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('SelectedNoteData') selectedNoteData: NoteData @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') @@ -503,7 +504,7 @@ export struct NoteItemListComp { @Consume('PortraitModel') portraitModel: boolean @State @Watch('setNoteListLazy') dateList: NoteData[] = []; @State noteList: noteListData = new noteListData(); - controllerShow: WebviewController + controllerShow: webview.WebviewController = new webview.WebviewController(); @StorageLink('isUpdate') @Watch('updateList') isUpdate: boolean = false updateList() { @@ -655,7 +656,7 @@ export struct OperateNoteComp { @Consume('PortraitModel') portraitModel: boolean @Consume('selectedAll') selectedAll: boolean @StorageLink('isUpdate') isUpdate: boolean = false - controllerShow: WebviewController + controllerShow: webview.WebviewController = new webview.WebviewController(); noteDataMoveDialogCtl: CustomDialogController = new CustomDialogController({ builder: NoteDataMoveDialog({ onConfirm: this.onMoveConfirm.bind(this) }), alignment: DialogAlignment.Center, @@ -837,7 +838,7 @@ export struct AddNoteComp { @Consume('EditModel') editModel: boolean @Consume('ChooseNote') chooseNote: boolean @Consume('PortraitModel') portraitModel: boolean - controllerShow: WebviewController + controllerShow: webview.WebviewController = new webview.WebviewController(); build() { Image($r('app.media.addNote')) diff --git a/product/default/src/main/ets/pages/NoteHome.ets b/product/default/src/main/ets/pages/NoteHome.ets index 0dcbb1e..8f3a252 100644 --- a/product/default/src/main/ets/pages/NoteHome.ets +++ b/product/default/src/main/ets/pages/NoteHome.ets @@ -22,6 +22,7 @@ import { circleColorArray } from '@ohos/utils/src/main/ets/default/model/NoteBas 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 LayoutUtil from '@ohos/utils/src/main/ets/default/baseUtil/LayoutUtil' +import webview from '@ohos.web.webview'; @Entry @Component @@ -42,7 +43,7 @@ export struct NoteHomeComp { @Provide('EditModel') editModel: boolean = false //编辑模式：临时方案 @Provide('Issave') issave: number = 0 @StorageLink('breakPoint') breakPoints: string = 'lg' - controllerShow: WebviewController + controllerShow: webview.WebviewController = new webview.WebviewController(); TAG = "NoteHomeComp_Tablet" @Provide('AsideWidth') asideWidth: number = 200