diff --git a/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets b/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets
index df10ebbcea14f1f4bb109524d408689f3a2e58f7..5f1e0728b5f5f5eb0bb3b3d93c3dd398d6d96fba 100644
--- a/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets
+++ b/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets
@@ -22,6 +22,7 @@ import StyleConstants from '../constants/StyleConstants'
import {LogUtil} from './LogUtil'
import FolderUtil from './FolderUtil'
import RdbStoreUtil from './RdbStoreUtil'
+import buffer from '@ohos.buffer';
const TAG = "NoteUtil"
@@ -282,6 +283,20 @@ export class NoteUtil {
let isRefresh = AppStorage.Get('isUpdate')
AppStorage.Set('isUpdate',!isRefresh)
}
+
+ /**
+ * Format conversion
+ * @param initContent
+ */
+ contrastInitType(initContent:string):string {
+ let base64regex = /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))?$/;
+ if(!base64regex.test(initContent)) {
+ const inputBuffer = buffer.from(initContent,'utf-8');
+ initContent = inputBuffer.toString('base64');
+ }
+ return initContent;
+ };
+
}
let noteUtil = new NoteUtil()
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 68fe7be298c032b0ddbd3a103e54115c2e5b6349..538a4eeece0247ba4ebda5a03f77f1a287d0e087 100644
--- a/common/utils/src/main/ets/default/model/databaseModel/SysDefData.ets
+++ b/common/utils/src/main/ets/default/model/databaseModel/SysDefData.ets
@@ -174,7 +174,7 @@ export default {
'玉米油40g
' +
'
1. 添加鸡蛋、盐、糖、蛋糕粉
' +
' 2. 加入玉米油、牛奶,烤箱预热15分钟
' +
- ' 3. 加入葡萄干、核桃仁,烤箱定时40分钟
',
+ ' 3. 加入葡萄干、核桃仁,烤箱定时40分钟
',
"content_img": "",
"note_type": NoteType.CusDef,
"is_top": Top.No,
diff --git a/features/src/main/ets/components/NoteContent.ets b/features/src/main/ets/components/NoteContent.ets
index d0cf46f23799463385ff175205d2342bd789e26a..c3689252f7401c6bd4ede9f2705d8ff5ec72961b 100644
--- a/features/src/main/ets/components/NoteContent.ets
+++ b/features/src/main/ets/components/NoteContent.ets
@@ -85,6 +85,10 @@ export struct NoteContent {
noteContent = {
callbackhtml: (html) => {
LogUtil.info(TAG, 'note uuid is:' + this.selectedNoteData.uuid)
+ this.selectedNoteData.content_text = NoteUtil.contrastInitType(this.selectedNoteData.content_text);
+ if (this.selectedNoteData.content_text === html ) {
+ return;
+ };
this.selectedNoteData.content_text = html
this.selectedNoteData.modified_time = new Date().getTime()
let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)
diff --git a/features/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets
index be331c1f9076267f1c983f18563e3ba22456c1e1..0c6cd42a019896dbba9a05e5afc0402abb4fe337 100644
--- a/features/src/main/ets/components/NoteContentComp.ets
+++ b/features/src/main/ets/components/NoteContentComp.ets
@@ -107,6 +107,10 @@ export struct NoteContentComp {
noteContent = {
callbackhtml: (html) => {
LogUtil.info(TAG, 'note uuid is:' + this.selectedNoteData.uuid)
+ this.selectedNoteData.content_text = NoteUtil.contrastInitType(this.selectedNoteData.content_text);
+ if (this.selectedNoteData.content_text === html ) {
+ return;
+ };
this.selectedNoteData.content_text = html
this.selectedNoteData.modified_time = new Date().getTime()
let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)
diff --git a/features/src/main/ets/components/NoteContentCompPortrait.ets b/features/src/main/ets/components/NoteContentCompPortrait.ets
index e5ef28d6ede035fcaf86517b51a34dadc70fddcf..a304494c5df8287d127293b1d575c4423f1e4c1f 100644
--- a/features/src/main/ets/components/NoteContentCompPortrait.ets
+++ b/features/src/main/ets/components/NoteContentCompPortrait.ets
@@ -111,6 +111,10 @@ export struct NoteContentCompPortrait {
noteContent = {
callbackhtml: (html) => {
LogUtil.info(TAG, 'note uuid is:' + this.selectedNoteData?.uuid)
+ this.selectedNoteData.content_text = NoteUtil.contrastInitType(this.selectedNoteData.content_text);
+ if (this.selectedNoteData.content_text === html ) {
+ return;
+ };
this.selectedNoteData.content_text = html
this.selectedNoteData.modified_time = new Date().getTime()
let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)