From a4ff1c793d77c2479231586f0f140adc0f2e47be Mon Sep 17 00:00:00 2001 From: qp Date: Tue, 21 Jun 2022 16:47:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98=EF=BC=9A?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=BC=82=E5=B8=B8=E9=AB=98=E9=A2=91=E7=8E=87?= =?UTF-8?q?=E5=A4=8D=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qp --- .../src/main/ets/pages/NoteHomePortrait.ets | 19 +++++++------------ .../tablet/src/main/ets/pages/NoteHome.ets | 19 +++++++------------ 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/product/phone/src/main/ets/pages/NoteHomePortrait.ets b/product/phone/src/main/ets/pages/NoteHomePortrait.ets index 73bc668..ec185df 100644 --- a/product/phone/src/main/ets/pages/NoteHomePortrait.ets +++ b/product/phone/src/main/ets/pages/NoteHomePortrait.ets @@ -13,25 +13,21 @@ * limitations under the License. */ -import {FolderListComp, FolderListBackGround} from '@ohos/component/src/main/ets/components/FolderListComp' -import {NoteListComp} from '@ohos/component/src/main/ets/components/NoteListComp' -import {NoteContentCompPortrait} from '@ohos/component/src/main/ets/components/NoteContentCompPortrait' +import { FolderListComp, FolderListBackGround } from '@ohos/component/src/main/ets/components/FolderListComp' +import { NoteListComp } from '@ohos/component/src/main/ets/components/NoteListComp' +import { NoteContentCompPortrait } from '@ohos/component/src/main/ets/components/NoteContentCompPortrait' import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants' -import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' -import {circleColorArray} from '@ohos/utils/src/main/ets/default/model/NoteBaseData' +import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' +import { circleColorArray } from '@ohos/utils/src/main/ets/default/model/NoteBaseData' 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 {SysDefFolderUuid} from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' +import { SysDefFolderUuid } from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' import LayoutUtil from '@ohos/utils/src/main/ets/default/baseUtil/LayoutUtil' import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil' @Entry @Component export struct NoteHomePortraitComp { - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') - @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] - // 当前文件夹、笔记、分栏 @Provide('SelectedFolderData') selectedFolderData: FolderData = AppStorage.Get('Folder') @Provide('SelectedNoteData') selectedNoteData: NoteData = AppStorage.Get('Note') @@ -47,9 +43,8 @@ export struct NoteHomePortraitComp { @Provide('Search') search: boolean = false // 是否处于搜索状态 @Provide('SearchResultList') searchResultList: NoteData[] = [] // 搜索得到的笔记列表 @Provide('InputKeyword') inputKeyword: string = '' // 搜索的字串 - @Provide('SelectedAll') selectedAll:boolean = false; + @Provide('SelectedAll') selectedAll: boolean = false; @Provide('EditModel') editModel: boolean = false - TAG = "NoteHomePortraitComp_Phone" build() { diff --git a/product/tablet/src/main/ets/pages/NoteHome.ets b/product/tablet/src/main/ets/pages/NoteHome.ets index b800fa2..1493527 100644 --- a/product/tablet/src/main/ets/pages/NoteHome.ets +++ b/product/tablet/src/main/ets/pages/NoteHome.ets @@ -13,15 +13,15 @@ * limitations under the License. */ -import {FolderListComp} from '@ohos/component/src/main/ets/components/FolderListComp' -import {NoteListComp} from '@ohos/component/src/main/ets/components/NoteListComp' -import {NoteContentComp} from '@ohos/component/src/main/ets/components/NoteContentComp' +import { FolderListComp } from '@ohos/component/src/main/ets/components/FolderListComp' +import { NoteListComp } from '@ohos/component/src/main/ets/components/NoteListComp' +import { NoteContentComp } from '@ohos/component/src/main/ets/components/NoteContentComp' import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants' -import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' -import {circleColorArray} from '@ohos/utils/src/main/ets/default/model/NoteBaseData' +import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' +import { circleColorArray } from '@ohos/utils/src/main/ets/default/model/NoteBaseData' 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 {SysDefFolderUuid} from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' +import { SysDefFolderUuid } from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' import LayoutUtil from '@ohos/utils/src/main/ets/default/baseUtil/LayoutUtil' import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil' import mediaquery from '@ohos.mediaquery' @@ -29,10 +29,6 @@ import mediaquery from '@ohos.mediaquery' @Entry @Component export struct NoteHomeComp { - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') - @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] - // 当前文件夹、笔记、分栏 @Provide('SelectedFolderData') selectedFolderData: FolderData = AppStorage.Get('Folder') @Provide('SelectedNoteData') selectedNoteData: NoteData = AppStorage.Get('Note') @@ -49,10 +45,9 @@ export struct NoteHomeComp { @Provide('EditModel') editModel: boolean = false //编辑模式：临时方案 @Provide('Issave') issave: number = 0 controllerShow: WebController - TAG = "NoteHomeComp_Tablet" - narrowWinListener = mediaquery.matchMediaSync('(width < 2000)') + onWinSizeChange(mediaQueryResult) { if (this.sectionStatus != 1) { this.sectionStatus = (mediaQueryResult.matches) ? 2 : 3 -- Gitee