openharmony/applications_launcher
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_launcher synced 2025-02-11 02:36:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source 
Signed-off-by: zhangchao <zhangchao338@huawei.com>
This commit is contained in:
zhangchao 2022-08-05 10:39:15 +08:00
parent daf4c1ab7c
commit b319b38cdf
12 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/ets/default/model/PageDesktopModel.ts
View File

@ -136,6 +136,7 @@ export class PageDesktopModel {
abilityName: item.abilityName,
moduleName: item.moduleName,
keyName: item.keyName,
badgeNumber:item.badgeNumber,
area: item.area,
page: i,
column: x,
@ -153,6 +154,7 @@ export class PageDesktopModel {
abilityName: item.abilityName,
moduleName: item.moduleName,
keyName: item.keyName,
badgeNumber:item.badgeNumber,
area: item.area,
page: pageCount,
column: 0,

4
common/src/main/ets/default/uicomponents/AppBubble.ets
View File

@ -49,7 +49,9 @@ export struct AppBubble {
Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
AppMenu({
menuInfoList: this.menuInfo,
isContextMenu: true
closeMenu: () => {
ContextMenu.close();
}
})
}
.width(StyleConstants.CONTEXT_MENU_WIDTH)

12
common/src/main/ets/default/uicomponents/AppMenu.ets
View File

@ -23,13 +23,13 @@ const TAG = 'AppMenu';
@Component
export struct AppMenu {
isContextMenu: boolean = false;
menuInfoList: Array<MenuInfo> = new Array<MenuInfo>();
getMenuInfoList: Function;
menuMode: number = CommonConstants.MENU_UI_MODE_LIGHT;
fixedMenuList: Array<MenuInfo> = null;
dynamicMenuList: Array<MenuInfo> = null;
isBothTypeMenuExist: boolean = true;
closeMenu: Function;
aboutToAppear(): void {
Log.showInfo(TAG, 'aboutToAppear start');
@ -63,7 +63,7 @@ export struct AppMenu {
HorizontalMenuItem({
menuInfo: item,
menuMode: this.menuMode,
isContextMenu: this.isContextMenu
closeMenu: this.closeMenu
})
}
}, item => JSON.stringify(item))
@ -83,7 +83,7 @@ export struct AppMenu {
HorizontalMenuItem({
menuInfo: item,
menuMode: this.menuMode,
isContextMenu: this.isContextMenu
closeMenu: this.closeMenu
})
}
}, item => JSON.stringify(item))
@ -104,10 +104,10 @@ export struct AppMenu {
struct HorizontalMenuItem {
@State shortcutIcon: string = StyleConstants.DEFAULT_ICON;
@State shortcutName: string = "";
isContextMenu: boolean;
private mResourceManager;
menuInfo: MenuInfo;
menuMode: number = CommonConstants.MENU_UI_MODE_LIGHT;
closeMenu: Function = null;
aboutToAppear(): void {
this.mResourceManager = ResourceManager.getInstance();
@ -178,8 +178,8 @@ struct HorizontalMenuItem {
.width(235)
.onClick(() => {
this.menuInfo.onMenuClick();
if (this.isContextMenu) {
ContextMenu.close();
if (this.closeMenu) {
this.closeMenu();
}
})
}

5
common/src/main/ets/default/uicomponents/FolderComponent.ets
View File

@ -111,7 +111,10 @@ export struct FolderComponent {
@Builder MenuBuilder() {
Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
AppMenu({
menuInfoList: this.buildMenu(this.mFolderItem)
menuInfoList: this.buildMenu(this.mFolderItem),
closeMenu: () => {
ContextMenu.close();
}
})
}
.width(StyleConstants.CONTEXT_MENU_WIDTH)

5
common/src/main/ets/default/uicomponents/FormItemComponent.ets
View File

@ -51,7 +51,10 @@ export struct FormItemComponent {
@Builder MenuBuilder() {
Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
AppMenu({
menuInfoList: this.menuInfo
menuInfoList: this.menuInfo,
closeMenu: () => {
ContextMenu.close();
}
})
}
.width(StyleConstants.CONTEXT_MENU_WIDTH)

11
feature/bigfolder/src/main/ets/default/view/FolderOpenComponent.ets
View File

@ -243,9 +243,11 @@ export struct FolderOpenComponent {
.index(this.PageIndex)
.loop(false)
.onChange((index) => {
Log.showDebug(TAG, `mBigFolderViewModel.changeIndex(index):${index}`);
this.mFolderInfo = mBigFolderViewModel.addAddIcon(this.mFolderInfo);
mBigFolderViewModel.changeIndex(index);
Log.showDebug(TAG, `onChange :${index}`);
if (this.PageIndex != index) {
this.mFolderInfo = mBigFolderViewModel.addAddIcon(this.mFolderInfo);
this.PageIndex = index;
}
})
}
}
@ -276,7 +278,8 @@ export struct FolderOpenComponent {
mBigFolderViewModel.modifyFolderName(this.mFolderInfo)
}
} else {
if (!isOpenFolderDialog) {
const contextMenuState: boolean = AppStorage.Get('contextMenuState');
if (!isOpenFolderDialog && !contextMenuState) {
mBigFolderViewModel.closeFolder();
}
}

2
feature/bigfolder/src/main/ets/default/viewModel/BigFolderViewModel.ts
View File

@ -826,7 +826,7 @@ export class BigFolderViewModel extends BaseViewModel {
* @return {boolean} isPad.
*/
getIsPad(): boolean {
return CommonConstants.PAD_DEVICE_TYPE == AppStorage.Get('device');
return CommonConstants.PAD_DEVICE_TYPE == AppStorage.Get('deviceType');
}
/**

1
feature/pagedesktop/src/main/ets/default/common/components/SwiperPage.ets
View File

@ -80,6 +80,7 @@ export default struct SwiperPage {
this.movingIconSwapPageDelay();
}
}
/**
* Increase delay when dragging app to other page.
*/

5
feature/pagedesktop/src/main/ets/default/layout/PageDesktopLayout.ets
View File

@ -133,7 +133,10 @@ export struct PageDesktopLayout {
if (this.logId()) {
Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
AppMenu({
getMenuInfoList: this.getMenu
getMenuInfoList: this.getMenu,
closeMenu: () => {
ContextMenu.close();
}
})
}
.width(StyleConstants.CONTEXT_MENU_WIDTH)

4
feature/smartdock/src/main/ets/default/layout/RecentLayout.ets
View File

@ -215,7 +215,9 @@ struct AppItem {
Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
AppMenu({
menuInfoList: this.menuInfo,
isContextMenu: false
closeMenu: () => {
this.isShow = false;
}
})
}
.width(StyleConstants.CONTEXT_MENU_WIDTH)

4
feature/smartdock/src/main/ets/default/layout/ResidentLayout.ets
View File

@ -142,7 +142,9 @@ struct AppItem {
Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
AppMenu({
menuInfoList: this.menuInfo,
isContextMenu: false
closeMenu: () => {
this.isShow = false;
}
})
}
.width(StyleConstants.CONTEXT_MENU_WIDTH)

2
product/pad/src/main/ets/pages/AppCenterView.ets
View File

@ -36,7 +36,7 @@ struct AppCenterView {
aboutToAppear(): void {
Log.showInfo(TAG, 'aboutToAppear');
AppStorage.SetOrCreate('device', this.device);
AppStorage.SetOrCreate('deviceType', this.device);
this.mLayoutViewModel = LayoutViewModel.getInstance();
}