From d6fa6a3e8506e4e3d28b264d311f15adddf21c18 Mon Sep 17 00:00:00 2001 From: wangzhiyu12 Date: Fri, 24 Jun 2022 16:49:47 +0800 Subject: [PATCH 1/2] fix bug Signed-off-by: wangzhiyu12 --- .../src/main/ets/components/CusDialogComp.ets | 6 +++--- .../src/main/ets/components/NoteListComp.ets | 4 ++-- .../src/main/ets/default/baseUtil/RdbStoreUtil.ets | 9 +++++---- .../ets/default/model/databaseModel/EnumData.ets | 3 ++- .../ets/default/model/databaseModel/NoteData.ets | 9 ++++++--- .../ets/default/model/databaseModel/SysDefData.ets | 12 ++++++++---- 6 files changed, 26 insertions(+), 17 deletions(-) diff --git a/common/component/src/main/ets/components/CusDialogComp.ets b/common/component/src/main/ets/components/CusDialogComp.ets index 732ea93..a101f75 100644 --- a/common/component/src/main/ets/components/CusDialogComp.ets +++ b/common/component/src/main/ets/components/CusDialogComp.ets @@ -721,7 +721,7 @@ export struct EditContentDialogPortrait { editContentDialogCtl: CustomDialogController; confirm: (excuteJs: string) => void @State selectFontColor: string = fontColorArray[0] - @State inSetValue: number = 20 + @Consume('SelectedNoteData') selectedNoteData: NoteData private circleColor: string private fontSize: number @@ -923,7 +923,7 @@ export struct EditContentDialogPortrait { Row({ space: 10 }) { Image($r('app.media.font_small')).height(24).width(24).margin({ top: 8 }) Slider({ - value: this.inSetValue, + value: this.selectedNoteData.slider_value, min: 0, max: 16, step: 4, @@ -935,7 +935,7 @@ export struct EditContentDialogPortrait { .showSteps(false) .showTips(false) .onChange((value: number, mode: SliderChangeMode) => { - this.inSetValue = value + this.selectedNoteData.slider_value = value this.fontSize = value + 12 this.confirm("javascript:RICH_EDITOR.execFontSize('" + this.fontSize + "')") LogUtil.info(TAG, 'value:' + value + 'mode:' + mode.toString()) diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/common/component/src/main/ets/components/NoteListComp.ets index 6617b99..f2db4da 100644 --- a/common/component/src/main/ets/components/NoteListComp.ets +++ b/common/component/src/main/ets/components/NoteListComp.ets @@ -620,9 +620,9 @@ export struct AddNoteComp { .onClick(() => { let noteData if (this.selectedFolderData.uuid == SysDefFolderUuid.AllNotes || this.selectedFolderData.uuid == SysDefFolderUuid.MyFavorites) { - noteData = new NoteData(0, "标题", new Date().getTime() + "", SysDefFolderUuid.UnClassified, "", "", NoteType.SysDef, Top.No, Favorite.No, Delete.No, new Date().getTime(), new Date().getTime(), 0) + noteData = new NoteData(0, "标题", new Date().getTime() + "", SysDefFolderUuid.UnClassified, "", "", NoteType.SysDef, Top.No, Favorite.No, Delete.No, new Date().getTime(), new Date().getTime(), 0,0) } else { - noteData = new NoteData(0, "标题", new Date().getTime() + "", this.selectedFolderData.uuid, "", "", NoteType.SysDef, Top.No, Favorite.No, Delete.No, new Date().getTime(), new Date().getTime(), 0) + noteData = new NoteData(0, "标题", new Date().getTime() + "", this.selectedFolderData.uuid, "", "", NoteType.SysDef, Top.No, Favorite.No, Delete.No, new Date().getTime(), new Date().getTime(), 0,0) } this.AllNoteArray.push(noteData) diff --git a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets index 0583113..216b142 100644 --- a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets @@ -83,7 +83,7 @@ export default { 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.is_deleted, sysDefNote.created_time, sysDefNote.modified_time, sysDefNote.deleted_time, sysDefNote.slider_value) noteDataArray.push(noteData) }) LogUtil.info(TAG, "noteDataArray[sysdef] : " + noteDataArray.length) @@ -101,7 +101,7 @@ export default { 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.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") @@ -209,7 +209,8 @@ export default { 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 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) + 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) } LogUtil.info(TAG, "noteDataArray[query] : " + noteDataArray.length) @@ -228,7 +229,7 @@ export default { 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.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") diff --git a/common/utils/src/main/ets/default/model/databaseModel/EnumData.ets b/common/utils/src/main/ets/default/model/databaseModel/EnumData.ets index 191ea27..b148b8d 100644 --- a/common/utils/src/main/ets/default/model/databaseModel/EnumData.ets +++ b/common/utils/src/main/ets/default/model/databaseModel/EnumData.ets @@ -53,7 +53,8 @@ export enum NoteTableColumn { IsDeleted = "is_deleted", // 是否被删除 CreatedTime = "created_time", // 创建时间 ModifiedTime = "modified_time", // 修改时间 - DeletedTime = "deleted_time" // 删除时间 + DeletedTime = "deleted_time", // 删除时间 + SliderValue = "slider_value" } /** diff --git a/common/utils/src/main/ets/default/model/databaseModel/NoteData.ets b/common/utils/src/main/ets/default/model/databaseModel/NoteData.ets index a02df35..4edcb19 100644 --- a/common/utils/src/main/ets/default/model/databaseModel/NoteData.ets +++ b/common/utils/src/main/ets/default/model/databaseModel/NoteData.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import {NoteType, Favorite, Delete, Top} from './EnumData' +import { NoteType, Favorite, Delete, Top } from './EnumData' /** * 笔记类 @@ -32,10 +32,11 @@ export default class NoteData { created_time: number // 创建时间 modified_time: number // 修改时间 deleted_time: number // 删除时间 + slider_value: number //字体进度条大小 constructor(id: number, title: string, uuid: string, folder_uuid: string, content_text: string, content_img: string, note_type: NoteType, is_top: Top, is_favorite: Favorite, is_deleted: Delete, created_time: number, - modified_time: number, deleted_time: number) { + modified_time: number, deleted_time: number, slider_value: number) { this.id = id this.title = title this.uuid = uuid @@ -49,6 +50,7 @@ export default class NoteData { this.created_time = created_time this.modified_time = modified_time this.deleted_time = deleted_time + this.slider_value = slider_value } /** @@ -67,7 +69,8 @@ export default class NoteData { "is_deleted": this.is_deleted, "created_time": this.created_time, "modified_time": this.modified_time, - "deleted_time": this.deleted_time + "deleted_time": this.deleted_time, + "slider_value":this.slider_value } } } \ No newline at end of file diff --git a/common/utils/src/main/ets/default/model/databaseModel/SysDefData.ets b/common/utils/src/main/ets/default/model/databaseModel/SysDefData.ets index d88fbad..ef10817 100644 --- a/common/utils/src/main/ets/default/model/databaseModel/SysDefData.ets +++ b/common/utils/src/main/ets/default/model/databaseModel/SysDefData.ets @@ -122,7 +122,8 @@ export default { "is_deleted": Delete.No, "created_time": 1641869573000, "modified_time": 1641869573000, - "deleted_time": 0 + "deleted_time": 0, + "slider_value":0 }, sys_def_note2: { @@ -138,7 +139,8 @@ export default { "is_deleted": Delete.No, "created_time": 1640999288000, "modified_time": 1640999288000, - "deleted_time": 0 + "deleted_time": 0, + "slider_value":0 }, sys_def_note3: { @@ -154,7 +156,8 @@ export default { "is_deleted": Delete.No, "created_time": 1641385708000, "modified_time": 1641385708000, - "deleted_time": 0 + "deleted_time": 0, + "slider_value":0 }, sys_def_note4: { @@ -177,6 +180,7 @@ export default { "is_deleted": Delete.No, "created_time": 1640909288000, "modified_time": 1640909288000, - "deleted_time": 0 + "deleted_time": 0, + "slider_value":0 } } \ No newline at end of file -- Gitee From 9214837f517363d8122aeba2786a2e96511f8c93 Mon Sep 17 00:00:00 2001 From: wangzhiyu12 Date: Fri, 24 Jun 2022 17:07:18 +0800 Subject: [PATCH 2/2] fix bug Signed-off-by: wangzhiyu12 --- .../src/main/ets/default/model/databaseModel/EnumData.ets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/utils/src/main/ets/default/model/databaseModel/EnumData.ets b/common/utils/src/main/ets/default/model/databaseModel/EnumData.ets index b148b8d..5fb4a3d 100644 --- a/common/utils/src/main/ets/default/model/databaseModel/EnumData.ets +++ b/common/utils/src/main/ets/default/model/databaseModel/EnumData.ets @@ -107,7 +107,8 @@ export enum TableSql { + NoteTableColumn.IsDeleted + " INTEGER DEFAULT 0," + NoteTableColumn.CreatedTime + " INTEGER," + NoteTableColumn.ModifiedTime + " INTEGER," - + NoteTableColumn.DeletedTime + " INTEGER" + + NoteTableColumn.DeletedTime + " INTEGER," + + NoteTableColumn.SliderValue + " INTEGER " + ")", AttachmentTableSQL = "CREATE TABLE IF NOT EXISTS " + TableName.AttachmentTable + " (" -- Gitee