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 63cfe741ed408d2666d41944fb1209fe1e5a75c7..c98c78ef3bd7cfbd83650796b5c75159d036a093 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 eab792e72de3d1c353018f5e5aa40820ba6a9938..b5e6de6dd113f4ac4f57bae47ea8c25d0ff122a6 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 20da32a487d8910ddcc5fe553370ff2f210d013a..c502774c6c51b52c4906e2ad96d44543bdeb220d 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)