diff --git a/common/resources/src/main/resources/rawfile/editor_style.css b/common/resources/src/main/resources/rawfile/editor_style.css index d296b946a0c5e2d2b63a7d041a13331875ec6bf5..fa00ab4c2e8444531d646818d43f6d7980b59c85 100644 --- a/common/resources/src/main/resources/rawfile/editor_style.css +++ b/common/resources/src/main/resources/rawfile/editor_style.css @@ -91,7 +91,6 @@ body { } .edit-box { - overflow: hidden; width: 100%; height: 100%; display: flex; diff --git a/common/resources/src/main/resources/rawfile/rich_editor.js b/common/resources/src/main/resources/rawfile/rich_editor.js index be51ea8a52e3973bd9391713b9b6311c404b4339..5d62c95576e4fe6ca8a46737bb581b87375e9138 100644 --- a/common/resources/src/main/resources/rawfile/rich_editor.js +++ b/common/resources/src/main/resources/rawfile/rich_editor.js @@ -430,7 +430,8 @@ RICH_EDITOR.insertImageHtml = function (contents) { document.addEventListener('click', (e) => { console.info(`lsq: e is ${JSON.stringify(e)}`) - if (e.id !== 'editorjs') { + var parent = document.getElementById('editorjs'); + if (parent.id !== 'editorjs') { e.preventDefault() } }) diff --git a/features/src/main/ets/components/CusDialogComp.ets b/features/src/main/ets/components/CusDialogComp.ets index 7c67f131ab5b2759e89249ae5628d41071c310dd..d0d067f85275d15f11c86f60c47b2a32abc79091 100644 --- a/features/src/main/ets/components/CusDialogComp.ets +++ b/features/src/main/ets/components/CusDialogComp.ets @@ -121,7 +121,11 @@ export struct NewOrEditFolderDialog { .width('48%') .onClick(() => { this.newOrEditFolderDialogCtl.close() - this.confirm(this.selectedColor, this.inputName) + if (this.inputName.replace(/\s+/g, '') == '') { + return + } else { + this.confirm(this.selectedColor, this.inputName) + } inputMethod.getController().stopInputSession(); }) }.width('100%') diff --git a/product/default/src/main/ets/pages/MyNoteHome.ets b/product/default/src/main/ets/pages/MyNoteHome.ets index 2aa91337dbd97d2479a5f5a7c67d8de7cd92969e..a29aee375c26475a973515d767917a50c79bafc4 100644 --- a/product/default/src/main/ets/pages/MyNoteHome.ets +++ b/product/default/src/main/ets/pages/MyNoteHome.ets @@ -22,6 +22,7 @@ import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData' import inputMethod from '@ohos.inputmethod'; import router from '@system.router'; +import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; @Entry @Component @@ -85,7 +86,10 @@ export struct MyNoteHomeComp { } LogUtil.info(this.TAG, 'permissions need to require from user') let context: any = getContext(this); - context.requestPermissionsFromUser(permissionList).then((data) => { + let AtManager = abilityAccessCtrl.createAtManager(); + //requestPermissionsFromUser会判断权限的授权状态来决定是否唤起弹窗 + // @ts-ignore + AtManager.requestPermissionsFromUser(context, ["ohos.permission.MANAGE_DISPOSED_APP_STATUS"]).then((data) => { LogUtil.info(this.TAG, 'data permissions : ' + data.permissions) LogUtil.info(this.TAG, 'data result: ' + data.authResults) let sum = 0 @@ -93,7 +97,7 @@ export struct MyNoteHomeComp { sum += data.authResults[i] } LogUtil.info(this.TAG, 'request permissions sum: ' + sum) - }, (err) => { + }).catch((err) => { LogUtil.warn(this.TAG, 'failed to requestPermissionsFromUser : ' + err.code); })