mirror of
https://gitee.com/openharmony/applications_notes
synced 2024-10-07 05:33:37 +00:00
!162 修改web滚动条问题&&修改标签不刷新问题&&修改文件夹为空问题&&适配新接口
Merge pull request !162 from nobbo/master
This commit is contained in:
commit
42a0f41068
@ -91,7 +91,6 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.edit-box {
|
.edit-box {
|
||||||
overflow: hidden;
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
@ -430,7 +430,8 @@ RICH_EDITOR.insertImageHtml = function (contents) {
|
|||||||
|
|
||||||
document.addEventListener('click', (e) => {
|
document.addEventListener('click', (e) => {
|
||||||
console.info(`lsq: e is ${JSON.stringify(e)}`)
|
console.info(`lsq: e is ${JSON.stringify(e)}`)
|
||||||
if (e.id !== 'editorjs') {
|
var parent = document.getElementById('editorjs');
|
||||||
|
if (parent.id !== 'editorjs') {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -121,7 +121,11 @@ export struct NewOrEditFolderDialog {
|
|||||||
.width('48%')
|
.width('48%')
|
||||||
.onClick(() => {
|
.onClick(() => {
|
||||||
this.newOrEditFolderDialogCtl.close()
|
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();
|
inputMethod.getController().stopInputSession();
|
||||||
})
|
})
|
||||||
}.width('100%')
|
}.width('100%')
|
||||||
|
@ -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 NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData'
|
||||||
import inputMethod from '@ohos.inputmethod';
|
import inputMethod from '@ohos.inputmethod';
|
||||||
import router from '@system.router';
|
import router from '@system.router';
|
||||||
|
import abilityAccessCtrl from '@ohos.abilityAccessCtrl';
|
||||||
|
|
||||||
@Entry
|
@Entry
|
||||||
@Component
|
@Component
|
||||||
@ -85,7 +86,10 @@ export struct MyNoteHomeComp {
|
|||||||
}
|
}
|
||||||
LogUtil.info(this.TAG, 'permissions need to require from user')
|
LogUtil.info(this.TAG, 'permissions need to require from user')
|
||||||
let context: any = getContext(this);
|
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 permissions : ' + data.permissions)
|
||||||
LogUtil.info(this.TAG, 'data result: ' + data.authResults)
|
LogUtil.info(this.TAG, 'data result: ' + data.authResults)
|
||||||
let sum = 0
|
let sum = 0
|
||||||
@ -93,7 +97,7 @@ export struct MyNoteHomeComp {
|
|||||||
sum += data.authResults[i]
|
sum += data.authResults[i]
|
||||||
}
|
}
|
||||||
LogUtil.info(this.TAG, 'request permissions sum: ' + sum)
|
LogUtil.info(this.TAG, 'request permissions sum: ' + sum)
|
||||||
}, (err) => {
|
}).catch((err) => {
|
||||||
LogUtil.warn(this.TAG, 'failed to requestPermissionsFromUser : ' + err.code);
|
LogUtil.warn(this.TAG, 'failed to requestPermissionsFromUser : ' + err.code);
|
||||||
})
|
})
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user