openharmony/applications_notes
1
0
Fork 0
mirror of https://github.com/openharmony/applications_notes.git synced 2026-07-19 13:16:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

!66 Bugfix

Browse Source 
Merge pull request !66 from 秦平/master
This commit is contained in:
openharmony_ci
2022-06-21 13:05:22 +00:00
committed by Gitee
parent 2f069e94bd 9411e5f813
commit 3e22176fdb
2 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
product/phone/src/main/ets/pages/NoteHomePortrait.ets
+7 -12
View File
@@ -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() {
product/tablet/src/main/ets/pages/NoteHome.ets
+7 -12
View File
@@ -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