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

fix bug

Browse Source 
Signed-off-by: wangzhiyu12 <wangzhiyu12@huawei.com>
This commit is contained in:
wangzhiyu12
2022-06-24 16:49:47 +08:00
parent 25135ce1c9
commit 49b8114ceb
6 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/component/src/main/ets/components/CusDialogComp.ets
+3 -3
View File
@@ -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())
common/component/src/main/ets/components/NoteListComp.ets
+2 -2
View File
@@ -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)
common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets
+5 -4
View File
@@ -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")
common/utils/src/main/ets/default/model/databaseModel/EnumData.ets
+2 -1
View File
@@ -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"
}
/**
common/utils/src/main/ets/default/model/databaseModel/NoteData.ets
+6 -3
View File
@@ -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
}
}
}
common/utils/src/main/ets/default/model/databaseModel/SysDefData.ets
+8 -4
View File
@@ -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
}
}