openharmony/applications_notes
1
0
Fork 0
mirror of https://github.com/openharmony/applications_notes.git synced 2026-07-21 00:26:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

!151 代码同步

Browse Source 
Merge pull request !151 from nobbo/master
This commit is contained in:
openharmony_ci
2022-12-15 08:17:34 +00:00
committed by Gitee
parent 03a62b111e 4c329bea29
commit c03afb61d8
9 changed files with 65 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets
+1
View File
@@ -200,6 +200,7 @@ export default {
let title = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.Title))
let uuid = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.Uuid))
let folder_uuid = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.FolderUuid))
// 暂时规避备忘录二次打开白屏问题，后续数据库解决
let content_text = '';
let content_img = '';
try {
features/src/main/ets/components/CusDialogComp.ets
+9 -10
View File
@@ -33,7 +33,7 @@ export struct NewOrEditFolderDialog {
private editFolderUuid: string = ""
private dialogType: number = 0 // 0表示新建文件夹 1表示修改文件夹
@State isExisted: boolean = false
@StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray')
@StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray')
@Consume('SelectedColor') selectedColor: string
build() {
@@ -136,7 +136,7 @@ export struct NewOrEditFolderDialog {
.margin({ bottom: 16, left: 12, right: 12 })
}
aboutToAppear(): void{
aboutToAppear(): void {
var currentFolder: FolderData = FolderUtil.getFolderData(this.AllFolderArray, this.editFolderUuid) // 获取当前选中的文件夹
if (currentFolder == null) {
return
@@ -179,9 +179,9 @@ struct ColorCircleComp {
@CustomDialog
export struct DeleteDialog {
@StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = []
@StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray')
@StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray')
@StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = []
@StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray')
@StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray')
@Consume('SelectedNoteData') selectedNoteData: NoteData
@Consume('SelectedFolderData') selectedFolderData: FolderData
private multiSelect: boolean = false
@@ -271,7 +271,7 @@ export struct DeleteDialog {
@Component
struct NoteDataMoveItemComp {
@StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = []
@StorageLink('AllFolderArray') AllFolderArray: FolderData[] = []
@StorageLink('AllFolderArray') AllFolderArray: FolderData[] = []
private folderItem: FolderData
dividerShow: boolean = true
@@ -326,7 +326,7 @@ export struct NoteDataMoveDialog {
noteDataMoveDialogCtl: CustomDialogController
onConfirm: (folderUuid: string) => void
NoteDataMoveArray: FolderData[]
@StorageLink('AllFolderArray') AllFolderArray: FolderData[] = []
@StorageLink('AllFolderArray') AllFolderArray: FolderData[] = []
aboutToAppear() {
this.NoteDataMoveArray = this.AllFolderArray.slice(2, this.AllFolderArray.length);
@@ -659,8 +659,7 @@ export struct EditTitleDialog {
editTitleDialog: CustomDialogController
confirm: (newTitle: string) => void
@State inputName: string = ""
@State isEquivalentVal: boolean= true
@State isEquivalentVal: boolean = true
build() {
Column() {
@@ -717,7 +716,7 @@ export struct EditTitleDialog {
this.editTitleDialog.close()
// @ts-ignore
inputMethod.getController().stopInputSession();
if (this.inputName.replace(/\s+/g,'') == '') {
if (this.inputName.replace(/\s+/g, '') == '') {
return
} else {
this.confirm(this.inputName)
features/src/main/ets/components/NoteContent.ets
+6 -4
View File
@@ -197,7 +197,9 @@ export struct NoteContent {
} else {
this.controllerShow.runJavaScript({ script: "changeSizeToTablet()" })
}
this.controllerShow.runJavaScript({ script: "hiddenButton()" })
if (AppStorage.Get('breakPoint') !== 'sm') {
this.controllerShow.runJavaScript({ script: "hiddenButton()" })
}
LogUtil.info(TAG, "finish loadurl")
if (this.selectedNoteData) {
let self = this
@@ -251,7 +253,7 @@ export struct NoteContent {
aboutToDisappear(): void {
NoteUtil.refreshAll()
AppStorage.Set("refreshCurrentNote",true)
AppStorage.Set("refreshCurrentNote", true)
clearInterval(timeID)
LogUtil.info(TAG, "aboutToDisappear")
}
@@ -289,7 +291,7 @@ export struct ToolBarComp {
LogUtil.info(TAG, "zoom, clearInterval timeID : " + timeID)
clearInterval(timeID)
}
AppStorage.Set("refreshCurrentNote",true)
AppStorage.Set("refreshCurrentNote", true)
router.back()
NoteUtil.refreshAll()
})
@@ -378,7 +380,7 @@ export struct ToolBarComp {
})
this.issave = 1
// 保存笔记信息到数据库
this.controllerShow.runJavaScript({script:"getHtmlContent()"})
this.controllerShow.runJavaScript({ script: "getHtmlContent()" })
})
}
}
features/src/main/ets/components/NoteContentComp.ets
+15 -12
View File
@@ -235,7 +235,9 @@ export struct NoteContentComp {
} else {
this.controllerShow.runJavaScript({ script: "changeSizeToTablet()" })
}
this.controllerShow.runJavaScript({ script: "hiddenButton()" })
if (AppStorage.Get('breakPoint') !== 'sm') {
this.controllerShow.runJavaScript({ script: "hiddenButton()" })
}
LogUtil.info(TAG, "finish loadurl")
if (this.selectedNoteData) {
let self = this
@@ -473,16 +475,6 @@ export struct ToolBarComp {
autoCancel: false,
customStyle: true,
})
editContentDialogCtl: CustomDialogController = new CustomDialogController({
builder: EditContentDialog({ confirm: this.confirm.bind(this) }),
alignment: DialogAlignment.Bottom,
autoCancel: true,
customStyle: true,
})
confirm(excuteJs: string) {
this.controllerShow.runJavaScript({ script: excuteJs })
}
onDeleteConfirm() {
if (this.selectedFolderData.uuid != SysDefFolderUuid.RecentDeletes) {
@@ -510,6 +502,17 @@ export struct ToolBarComp {
AppStorage.SetOrCreate('isUpdate', true)
}
editContentDialogCtl: CustomDialogController = new CustomDialogController({
builder: EditContentDialog({ confirm: this.confirm.bind(this) }),
alignment: DialogAlignment.Bottom,
autoCancel: true,
customStyle: true,
})
confirm(excuteJs: string) {
this.controllerShow.runJavaScript({ script: excuteJs })
}
build() {
Flex({ direction: FlexDirection.Row, wrap: FlexWrap.NoWrap,
justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
@@ -661,7 +664,7 @@ export struct ToolBarComp {
})
this.issave = 1
// 保存笔记信息到数据库
this.controllerShow.runJavaScript({script:"getHtmlContent()"})
this.controllerShow.runJavaScript({ script: "getHtmlContent()" })
})
}
}
features/src/main/ets/components/NoteContentCompPortrait.ets
+2 -2
View File
@@ -210,7 +210,7 @@ export struct NoteContentCompPortrait {
OperationUtils.copy(imageUri).then((uriPath) => {
var path = "file://" + uriPath
LogUtil.info(TAG, 'image uri is:' + path)
this.controllerShow.runJavaScript({ script: "RICH_EDITOR.getFocus()" })
this.controllerShow.runJavaScript({ script: "javascript:RICH_EDITOR.getFocus()" })
this.controllerShow.runJavaScript({ script: "javascript:RICH_EDITOR.insertImage('" + path + "')" })
})
}
@@ -301,8 +301,8 @@ export struct NoteContentCompPortrait {
}
aboutToDisappear(): void {
NoteUtil.refreshAll()
clearInterval(time_id)
NoteUtil.refreshAll()
LogUtil.info(TAG, "aboutToDisappear")
}
}
features/src/main/ets/components/NoteListComp.ets
+13 -13
View File
@@ -141,7 +141,7 @@ struct NoteOverViewComp {
alignItems: ItemAlign.Start
}) {
Text(FolderUtil.getFolderText(this.selectedFolderData))
.id(this.isUpdate+'')
.id(this.isUpdate + '')
.maxLines(1)
.fontSize(30)
.fontColor($r("app.color.all_notes_font_color"))
@@ -149,7 +149,7 @@ struct NoteOverViewComp {
.textOverflow({ overflow: TextOverflow.Ellipsis })
Row() {
Text(FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid).toString())
.id(this.isUpdate+'')
.id(this.isUpdate + '')
.maxLines(1)
.fontSize(14)
.fontColor($r("app.color.num_of_notes_font_color"))
@@ -217,11 +217,11 @@ export struct NoteItemComp {
@Consume('selectedAll') selectedAll: boolean
@Consume('PortraitModel') portraitModel: boolean
@State isChecked: boolean = undefined
@Consume('Longpress')@Watch('isLongPress') longpress: boolean
@Consume('Longpress') @Watch('isLongPress') longpress: boolean
@StorageLink('isUpdate') isUpdate: boolean = false
isLongPress(){
if(this.longpress){
isLongPress() {
if (this.longpress) {
this.isChecked = false
}
}
@@ -238,7 +238,7 @@ export struct NoteItemComp {
Column({ space: 2 }) {
Row({ space: 8 }) {
Image($r("app.media.verticalBar"))
.id(this.isUpdate+'')
.id(this.isUpdate + '')
.height(16)
.width(4)
.fillColor(NoteUtil.getVerticalBarBgColor(AppStorage.Get('AllFolderArray'), this.noteItem.folder_uuid))
@@ -250,7 +250,7 @@ export struct NoteItemComp {
Row({ space: 4 }) {
Text(DateUtil.formateDateForNoteTitle(new Date(this.noteItem.modified_time)))
.id(this.isUpdate+'')
.id(this.isUpdate + '')
.maxLines(1)
.fontSize(14)
.fontColor($r("app.color.list_modified_time_font_color"))
@@ -272,7 +272,7 @@ export struct NoteItemComp {
Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
Stack({ alignContent: Alignment.Center }) {
Image(this.noteItem.content_img)
.id(this.isUpdate+'')
.id(this.isUpdate + '')
.height(47)
.width(47)
.borderRadius(12)
@@ -288,7 +288,7 @@ export struct NoteItemComp {
.width(24)
.height(24)
.visibility(this.updateAndGetChecked() ? Visibility.Visible : Visibility.None)
.id(this.isUpdate+'')
.id(this.isUpdate + '')
}.width(24)
.height(24)
.visibility(this.longpress ? Visibility.Visible : Visibility.None)
@@ -425,7 +425,7 @@ export struct NoteItemListComp {
Flex() {
SearchComp()
}
.id(this.isUpdate+'')
.id(this.isUpdate + '')
.width("100%")
.padding({ left: 24, right: 24, bottom: 12 })
.visibility((FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0) ? Visibility.None : Visibility.Visible)
@@ -454,7 +454,7 @@ export struct NoteItemListComp {
.fontColor($r("app.color.Empty_page_font_color"))
}
}
.id(this.isUpdate+'')
.id(this.isUpdate + '')
.width('100%')
.height('100%')
.padding({ bottom: 120 })
@@ -474,7 +474,7 @@ export struct NoteItemListComp {
}
}, noteItem => JSON.stringify(noteItem))
}
.id(this.isUpdate+'')
.id(this.isUpdate + '')
.margin((FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0) ? {
bottom: 0
} : {
@@ -758,7 +758,7 @@ export struct SearchComp {
this.search = false
// 退出键盘
// @ts-ignore
inputMethod.getController().stopInputSession()
inputMethod.getController().stopInputSession();
AppStorage.SetOrCreate<boolean>('Search', this.search)
})
product/default/src/main/ets/pages/MyNoteHome.ets
+15 -15
View File
@@ -32,12 +32,12 @@ export struct MyNoteHomeComp {
private controllerShow: WebController = new WebController()
private context = getContext(this)
TAG = "MyNoteHomeComp_Tablet"
@StorageLink('breakPoint') @Watch('onBreakPointChange') breakPoints: string = 'lg'
@StorageLink('breakPoint')@Watch('onBreakPointChange') breakPoints: string = 'lg'
onBreakPointChange(){
if(this.breakPoints == 'sm' || this.breakPoints == 'md'){
onBreakPointChange() {
if (this.breakPoints == 'sm' || this.breakPoints == 'md') {
this.portraitModel = true
}else{
} else {
this.portraitModel = false
}
}
@@ -60,9 +60,9 @@ export struct MyNoteHomeComp {
aboutToAppear(): void {
LogUtil.info(this.TAG, "aboutToAppear")
this.breakPoints = AppStorage.Get('breakPoint')
if(this.breakPoints == 'sm' || this.breakPoints == 'md'){
if (this.breakPoints == 'sm' || this.breakPoints == 'md') {
this.portraitModel = true
}else{
} else {
this.portraitModel = false
}
if (this.context == undefined || this.context == null) {
@@ -126,15 +126,15 @@ export struct MyNoteHomeComp {
onPageShow(): void {
LogUtil.info(this.TAG, "onPageShow")
// continue from tablet
let continueFromTablet = AppStorage.Get<boolean>('ContinueFromTablet')
LogUtil.info(this.TAG, "onPageShow, continueFromTablet : " + continueFromTablet)
let noteContentHomeExist = AppStorage.Get<boolean>('NoteContentHomeExist')
LogUtil.info(this.TAG, "onPageShow, noteContentHomeExist : " + noteContentHomeExist)
if (continueFromTablet && !noteContentHomeExist) {
router.push({ uri: 'pages/NoteContentHome' })
AppStorage.SetOrCreate<boolean>('ContinueFromTablet', false)
}
// continue from tablet
let continueFromTablet = AppStorage.Get<boolean>('ContinueFromTablet')
LogUtil.info(this.TAG, "onPageShow, continueFromTablet : " + continueFromTablet)
let noteContentHomeExist = AppStorage.Get<boolean>('NoteContentHomeExist')
LogUtil.info(this.TAG, "onPageShow, noteContentHomeExist : " + noteContentHomeExist)
if (continueFromTablet && !noteContentHomeExist) {
router.push({ uri: 'pages/NoteContentHome' })
AppStorage.SetOrCreate<boolean>('ContinueFromTablet', false)
}
this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0)
}
product/default/src/main/ets/pages/NoteHomePortrait.ets
+3 -3
View File
@@ -60,7 +60,7 @@ export struct NoteHomePortraitComp {
.backgroundColor($r("app.color.notelist_bgcolor_f1f3f5"))
//Folder list display area
Row(){
Row() {
Stack() {
FolderListBackGround()
FolderListComp()
@@ -81,11 +81,11 @@ export struct NoteHomePortraitComp {
.width(StyleConstants.PERCENTAGE_100).height(StyleConstants.PERCENTAGE_100)
}
aboutToAppear(): void{
aboutToAppear(): void {
LogUtil.info(this.TAG, "aboutToAppear")
}
aboutToDisappear(): void{
aboutToDisappear(): void {
LogUtil.info(this.TAG, "aboutToDisappear")
}
}
product/default/src/main/module.json5
+1 -1
View File
@@ -44,7 +44,7 @@
{
"name": "ohos.permission.DISTRIBUTED_DATASYNC",
"reason": "$string:distributed_dataSync_permission"
}
},
],
"deliveryWithInstall": true,
"installationFree": false,