From a7ebe4cb3bae3c973cce83f112d3948f35acc70d Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 24 Oct 2023 15:09:48 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=AC=94=E8=AE=B0=E5=90=8E=E5=A4=87=E5=BF=98=E5=BD=95=E6=B5=81?= =?UTF-8?q?=E8=BD=AC=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets | 2 +- product/default/src/main/ets/MainAbility/MainAbility.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets index 8d01d70..5760d03 100644 --- a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets @@ -328,7 +328,7 @@ export default { let html if (base64regex.test(noteData.content_text)) { let base64 = new util.Base64Helper - html = base64.decodeSync(noteData.content_text) + html = base64.decodeSync(noteData.content_text).toString() } else { html = noteData.content_text } diff --git a/product/default/src/main/ets/MainAbility/MainAbility.ts b/product/default/src/main/ets/MainAbility/MainAbility.ts index 2aa4a1d..a3b14aa 100644 --- a/product/default/src/main/ets/MainAbility/MainAbility.ts +++ b/product/default/src/main/ets/MainAbility/MainAbility.ts @@ -172,7 +172,7 @@ export default class MainAbility extends UIAbility { let realHtml if (base64regex.test(html)) { let base64 = new util.Base64Helper - realHtml = base64.decodeSync(html) + realHtml = base64.decodeSync(html).toString() } else { realHtml = html; } -- Gitee From 5e3260624e0846cc03a6f580e56dedf0c4f77df9 Mon Sep 17 00:00:00 2001 From: nobbo Date: Wed, 25 Oct 2023 11:06:39 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0hvigor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- build-profile.json5 | 6 +++--- hvigor/hvigor-config.json5 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-profile.json5 b/build-profile.json5 index e0e91d4..4912ee0 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -16,12 +16,12 @@ { "app": { - "compileSdkVersion": 10, - "compatibleSdkVersion": 9, "products": [ { "name": "default", - "signingConfig": "default" + "signingConfig": "default", + "compileSdkVersion": 10, + "compatibleSdkVersion": 9 } ], "signingConfigs": [ diff --git a/hvigor/hvigor-config.json5 b/hvigor/hvigor-config.json5 index ff68812..63bbb5e 100644 --- a/hvigor/hvigor-config.json5 +++ b/hvigor/hvigor-config.json5 @@ -1,6 +1,6 @@ { - "hvigorVersion": "2.0.0", + "hvigorVersion": "3.0.2", "dependencies": { - "@ohos/hvigor-ohos-plugin": "2.0.0" + "@ohos/hvigor-ohos-plugin": "3.0.2" } } -- Gitee From cc5c10e18c3d257d5890e5c09269c0832ba02f4b Mon Sep 17 00:00:00 2001 From: nobbo Date: Wed, 25 Oct 2023 15:05:34 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A1=86=E5=AD=97=E4=BD=93=E8=A2=AB=E9=81=AE=E6=8C=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- features/src/main/ets/components/NoteListComp.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/src/main/ets/components/NoteListComp.ets b/features/src/main/ets/components/NoteListComp.ets index b21cac3..9c66368 100644 --- a/features/src/main/ets/components/NoteListComp.ets +++ b/features/src/main/ets/components/NoteListComp.ets @@ -794,7 +794,7 @@ export struct SearchComp { .backgroundColor(this.longpress ? $r("app.color.search_longpress_bgcolor_f7f8f9") : $r("app.color.color_ffffff")) .caretColor($r("app.color.search_note_caret_color")) .enabled(this.longpress ? false : true) - .padding({ left: 6, top: 1 }) + .padding({ left: 6, top: 0, bottom: 0, right: 0 }) .onEditChange((isEditing: boolean) => { // this.search = isEditing }) -- Gitee From 62436bc4bf455b4fa3471802397706e0bd9c882c Mon Sep 17 00:00:00 2001 From: nobbo Date: Mon, 6 Nov 2023 16:02:23 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=BE=E5=BA=93?= =?UTF-8?q?=E6=89=93=E4=B8=8D=E5=BC=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- features/src/main/ets/components/NoteContentCompPortrait.ets | 2 +- product/default/src/main/ets/MainAbility/MainAbility.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/features/src/main/ets/components/NoteContentCompPortrait.ets b/features/src/main/ets/components/NoteContentCompPortrait.ets index 6f3d391..e5b7b8c 100644 --- a/features/src/main/ets/components/NoteContentCompPortrait.ets +++ b/features/src/main/ets/components/NoteContentCompPortrait.ets @@ -200,7 +200,7 @@ export struct NoteContentCompPortrait { "ohos.permission.READ_MEDIA", "ohos.permission.WRITE_MEDIA", ] - let context: any = getContext(this); + let context: any = AppStorage.Get("context"); let AtManager = abilityAccessCtrl.createAtManager(); // @ts-ignore await AtManager.requestPermissionsFromUser(context, permissionList).then((data) => { diff --git a/product/default/src/main/ets/MainAbility/MainAbility.ts b/product/default/src/main/ets/MainAbility/MainAbility.ts index a3b14aa..0a46735 100644 --- a/product/default/src/main/ets/MainAbility/MainAbility.ts +++ b/product/default/src/main/ets/MainAbility/MainAbility.ts @@ -29,6 +29,7 @@ export default class MainAbility extends UIAbility { private Tag = "MainAbility_Tablet" onCreate(want, launchParam) { + AppStorage.SetOrCreate('context', this.context) // @ts-ignore window.getLastWindow(this.context, (err, data) => { if (data && data.getWindowProperties()) { -- Gitee From 21f085914df0800966324accdca484c2821c594f Mon Sep 17 00:00:00 2001 From: wangzhiyu Date: Thu, 16 Nov 2023 10:22:00 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0bundle.json=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangzhiyu --- bundle.json | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 bundle.json diff --git a/bundle.json b/bundle.json new file mode 100644 index 0000000..69e5203 --- /dev/null +++ b/bundle.json @@ -0,0 +1,40 @@ +{ + "name": "@ohos/notes", + "description": "notes app for standard system.", + "version": "3.0", + "license": "Apache License 2.0", + "publishAs": "code-segment", + "segment": { + "destPath": "applications/standard/notes" + }, + "dirs": {}, + "scripts": {}, + "component": { + "name": "notes", + "subsystem": "applications", + "syscap": [], + "features": [], + "adapted_system_type": [ + "standard" + ], + "rom": "0KB", + "ram": "0KB", + "deps": { + "components": [ + "ability_base", + "ability_runtime", + "relational_store", + "hiviewdfx_hilog_native", + "web_webview", + "resourceManager", + "medialibrary_standard" + ], + "third_party": [] + }, + "build": { + "sub_component": [], + "inner_kits": [], + "test": [] + } + } +} \ No newline at end of file -- Gitee From bf31aa2a7b08c7951415a2d7a6178523da79635d Mon Sep 17 00:00:00 2001 From: ywx1281445 Date: Tue, 14 Nov 2023 18:50:19 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=98=E5=8C=96note=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ywx1281445 --- .../src/main/ets/components/CusDialogComp.ets | 2 +- .../main/ets/components/NoteContentComp.ets | 2 +- .../components/NoteContentCompPortrait.ets | 2 +- .../src/main/ets/components/NoteListComp.ets | 134 ++++++++++++++++-- 4 files changed, 125 insertions(+), 15 deletions(-) diff --git a/features/src/main/ets/components/CusDialogComp.ets b/features/src/main/ets/components/CusDialogComp.ets index 1afb2e0..1a04055 100644 --- a/features/src/main/ets/components/CusDialogComp.ets +++ b/features/src/main/ets/components/CusDialogComp.ets @@ -173,7 +173,7 @@ struct ColorCircleComp { try { this.selectedColor = this.circleColor } catch (error) { - console.log("selectedColor error: ", error.toString()); + LogUtil.error(TAG, "selectedColor error: ", error.toString()); } }) } diff --git a/features/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets index 58052e5..81bb0f5 100644 --- a/features/src/main/ets/components/NoteContentComp.ets +++ b/features/src/main/ets/components/NoteContentComp.ets @@ -590,7 +590,7 @@ export struct ToolBarComp { }; context.resourceManager.getString(resource, (error, value) => { if (error != null) { - console.log("error is " + error); + LogUtil.error(TAG, "error is " + error); } else { prompt.showToast({ message: value, duration: 2000 }); } diff --git a/features/src/main/ets/components/NoteContentCompPortrait.ets b/features/src/main/ets/components/NoteContentCompPortrait.ets index e5b7b8c..3c3c1cf 100644 --- a/features/src/main/ets/components/NoteContentCompPortrait.ets +++ b/features/src/main/ets/components/NoteContentCompPortrait.ets @@ -694,7 +694,7 @@ export struct DeleteNoteComp { }; context.resourceManager.getString(resource, (error, value) => { if (error != null) { - console.log("error is " + error); + LogUtil.error(TAG, "error is " + error); } else { prompt.showToast({ message: value, duration: 2000 }); } diff --git a/features/src/main/ets/components/NoteListComp.ets b/features/src/main/ets/components/NoteListComp.ets index 9c66368..ed883f2 100644 --- a/features/src/main/ets/components/NoteListComp.ets +++ b/features/src/main/ets/components/NoteListComp.ets @@ -32,22 +32,125 @@ import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil' import FolderUtil from '@ohos/utils/src/main/ets/default/baseUtil/FolderUtil' import SearchModel from '@ohos/utils/src/main/ets/default/model/searchModel/SearchModel' import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' -import router from '@system.router'; +import router from '@ohos.router'; import inputMethod from '@ohos.inputMethod'; const TAG = "NoteListComp" -async function routePage() { +function routePage() { let options = { - uri: 'pages/NoteContentHome' + url: 'pages/NoteContentHome' } try { - await router.push(options) + router.pushUrl(options) } catch (err) { LogUtil.info(TAG, "fail callback") } } +abstract class BasicDataSource implements IDataSource { + private listeners: DataChangeListener[] = []; + + public abstract totalCount(): number; + + public getData(index: number): T | void { + LogUtil.info(TAG, 'getDataindex: '+index); + }; + + registerDataChangeListener(listener: DataChangeListener): void { + if (this.listeners.indexOf(listener) < 0) { + this.listeners.push(listener); + }; + }; + + unregisterDataChangeListener(listener: DataChangeListener): void { + const pos = this.listeners.indexOf(listener); + if (pos >= 0) { + this.listeners.splice(pos, 1); + }; + }; + + notifyDataReload(): void { + this.listeners.forEach((listener: DataChangeListener) => { + listener.onDataReloaded(); + }); + }; + + notifyDataAdd(index: number): void { + this.listeners.forEach((listener: DataChangeListener) => { + listener.onDataAdd(index); + }); + }; + + notifyDataChange(index: number): void { + this.listeners.forEach((listener: DataChangeListener) => { + listener.onDataChange(index); + }); + }; + + notifyDataDelete(index: number): void { + this.listeners.forEach((listener: DataChangeListener) => { + listener.onDataDelete(index); + }); + }; + + notifyDataMove(from: number, to: number): void { + this.listeners.forEach((listener: DataChangeListener) => { + listener.onDataMove(from, to); + }); + }; +}; + +class noteListData extends BasicDataSource { + private noteList: Array = []; + + public totalCount(): number { + return this.noteList.length; + }; + + public getData(index: number): NoteData { + LogUtil.info(TAG, 'getData, index=' + index); + return this.noteList[index]; + }; + + public addData(index: number, data: NoteData): void { + this.noteList.splice(index, 0, data); + this.notifyDataAdd(index); + }; + + public pushData(data: NoteData): void { + this.noteList.push(data); + this.notifyDataAdd(this.noteList.length - 1); + }; + + // 查找列表中对象的index + public indexOf(data: NoteData): number { + LogUtil.info(TAG, `indexOf data , id = ${data.id} , name = ${data.title}`); + return this.noteList.indexOf(data); + }; + + // 删除列表中处于index位置的对象 + public deleteDataByIndex(index: number): void { + LogUtil.info(TAG, `delete data , index = ${index}}`); + this.noteList.splice(index, 1); + this.notifyDataDelete(index); + }; + + // 删除列表中的对象 + public deleteData(data: NoteData): void { + LogUtil.info(TAG, `delete data , data = ${data.id}}`); + let index = this.indexOf(data); + this.deleteDataByIndex(index); + }; + + // 修改列表中所有对象 + public modifyAllData(data: NoteData[]): void { + LogUtil.info(TAG, `all data modified`); + this.noteList = data; + this.notifyDataReload(); + } +}; + // Note list component @Component export struct NoteListComp { @@ -392,7 +495,8 @@ export struct NoteItemListComp { @Consume('SearchResultList') searchResultList: NoteData[] @Consume('SelectedNoteData') selectedNoteData: NoteData @Consume('PortraitModel') portraitModel: boolean - @State dateList: NoteData[] = [] + @State @Watch('setNoteListLazy') dateList: NoteData[] = []; + @State noteList: noteListData = new noteListData(); controllerShow: WebviewController @StorageLink('isUpdate') @Watch('updateList') isUpdate: boolean = false @@ -412,12 +516,13 @@ export struct NoteItemListComp { doSearch() { if (this.inputKeyword.length == 0) { - return - } + return; + }; SearchModel.search(NoteUtil.getNoteDataArray(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid), this.inputKeyword) .then((result: NoteData[]) => { LogUtil.info(TAG, "result size " + result.length.toString()) this.searchResultList = result + this.setNoteListLazy() if (this.searchResultList.length != 0) { this.selectedNoteData = this.searchResultList[0] } else { @@ -436,6 +541,12 @@ export struct NoteItemListComp { }) } + setNoteListLazy() { + let noteLazySource: NoteData[]; + this.inputKeyword.length === 0 ? noteLazySource = this.dateList : noteLazySource = this.searchResultList; + this.noteList.modifyAllData(noteLazySource); + } + build() { Column() { Text(this.refreshFlag.toString()).visibility(Visibility.None) @@ -476,9 +587,7 @@ export struct NoteItemListComp { .height('100%') .padding({ bottom: 120 }) .visibility((FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0) ? Visibility.Visible : Visibility.None) - - ForEach(this.inputKeyword.length == 0 ? - this.dateList : this.searchResultList, (noteItem) => { + LazyForEach(this.noteList, (noteItem) => { ListItem() { Column() { NoteItemComp({ @@ -501,6 +610,7 @@ export struct NoteItemListComp { .layoutWeight(1) .listDirection(Axis.Vertical) .edgeEffect(EdgeEffect.Spring) + .cachedCount(10) } .layoutWeight(1) .height("100%") @@ -667,7 +777,7 @@ export struct OperateNoteComp { }; context.resourceManager.getString(resource, (error, value) => { if (error != null) { - console.log("error is " + error); + LogUtil.error(TAG, "error is " + error); } else { prompt.showToast({ message: value, duration: 2000 }); } @@ -1023,7 +1133,7 @@ export struct OperateNoteCompForPortrait { }; context.resourceManager.getString(resource, (error, value) => { if (error != null) { - console.log("error is " + error); + LogUtil.error(TAG, "error is " + error); } else { prompt.showToast({ message: value, duration: 2000 }); } -- Gitee From 19f3e9b7e3b5a444fb1cd51159c7b6ddcca7cb6c Mon Sep 17 00:00:00 2001 From: nobbo Date: Mon, 11 Dec 2023 20:00:51 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=A7=84=E9=81=BF=E5=A4=87=E5=BF=98?= =?UTF-8?q?=E5=BD=95context=E5=BC=82=E5=B8=B8=E5=87=BA=E7=8E=B0=E7=9A=84js?= =?UTF-8?q?crash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- .../ets/default/baseUtil/RdbStoreUtil.ets | 492 +++++++++--------- 1 file changed, 247 insertions(+), 245 deletions(-) diff --git a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets index 5760d03..9330241 100644 --- a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets @@ -43,129 +43,130 @@ export default { * create db and table */ createRdbStore(context) { - relationalStore.getRdbStore(context, SysDefData.dbInfo.db_name) - .then(async (store) => { - // add sys-def folder and note to AppStorage - let folderDataArray = [] - let sysDefFolderArray = [SysDefData.sys_def_allNotes, SysDefData.sys_def_unClassified, - SysDefData.sys_def_myFavorites, SysDefData.sys_def_recentDeletes, - SysDefData.sys_def_personal, SysDefData.sys_def_life, SysDefData.sys_def_work] - sysDefFolderArray.forEach((sysDefFolder) => { - let folderData = new FolderData(sysDefFolder.id, sysDefFolder.name, sysDefFolder.uuid, sysDefFolder.color, - sysDefFolder.folder_type, sysDefFolder.is_deleted, sysDefFolder.created_time, - sysDefFolder.modified_time) - folderDataArray.push(folderData) - }) - LogUtil.info(TAG, "folderDataArray[sysdef] : " + folderDataArray.length) + try { + relationalStore.getRdbStore(context, SysDefData.dbInfo.db_name) + .then(async (store) => { + // add sys-def folder and note to AppStorage + let folderDataArray = [] + let sysDefFolderArray = [SysDefData.sys_def_allNotes, SysDefData.sys_def_unClassified, + SysDefData.sys_def_myFavorites, SysDefData.sys_def_recentDeletes, + SysDefData.sys_def_personal, SysDefData.sys_def_life, SysDefData.sys_def_work] + sysDefFolderArray.forEach((sysDefFolder) => { + let folderData = new FolderData(sysDefFolder.id, sysDefFolder.name, sysDefFolder.uuid, sysDefFolder.color, + sysDefFolder.folder_type, sysDefFolder.is_deleted, sysDefFolder.created_time, + sysDefFolder.modified_time) + folderDataArray.push(folderData) + }) + LogUtil.info(TAG, "folderDataArray[sysdef] : " + folderDataArray.length) - let noteDataArray = [] - let sysDefNoteArray = [SysDefData.sys_def_note1, SysDefData.sys_def_note2, - SysDefData.sys_def_note3, SysDefData.sys_def_note4] - sysDefNoteArray.forEach((sysDefNote) => { - let noteData = new NoteData(sysDefNote.id, sysDefNote.title, sysDefNote.uuid, sysDefNote.folder_uuid, sysDefNote.content_text, - sysDefNote.content_img, sysDefNote.note_type, sysDefNote.is_top, sysDefNote.is_favorite, - sysDefNote.is_deleted, sysDefNote.created_time, sysDefNote.modified_time, sysDefNote.deleted_time, sysDefNote.slider_value) - noteDataArray.push(noteData) - }) - LogUtil.info(TAG, "noteDataArray[sysdef] : " + noteDataArray.length) + let noteDataArray = [] + let sysDefNoteArray = [SysDefData.sys_def_note1, SysDefData.sys_def_note2, + SysDefData.sys_def_note3, SysDefData.sys_def_note4] + sysDefNoteArray.forEach((sysDefNote) => { + let noteData = new NoteData(sysDefNote.id, sysDefNote.title, sysDefNote.uuid, sysDefNote.folder_uuid, sysDefNote.content_text, + sysDefNote.content_img, sysDefNote.note_type, sysDefNote.is_top, sysDefNote.is_favorite, + sysDefNote.is_deleted, sysDefNote.created_time, sysDefNote.modified_time, sysDefNote.deleted_time, sysDefNote.slider_value) + noteDataArray.push(noteData) + }) + LogUtil.info(TAG, "noteDataArray[sysdef] : " + noteDataArray.length) - AppStorage.SetOrCreate('AllFolderArray', folderDataArray) - AppStorage.SetOrCreate('AllNoteArray', noteDataArray) - LogUtil.info(TAG, "AppStorage[sysdef] set AllFolderArray and AllNoteArray success") + AppStorage.SetOrCreate('AllFolderArray', folderDataArray) + AppStorage.SetOrCreate('AllNoteArray', noteDataArray) + LogUtil.info(TAG, "AppStorage[sysdef] set AllFolderArray and AllNoteArray success") - // save continue data - let isContinue = AppStorage.Get('IsContinue'); - LogUtil.info(TAG, "createRdbStore, isContinue is " + isContinue) - if (isContinue) { - let continueNote: string = AppStorage.Get('ContinueNote') - let continueSection = AppStorage.Get('ContinueSection') - let noteObj = JSON.parse(continueNote) - let noteData = new NoteData(noteObj.uuid, noteObj.title, noteObj.uuid, noteObj.folder_uuid, - noteObj.content_text, noteObj.content_img, noteObj.note_type, noteObj.is_top, noteObj.is_favorite, - noteObj.is_deleted, noteObj.created_time, noteObj.modified_time, noteObj.deleted_time, noteObj.slider_value) + // save continue data + let isContinue = AppStorage.Get('IsContinue'); + LogUtil.info(TAG, "createRdbStore, isContinue is " + isContinue) + if (isContinue) { + let continueNote: string = AppStorage.Get('ContinueNote') + let continueSection = AppStorage.Get('ContinueSection') + let noteObj = JSON.parse(continueNote) + let noteData = new NoteData(noteObj.uuid, noteObj.title, noteObj.uuid, noteObj.folder_uuid, + noteObj.content_text, noteObj.content_img, noteObj.note_type, noteObj.is_top, noteObj.is_favorite, + noteObj.is_deleted, noteObj.created_time, noteObj.modified_time, noteObj.deleted_time, noteObj.slider_value) - // save img to FileDir - LogUtil.info(TAG, "createRdbStore, save img to FileDir") - let imgNameArray = this.getImgNameFromHtml(noteData) - imgNameArray.forEach((imgName: string) => { - this.writeToFileDir(imgName) - }) + // save img to FileDir + LogUtil.info(TAG, "createRdbStore, save img to FileDir") + let imgNameArray = this.getImgNameFromHtml(noteData) + imgNameArray.forEach((imgName: string) => { + this.writeToFileDir(imgName) + }) - // if not exit this note - let exist = false - let folderUuid = "" - for (let note of noteDataArray) { - if (noteData.created_time == note.created_time) { - exist = true - folderUuid = note.folder_uuid - break - } - } - LogUtil.info(TAG, "createRdbStore, exist : " + exist) - if (!exist) { - // 迁移过来的笔记在本地不存在，则保存在未分类文件夹 - noteData.folder_uuid = SysDefFolderUuid.UnClassified - noteDataArray.push(noteData) - AppStorage.SetOrCreate('AllNoteArray', noteDataArray) - this.insert(TableName.NoteTable, noteData.toNoteObject(), null) - AppStorage.SetOrCreate('Folder', FolderUtil.getFolderData(folderDataArray, SysDefFolderUuid.UnClassified)) - } else { - // 迁移过来的笔记在本地存在，则进行修改 - for (let i = 0; i < noteDataArray.length; i++) { - if (noteData.created_time == noteDataArray[i].created_time) { - noteDataArray[i] = noteData - LogUtil.info(TAG, "createRdbStore, update noteData in noteDataArray success") + // if not exit this note + let exist = false + let folderUuid = "" + for (let note of noteDataArray) { + if (noteData.created_time == note.created_time) { + exist = true + folderUuid = note.folder_uuid break } } - let predicates_note = this.getRdbPredicates(TableName.NoteTable) - predicates_note.equalTo(NoteTableColumn.CreatedTime, noteData.created_time) - this.update(noteData.toNoteObject(), predicates_note, null) - AppStorage.SetOrCreate('Folder', FolderUtil.getFolderData(folderDataArray, folderUuid)) - } - AppStorage.SetOrCreate('Note', noteData) - AppStorage.SetOrCreate('ContinueNote', JSON.stringify(noteData.toNoteObject())) - AppStorage.SetOrCreate('Section', continueSection) - AppStorage.SetOrCreate('NewNote', noteData) - } else { - LogUtil.info(TAG, "createRdbStore, IsContinue false") - AppStorage.SetOrCreate('Folder', AppStorage.Get('AllFolderArray')[0]) - let note = NoteUtil.getFirstNoteData(AppStorage.Get('AllNoteArray'), SysDefFolderUuid.AllNotes) - AppStorage.SetOrCreate('Note', note) - if (note) { - AppStorage.SetOrCreate('ContinueNote', JSON.stringify(note.toNoteObject())) + LogUtil.info(TAG, "createRdbStore, exist : " + exist) + if (!exist) { + // 迁移过来的笔记在本地不存在，则保存在未分类文件夹 + noteData.folder_uuid = SysDefFolderUuid.UnClassified + noteDataArray.push(noteData) + AppStorage.SetOrCreate('AllNoteArray', noteDataArray) + this.insert(TableName.NoteTable, noteData.toNoteObject(), null) + AppStorage.SetOrCreate('Folder', FolderUtil.getFolderData(folderDataArray, SysDefFolderUuid.UnClassified)) + } else { + // 迁移过来的笔记在本地存在，则进行修改 + for (let i = 0; i < noteDataArray.length; i++) { + if (noteData.created_time == noteDataArray[i].created_time) { + noteDataArray[i] = noteData + LogUtil.info(TAG, "createRdbStore, update noteData in noteDataArray success") + break + } + } + let predicates_note = this.getRdbPredicates(TableName.NoteTable) + predicates_note.equalTo(NoteTableColumn.CreatedTime, noteData.created_time) + this.update(noteData.toNoteObject(), predicates_note, null) + AppStorage.SetOrCreate('Folder', FolderUtil.getFolderData(folderDataArray, folderUuid)) + } + AppStorage.SetOrCreate('Note', noteData) + AppStorage.SetOrCreate('ContinueNote', JSON.stringify(noteData.toNoteObject())) + AppStorage.SetOrCreate('Section', continueSection) + AppStorage.SetOrCreate('NewNote', noteData) + } else { + LogUtil.info(TAG, "createRdbStore, IsContinue false") + AppStorage.SetOrCreate('Folder', AppStorage.Get('AllFolderArray')[0]) + let note = NoteUtil.getFirstNoteData(AppStorage.Get('AllNoteArray'), SysDefFolderUuid.AllNotes) + AppStorage.SetOrCreate('Note', note) + if (note) { + AppStorage.SetOrCreate('ContinueNote', JSON.stringify(note.toNoteObject())) + } + AppStorage.SetOrCreate('Section', 3) } - AppStorage.SetOrCreate('Section', 3) - } - AppStorage.SetOrCreate('DBQueryFinished', 1) - LogUtil.info(TAG, "createRdbStore, set DBQueryFinished 1") - LogUtil.info(TAG, "createRdbStore, store is " + store) - globalThis.rdbStore = store - // create table - await globalThis.rdbStore.executeSql(TableSql.FolderTableSQL, null) - await globalThis.rdbStore.executeSql(TableSql.NoteTableSQL, null) - await globalThis.rdbStore.executeSql(TableSql.AttachmentTableSQL, null) - await globalThis.rdbStore.executeSql(TableSql.FormTableSQL, null) - LogUtil.info(TAG, "create table success") - // insert system defined folder - await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_allNotes) - await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_unClassified) - await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_myFavorites) - await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_recentDeletes) - await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_personal) - await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_life) - await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_work) - LogUtil.info(TAG, "insert system defined folder success") - // insert system defined note and attachment - await globalThis.rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note1) - await globalThis.rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note2) - await globalThis.rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note3) - await globalThis.rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note4) - LogUtil.info(TAG, "insert system defined note and attachment success") - }) - .catch((err) => { - LogUtil.warn(TAG, "createRdbStore, error : " + err) - }) + AppStorage.SetOrCreate('DBQueryFinished', 1) + LogUtil.info(TAG, "createRdbStore, set DBQueryFinished 1") + LogUtil.info(TAG, "createRdbStore, store is " + store) + globalThis.rdbStore = store + // create table + await globalThis.rdbStore.executeSql(TableSql.FolderTableSQL, null) + await globalThis.rdbStore.executeSql(TableSql.NoteTableSQL, null) + await globalThis.rdbStore.executeSql(TableSql.AttachmentTableSQL, null) + await globalThis.rdbStore.executeSql(TableSql.FormTableSQL, null) + LogUtil.info(TAG, "create table success") + // insert system defined folder + await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_allNotes) + await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_unClassified) + await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_myFavorites) + await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_recentDeletes) + await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_personal) + await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_life) + await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_work) + LogUtil.info(TAG, "insert system defined folder success") + // insert system defined note and attachment + await globalThis.rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note1) + await globalThis.rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note2) + await globalThis.rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note3) + await globalThis.rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note4) + LogUtil.info(TAG, "insert system defined note and attachment success") + }) + } catch (err) { + LogUtil.warn(TAG, "createRdbStore, error : " + err) + } }, /** @@ -174,147 +175,148 @@ export default { initAppStorage(context) { let folderDataArray = [] let noteDataArray = [] - relationalStore.getRdbStore(context, SysDefData.dbInfo.db_name) - .then(async (store) => { - LogUtil.info(TAG, "initAppStorage, store is " + store) - globalThis.rdbStore = store - // query folder - let columns_folder = [] - let predicates_folder = new relationalStore.RdbPredicates(TableName.FolderTable) - let resultSet_folder = await globalThis.rdbStore.query(predicates_folder, columns_folder) - while (resultSet_folder.goToNextRow()) { - let id = resultSet_folder.getLong(resultSet_folder.getColumnIndex(FolderTableColumn.Id)) - let name = resultSet_folder.getString(resultSet_folder.getColumnIndex(FolderTableColumn.Name)) - let uuid = resultSet_folder.getString(resultSet_folder.getColumnIndex(FolderTableColumn.Uuid)) - let color = resultSet_folder.getString(resultSet_folder.getColumnIndex(FolderTableColumn.Color)) - let folder_type = resultSet_folder.getLong(resultSet_folder.getColumnIndex(FolderTableColumn.FolderType)) - let is_deleted = resultSet_folder.getLong(resultSet_folder.getColumnIndex(FolderTableColumn.IsDeleted)) - let created_time = resultSet_folder.getLong(resultSet_folder.getColumnIndex(FolderTableColumn.CreatedTime)) - let modified_time = resultSet_folder.getLong(resultSet_folder.getColumnIndex(FolderTableColumn.ModifiedTime)) - let folderData = new FolderData(id, name, uuid, color, folder_type, is_deleted, created_time, modified_time) - folderDataArray.push(folderData) - } - resultSet_folder.close(); - LogUtil.info(TAG, "folderDataArray[query] : " + folderDataArray.length) - // query note - let columns_note = [] - let predicates_note = new relationalStore.RdbPredicates(TableName.NoteTable) - let resultSet_note = await globalThis.rdbStore.query(predicates_note, columns_note) - while (resultSet_note.goToNextRow()) { - let id = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.Id)) - let title = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.Title)) - let uuid = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.Uuid)) - let folder_uuid = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.FolderUuid)) - // 暂时规避备忘录二次打开白屏问题，后续数据库解决 - let content_text = ''; - let content_img = ''; - try { - content_text = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.ContentText)) - content_img = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.ContentImg)) - } catch (err) { - LogUtil.error(TAG, "initAppStorage, content_img = error : " + err) - } - let noteType = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.NoteType)) - let is_top = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.IsTop)) - let is_favorite = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.IsFavorite)) - let is_deleted = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.IsDeleted)) - let created_time = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.CreatedTime)) - let modified_time = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.ModifiedTime)) - let deleted_time = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.DeletedTime)) - let slider_value = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.SliderValue)) - let noteData = new NoteData(id, title, uuid, folder_uuid, content_text, content_img, noteType, is_top, is_favorite, is_deleted, created_time, modified_time, deleted_time, slider_value) - noteDataArray.push(noteData) - } - resultSet_note.close(); - LogUtil.info(TAG, "noteDataArray[query] : " + noteDataArray.length) - if (folderDataArray === null || folderDataArray === undefined || folderDataArray.length === 0) { - LogUtil.info(TAG, "folderDataArray is null") - let sysDefFolderArray = [SysDefData.sys_def_allNotes, SysDefData.sys_def_unClassified, - SysDefData.sys_def_myFavorites, SysDefData.sys_def_recentDeletes, - SysDefData.sys_def_personal, SysDefData.sys_def_life, SysDefData.sys_def_work] - sysDefFolderArray.forEach((sysDefFolder) => { - let folderData = new FolderData(sysDefFolder.id, sysDefFolder.name, sysDefFolder.uuid, sysDefFolder.color, - sysDefFolder.folder_type, sysDefFolder.is_deleted, sysDefFolder.created_time, - sysDefFolder.modified_time) + try { + relationalStore.getRdbStore(context, SysDefData.dbInfo.db_name) + .then(async (store) => { + LogUtil.info(TAG, "initAppStorage, store is " + store) + globalThis.rdbStore = store + // query folder + let columns_folder = [] + let predicates_folder = new relationalStore.RdbPredicates(TableName.FolderTable) + let resultSet_folder = await globalThis.rdbStore.query(predicates_folder, columns_folder) + while (resultSet_folder.goToNextRow()) { + let id = resultSet_folder.getLong(resultSet_folder.getColumnIndex(FolderTableColumn.Id)) + let name = resultSet_folder.getString(resultSet_folder.getColumnIndex(FolderTableColumn.Name)) + let uuid = resultSet_folder.getString(resultSet_folder.getColumnIndex(FolderTableColumn.Uuid)) + let color = resultSet_folder.getString(resultSet_folder.getColumnIndex(FolderTableColumn.Color)) + let folder_type = resultSet_folder.getLong(resultSet_folder.getColumnIndex(FolderTableColumn.FolderType)) + let is_deleted = resultSet_folder.getLong(resultSet_folder.getColumnIndex(FolderTableColumn.IsDeleted)) + let created_time = resultSet_folder.getLong(resultSet_folder.getColumnIndex(FolderTableColumn.CreatedTime)) + let modified_time = resultSet_folder.getLong(resultSet_folder.getColumnIndex(FolderTableColumn.ModifiedTime)) + let folderData = new FolderData(id, name, uuid, color, folder_type, is_deleted, created_time, modified_time) folderDataArray.push(folderData) - }) + } + resultSet_folder.close(); LogUtil.info(TAG, "folderDataArray[query] : " + folderDataArray.length) - } - AppStorage.SetOrCreate('AllFolderArray', folderDataArray) - AppStorage.SetOrCreate('AllNoteArray', noteDataArray) - LogUtil.info(TAG, "AppStorage[query] set AllFolderArray and AllNoteArray success") + // query note + let columns_note = [] + let predicates_note = new relationalStore.RdbPredicates(TableName.NoteTable) + let resultSet_note = await globalThis.rdbStore.query(predicates_note, columns_note) + while (resultSet_note.goToNextRow()) { + let id = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.Id)) + let title = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.Title)) + let uuid = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.Uuid)) + let folder_uuid = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.FolderUuid)) + // 暂时规避备忘录二次打开白屏问题，后续数据库解决 + let content_text = ''; + let content_img = ''; + try { + content_text = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.ContentText)) + content_img = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.ContentImg)) + } catch (err) { + LogUtil.error(TAG, "initAppStorage, content_img = error : " + err) + } + let noteType = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.NoteType)) + let is_top = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.IsTop)) + let is_favorite = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.IsFavorite)) + let is_deleted = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.IsDeleted)) + let created_time = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.CreatedTime)) + let modified_time = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.ModifiedTime)) + let deleted_time = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.DeletedTime)) + let slider_value = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.SliderValue)) + let noteData = new NoteData(id, title, uuid, folder_uuid, content_text, content_img, noteType, is_top, is_favorite, is_deleted, created_time, modified_time, deleted_time, slider_value) + noteDataArray.push(noteData) + } + resultSet_note.close(); + LogUtil.info(TAG, "noteDataArray[query] : " + noteDataArray.length) + if (folderDataArray === null || folderDataArray === undefined || folderDataArray.length === 0) { + LogUtil.info(TAG, "folderDataArray is null") + let sysDefFolderArray = [SysDefData.sys_def_allNotes, SysDefData.sys_def_unClassified, + SysDefData.sys_def_myFavorites, SysDefData.sys_def_recentDeletes, + SysDefData.sys_def_personal, SysDefData.sys_def_life, SysDefData.sys_def_work] + sysDefFolderArray.forEach((sysDefFolder) => { + let folderData = new FolderData(sysDefFolder.id, sysDefFolder.name, sysDefFolder.uuid, sysDefFolder.color, + sysDefFolder.folder_type, sysDefFolder.is_deleted, sysDefFolder.created_time, + sysDefFolder.modified_time) + folderDataArray.push(folderData) + }) + LogUtil.info(TAG, "folderDataArray[query] : " + folderDataArray.length) + } + AppStorage.SetOrCreate('AllFolderArray', folderDataArray) + AppStorage.SetOrCreate('AllNoteArray', noteDataArray) + LogUtil.info(TAG, "AppStorage[query] set AllFolderArray and AllNoteArray success") - // save continue data - let isContinue = AppStorage.Get('IsContinue'); - LogUtil.info(TAG, "initAppStorage, isContinue is " + isContinue) - if (isContinue) { - let continueNote: string = AppStorage.Get('ContinueNote') - let continueSection = AppStorage.Get('ContinueSection') + // save continue data + let isContinue = AppStorage.Get('IsContinue'); + LogUtil.info(TAG, "initAppStorage, isContinue is " + isContinue) + if (isContinue) { + let continueNote: string = AppStorage.Get('ContinueNote') + let continueSection = AppStorage.Get('ContinueSection') - let noteObj = JSON.parse(continueNote) - let noteData = new NoteData(noteObj.uuid, noteObj.title, noteObj.uuid, noteObj.folder_uuid, - noteObj.content_text, noteObj.content_img, noteObj.note_type, noteObj.is_top, noteObj.is_favorite, - noteObj.is_deleted, noteObj.created_time, noteObj.modified_time, noteObj.deleted_time, noteObj.slider_value) + let noteObj = JSON.parse(continueNote) + let noteData = new NoteData(noteObj.uuid, noteObj.title, noteObj.uuid, noteObj.folder_uuid, + noteObj.content_text, noteObj.content_img, noteObj.note_type, noteObj.is_top, noteObj.is_favorite, + noteObj.is_deleted, noteObj.created_time, noteObj.modified_time, noteObj.deleted_time, noteObj.slider_value) - // save img to FileDir - LogUtil.info(TAG, "initAppStorage, save img to FileDir") - let imgNameArray = this.getImgNameFromHtml(noteData) - imgNameArray.forEach((imgName: string) => { - this.writeToFileDir(imgName) - }) + // save img to FileDir + LogUtil.info(TAG, "initAppStorage, save img to FileDir") + let imgNameArray = this.getImgNameFromHtml(noteData) + imgNameArray.forEach((imgName: string) => { + this.writeToFileDir(imgName) + }) - // if not exit this note - let exist = false - let folderUuid = "" - for (let note of noteDataArray) { - if (noteData.created_time == note.created_time) { - exist = true - folderUuid = note.folder_uuid - break - } - } - LogUtil.info(TAG, "initAppStorage, exist : " + exist) - if (!exist) { - // 迁移过来的笔记在本地不存在，则保存在未分类文件夹 - noteData.folder_uuid = SysDefFolderUuid.UnClassified - noteDataArray.push(noteData) - AppStorage.SetOrCreate('AllNoteArray', noteDataArray) - this.insert(TableName.NoteTable, noteData.toNoteObject(), null) - AppStorage.SetOrCreate('Folder', FolderUtil.getFolderData(folderDataArray, SysDefFolderUuid.UnClassified)) - } else { - // 迁移过来的笔记在本地存在，则进行修改 - for (let i = 0; i < noteDataArray.length; i++) { - if (noteData.created_time == noteDataArray[i].created_time) { - noteDataArray[i] = noteData - LogUtil.info(TAG, "initAppStorage, update noteData in noteDataArray success") + // if not exit this note + let exist = false + let folderUuid = "" + for (let note of noteDataArray) { + if (noteData.created_time == note.created_time) { + exist = true + folderUuid = note.folder_uuid break } } - let predicates_note = this.getRdbPredicates(TableName.NoteTable) - predicates_note.equalTo(NoteTableColumn.CreatedTime, noteData.created_time) - this.update(noteData.toNoteObject(), predicates_note, null) - AppStorage.SetOrCreate('Folder', FolderUtil.getFolderData(folderDataArray, folderUuid)) - } - AppStorage.SetOrCreate('Note', noteData) - AppStorage.SetOrCreate('ContinueNote', JSON.stringify(noteData.toNoteObject())) - AppStorage.SetOrCreate('Section', continueSection) - AppStorage.SetOrCreate('NewNote', noteData) - } else { - LogUtil.info(TAG, "initAppStorage, IsContinue false") - AppStorage.SetOrCreate('Folder', AppStorage.Get('AllFolderArray')[0]) - let note = NoteUtil.getFirstNoteData(AppStorage.Get('AllNoteArray'), SysDefFolderUuid.AllNotes) - AppStorage.SetOrCreate('Note', note) - if (note) { - AppStorage.SetOrCreate('ContinueNote', JSON.stringify(note.toNoteObject())) + LogUtil.info(TAG, "initAppStorage, exist : " + exist) + if (!exist) { + // 迁移过来的笔记在本地不存在，则保存在未分类文件夹 + noteData.folder_uuid = SysDefFolderUuid.UnClassified + noteDataArray.push(noteData) + AppStorage.SetOrCreate('AllNoteArray', noteDataArray) + this.insert(TableName.NoteTable, noteData.toNoteObject(), null) + AppStorage.SetOrCreate('Folder', FolderUtil.getFolderData(folderDataArray, SysDefFolderUuid.UnClassified)) + } else { + // 迁移过来的笔记在本地存在，则进行修改 + for (let i = 0; i < noteDataArray.length; i++) { + if (noteData.created_time == noteDataArray[i].created_time) { + noteDataArray[i] = noteData + LogUtil.info(TAG, "initAppStorage, update noteData in noteDataArray success") + break + } + } + let predicates_note = this.getRdbPredicates(TableName.NoteTable) + predicates_note.equalTo(NoteTableColumn.CreatedTime, noteData.created_time) + this.update(noteData.toNoteObject(), predicates_note, null) + AppStorage.SetOrCreate('Folder', FolderUtil.getFolderData(folderDataArray, folderUuid)) + } + AppStorage.SetOrCreate('Note', noteData) + AppStorage.SetOrCreate('ContinueNote', JSON.stringify(noteData.toNoteObject())) + AppStorage.SetOrCreate('Section', continueSection) + AppStorage.SetOrCreate('NewNote', noteData) + } else { + LogUtil.info(TAG, "initAppStorage, IsContinue false") + AppStorage.SetOrCreate('Folder', AppStorage.Get('AllFolderArray')[0]) + let note = NoteUtil.getFirstNoteData(AppStorage.Get('AllNoteArray'), SysDefFolderUuid.AllNotes) + AppStorage.SetOrCreate('Note', note) + if (note) { + AppStorage.SetOrCreate('ContinueNote', JSON.stringify(note.toNoteObject())) + } + AppStorage.SetOrCreate('Section', 3) } - AppStorage.SetOrCreate('Section', 3) - } - AppStorage.SetOrCreate('DBQueryFinished', 1) - LogUtil.info(TAG, "initAppStorage, set DBQueryFinished 1") - }) - .catch((err) => { - LogUtil.error(TAG, "initAppStorage, error : " + err) - }) + AppStorage.SetOrCreate('DBQueryFinished', 1) + LogUtil.info(TAG, "initAppStorage, set DBQueryFinished 1") + }) + } catch (err) { + LogUtil.error(TAG, "initAppStorage, error : " + err) + } }, getImgNameFromHtml(noteData: NoteData): any { -- Gitee From ad70033f0b08e50b85d4a3ad9ae8bc45416f6b7f Mon Sep 17 00:00:00 2001 From: nobbo Date: Tue, 12 Dec 2023 17:29:49 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=AE=B0=E5=BF=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- features/src/main/ets/components/NoteListComp.ets | 1 + 1 file changed, 1 insertion(+) diff --git a/features/src/main/ets/components/NoteListComp.ets b/features/src/main/ets/components/NoteListComp.ets index ed883f2..5466f43 100644 --- a/features/src/main/ets/components/NoteListComp.ets +++ b/features/src/main/ets/components/NoteListComp.ets @@ -516,6 +516,7 @@ export struct NoteItemListComp { doSearch() { if (this.inputKeyword.length == 0) { + this.setNoteListLazy() return; }; SearchModel.search(NoteUtil.getNoteDataArray(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid), this.inputKeyword) -- Gitee