diff --git a/common/component/src/main/ets/components/CusDialogComp.ets b/common/component/src/main/ets/components/CusDialogComp.ets index 8422c1fa2dfc9d7374d8fd32bfb9dc706d023c63..d4f1f59e67d71861ea8ea073376afacc536b2434 100644 --- a/common/component/src/main/ets/components/CusDialogComp.ets +++ b/common/component/src/main/ets/components/CusDialogComp.ets @@ -50,9 +50,10 @@ export struct NewOrEditFolderDialog { // folder name input Flex({ wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.SpaceBetween }) { Image($r("app.media.folder")) + .objectFit(ImageFit.Fill) .width(24) .height(24) - .objectFit(ImageFit.ScaleDown) + .flexShrink(0) .fillColor(this.selectedColor) TextInput({ text: this.inputName, placeholder: $r("app.string.input_placeholder") }) .placeholderFont({ size: 18 }) @@ -260,9 +261,10 @@ struct NoteDataMoveItemComp { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap }) { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap }) { Image(FolderUtil.getFolderIcon(this.folderItem.uuid)) - .objectFit(ImageFit.ScaleDown) + .objectFit(ImageFit.Fill) .width(24) .height(24) + .flexShrink(0) .fillColor(FolderUtil.getFolderIconColor(this.AllFolderArray, this.folderItem.uuid, false)) } .width(24) @@ -277,9 +279,10 @@ struct NoteDataMoveItemComp { .flexShrink(1) Image((FolderUtil.getCommonFolder(this.AllFolderArray, this.CheckedNoteArray) == null || FolderUtil.getCommonFolder(this.AllFolderArray, this.CheckedNoteArray) != this.folderItem) ? $r("app.media.foldMove_unselect") : $r("app.media.foldMove_select")) - .objectFit(ImageFit.ScaleDown) + .objectFit(ImageFit.Fill) .width(24) .height(24) + .flexShrink(0) } .width(248) .height(55) diff --git a/common/component/src/main/ets/components/NoteContent.ets b/common/component/src/main/ets/components/NoteContent.ets index c0ac73ba55e3a1f3a0f318fc303cab19b20abe01..2a4c95f1b4ef8f148eb7a18e47a14a84b2ebad6c 100644 --- a/common/component/src/main/ets/components/NoteContent.ets +++ b/common/component/src/main/ets/components/NoteContent.ets @@ -75,6 +75,7 @@ export struct NoteContent { LogUtil.info(TAG, 'callbackScheduledSave, update note success:' + this.selectedNoteData.uuid) // save continue data let continueNote: string = JSON.stringify(this.selectedNoteData.toNoteObject()) + LogUtil.info(TAG, 'continueNote content', continueNote) AppStorage.SetOrCreate('ContinueNote', continueNote) LogUtil.info(TAG, 'callbackScheduledSave, set continue note success') } @@ -414,9 +415,10 @@ struct NoteDataMoveItemComp { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.Center }) { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap }) { Image(FolderUtil.getFolderIcon(this.folderItem.uuid)) - .objectFit(ImageFit.ScaleDown) + .objectFit(ImageFit.Fill) .width(24) .height(24) + .flexShrink(0) .fillColor(FolderUtil.getFolderIconColor(this.AllFolderArray, this.folderItem.uuid, false)) } .width(24) diff --git a/common/component/src/main/ets/components/NoteContentComp.ets b/common/component/src/main/ets/components/NoteContentComp.ets index 24b84c5af1d17a13a5a14a459672bb90fe89a869..8469731c355050ba75b03d767584c10e64705ac4 100644 --- a/common/component/src/main/ets/components/NoteContentComp.ets +++ b/common/component/src/main/ets/components/NoteContentComp.ets @@ -577,9 +577,10 @@ struct NoteDataMoveItemComp { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.Center }) { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap }) { Image(FolderUtil.getFolderIcon(this.folderItem.uuid)) - .objectFit(ImageFit.ScaleDown) + .objectFit(ImageFit.Fill) .width(24) .height(24) + .flexShrink(0) .fillColor(FolderUtil.getFolderIconColor(this.AllFolderArray, this.folderItem.uuid, false)) } .width(24) diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index 6b84233784198e883344036d11d40266a1cc2558..b6c071651f27dc2905bdd6826f9242816cd3de9b 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -531,9 +531,10 @@ struct NoteDataMoveItemCompMenu { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.Center }) { Flex({ alignItems: ItemAlign.Center, wrap: FlexWrap.NoWrap }) { Image(FolderUtil.getFolderIcon(this.folderItem.uuid)) - .objectFit(ImageFit.ScaleDown) + .objectFit(ImageFit.Fill) .width(24) .height(24) + .flexShrink(0) .fillColor(FolderUtil.getFolderIconColor(this.AllFolderArray, this.folderItem.uuid, this.folderItem.uuid == this.uuid)) } .width(24) diff --git a/common/resources/src/main/resources/rawfile/rich_editor.js b/common/resources/src/main/resources/rawfile/rich_editor.js index f14a7616bea756b4eeabc040d4590ff94a807903..dbc3d7c88b08bd70b80d9bcdb051da1c0ebb40fb 100644 --- a/common/resources/src/main/resources/rawfile/rich_editor.js +++ b/common/resources/src/main/resources/rawfile/rich_editor.js @@ -12,9 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' - -const TAG = "Rich_Editor" var RICH_EDITOR = {}; @@ -85,7 +82,7 @@ RICH_EDITOR.getListStyle = function () { } } } catch (err) { - LogUtil.error(TAG, err) + console.error(err) } } @@ -115,7 +112,7 @@ RICH_EDITOR.setNumbers = function () { } } } catch (err) { - LogUtil.error(TAG, err) + console.error(err) } } } @@ -144,7 +141,7 @@ RICH_EDITOR.setABC = function () { } } } catch (err) { - LogUtil.error(TAG, err) + console.error(err) } } } @@ -173,7 +170,7 @@ RICH_EDITOR.setBullets = function () { } } } catch (err) { - LogUtil.error(TAG, err) + console.error(err) } } } @@ -202,7 +199,7 @@ RICH_EDITOR.setSquare = function () { } } } catch (err) { - LogUtil.error(TAG, err) + console.error(err) } } }