diff --git a/.gitignore b/.gitignore index b1645147..288e3f54 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,7 @@ local.properties *.DS_Store tsconfig.json node_modules -.hvigor \ No newline at end of file +.hvigor +package-lock.json +oh_modules +oh-package-lock.json5 \ No newline at end of file diff --git a/.hvigor/outputs/logs/details/details.json b/.hvigor/outputs/logs/details/details.json deleted file mode 100644 index 0b56fe54..00000000 --- a/.hvigor/outputs/logs/details/details.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "totalTime": 23082695000, - "moduleNum": 12, - "taskTime": { - "compileArkTS": 20882815800, - "compileJS": 5937000, - "compileResource": 0, - "packageHap": 650291700, - "signHap": 1595300 - }, - "isIncremental": true, - "hasIncremental": true, - "isParallel": true -} \ No newline at end of file diff --git a/README_zh.md b/README_zh.md index 201c5bea..20bf4be6 100755 --- a/README_zh.md +++ b/README_zh.md @@ -1,27 +1,5 @@ # 应用子系统/Launcher -- [应用子系统/Launcher](#应用子系统launcher) - - [简介](#简介) - - - [目录](#目录) - - [目录结构](#目录结构) - - - [约束](#约束) - - - [说明](#说明) - - [使用说明](#使用说明) - - - [开发调试](#开发调试) - - - [IDE下载](#IDE下载) - - [SDK使用说明及下载地址](SDK使用说明及下载地址) - - [代码下载](#代码下载) - - [签名配置](#签名配置) - - [调试编译](#调试编译) - - [部件更新](#部件更新) - - - [相关仓](#相关仓) - ## 简介 Launcher 作为系统人机交互的首要入口，提供应用图标的显示、点击启动、卸载应用，并提供桌面布局设置以及最近任务管理等功能。 Launcher 采用 扩展的TS语言（ArkTS）开发，主要的结构如下： diff --git a/UPDATE_TTERATION.md b/UPDATE_TTERATION.md new file mode 100644 index 00000000..599b8464 --- /dev/null +++ b/UPDATE_TTERATION.md @@ -0,0 +1,5 @@ +# 应用子系统/Launcher更新说明 + +## 2023/06/17更新说明 +1. 简化签名配置 +2. 部分any类型的变量变更为明确的指定约束类型 \ No newline at end of file diff --git a/build-profile.json5 b/build-profile.json5 index cb4944af..31cc92c3 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -4,7 +4,22 @@ "compatibleSdkVersion": 10, "products": [ { - "name": "default" + "name": "default", + "signingConfig": "default" + } + ], + "signingConfigs": [ + { + "name": "default", + "material": { + "storePassword": "00000016898B7E4E76E6E7089591AB3ECEC5C68F194BBD0C6E6C17446516E8FBDA0E8657F0A8", + "certpath": "signature/OpenHarmonyApplication.cer", + "keyAlias": "OpenHarmony Application Release", + "keyPassword": "0000001607C1E3DE9D968380A780032F24E0099F93A67F346F8C51189010440B5BF58E8E0147", + "profile": "signature/launcher.p7b", + "signAlg": "SHA256withECDSA", + "storeFile": "signature/OpenHarmony.p12" + } } ] }, diff --git a/common/index.ets b/common/index.ets index b87558f5..f4f0f171 100644 --- a/common/index.ets +++ b/common/index.ets @@ -22,6 +22,8 @@ export { MissionInfo } from './src/main/ets/default/bean/MissionInfo' export { AppItemInfo } from './src/main/ets/default/bean/AppItemInfo' export { DockItemInfo } from './src/main/ets/default/bean/DockItemInfo' export { CardItemInfo } from './src/main/ets/default/bean/CardItemInfo' +export { LauncherDragItemInfo } from './src/main/ets/default/bean/LauncherDragItemInfo' +export { FolderItemInfo } from './src/main/ets/default/bean/FolderItemInfo' export { SnapShotInfo } from './src/main/ets/default/bean/SnapShotInfo' export { SettingItemInfo } from './src/main/ets/default/bean/SettingItemInfo' export { RecentMissionInfo } from './src/main/ets/default/bean/RecentMissionInfo' diff --git a/common/package-lock.json b/common/package-lock.json deleted file mode 100644 index 01b613ff..00000000 --- a/common/package-lock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "@ohos/common", - "version": "1.0.0", - "lockfileVersion": 1 -} diff --git a/common/src/main/ets/default/base/BaseDragHandler.ts b/common/src/main/ets/default/base/BaseDragHandler.ts index dd7c7abf..eb08e67d 100644 --- a/common/src/main/ets/default/base/BaseDragHandler.ts +++ b/common/src/main/ets/default/base/BaseDragHandler.ts @@ -16,6 +16,7 @@ import { Log } from '../utils/Log'; import { DragArea } from '../interface/DragArea'; import { CommonConstants } from '../constants/CommonConstants'; +import { LauncherDragItemInfo } from '../bean/LauncherDragItemInfo'; const TAG = 'BaseDragHandler'; @@ -76,9 +77,9 @@ export abstract class BaseDragHandler { * * @param dragItemInfo */ - protected setDragItemInfo(dragItemInfo): void { + protected setDragItemInfo(dragItemInfo: LauncherDragItemInfo): void { Log.showDebug(TAG, `setDragItemInfo dragItemInfo: ${JSON.stringify(dragItemInfo)}`); - AppStorage.SetOrCreate('dragItemInfo', dragItemInfo); + AppStorage.SetOrCreate('dragItemInfo', dragItemInfo); } /** @@ -87,9 +88,9 @@ export abstract class BaseDragHandler { * @return dragItemInfo */ protected getDragItemInfo() { - const dragItemInfo: any = AppStorage.Get('dragItemInfo'); + const dragItemInfo: LauncherDragItemInfo = AppStorage.Get('dragItemInfo'); // avoid dragItemInfo from AppStorage is undefined - return dragItemInfo ? dragItemInfo : {}; + return dragItemInfo; } /** diff --git a/common/src/main/ets/default/bean/AppItemInfo.ts b/common/src/main/ets/default/bean/AppItemInfo.ts index 953c832e..44dd0f6f 100644 --- a/common/src/main/ets/default/bean/AppItemInfo.ts +++ b/common/src/main/ets/default/bean/AppItemInfo.ts @@ -35,7 +35,7 @@ export class AppItemInfo { /** * Indicates appLabelId. */ - appLabelId: string | undefined; + appLabelId: number | undefined; /** * Indicates bundleName. diff --git a/common/src/main/ets/default/bean/FolderItemInfo.ts b/common/src/main/ets/default/bean/FolderItemInfo.ts index fafd8e92..b0d022e5 100644 --- a/common/src/main/ets/default/bean/FolderItemInfo.ts +++ b/common/src/main/ets/default/bean/FolderItemInfo.ts @@ -16,7 +16,7 @@ /** * Item info of folders. */ -export default class FolderItemInfo { +export class FolderItemInfo { /** * folder id. @@ -32,4 +32,6 @@ export default class FolderItemInfo { * Application list of this folder. */ appList: string[] | undefined; + + [key: string]: any; } \ No newline at end of file diff --git a/common/src/main/ets/default/bean/LauncherDragItemInfo.ts b/common/src/main/ets/default/bean/LauncherDragItemInfo.ts new file mode 100644 index 00000000..c3c4c34f --- /dev/null +++ b/common/src/main/ets/default/bean/LauncherDragItemInfo.ts @@ -0,0 +1,29 @@ +/** + * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { AppItemInfo } from './AppItemInfo'; + +/** + * drag item info + */ +export class LauncherDragItemInfo extends AppItemInfo { + isDragging: boolean = false; + + constructor(isDragging?: boolean) { + super(); + this.isDragging = isDragging ? isDragging : false; + } + + [key: string]: any; +} \ No newline at end of file diff --git a/common/src/main/ets/default/bean/RecentMissionInfo.ts b/common/src/main/ets/default/bean/RecentMissionInfo.ts index 0e845f58..63108b5d 100644 --- a/common/src/main/ets/default/bean/RecentMissionInfo.ts +++ b/common/src/main/ets/default/bean/RecentMissionInfo.ts @@ -35,7 +35,7 @@ export class RecentMissionInfo { /** * Recent mission: app label Id */ - appLabelId: string | undefined; + appLabelId: number | undefined; /** * Recent mission: bundle name diff --git a/common/src/main/ets/default/uicomponents/AppBubble.ets b/common/src/main/ets/default/uicomponents/AppBubble.ets index 08911ac6..08cca140 100644 --- a/common/src/main/ets/default/uicomponents/AppBubble.ets +++ b/common/src/main/ets/default/uicomponents/AppBubble.ets @@ -29,7 +29,7 @@ export struct AppBubble { @State abilityName: string = ''; @State moduleName: string = ''; @State appIconId: string = ''; - @State appLabelId: string = ''; + @State appLabelId: number = undefined; iconSize: number = 0; nameHeight: number = 0; nameSize: number = 0; @@ -74,6 +74,11 @@ export struct AppBubble { badgeNumber: this.badgeNumber, useCache: this.useCache }) + .onDragStart((event: DragEvent, extraParams: string) => { + return this.dragStart(event); + }) + .bindContextMenu(this.MenuBuilder, ResponseType.LongPress) + .bindContextMenu(this.MenuBuilder, ResponseType.RightClick) AppName({ nameHeight: this.nameHeight, nameSize: this.nameSize, @@ -87,11 +92,6 @@ export struct AppBubble { marginTop: this.mIconNameMargin }) } - .onDragStart((event: DragEvent, extraParams: string) => { - return this.dragStart(event); - }) - .bindContextMenu(this.MenuBuilder, ResponseType.LongPress) - .bindContextMenu(this.MenuBuilder, ResponseType.RightClick) .width(this.isSelect ? this.iconSize + StyleConstants.DEFAULT_40 : StyleConstants.PERCENTAGE_100) .height(StyleConstants.PERCENTAGE_100) .backgroundColor(this.isSelect ? StyleConstants.DEFAULT_BROAD_COLOR : StyleConstants.DEFAULT_TRANSPARENT_COLOR) diff --git a/common/src/main/ets/default/uicomponents/AppName.ets b/common/src/main/ets/default/uicomponents/AppName.ets index 39e9d87b..a777f921 100644 --- a/common/src/main/ets/default/uicomponents/AppName.ets +++ b/common/src/main/ets/default/uicomponents/AppName.ets @@ -22,7 +22,7 @@ export struct AppName { nameHeight: number; bundleName: string; moduleName: string; - labelId: string; + labelId: number; nameFontColor: string; @State @Watch("updateName") appName: string = ''; useCache: boolean = true; diff --git a/common/src/main/ets/default/uicomponents/FolderComponent.ets b/common/src/main/ets/default/uicomponents/FolderComponent.ets index 856ced5c..b1db03ce 100644 --- a/common/src/main/ets/default/uicomponents/FolderComponent.ets +++ b/common/src/main/ets/default/uicomponents/FolderComponent.ets @@ -277,11 +277,6 @@ export struct FolderComponent { }) } } - .onDragStart((event: DragEvent) => { - return this.dragStart(event); - }) - .bindContextMenu(this.MenuBuilder, ResponseType.LongPress) - .bindContextMenu(this.MenuBuilder, ResponseType.RightClick) .padding(this.gridMargin) .columnsTemplate('1fr 1fr 1fr') .rowsTemplate('1fr 1fr 1fr') @@ -311,6 +306,11 @@ export struct FolderComponent { Log.showInfo(TAG, `onHover isHover:${isHover}`); this.isHover = isHover; }) + .onDragStart((event: DragEvent) => { + return this.dragStart(event); + }) + .bindContextMenu(this.MenuBuilder, ResponseType.LongPress) + .bindContextMenu(this.MenuBuilder, ResponseType.RightClick) } .height(this.folderGridSize) .width(this.folderGridSize) diff --git a/common/src/main/ets/default/uicomponents/FormItemComponent.ets b/common/src/main/ets/default/uicomponents/FormItemComponent.ets index 81fffd5f..924f044b 100644 --- a/common/src/main/ets/default/uicomponents/FormItemComponent.ets +++ b/common/src/main/ets/default/uicomponents/FormItemComponent.ets @@ -96,6 +96,11 @@ export struct FormItemComponent { this.clickForm(event, this.formItem); } }) + .bindContextMenu(this.MenuBuilder, ResponseType.LongPress) + .bindContextMenu(this.MenuBuilder, ResponseType.RightClick) + .onDragStart((event: DragEvent, extraParams: string) => { + return this.dragStart(event); + }) Column() { AppName({ @@ -122,10 +127,5 @@ export struct FormItemComponent { .padding({top : this.mPaddingTop}) .height(StyleConstants.PERCENTAGE_100) .width(StyleConstants.PERCENTAGE_100) - .bindContextMenu(this.MenuBuilder, ResponseType.LongPress) - .bindContextMenu(this.MenuBuilder, ResponseType.RightClick) - .onDragStart((event: DragEvent, extraParams: string) => { - return this.dragStart(event); - }) } } \ No newline at end of file diff --git a/common/src/main/ets/default/uicomponents/FormManagerDialog.ets b/common/src/main/ets/default/uicomponents/FormManagerDialog.ets index 42b50700..a09acaf3 100644 --- a/common/src/main/ets/default/uicomponents/FormManagerDialog.ets +++ b/common/src/main/ets/default/uicomponents/FormManagerDialog.ets @@ -24,7 +24,7 @@ const TAG = 'FormManagerDialog'; */ @CustomDialog export struct FormManagerDialog { - @StorageLink('formMgrItem') formItem: any = []; + @StorageLink('formMgrItem') formItem: Array = []; @State mAllowUpdate: boolean = false; private mSwiperController: SwiperController = new SwiperController() private mFormModel: FormModel; @@ -46,7 +46,7 @@ export struct FormManagerDialog { confirm: (formCardItem) => void; bundleName: string; appName: string; - appLabelId: string; + appLabelId: number; aboutToAppear(): void { this.mFormModel = FormModel.getInstance(); @@ -54,6 +54,12 @@ export struct FormManagerDialog { this.getCurrentFormInfo(); } + aboutToDisappear(): void { + this.cancel = null; + this.confirm = null; + this.mFormDialogController = null; + } + /** * Get current form information by bundle name. */ @@ -67,19 +73,19 @@ export struct FormManagerDialog { * @return formCardItem */ private getChooseCard() { - let formCardItem: any = {}; - formCardItem.id = this.mFormIdList[this.mSwiperIndex]; + let formCardItem: CardItemInfo = new CardItemInfo(); + formCardItem.cardId = this.mFormIdList[this.mSwiperIndex]; let count = 0; let isStop = false; for (let i = 0; i < this.formItem.length; i++) { if (isStop) break; for (let j = 0; j < this.formItem[i].supportDimensions.length; j++) { if (count === this.mSwiperIndex) { - formCardItem.name = this.formItem[i].cardName; + formCardItem.cardName = this.formItem[i].cardName; formCardItem.bundleName = this.formItem[i].bundleName; formCardItem.abilityName = this.formItem[i].abilityName; formCardItem.moduleName = this.formItem[i].moduleName; - formCardItem.dimension = this.formItem[i].supportDimensions[j]; + formCardItem.cardDimension = this.formItem[i].supportDimensions[j]; formCardItem.formConfigAbility = this.formItem[i].formConfigAbility; formCardItem.appLabelId = this.appLabelId; isStop = true; diff --git a/common/src/main/ets/default/uicomponents/UninstallDialog.ets b/common/src/main/ets/default/uicomponents/UninstallDialog.ets index b9684357..23f2bc0c 100644 --- a/common/src/main/ets/default/uicomponents/UninstallDialog.ets +++ b/common/src/main/ets/default/uicomponents/UninstallDialog.ets @@ -17,11 +17,11 @@ import { StyleConstants } from '../constants/StyleConstants'; import { CheckEmptyUtils } from '../utils/CheckEmptyUtils'; import { ResourceManager } from '../manager/ResourceManager'; import { LayoutViewModel } from '../viewmodel/LayoutViewModel'; - +import { AppItemInfo } from '../bean/AppItemInfo'; @CustomDialog export struct UninstallDialog { - @StorageLink('uninstallAppInfo') appInfo: any = {}; + @StorageLink('uninstallAppInfo') appInfo: AppItemInfo = new AppItemInfo(); @StorageLink('isPad') isPad: boolean = false; @StorageLink('NavigationBarStatusValue') navigationBarStatusValue: boolean = false; controller: CustomDialogController; @@ -57,6 +57,12 @@ export struct UninstallDialog { } } + aboutToDisappear(): void { + this.cancel = null; + this.confirm = null; + this.controller = null; + } + public iconLoadCallback(image) { this.icon = image; } diff --git a/common/src/main/module.json5 b/common/src/main/module.json5 index 37b01840..729d5d4f 100644 --- a/common/src/main/module.json5 +++ b/common/src/main/module.json5 @@ -5,7 +5,6 @@ "deviceTypes": [ "default", "tablet" - ], - "uiSyntax": "ets" + ] } } diff --git a/feature/appcenter/package-lock.json b/feature/appcenter/package-lock.json deleted file mode 100644 index f3775687..00000000 --- a/feature/appcenter/package-lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "@ohos/appcenter", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } -} diff --git a/feature/appcenter/src/main/module.json5 b/feature/appcenter/src/main/module.json5 index 5660f08b..fae9e32b 100644 --- a/feature/appcenter/src/main/module.json5 +++ b/feature/appcenter/src/main/module.json5 @@ -5,7 +5,6 @@ "deviceTypes": [ "default", "tablet" - ], - "uiSyntax": "ets" + ] } } diff --git a/feature/bigfolder/package-lock.json b/feature/bigfolder/package-lock.json deleted file mode 100644 index 7b066c2b..00000000 --- a/feature/bigfolder/package-lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "@ohos/bigfolder", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } -} diff --git a/feature/bigfolder/src/main/ets/default/common/uicomponents/FolderAppListDialog.ets b/feature/bigfolder/src/main/ets/default/common/uicomponents/FolderAppListDialog.ets index a09b0875..e664443c 100644 --- a/feature/bigfolder/src/main/ets/default/common/uicomponents/FolderAppListDialog.ets +++ b/feature/bigfolder/src/main/ets/default/common/uicomponents/FolderAppListDialog.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Log } from '@ohos/common'; +import { AppItemInfo, Log } from '@ohos/common'; import { AppIcon } from '@ohos/common'; import { AppName } from '@ohos/common'; import { CommonConstants } from '@ohos/common'; @@ -32,8 +32,8 @@ export default struct FolderAppListDialog { @StorageLink('isPad') isPad: boolean = false; @StorageLink('allAppListForFolder') allAppInfoList: [] = []; @StorageLink('folderAppList') folderAppList: [] = []; - @StorageLink('appListChecked') @Watch('onAppListChecked') appListChecked: any = []; - @StorageLink('titleDescription') titleDescription: any = ''; + @StorageLink('appListChecked') @Watch('onAppListChecked') appListChecked: Array = []; + @StorageLink('titleDescription') titleDescription: string = ''; @State mNameFontColor: string = BigFolderStyleConstants.FOLDER_ADD_APP_FONT_COLOR; private mBigFolderViewModel: BigFolderViewModel; private mFolderStyleConfig: BigFolderStyleConfig; diff --git a/feature/bigfolder/src/main/ets/default/common/uicomponents/TitleDescriptionComponent.ets b/feature/bigfolder/src/main/ets/default/common/uicomponents/TitleDescriptionComponent.ets index 3c8a7004..00fcf43f 100644 --- a/feature/bigfolder/src/main/ets/default/common/uicomponents/TitleDescriptionComponent.ets +++ b/feature/bigfolder/src/main/ets/default/common/uicomponents/TitleDescriptionComponent.ets @@ -17,7 +17,7 @@ import { BigFolderStyleConstants } from '../constants/BigFolderStyleConstants'; @Component export default struct TitleDescriptionComponent { - @StorageLink('titleDescription') titleDescription: any = ''; + @StorageLink('titleDescription') titleDescription: string = ''; @State mTextSize: number = BigFolderStyleConstants.DEFAULT_APP_GRID_TEXT_FONT_SIZE; build() { diff --git a/feature/bigfolder/src/main/ets/default/view/FolderOpenComponent.ets b/feature/bigfolder/src/main/ets/default/view/FolderOpenComponent.ets index 98167190..36b11cd5 100644 --- a/feature/bigfolder/src/main/ets/default/view/FolderOpenComponent.ets +++ b/feature/bigfolder/src/main/ets/default/view/FolderOpenComponent.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Log , CheckEmptyUtils } from '@ohos/common'; +import { Log , CheckEmptyUtils, AppItemInfo, FolderItemInfo } from '@ohos/common'; import { Trace } from '@ohos/common'; import { EventConstants } from '@ohos/common'; import { StyleConstants } from '@ohos/common'; @@ -231,10 +231,9 @@ export struct FolderOpenComponent { }) }) } - .indicatorStyle({ - selectedColor: StyleConstants.DEFAULT_FONT_COLOR, - bottom: BigFolderStyleConstants.DEFAULT_OPEN_FOLDER_INDICATOR - }) + .indicator(new DotIndicator() + .selectedColor(StyleConstants.DEFAULT_FONT_COLOR) + .bottom(BigFolderStyleConstants.DEFAULT_OPEN_FOLDER_INDICATOR)) .onClick(() => { Log.showDebug(TAG, `Swiper click`); this.saveText(); @@ -438,14 +437,14 @@ struct FolderSwiperPage { @Component struct FolderAppItem { - @StorageLink('uninstallAppInfo') appInfo: any = {}; + @StorageLink('uninstallAppInfo') appInfo: AppItemInfo = new AppItemInfo(); @StorageLink('selectDesktopAppItem') selectDesktopAppItem: string = ''; - @State item: any = {}; + @State item: AppItemInfo = new AppItemInfo(); private ColumnsTemplate: string = ''; private RowsTemplate: string = ''; private isSwappingPage = false; private willCloseFolder: boolean = false; - private mFolderInfo: any = {}; + private mFolderInfo: FolderItemInfo = new FolderItemInfo(); private mouseClick: number = 0; private dialogName: string = ""; private clearForm: Function = null; diff --git a/feature/bigfolder/src/main/module.json5 b/feature/bigfolder/src/main/module.json5 index 4a3d38a1..8235da56 100644 --- a/feature/bigfolder/src/main/module.json5 +++ b/feature/bigfolder/src/main/module.json5 @@ -5,7 +5,6 @@ "deviceTypes": [ "default", "tablet" - ], - "uiSyntax": "ets" + ] } } diff --git a/feature/form/package-lock.json b/feature/form/package-lock.json deleted file mode 100644 index 76e71b19..00000000 --- a/feature/form/package-lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "@ohos/form", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } -} diff --git a/feature/form/src/main/ets/default/view/FormManagerComponent.ets b/feature/form/src/main/ets/default/view/FormManagerComponent.ets index 5c0eef86..cbe1331d 100644 --- a/feature/form/src/main/ets/default/view/FormManagerComponent.ets +++ b/feature/form/src/main/ets/default/view/FormManagerComponent.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Log } from '@ohos/common'; +import { CardItemInfo, Log } from '@ohos/common'; import { FormModel } from '@ohos/common'; import { windowManager } from '@ohos/common'; import { localEventManager } from '@ohos/common'; @@ -27,8 +27,8 @@ const TAG = 'FormManagerComponent'; */ @Component export struct FormManagerComponent { - @StorageLink('formAppInfo') formAppInfo: any = {}; - @StorageLink('formMgrItem') formItem: any = []; + @StorageLink('formAppInfo') formAppInfo: CardItemInfo = new CardItemInfo(); + @StorageLink('formMgrItem') formItem: Array = []; @State allowUpdate: boolean = false; private mSwiperController: SwiperController = new SwiperController(); private mFormModel: FormModel; @@ -64,19 +64,19 @@ export struct FormManagerComponent { * @return {any} formCardItem */ private getChooseCard() { - let formCardItem: any = {}; - formCardItem.id = this.mFormIdList[this.mSwiperIndex]; + let formCardItem: CardItemInfo = new CardItemInfo(); + formCardItem.cardId = this.mFormIdList[this.mSwiperIndex]; let count = 0; let isStop = false; for (let i = 0; i < this.formItem.length; i++) { if (isStop) break; for (let j = 0; j < this.formItem[i].supportDimensions.length; j++) { if (count === this.mSwiperIndex) { - formCardItem.name = this.formItem[i].cardName; + formCardItem.cardName = this.formItem[i].cardName; formCardItem.bundleName = this.formItem[i].bundleName; formCardItem.abilityName = this.formItem[i].abilityName; formCardItem.moduleName = this.formItem[i].moduleName; - formCardItem.dimension = this.formItem[i].supportDimensions[j]; + formCardItem.cardDimension = this.formItem[i].supportDimensions[j]; formCardItem.formConfigAbility = this.formItem[i].formConfigAbility; formCardItem.appLabelId = this.formAppInfo.appLabelId; isStop = true; diff --git a/feature/form/src/main/module.json5 b/feature/form/src/main/module.json5 index 4d268d99..675c98c1 100644 --- a/feature/form/src/main/module.json5 +++ b/feature/form/src/main/module.json5 @@ -5,7 +5,6 @@ "deviceTypes": [ "default", "tablet" - ], - "uiSyntax": "ets" + ] } } diff --git a/feature/gesturenavigation/package-lock.json b/feature/gesturenavigation/package-lock.json deleted file mode 100644 index 33739b9c..00000000 --- a/feature/gesturenavigation/package-lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "@ohos/gesturenavigation", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } -} diff --git a/feature/gesturenavigation/src/main/ets/default/common/GestureNavigationExecutors.ts b/feature/gesturenavigation/src/main/ets/default/common/GestureNavigationExecutors.ts index e4fd21cb..c73214cd 100644 --- a/feature/gesturenavigation/src/main/ets/default/common/GestureNavigationExecutors.ts +++ b/feature/gesturenavigation/src/main/ets/default/common/GestureNavigationExecutors.ts @@ -208,7 +208,7 @@ export default class GestureNavigationExecutors { } private isRecentsViewShowOfSpeedLimit(curTime: number, acceleration: number, curSpeed: number) { - return (acceleration > 0.05 && curSpeed > -2.0) || ((curSpeed > -1.0) && (curTime - this.preEventTime) / 1000 > 80.0); + return (acceleration > 0.05 && curSpeed > -5.0) || ((curSpeed > -1.0) && (curTime - this.preEventTime) / 1000 > 10.0); } private isSpecifiesRegion(startXPosition: number, startYPosition: number) { diff --git a/feature/gesturenavigation/src/main/module.json5 b/feature/gesturenavigation/src/main/module.json5 index 651df8c0..0d9af656 100644 --- a/feature/gesturenavigation/src/main/module.json5 +++ b/feature/gesturenavigation/src/main/module.json5 @@ -5,7 +5,6 @@ "deviceTypes": [ "default", "tablet" - ], - "uiSyntax": "ets" + ] } } diff --git a/feature/numbadge/package-lock.json b/feature/numbadge/package-lock.json deleted file mode 100644 index c293d941..00000000 --- a/feature/numbadge/package-lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "@ohos/numbadge", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } -} diff --git a/feature/numbadge/src/main/module.json5 b/feature/numbadge/src/main/module.json5 index 64379b3e..c9ede84e 100644 --- a/feature/numbadge/src/main/module.json5 +++ b/feature/numbadge/src/main/module.json5 @@ -5,7 +5,6 @@ "deviceTypes": [ "default", "tablet" - ], - "uiSyntax": "ets" + ] } } diff --git a/feature/pagedesktop/package-lock.json b/feature/pagedesktop/package-lock.json deleted file mode 100644 index 97914b16..00000000 --- a/feature/pagedesktop/package-lock.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "@ohos/pagedesktop", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/bigfolder": { - "version": "file:../bigfolder", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/common": { - "version": "file:../../common" - }, - "@ohos/form": { - "version": "file:../form", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - } - } -} diff --git a/feature/pagedesktop/src/main/ets/default/common/PageDesktopDragHandler.ts b/feature/pagedesktop/src/main/ets/default/common/PageDesktopDragHandler.ts index 6985c936..3cee824c 100644 --- a/feature/pagedesktop/src/main/ets/default/common/PageDesktopDragHandler.ts +++ b/feature/pagedesktop/src/main/ets/default/common/PageDesktopDragHandler.ts @@ -13,17 +13,20 @@ * limitations under the License. */ -import { Log } from '@ohos/common'; -import { DragArea } from '@ohos/common'; -import { BaseDragHandler } from '@ohos/common'; -import { CommonConstants } from '@ohos/common'; -import { CheckEmptyUtils } from '@ohos/common'; -import { SettingsModel } from '@ohos/common'; -import { EventConstants } from '@ohos/common'; -import { localEventManager } from '@ohos/common'; -import { layoutConfigManager } from '@ohos/common'; -import { PageDesktopModel } from '@ohos/common'; -import { DragItemPosition } from '@ohos/common'; +import { + Log, + LauncherDragItemInfo, + DragArea, + BaseDragHandler, + CommonConstants, + CheckEmptyUtils, + SettingsModel, + EventConstants, + localEventManager, + layoutConfigManager, + PageDesktopModel, + DragItemPosition +} from '@ohos/common'; import { FormViewModel } from '@ohos/form'; import { BigFolderViewModel } from '@ohos/bigfolder'; import { PageDesktopGridStyleConfig } from './PageDesktopGridStyleConfig'; @@ -222,8 +225,8 @@ export class PageDesktopDragHandler extends BaseDragHandler { } onDragDrop(x: number, y: number): boolean { - const dragItemInfo: any = AppStorage.Get('dragItemInfo'); - if (JSON.stringify(dragItemInfo) == '{}') { + const dragItemInfo: LauncherDragItemInfo = AppStorage.Get('dragItemInfo'); + if (!dragItemInfo.isDragging) { return false; } const dragItemType: number = AppStorage.Get('dragItemType'); @@ -243,10 +246,7 @@ export class PageDesktopDragHandler extends BaseDragHandler { endPosition = this.copyPosition(this.mEndPosition); const info = this.mSettingsModel.getLayoutInfo(); const layoutInfo = info.layoutInfo; - if (dragItemInfo.typeId == CommonConstants.TYPE_FOLDER || dragItemInfo.typeId == CommonConstants.TYPE_CARD ) { - this.updateEndPosition(dragItemInfo); - AppStorage.SetOrCreate('positionOffset', []); - } else { + if (dragItemInfo.typeId === CommonConstants.TYPE_APP) { if (this.isMoveToSamePosition(dragItemInfo)) { this.deleteBlankPageAfterDragging(startPosition, endPosition); return false; @@ -394,7 +394,7 @@ export class PageDesktopDragHandler extends BaseDragHandler { } } - private isMoveToSamePosition(dragItemInfo): boolean { + private isMoveToSamePosition(dragItemInfo: LauncherDragItemInfo): boolean { if (this.mEndPosition.page == dragItemInfo.page && this.mEndPosition.row == dragItemInfo.row && this.mEndPosition.column == dragItemInfo.column) { return true; @@ -402,24 +402,6 @@ export class PageDesktopDragHandler extends BaseDragHandler { return false; } - private updateEndPosition(dragItemInfo): void { - const positionOffset = AppStorage.Get('positionOffset'); - - this.mEndPosition.row = this.mEndPosition.row - positionOffset[1]; - this.mEndPosition.column = this.mEndPosition.column - positionOffset[0]; - this.mGridConfig = this.mSettingsModel.getGridConfig(); - if (this.mEndPosition.row < 0) { - this.mEndPosition.row = 0; - } else if (this.mEndPosition.row + dragItemInfo.area[1] > this.mGridConfig.row) { - this.mEndPosition.row = this.mGridConfig.row - dragItemInfo.area[1]; - } - if (this.mEndPosition.column < 0) { - this.mEndPosition.column = 0; - } else if (this.mEndPosition.column + dragItemInfo.area[0] > this.mGridConfig.column ) { - this.mEndPosition.column = this.mGridConfig.column - dragItemInfo.area[0]; - } - } - private getEndLayoutInfo(layoutInfo) { const endLayoutInfo = layoutInfo.find(item => { if (item.typeId == CommonConstants.TYPE_FOLDER || item.typeId == CommonConstants.TYPE_CARD) { @@ -431,7 +413,7 @@ export class PageDesktopDragHandler extends BaseDragHandler { return endLayoutInfo; } - private getStartLayoutInfo(layoutInfo, dragItemInfo) { + private getStartLayoutInfo(layoutInfo, dragItemInfo: LauncherDragItemInfo) { const startLayoutInfo = layoutInfo.find(item => { return item.page === dragItemInfo.page && item.row === dragItemInfo.row && item.column === dragItemInfo.column; }); @@ -445,7 +427,7 @@ export class PageDesktopDragHandler extends BaseDragHandler { * @param layoutInfo * @param dragItemInfo */ - private checkAndMove(source, destination, layoutInfo, dragItemInfo): boolean { + private checkAndMove(source, destination, layoutInfo, dragItemInfo: LauncherDragItemInfo): boolean { Log.showDebug(TAG, 'checkAndMove start'); const allPositions = this.getAllPositions(destination, layoutInfo); @@ -593,7 +575,7 @@ export class PageDesktopDragHandler extends BaseDragHandler { * @param allPositions * @param dragItemInfo */ - private getPressedObjects(destination, allPositions, dragItemInfo) { + private getPressedObjects(destination, allPositions, dragItemInfo: LauncherDragItemInfo) { Log.showDebug(TAG, 'getPressedObjects start'); const row = destination.row; const column = destination.column; @@ -631,7 +613,7 @@ export class PageDesktopDragHandler extends BaseDragHandler { * @param objectPositionCount * @param dragItemInfo */ - private checkCanMoveInSamePage(pressedPositions, objectPositionCount, dragItemInfo): boolean { + private checkCanMoveInSamePage(pressedPositions, objectPositionCount, dragItemInfo: LauncherDragItemInfo): boolean { Log.showDebug(TAG, 'checkCanMoveInSamePage start'); const foldersAndForms = pressedPositions.foldersAndForms; if (foldersAndForms.length == 0) { @@ -744,7 +726,7 @@ export class PageDesktopDragHandler extends BaseDragHandler { * @param allPositions * @param dragItemInfo */ - private moveFoldersAndForms(foldersAndForms, destination, allPositions, dragItemInfo): boolean { + private moveFoldersAndForms(foldersAndForms, destination, allPositions, dragItemInfo: LauncherDragItemInfo): boolean { Log.showDebug(TAG, 'moveFoldersAndForms start'); const movedFoldersAndForms = []; for (let i = 0; i < foldersAndForms.length; i++) { @@ -813,7 +795,7 @@ export class PageDesktopDragHandler extends BaseDragHandler { * @param row * @param column */ - private updateDestinationToNull(dragItemInfo, destination, allPositions, row, column): void { + private updateDestinationToNull(dragItemInfo: LauncherDragItemInfo, destination, allPositions, row, column): void { let destinationFlag = false; for (let j = 0; j < dragItemInfo.area[1]; j++) { if (destinationFlag) { @@ -843,7 +825,7 @@ export class PageDesktopDragHandler extends BaseDragHandler { * @param destination * @param allPositions */ - private updateDestinationByDragItem(dragItemInfo, destination, allPositions): void { + private updateDestinationByDragItem(dragItemInfo: LauncherDragItemInfo, destination, allPositions): void { let keyName = ''; if (dragItemInfo.typeId == CommonConstants.TYPE_FOLDER) { keyName = dragItemInfo.folderId; diff --git a/feature/pagedesktop/src/main/ets/default/common/components/AppItem.ets b/feature/pagedesktop/src/main/ets/default/common/components/AppItem.ets index 14bb7368..5f8ac815 100644 --- a/feature/pagedesktop/src/main/ets/default/common/components/AppItem.ets +++ b/feature/pagedesktop/src/main/ets/default/common/components/AppItem.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Log } from '@ohos/common'; +import { AppItemInfo, CardItemInfo, LauncherDragItemInfo, Log } from '@ohos/common'; import { Trace } from '@ohos/common'; import { StyleConstants } from '@ohos/common'; import { PresetStyleConstants } from '@ohos/common'; @@ -33,10 +33,10 @@ const TAG = "AppItem"; @Component export default struct AppItem { - @StorageLink('dragItemInfo') pageDesktopDragItemInfo: any = {}; + @StorageLink('dragItemInfo') pageDesktopDragItemInfo: LauncherDragItemInfo = new LauncherDragItemInfo(); @StorageLink('dragItemType') dragItemType: number = CommonConstants.DRAG_FROM_DESKTOP; - @StorageLink('uninstallAppInfo') appInfo: any = {}; - @StorageLink('formAppInfo') formAppInfo: any = {}; + @StorageLink('uninstallAppInfo') appInfo: AppItemInfo = new AppItemInfo(); + @StorageLink('formAppInfo') formAppInfo: CardItemInfo = new CardItemInfo(); @StorageLink('selectDesktopAppItem') selectDesktopAppItem: string = ''; @State mAppNameHeight: number = StyleConstants.DEFAULT_APP_NAME_HEIGHT; @State mAppItemWidth: number = StyleConstants.DEFAULT_APP_ITEM_WIDTH; @@ -105,19 +105,6 @@ export default struct AppItem { customStyle: true }); - @Builder dragLayerBuilder() { - Column() { - AppIcon({ - iconSize: this.mIconSize * 1.05, - iconId: this.item.appIconId, - bundleName: this.item.bundleName, - moduleName: this.item.moduleName, - icon: ResourceManager.getInstance().getCachedAppIcon(this.item.appIconId, this.item.bundleName, this.item.moduleName), - badgeNumber: this.item.badgeNumber - }) - } - } - /** * When click cancel dialog, this function will be called. */ @@ -211,13 +198,12 @@ export default struct AppItem { }) .onTouch((event: TouchEvent) => { Log.showDebug(TAG, `onTouch event type: ${event.type}, x: ${event.touches[0].screenX}, y: ${event.touches[0].screenY}`); - if (event.type === CommonConstants.TOUCH_TYPE_UP && AppStorage.Get('isDrag')) { + if (event.type === CommonConstants.TOUCH_TYPE_UP && this.pageDesktopDragItemInfo.isDragging) { let mIsDragEffectArea = globalThis.PageDesktopDragHandler.isDragEffectArea(event.touches[0].screenX, event.touches[0].screenY); Log.showInfo(TAG, `onTouch mIsDragEffectArea: ${mIsDragEffectArea}`); if (!mIsDragEffectArea) { - this.pageDesktopDragItemInfo = {}; + this.pageDesktopDragItemInfo = new LauncherDragItemInfo(); AppStorage.SetOrCreate('selectAppIndex', null); - AppStorage.SetOrCreate('isDrag', false); } } }) @@ -235,13 +221,11 @@ export default struct AppItem { } dragStart(event: DragEvent): CustomBuilder { - AppStorage.SetOrCreate('isDrag', true); ContextMenu.close(); this.dragItemType = CommonConstants.DRAG_FROM_DESKTOP; - this.pageDesktopDragItemInfo = this.item; + this.pageDesktopDragItemInfo = Object.assign(new LauncherDragItemInfo(true), this.item); Log.showInfo(TAG, `pageDesktopDragItemInfo: ${JSON.stringify(this.pageDesktopDragItemInfo)}`); globalThis.PageDesktopDragHandler.onDragStart(event.getX(), event.getY()); - return this.dragLayerBuilder(); } /** diff --git a/feature/pagedesktop/src/main/ets/default/common/components/FolderItem.ets b/feature/pagedesktop/src/main/ets/default/common/components/FolderItem.ets index d024e5ff..1b17482f 100644 --- a/feature/pagedesktop/src/main/ets/default/common/components/FolderItem.ets +++ b/feature/pagedesktop/src/main/ets/default/common/components/FolderItem.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Log } from '@ohos/common'; +import { LauncherDragItemInfo, Log } from '@ohos/common'; import { Trace } from '@ohos/common'; import { StyleConstants } from '@ohos/common'; import { CommonConstants } from '@ohos/common'; @@ -33,7 +33,7 @@ const TAG = 'FolderItem'; */ @Component export default struct FolderItem { - @StorageLink('dragItemInfo') pageDesktopDragItemInfo: any = {}; + @StorageLink('dragItemInfo') pageDesktopDragItemInfo: LauncherDragItemInfo = new LauncherDragItemInfo(); @StorageLink('dragItemType') dragItemType: number = CommonConstants.DRAG_FROM_DESKTOP; @StorageLink('openFolderStatus') openFolderStatus: number = BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE; @StorageLink('selectDesktopAppItem') selectDesktopAppItem: string = ''; @@ -53,27 +53,6 @@ export default struct FolderItem { private mFolderStyleConfig: BigFolderStyleConfig; mNameLines: number = PresetStyleConstants.DEFAULT_APP_NAME_LINES; - @Builder dragLayerBuilder() { - Column() { - FolderComponent({ - showFolderName: false, - nameFontColor: this.mPageDesktopViewModel.getPageDesktopStyleConfig().mNameFontColor, - folderNameHeight: 0, - folderNameSize: 0, - mFolderItem: this.folderItem, - folderGridSize: this.mFolderStyleConfig.mGridSize * 1.05, - appIconSize: this.mFolderStyleConfig.mFolderAppSize * 1.05, - gridMargin: this.mFolderStyleConfig.mGridMargin * 1.05, - gridGap: this.mFolderStyleConfig.mFolderGridGap * 1.05, - buildMenu: (folderItem) => { - return []; - } - }) - } - .height(this.mFolderStyleConfig.mGridSize * 1.05 + StyleConstants.DEFAULT_40) - .width(this.mFolderStyleConfig.mGridSize * 1.05) - } - aboutToAppear(): void { this.mPageDesktopDragHandler = PageDesktopDragHandler.getInstance(); this.mPageDesktopStartAppHandler = PageDesktopStartAppHandler.getInstance(); @@ -134,20 +113,14 @@ export default struct FolderItem { } dragStart(event: DragEvent): CustomBuilder { - AppStorage.SetOrCreate('isDrag', true); ContextMenu.close(); this.dragItemType = CommonConstants.DRAG_FROM_DESKTOP; - this.pageDesktopDragItemInfo = this.folderItem; + this.pageDesktopDragItemInfo = Object.assign(new LauncherDragItemInfo(true), this.folderItem); const selectAppIndex = globalThis.PageDesktopDragHandler.getItemIndex(event.getX(), event.getY()); const startPosition = globalThis.PageDesktopDragHandler.getTouchPosition(event.getX(), event.getY()) globalThis.PageDesktopDragHandler.mStartPosition = startPosition; AppStorage.SetOrCreate('selectAppIndex', selectAppIndex); Log.showInfo(TAG, `onDragStart event: [${event.getX()}, ${event.getY()}], selectAppIndex: ${selectAppIndex}`); - const rowOffset = startPosition.row - this.pageDesktopDragItemInfo.row; - const columnOffset = startPosition.column - this.pageDesktopDragItemInfo.column; - const positionOffset = [columnOffset, rowOffset]; - AppStorage.SetOrCreate('positionOffset', positionOffset); - return this.dragLayerBuilder(); } build() { @@ -184,14 +157,13 @@ export default struct FolderItem { this.mBigFolderViewModel.openFolder(false, folderItem); }, onFolderTouch: (event, folderItem) => { - if (event.type === CommonConstants.TOUCH_TYPE_UP && AppStorage.Get('isDrag')) { + if (event.type === CommonConstants.TOUCH_TYPE_UP && this.pageDesktopDragItemInfo.isDragging) { let mIsDragEffectArea = globalThis.PageDesktopDragHandler.isDragEffectArea(event.touches[0].screenX, event.touches[0].screenY); Log.showInfo(TAG, `onTouch mIsDragEffectArea: ${mIsDragEffectArea}`); if (!mIsDragEffectArea) { globalThis.PageDesktopDragHandler.deleteBlankPageOutsideEffect(); - AppStorage.SetOrCreate('dragItemInfo', {}); + AppStorage.SetOrCreate('dragItemInfo', new LauncherDragItemInfo()); AppStorage.SetOrCreate('selectAppIndex', null); - AppStorage.SetOrCreate('isDrag', false); } } }, diff --git a/feature/pagedesktop/src/main/ets/default/common/components/FormItem.ets b/feature/pagedesktop/src/main/ets/default/common/components/FormItem.ets index f251cbdd..dc3aea77 100644 --- a/feature/pagedesktop/src/main/ets/default/common/components/FormItem.ets +++ b/feature/pagedesktop/src/main/ets/default/common/components/FormItem.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Log } from '@ohos/common'; +import { CardItemInfo, LauncherDragItemInfo, Log } from '@ohos/common'; import { StyleConstants } from '@ohos/common'; import { PresetStyleConstants } from '@ohos/common'; import { ResourceManager } from '@ohos/common'; @@ -34,7 +34,7 @@ const TAG = 'FormItem'; */ @Component export default struct FormItem { - @StorageLink('dragItemInfo') pageDesktopDragItemInfo: any = {}; + @StorageLink('dragItemInfo') pageDesktopDragItemInfo: LauncherDragItemInfo = new LauncherDragItemInfo(); @StorageLink('isRemoveForm') @Watch('removeFormAnimate') isRemoveForm: boolean = false; @StorageLink('dragItemType') dragItemType: number = CommonConstants.DRAG_FROM_DESKTOP; @StorageLink('formAnimateData') formAnimateData: { @@ -45,7 +45,7 @@ export default struct FormItem { @State animateOpacity: number = 1.0; @State allowUpdate: boolean = true; @State isShow: boolean = true; - private formItem: any = {}; + private formItem: CardItemInfo = new CardItemInfo(); private mPageDesktopViewModel: PageDesktopViewModel = PageDesktopViewModel.getInstance(); private mFormViewModel: FormViewModel; private mFormStyleConfig: FormStyleConfig; @@ -66,20 +66,6 @@ export default struct FormItem { private mForm: string = ''; private clearForm: Function = null; - @Builder dragLayerBuilder() { - Column() { - FormItemComponent({ - formItem: this.formItem, - formItemWidth: this.mFormItemWidth * 1.05, - formItemHeight: this.mFormItemHeight * 1.05, - formNameHeight: 0, - formNameSize: 0 - }) - } - .height(this.mFormItemWidth * 1.05 + StyleConstants.DEFAULT_10 ) - .width(this.mFormItemWidth * 1.05) - } - aboutToAppear(): void { this.mPageDesktopDragHandler = PageDesktopDragHandler.getInstance(); this.mFormViewModel = FormViewModel.getInstance(); @@ -94,8 +80,10 @@ export default struct FormItem { this.mFormNameSize = styleConfig.mNameSize; this.mGridSpaceWidth = Number(this.mPageDesktopViewModel.getWorkSpaceWidth()) - this.mMargin; this.mGridSpaceHeight = Number(this.mPageDesktopViewModel.getWorkSpaceHeight()); - this.mFormItemWidth = this.mFormStyleConfig.mFormWidth.get(this.formItem.cardDimension.toString()); - this.mFormItemHeight = this.mFormStyleConfig.mFormHeight.get(this.formItem.cardDimension.toString()); + if (this.formItem.cardDimension) { + this.mFormItemWidth = this.mFormStyleConfig.mFormWidth.get(this.formItem.cardDimension.toString()); + this.mFormItemHeight = this.mFormStyleConfig.mFormHeight.get(this.formItem.cardDimension.toString()); + } const resourceManager = ResourceManager.getInstance(); resourceManager.getStringById($r('app.string.is_delete_form').id, this.getDialogNamePre.bind(this)); resourceManager.getStringById($r('app.string.form').id, this.getDialogNameAft.bind(this)); @@ -208,20 +196,14 @@ export default struct FormItem { } dragStart(event: DragEvent): CustomBuilder { - AppStorage.SetOrCreate('isDrag', true); ContextMenu.close(); this.dragItemType = CommonConstants.DRAG_FROM_DESKTOP; - this.pageDesktopDragItemInfo = this.formItem; + this.pageDesktopDragItemInfo = Object.assign(new LauncherDragItemInfo(true), this.formItem); const selectAppIndex = globalThis.PageDesktopDragHandler.getItemIndex(event.getX(), event.getY()); const startPosition = globalThis.PageDesktopDragHandler.getTouchPosition(event.getX(), event.getY()) globalThis.PageDesktopDragHandler.mStartPosition = startPosition; AppStorage.SetOrCreate('selectAppIndex', selectAppIndex); Log.showInfo(TAG, `onDragStart event: [${event.getX()}, ${event.getY()}], selectAppIndex: ${selectAppIndex}`); - const rowOffset = startPosition.row - this.pageDesktopDragItemInfo.row; - const columnOffset = startPosition.column - this.pageDesktopDragItemInfo.column; - const positionOffset = [columnOffset, rowOffset]; - AppStorage.SetOrCreate('positionOffset', positionOffset); - return this.dragLayerBuilder(); } build() { @@ -246,7 +228,7 @@ export default struct FormItem { }, }) } - .visibility(this.pageDesktopDragItemInfo.cardId === this.formItem.cardId ? Visibility.None : Visibility.Visible) + .visibility(this.pageDesktopDragItemInfo.cardId === this.formItem.cardId && this.pageDesktopDragItemInfo.isDragging ? Visibility.None : Visibility.Visible) .scale({ x: this.animateScale, y: this.animateScale }) .opacity(this.animateOpacity) .onMouse((event: MouseEvent) => { @@ -266,14 +248,13 @@ export default struct FormItem { ) ) .onTouch((event: TouchEvent) => { - if (event.type === CommonConstants.TOUCH_TYPE_UP && AppStorage.Get('isDrag')) { + if (event.type === CommonConstants.TOUCH_TYPE_UP && this.pageDesktopDragItemInfo.isDragging) { let mIsDragEffectArea = globalThis.PageDesktopDragHandler.isDragEffectArea(event.touches[0].screenX, event.touches[0].screenY); Log.showInfo(TAG, `onTouch mIsDragEffectArea: ${mIsDragEffectArea}`); if (!mIsDragEffectArea) { globalThis.PageDesktopDragHandler.deleteBlankPageOutsideEffect(); - this.pageDesktopDragItemInfo = {}; + this.pageDesktopDragItemInfo = new LauncherDragItemInfo(); AppStorage.SetOrCreate('selectAppIndex', null); - AppStorage.SetOrCreate('isDrag', false); } } }) diff --git a/feature/pagedesktop/src/main/ets/default/common/components/GridSwiper.ets b/feature/pagedesktop/src/main/ets/default/common/components/GridSwiper.ets index b8f534d2..78a04cf8 100644 --- a/feature/pagedesktop/src/main/ets/default/common/components/GridSwiper.ets +++ b/feature/pagedesktop/src/main/ets/default/common/components/GridSwiper.ets @@ -13,7 +13,8 @@ * limitations under the License. */ -import { Log, Trace, StyleConstants, CommonConstants, AppMenu, MenuInfo, localEventManager, EventConstants } from '@ohos/common'; +import { Log, Trace, StyleConstants, CommonConstants, AppMenu, MenuInfo, localEventManager, EventConstants, + LauncherDragItemInfo } from '@ohos/common'; import SwiperPage from './SwiperPage'; const TAG = "GridSwiper"; @@ -152,9 +153,7 @@ export default struct GridSwiper { }) .height(StyleConstants.PERCENTAGE_100) .width(StyleConstants.PERCENTAGE_100) - .indicatorStyle({ - selectedColor: StyleConstants.DEFAULT_FONT_COLOR - }) + .indicator(new DotIndicator().selectedColor(StyleConstants.DEFAULT_FONT_COLOR)) .loop(false) .index(this.pageIndex) .onChange((index) => { @@ -170,7 +169,8 @@ export default struct GridSwiper { .width(StyleConstants.PERCENTAGE_100) .onDragMove((event: DragEvent, extraParams: string) => { Log.showInfo(TAG, `onDragMove event: [${event.getX()}, ${event.getY()}]`); - if (!AppStorage.Get('isDrag')) return; + const dragItemInfo: LauncherDragItemInfo = AppStorage.Get('dragItemInfo'); + if (!dragItemInfo.isDragging) return; if (AppStorage.Get('deviceType') === CommonConstants.DEFAULT_DEVICE_TYPE || (AppStorage.Get('deviceType') !== CommonConstants.DEFAULT_DEVICE_TYPE && AppStorage.Get('dragItemType') === CommonConstants.DRAG_FROM_DESKTOP)) { diff --git a/feature/pagedesktop/src/main/ets/default/common/components/SwiperPage.ets b/feature/pagedesktop/src/main/ets/default/common/components/SwiperPage.ets index 23859875..fc6d474f 100644 --- a/feature/pagedesktop/src/main/ets/default/common/components/SwiperPage.ets +++ b/feature/pagedesktop/src/main/ets/default/common/components/SwiperPage.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Log } from '@ohos/common'; +import { LauncherDragItemInfo, Log } from '@ohos/common'; import { CommonConstants } from '@ohos/common'; import { PresetStyleConstants } from '@ohos/common'; import { localEventManager } from '@ohos/common'; @@ -159,13 +159,12 @@ export default struct SwiperPage { const dragResult = globalThis.PageDesktopDragHandler.onDragDrop(event.getX(), event.getY()); Log.showInfo(TAG, `onDrop dragResult: ${dragResult}`); AppStorage.SetOrCreate('selectAppIndex', null); - AppStorage.SetOrCreate('isDrag', false); if (!dragResult) { - AppStorage.SetOrCreate('dragItemInfo', {}); + AppStorage.SetOrCreate('dragItemInfo', new LauncherDragItemInfo()); } else { // Wait for the UI rendering to end. setTimeout(() => { - AppStorage.SetOrCreate('dragItemInfo', {}); + AppStorage.SetOrCreate('dragItemInfo', new LauncherDragItemInfo()); }, 50); } } diff --git a/feature/pagedesktop/src/main/ets/default/viewmodel/PageDesktopViewModel.ts b/feature/pagedesktop/src/main/ets/default/viewmodel/PageDesktopViewModel.ts index 2afd242e..eb967e1a 100644 --- a/feature/pagedesktop/src/main/ets/default/viewmodel/PageDesktopViewModel.ts +++ b/feature/pagedesktop/src/main/ets/default/viewmodel/PageDesktopViewModel.ts @@ -1257,7 +1257,7 @@ export default class PageDesktopViewModel extends BaseViewModel { * @param appInfo */ async createCardToDeskTop(formCardItem) { - Log.showDebug(TAG, `createCardToDeskTop formCardItem id: ${formCardItem.id}`); + Log.showDebug(TAG, `createCardToDeskTop formCardItem id: ${formCardItem.cardId}`); const cardItemInfo = this.createNewCardItemInfo(formCardItem); let formInfoList: any = this.mFormListInfoCacheManager.getCache(KEY_FORM_LIST); @@ -1307,14 +1307,14 @@ export default class PageDesktopViewModel extends BaseViewModel { */ private createNewCardItemInfo(formCardItem): CardItemInfo { const cardItemInfo = new CardItemInfo(); - cardItemInfo.cardId = formCardItem.id; - cardItemInfo.cardName = formCardItem.name; + cardItemInfo.cardId = formCardItem.cardId; + cardItemInfo.cardName = formCardItem.cardName; cardItemInfo.bundleName = formCardItem.bundleName; cardItemInfo.abilityName = formCardItem.abilityName; cardItemInfo.moduleName = formCardItem.moduleName; cardItemInfo.formConfigAbility = formCardItem.formConfigAbility; cardItemInfo.appLabelId = formCardItem.appLabelId; - cardItemInfo.cardDimension = formCardItem.dimension; + cardItemInfo.cardDimension = formCardItem.cardDimension; return cardItemInfo; } diff --git a/feature/pagedesktop/src/main/module.json5 b/feature/pagedesktop/src/main/module.json5 index b0986c47..71af09ef 100644 --- a/feature/pagedesktop/src/main/module.json5 +++ b/feature/pagedesktop/src/main/module.json5 @@ -5,7 +5,6 @@ "deviceTypes": [ "default", "tablet" - ], - "uiSyntax": "ets" + ] } } diff --git a/feature/recents/package-lock.json b/feature/recents/package-lock.json deleted file mode 100644 index d492edab..00000000 --- a/feature/recents/package-lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "@ohos/recents", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } -} diff --git a/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionAppIcon.ets b/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionAppIcon.ets index 438ad985..10d28b2d 100644 --- a/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionAppIcon.ets +++ b/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionAppIcon.ets @@ -28,7 +28,7 @@ export default struct RecentMissionAppIcon { @State @Watch("updateIcon") appIcon: string = ''; @State bundleName: string = ''; @State moduleName: string = ''; - @State labelId: string = ''; + @State labelId: number = undefined; @State icon: string = ' '; @State useCache: boolean = true; private mIsSingleLayout: boolean = true; diff --git a/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionAppName.ets b/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionAppName.ets index 6b0209e8..363af064 100644 --- a/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionAppName.ets +++ b/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionAppName.ets @@ -28,7 +28,7 @@ export default struct RecentMissionAppName { @State name: string = '' @Prop bundleName: string; @Prop moduleName: string; - @Prop labelId: string; + @Prop labelId: number; private mResourceManager; aboutToAppear(): void { diff --git a/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionCard.ets b/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionCard.ets index 17cd0f98..4f87673d 100644 --- a/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionCard.ets +++ b/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionCard.ets @@ -35,7 +35,7 @@ export default struct RecentMissionCard { @Link isClickSubComponent: boolean; @State missionId: number = 0; @State appIconId: string = ''; - @State appLabelId: string = ''; + @State appLabelId: number = undefined; @State appName: string = ''; @State bundleName: string = ''; @State moduleName: string = ''; @@ -44,7 +44,7 @@ export default struct RecentMissionCard { @State cardMargin: number = RecentsStyleConstants.SINGLE_LIST_LAYOUT_MARGIN; @State cardLayoutWeight: number = RecentsStyleConstants.SINGLE_LIST_APP_INFO_LAYOUT_WEIGHT; // recentImage default is Resource type, to avoid toolchain typeCheck - @State recentImage: any = RecentsStyleConstants.DEFAULT_APP_IMAGE; + @State recentImage: image.PixelMap = undefined; private mIsSingleLayout: boolean = true; private snapShotTime: string = ''; private mRecentMissionsViewModel: RecentMissionsViewModel; diff --git a/feature/recents/src/main/module.json5 b/feature/recents/src/main/module.json5 index d9d95168..a026e00b 100644 --- a/feature/recents/src/main/module.json5 +++ b/feature/recents/src/main/module.json5 @@ -5,7 +5,6 @@ "deviceTypes": [ "default", "tablet" - ], - "uiSyntax": "ets" + ] } } diff --git a/feature/settings/package-lock.json b/feature/settings/package-lock.json deleted file mode 100644 index 8f4b40b5..00000000 --- a/feature/settings/package-lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "launcher_settings", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } -} diff --git a/feature/settings/src/main/module.json5 b/feature/settings/src/main/module.json5 index fbf4c62a..55b4e833 100644 --- a/feature/settings/src/main/module.json5 +++ b/feature/settings/src/main/module.json5 @@ -2,7 +2,7 @@ "module": { "name": "launcher_settings", "type": "feature", - "srcEntrance": "./ets/Application/AbilityStage.ts", + "srcEntry": "./ets/Application/AbilityStage.ts", "description": "$string:mainability_description", "mainElement": "com.ohos.launcher.settings.MainAbility", "deviceTypes": [ @@ -18,18 +18,17 @@ "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", - "uiSyntax": "ets", "abilities": [ { "name": "com.ohos.launcher.settings.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "srcEntry": "./ets/MainAbility/MainAbility.ts", "startWindowIcon": "$media:startWindowIcon", "startWindowBackground": "$color:startWindowBackground", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:settings_MainAbility", "launchType": "singleton", - "visible": false + "exported": false } ], "requestPermissions": [ diff --git a/feature/smartdock/package-lock.json b/feature/smartdock/package-lock.json deleted file mode 100644 index 740cc265..00000000 --- a/feature/smartdock/package-lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "@ohos/smartdock", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } -} diff --git a/feature/smartdock/src/main/ets/default/common/SmartDockDragHandler.ts b/feature/smartdock/src/main/ets/default/common/SmartDockDragHandler.ts index 617dc79f..5e90236a 100644 --- a/feature/smartdock/src/main/ets/default/common/SmartDockDragHandler.ts +++ b/feature/smartdock/src/main/ets/default/common/SmartDockDragHandler.ts @@ -23,6 +23,7 @@ import { CheckEmptyUtils } from '@ohos/common'; import { SmartDockStyleConfig } from '../config/SmartDockStyleConfig'; import SmartDockModel from '../model/SmartDockModel'; import SmartDockConstants from '../common/constants/SmartDockConstants'; +import { LauncherDragItemInfo } from '@ohos/common/src/main/ets/default/bean/LauncherDragItemInfo'; const TAG = 'SmartDockDragHandler'; @@ -147,8 +148,8 @@ export default class SmartDockDragHandler extends BaseDragHandler { } protected onDragDrop(x: number, y: number): boolean { - const dragItemInfo: any = AppStorage.Get('dragItemInfo'); - if (JSON.stringify(dragItemInfo) == '{}') { + const dragItemInfo: LauncherDragItemInfo = AppStorage.Get('dragItemInfo'); + if (!dragItemInfo.isDragging) { return false; } const dragItemType: number = AppStorage.Get('dragItemType'); @@ -167,7 +168,7 @@ export default class SmartDockDragHandler extends BaseDragHandler { return false; } - addItemToSmartDock(dragItemInfo: any, insertIndex: number): boolean { + addItemToSmartDock(dragItemInfo: LauncherDragItemInfo, insertIndex: number): boolean { let addToDockRes = this.mSmartDockModel.addToSmartdock(dragItemInfo, insertIndex); if (addToDockRes) { localEventManager.sendLocalEventSticky(EventConstants.EVENT_REQUEST_PAGEDESK_ITEM_DELETE, { diff --git a/feature/smartdock/src/main/ets/default/layout/RecentLayout.ets b/feature/smartdock/src/main/ets/default/layout/RecentLayout.ets index f37f4aaa..d0d3804b 100644 --- a/feature/smartdock/src/main/ets/default/layout/RecentLayout.ets +++ b/feature/smartdock/src/main/ets/default/layout/RecentLayout.ets @@ -13,14 +13,17 @@ * limitations under the License. */ -import { AppMenu } from '@ohos/common'; -import { AppIcon } from '@ohos/common'; -import { DockItemInfo } from '@ohos/common'; -import { ScrollerComponent } from '@ohos/common'; -import { CommonConstants } from '@ohos/common'; -import { StyleConstants } from '@ohos/common'; -import { ResourceManager } from '@ohos/common'; -import { Log } from '@ohos/common'; +import { + AppMenu, + LauncherDragItemInfo, + AppIcon, + DockItemInfo, + ScrollerComponent, + CommonConstants, + StyleConstants, + ResourceManager, + Log +} from '@ohos/common'; import { SmartDockStyleConfig } from '../config/SmartDockStyleConfig'; let mSmartDockStyleConfig: SmartDockStyleConfig = null; @@ -270,7 +273,8 @@ struct AppItem { if (event.type == CommonConstants.TOUCH_TYPE_UP) { AppStorage.SetOrCreate('isLongPress', false); } - if (AppStorage.Get('isDrag')) { + const dragItemInfo: LauncherDragItemInfo = AppStorage.Get('dragItemInfo'); + if (dragItemInfo.isDragging) { this.isShow = false; } }) diff --git a/feature/smartdock/src/main/ets/default/layout/ResidentLayout.ets b/feature/smartdock/src/main/ets/default/layout/ResidentLayout.ets index 07f9361a..24cfa0c6 100644 --- a/feature/smartdock/src/main/ets/default/layout/ResidentLayout.ets +++ b/feature/smartdock/src/main/ets/default/layout/ResidentLayout.ets @@ -14,13 +14,16 @@ * limitations under the License. */ -import { AppMenu } from '@ohos/common'; -import { AppIcon } from '@ohos/common'; -import { DockItemInfo } from '@ohos/common'; -import { CommonConstants } from '@ohos/common'; -import { StyleConstants } from '@ohos/common'; -import { ResourceManager } from '@ohos/common'; -import { Log } from '@ohos/common'; +import { + AppMenu, + AppIcon, + DockItemInfo, + LauncherDragItemInfo, + CommonConstants, + StyleConstants, + ResourceManager, + Log +} from '@ohos/common'; import { SmartDockStyleConfig } from '../config/SmartDockStyleConfig'; let mSmartDockStyleConfig: SmartDockStyleConfig = null; @@ -110,13 +113,12 @@ export default struct ResidentLayout { Log.showInfo(TAG, `onDrop event: [${event.getX()}, ${event.getY()}]`); const dragResult = globalThis.SmartDockDragHandler.onDragDrop(event.getX(), event.getY()); AppStorage.SetOrCreate('selectAppIndex', null); - AppStorage.SetOrCreate('isDrag', false); if (!dragResult) { - AppStorage.SetOrCreate('dragItemInfo', {}); + AppStorage.SetOrCreate('dragItemInfo', new LauncherDragItemInfo()); } else { // Wait for the UI rendering to end. setTimeout(() => { - AppStorage.SetOrCreate('dragItemInfo', {}); + AppStorage.SetOrCreate('dragItemInfo', new LauncherDragItemInfo()); }, 50); } }) @@ -126,7 +128,7 @@ export default struct ResidentLayout { @Component struct AppItem { - @StorageLink('dragItemInfo') smartDragItemInfo: any = {}; + @StorageLink('dragItemInfo') smartDragItemInfo: LauncherDragItemInfo = new LauncherDragItemInfo(); @StorageLink('dragItemType') dragItemType: number = CommonConstants.DRAG_FROM_DOCK; @State isShow: boolean = false; onItemClick: Function = null; @@ -134,20 +136,6 @@ struct AppItem { buildMenu: Function = null; private menuInfo; - @Builder dragLayerBuilder() { - Column() { - AppIcon({ - iconSize: mSmartDockStyleConfig.mIconSize * 1.05, - iconId: this.appInfo.appIconId, - bundleName: this.appInfo.bundleName, - moduleName: this.appInfo.moduleName, - icon: ResourceManager.getInstance().getCachedAppIcon(this.appInfo.appIconId, - this.appInfo.bundleName, this.appInfo.moduleName), - badgeNumber: CommonConstants.BADGE_DISPLAY_HIDE - }) - } - } - aboutToAppear(): void { this.menuInfo = this.buildMenu(this.appInfo); } @@ -212,19 +200,18 @@ struct AppItem { }) .onTouch((event: TouchEvent) => { Log.showInfo(TAG, `onTouch event type: ${event.type}`); - if (event.type === CommonConstants.TOUCH_TYPE_UP && AppStorage.Get('isDrag')) { + if (event.type === CommonConstants.TOUCH_TYPE_UP && this.smartDragItemInfo.isDragging) { let mIsDragEffectArea = globalThis.SmartDockDragHandler.isDragEffectArea(event.touches[0].screenX, event.touches[0].screenY); if (!mIsDragEffectArea) { - AppStorage.SetOrCreate('dragItemInfo', {}); + AppStorage.SetOrCreate('dragItemInfo', new LauncherDragItemInfo()); AppStorage.SetOrCreate('selectAppIndex', null); - AppStorage.SetOrCreate('isDrag', false); } AppStorage.SetOrCreate('isLongPress', false); } - if (AppStorage.Get('isDrag')) { + if (this.smartDragItemInfo.isDragging) { this.isShow = false; } - if (event.type === CommonConstants.TOUCH_TYPE_UP && !AppStorage.Get('isDrag') && !this.isShow) { + if (event.type === CommonConstants.TOUCH_TYPE_UP && !this.smartDragItemInfo.isDragging && !this.isShow) { this.onItemClick(event, this.appInfo); } }) @@ -238,13 +225,11 @@ struct AppItem { }) .onDragStart((event: DragEvent, extraParams: string) => { Log.showInfo(TAG, `DragStart`); - AppStorage.SetOrCreate('isDrag', true); this.dragItemType = CommonConstants.DRAG_FROM_DOCK; - this.smartDragItemInfo = this.appInfo; + this.smartDragItemInfo = Object.assign(new LauncherDragItemInfo(true), this.appInfo); Log.showInfo(TAG, `smartDragItemInfo: ${JSON.stringify(this.smartDragItemInfo)}`); const selectAppIndex = globalThis.SmartDockDragHandler.getDragItemIndexByCoordinates(event.getX(), event.getY()); AppStorage.SetOrCreate('selectAppIndex', selectAppIndex); - return this.dragLayerBuilder(); }) } } \ No newline at end of file diff --git a/feature/smartdock/src/main/ets/default/layout/SmartDock.ets b/feature/smartdock/src/main/ets/default/layout/SmartDock.ets index 6ddd744a..62e11603 100644 --- a/feature/smartdock/src/main/ets/default/layout/SmartDock.ets +++ b/feature/smartdock/src/main/ets/default/layout/SmartDock.ets @@ -17,7 +17,8 @@ import { Log, CommonConstants, ResourceManager, - UninstallDialog } from '@ohos/common'; + UninstallDialog, RecentBundleMissionInfo +} from '@ohos/common'; import RecentLayout from './RecentLayout'; import ResidentLayout from './ResidentLayout'; import SmartDockViewModel from '../viewmodel/SmartDockViewModel'; @@ -34,8 +35,8 @@ export struct SmartDock { } = { show: false, showItem: '', popup: null }; showAppCenter: Function = () => {}; @StorageLink('showDock') showDock: boolean = false; - @StorageLink('recentList') recentList: any = []; - @StorageLink('missionInfoList') missionInfoList: any = []; + @StorageLink('recentList') recentList: Array = []; + @StorageLink('missionInfoList') missionInfoList: Array = []; private deviceType: string = CommonConstants.DEFAULT_DEVICE_TYPE; private mSmartDockViewModel: SmartDockViewModel; private mSelectedItem = null; diff --git a/feature/smartdock/src/main/module.json5 b/feature/smartdock/src/main/module.json5 index 098bb115..9d5fdc4f 100644 --- a/feature/smartdock/src/main/module.json5 +++ b/feature/smartdock/src/main/module.json5 @@ -5,7 +5,6 @@ "deviceTypes": [ "default", "tablet" - ], - "uiSyntax": "ets" + ] } } diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 4f16a69e..00000000 --- a/package-lock.json +++ /dev/null @@ -1,1232 +0,0 @@ -{ - "name": "launcher", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/hos-sdkmanager-common": { - "version": "1.0.4", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hos-sdkmanager-common/-/@ohos/hos-sdkmanager-common-1.0.4.tgz", - "integrity": "sha512-LWrfF8Js+u54BcEAdyjzsA81iGBA4LPvQdQ1ig/pX6mvTieUPSvtjtAzdI8nnGVmJRLrHwAMHEO/syd9d8UAFw==", - "requires": { - "@ohos/sdkmanager-common": "^1.1.8" - } - }, - "@ohos/hvigor": { - "version": "1.1.6", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor/-/@ohos/hvigor-1.1.6.tgz", - "integrity": "sha512-/n7cSH3Tc1p5CEgELeJof2MLBYbu96Enmkga8PA1BFoBZnPF+SirHwJyynhtUtOJQOyFkBFQOXmwzq5o2Pdvug==", - "requires": { - "@ohos/hvigor-base": "1.1.6", - "fs-extra": "10.0.0", - "interpret": "1.4.0", - "liftoff": "4.0.0", - "mute-stdout": "1.0.0", - "pretty-hrtime": "1.0.0", - "v8flags": "3.2.0", - "yargs": "7.1.2" - } - }, - "@ohos/hvigor-base": { - "version": "1.1.6", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-base/-/@ohos/hvigor-base-1.1.6.tgz", - "integrity": "sha512-VU1jdgb+86RZ6fsea1kKP3Dx77DAQmSwGQoFEpjRVPP6aLXpRfM8aLS8DNlpMVEw1dFVQhOOsZ22thcbxinSOA==", - "requires": { - "json5": "2.2.0", - "log4js": "6.4.1", - "once": "1.4.0", - "pretty-hrtime": "1.0.0" - } - }, - "@ohos/hvigor-ohos-plugin": { - "version": "1.1.6", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-ohos-plugin/-/@ohos/hvigor-ohos-plugin-1.1.6.tgz", - "integrity": "sha512-Bnm1932VypATJf/Cp+sTzsX/oHFojAW7dAbEgfQpwQsyXmQbwXEf0zGnbrjVD0WKtxVVpO+znhpZvrDhOiUXlg==", - "requires": { - "@ohos/hos-sdkmanager-common": "1.0.4", - "@ohos/hvigor-base": "1.1.6", - "@ohos/sdkmanager-common": "1.1.8", - "adm-zip": "0.5.9", - "ajv": "8.10.0", - "execa": "5.1.1", - "fast-xml-parser": "4.0.3", - "fs-extra": "10.0.0", - "glob": "7.2.0", - "iconv-lite": "0.6.3", - "json5": "2.2.0", - "lodash": "4.17.21", - "pretty-hrtime": "1.0.3", - "resolve-package-path": "4.0.3" - }, - "dependencies": { - "pretty-hrtime": { - "version": "1.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", - "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==" - } - } - }, - "@ohos/hypium": { - "version": "1.0.1", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hypium/-/@ohos/hypium-1.0.1.tgz", - "integrity": "sha512-HaztFbgwYZCdVlayXirBlmJaNTXUO65qRgYnUmrhWGEzG7wFU2fyFbeXgQeYMVWFXgeezFOoHAPoS96TEE7TIQ==" - }, - "@ohos/sdkmanager-common": { - "version": "1.1.8", - "resolved": "https://repo.harmonyos.com/npm/@ohos/sdkmanager-common/-/@ohos/sdkmanager-common-1.1.8.tgz", - "integrity": "sha512-mxq69+6Zg/ybeQGnOtkBzOTbNBkEdiYehRKWsAD/je53v1W+ahauLqe90pNZEiBuVYugzb6z2EaJtAXYZtE8gQ==" - }, - "adm-zip": { - "version": "0.5.9", - "resolved": "https://repo.huaweicloud.com/repository/npm/adm-zip/-/adm-zip-0.5.9.tgz", - "integrity": "sha512-s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg==" - }, - "ajv": { - "version": "8.10.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/ajv/-/ajv-8.10.0.tgz", - "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==", - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==" - }, - "array-each": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/array-each/-/array-each-1.0.1.tgz", - "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==" - }, - "array-slice": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/array-slice/-/array-slice-1.1.0.tgz", - "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==" - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://repo.huaweicloud.com/repository/npm/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { - "fill-range": "^7.0.1" - } - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "camelcase": { - "version": "3.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==" - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" - } - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==" - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "dependencies": { - "which": { - "version": "2.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "date-format": { - "version": "4.0.14", - "resolved": "https://repo.huaweicloud.com/repository/npm/date-format/-/date-format-4.0.14.tgz", - "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==" - }, - "debug": { - "version": "4.3.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==" - }, - "define-properties": { - "version": "1.1.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", - "requires": { - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - } - }, - "detect-file": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==" - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "execa": { - "version": "5.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, - "fast-xml-parser": { - "version": "4.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/fast-xml-parser/-/fast-xml-parser-4.0.3.tgz", - "integrity": "sha512-xhQbg3a/EYNHwK0cxIG1nZmVkHX/0tWihamn5pU4Mhd9KEVE2ga8ZJiqEUgB2sApElvAATOdMTLjgqIpvYDUkQ==", - "requires": { - "strnum": "^1.0.5" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "find-up": { - "version": "1.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==", - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "findup-sync": { - "version": "5.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/findup-sync/-/findup-sync-5.0.0.tgz", - "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.3", - "micromatch": "^4.0.4", - "resolve-dir": "^1.0.1" - } - }, - "fined": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/fined/-/fined-2.0.0.tgz", - "integrity": "sha512-OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A==", - "requires": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^5.0.0", - "object.defaults": "^1.1.0", - "object.pick": "^1.3.0", - "parse-filepath": "^1.0.2" - } - }, - "flagged-respawn": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/flagged-respawn/-/flagged-respawn-2.0.0.tgz", - "integrity": "sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==" - }, - "flatted": { - "version": "3.2.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==" - }, - "for-own": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==", - "requires": { - "for-in": "^1.0.1" - } - }, - "fs-extra": { - "version": "10.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "dependencies": { - "jsonfile": { - "version": "6.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" - } - }, - "universalify": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" - } - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" - }, - "get-intrinsic": { - "version": "1.1.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" - } - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" - }, - "glob": { - "version": "7.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://repo.huaweicloud.com/repository/npm/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" - }, - "has": { - "version": "1.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "requires": { - "get-intrinsic": "^1.1.1" - } - }, - "has-symbols": { - "version": "1.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" - }, - "homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "requires": { - "parse-passwd": "^1.0.0" - } - }, - "hosted-git-info": { - "version": "2.8.9", - "resolved": "https://repo.huaweicloud.com/repository/npm/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" - }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" - }, - "hypium": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/hypium/-/hypium-1.0.0.tgz", - "integrity": "sha512-nl+RQVv2AU/5FvFRhsXyWO5wh+2huhdqRZ3bszBWZzW+kpNI3AT4ydvVRYIfaQbYwV4UlX/rSc7BtFjLAezhow==" - }, - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://repo.huaweicloud.com/repository/npm/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "ini": { - "version": "1.3.8", - "resolved": "https://repo.huaweicloud.com/repository/npm/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" - }, - "interpret": { - "version": "1.4.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==" - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==" - }, - "is-absolute": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "requires": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - } - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" - }, - "is-core-module": { - "version": "2.11.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", - "requires": { - "has": "^1.0.3" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" - }, - "is-plain-object": { - "version": "5.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==" - }, - "is-relative": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "requires": { - "is-unc-path": "^1.0.0" - } - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" - }, - "is-unc-path": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "requires": { - "unc-path-regex": "^0.1.2" - } - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==" - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==" - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" - }, - "json5": { - "version": "2.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "requires": { - "minimist": "^1.2.5" - } - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "kind-of": { - "version": "6.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==", - "requires": { - "invert-kv": "^1.0.0" - } - }, - "liftoff": { - "version": "4.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/liftoff/-/liftoff-4.0.0.tgz", - "integrity": "sha512-rMGwYF8q7g2XhG2ulBmmJgWv25qBsqRbDn5gH0+wnuyeFt7QBJlHJmtg5qEdn4pN6WVAUMgXnIxytMFRX9c1aA==", - "requires": { - "extend": "^3.0.2", - "findup-sync": "^5.0.0", - "fined": "^2.0.0", - "flagged-respawn": "^2.0.0", - "is-plain-object": "^5.0.0", - "object.map": "^1.0.1", - "rechoir": "^0.8.0", - "resolve": "^1.20.0" - } - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==", - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://repo.huaweicloud.com/repository/npm/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "log4js": { - "version": "6.4.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/log4js/-/log4js-6.4.1.tgz", - "integrity": "sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==", - "requires": { - "date-format": "^4.0.3", - "debug": "^4.3.3", - "flatted": "^3.2.4", - "rfdc": "^1.3.0", - "streamroller": "^3.0.2" - } - }, - "make-iterator": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/make-iterator/-/make-iterator-1.0.1.tgz", - "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", - "requires": { - "kind-of": "^6.0.2" - } - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==" - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" - }, - "micromatch": { - "version": "4.0.5", - "resolved": "https://repo.huaweicloud.com/repository/npm/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "requires": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==" - }, - "ms": { - "version": "2.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "mute-stdout": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/mute-stdout/-/mute-stdout-1.0.0.tgz", - "integrity": "sha512-MaSQenn0f9oxIjtCufclpV00MuYTiHaXPbdcfPIM+quMqoa8cXywjHHx4LhhIAZlXqPWMdcUpYviajfmHtHRJw==" - }, - "normalize-package-data": { - "version": "2.5.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "requires": { - "path-key": "^3.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==" - }, - "object-keys": { - "version": "1.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" - }, - "object.assign": { - "version": "4.1.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "has-symbols": "^1.0.3", - "object-keys": "^1.1.1" - } - }, - "object.defaults": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/object.defaults/-/object.defaults-1.1.0.tgz", - "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==", - "requires": { - "array-each": "^1.0.1", - "array-slice": "^1.0.0", - "for-own": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "object.map": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/object.map/-/object.map-1.0.1.tgz", - "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==", - "requires": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", - "requires": { - "isobject": "^3.0.1" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==", - "requires": { - "lcid": "^1.0.0" - } - }, - "parse-filepath": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", - "requires": { - "is-absolute": "^1.0.0", - "map-cache": "^0.2.0", - "path-root": "^0.1.1" - } - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==", - "requires": { - "error-ex": "^1.2.0" - } - }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==" - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==", - "requires": { - "pinkie-promise": "^2.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" - }, - "path-root": { - "version": "0.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", - "requires": { - "path-root-regex": "^0.1.0" - } - }, - "path-root-regex": { - "version": "0.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==" - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==", - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" - }, - "pify": { - "version": "2.3.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==" - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==" - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", - "requires": { - "pinkie": "^2.0.0" - } - }, - "pretty-hrtime": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/pretty-hrtime/-/pretty-hrtime-1.0.0.tgz", - "integrity": "sha512-CU2l5CYUAptUYq/671ajexQfXuxJFwwg0n243Kdkx8bTjeenedsWgu8TGHPm03vLfNtk3aTXgySKPp3Usykudw==" - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==", - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==", - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - } - }, - "rechoir": { - "version": "0.8.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/rechoir/-/rechoir-0.8.0.tgz", - "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", - "requires": { - "resolve": "^1.20.0" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==" - }, - "resolve": { - "version": "1.22.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", - "requires": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - } - }, - "resolve-package-path": { - "version": "4.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/resolve-package-path/-/resolve-package-path-4.0.3.tgz", - "integrity": "sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==", - "requires": { - "path-root": "^0.1.1" - } - }, - "rfdc": { - "version": "1.3.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/rfdc/-/rfdc-1.3.0.tgz", - "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "semver": { - "version": "5.7.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" - }, - "spdx-correct": { - "version": "3.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" - }, - "spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.12", - "resolved": "https://repo.huaweicloud.com/repository/npm/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz", - "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==" - }, - "streamroller": { - "version": "3.1.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/streamroller/-/streamroller-3.1.3.tgz", - "integrity": "sha512-CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w==", - "requires": { - "date-format": "^4.0.14", - "debug": "^4.3.4", - "fs-extra": "^8.1.0" - }, - "dependencies": { - "fs-extra": { - "version": "8.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - } - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==", - "requires": { - "is-utf8": "^0.2.0" - } - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" - }, - "strnum": { - "version": "1.0.5", - "resolved": "https://repo.huaweicloud.com/repository/npm/strnum/-/strnum-1.0.5.tgz", - "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { - "is-number": "^7.0.0" - } - }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==" - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" - }, - "uri-js": { - "version": "4.4.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "requires": { - "punycode": "^2.1.0" - } - }, - "v8flags": { - "version": "3.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/v8flags/-/v8flags-3.2.0.tgz", - "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==", - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "which": { - "version": "1.3.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==" - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, - "y18n": { - "version": "3.2.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/y18n/-/y18n-3.2.2.tgz", - "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==" - }, - "yargs": { - "version": "7.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/yargs/-/yargs-7.1.2.tgz", - "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==", - "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.1" - } - }, - "yargs-parser": { - "version": "5.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/yargs-parser/-/yargs-parser-5.0.1.tgz", - "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==", - "requires": { - "camelcase": "^3.0.0", - "object.assign": "^4.1.0" - } - } - } -} diff --git a/package.json b/package.json index 5ebbdc64..371ef984 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "version": "1.0.0", "dependencies": { "@ohos/hvigor-ohos-plugin": "1.3.1", - "hypium": "^1.0.0", "@ohos/hvigor": "1.3.1", "@ohos/hypium": "1.0.3" } diff --git a/product/pad/package-lock.json b/product/pad/package-lock.json deleted file mode 100644 index fa1b2569..00000000 --- a/product/pad/package-lock.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "name": "launcher", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/appcenter": { - "version": "file:../../feature/appcenter", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/bigfolder": { - "version": "file:../../feature/bigfolder", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/common": { - "version": "file:../../common" - }, - "@ohos/form": { - "version": "file:../../feature/form", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/gesturenavigation": { - "version": "file:../../feature/gesturenavigation", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/numbadge": { - "version": "file:../../feature/numbadge", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/pagedesktop": { - "version": "file:../../feature/pagedesktop", - "requires": { - "@ohos/bigfolder": "file:../../feature/bigfolder", - "@ohos/common": "file:../../common", - "@ohos/form": "file:../../feature/form" - }, - "dependencies": { - "@ohos/bigfolder": { - "version": "file:../../feature/bigfolder", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/common": { - "version": "file:../../common" - }, - "@ohos/form": { - "version": "file:../../feature/form", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - } - } - }, - "@ohos/recents": { - "version": "file:../../feature/recents", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/smartdock": { - "version": "file:../../feature/smartdock", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - } - } -} diff --git a/product/pad/src/main/module.json5 b/product/pad/src/main/module.json5 index 1d8b1a17..4cbc027d 100644 --- a/product/pad/src/main/module.json5 +++ b/product/pad/src/main/module.json5 @@ -2,7 +2,7 @@ "module": { "name": "pad-launcher", "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", + "srcEntry": "./ets/Application/AbilityStage.ts", "description": "$string:mainability_description", "mainElement": "com.ohos.launcher.MainAbility", "deviceTypes": [ @@ -18,7 +18,6 @@ "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", - "uiSyntax": "ets", "extensionAbilities": [ { "priority": 2, @@ -35,12 +34,12 @@ ] } ], - "visible": false, + "exported": false, "name": "com.ohos.launcher.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:entry_MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "srcEntry": "./ets/MainAbility/MainAbility.ts", "type": "service" } ], diff --git a/product/phone/package-lock.json b/product/phone/package-lock.json deleted file mode 100644 index 48b59df6..00000000 --- a/product/phone/package-lock.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "name": "launcher", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/bigfolder": { - "version": "file:../../feature/bigfolder", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/common": { - "version": "file:../../common" - }, - "@ohos/form": { - "version": "file:../../feature/form", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/gesturenavigation": { - "version": "file:../../feature/gesturenavigation", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/numbadge": { - "version": "file:../../feature/numbadge", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/pagedesktop": { - "version": "file:../../feature/pagedesktop", - "requires": { - "@ohos/bigfolder": "file:../../feature/bigfolder", - "@ohos/common": "file:../../common", - "@ohos/form": "file:../../feature/form" - }, - "dependencies": { - "@ohos/bigfolder": { - "version": "file:../../feature/bigfolder", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/common": { - "version": "file:../../common" - }, - "@ohos/form": { - "version": "file:../../feature/form", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - } - } - }, - "@ohos/recents": { - "version": "file:../../feature/recents", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/smartdock": { - "version": "file:../../feature/smartdock", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - } - } -} diff --git a/product/phone/src/main/module.json5 b/product/phone/src/main/module.json5 index 98939875..7175144f 100644 --- a/product/phone/src/main/module.json5 +++ b/product/phone/src/main/module.json5 @@ -2,7 +2,7 @@ "module": { "name": "phone-launcher", "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", + "srcEntry": "./ets/Application/AbilityStage.ts", "description": "$string:mainability_description", "mainElement": "com.ohos.launcher.MainAbility", "deviceTypes": [ @@ -18,7 +18,6 @@ "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", - "uiSyntax": "ets", "extensionAbilities": [ { "priority": 2, @@ -35,12 +34,12 @@ ] } ], - "visible": false, + "exported": false, "name": "com.ohos.launcher.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:entry_MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "srcEntry": "./ets/MainAbility/MainAbility.ts", "type": "service" } ], diff --git a/signature/OpenHarmony.p12 b/signature/OpenHarmony.p12 new file mode 100644 index 00000000..60f9bb48 Binary files /dev/null and b/signature/OpenHarmony.p12 differ diff --git a/signature/OpenHarmonyApplication.cer b/signature/OpenHarmonyApplication.cer new file mode 100644 index 00000000..825abdc7 --- /dev/null +++ b/signature/OpenHarmonyApplication.cer @@ -0,0 +1,44 @@ +-----BEGIN CERTIFICATE----- +MIICRDCCAcmgAwIBAgIED+E4izAMBggqhkjOPQQDAwUAMGgxCzAJBgNVBAYTAkNO +MRQwEgYDVQQKEwtPcGVuSGFybW9ueTEZMBcGA1UECxMQT3Blbkhhcm1vbnkgVGVh +bTEoMCYGA1UEAxMfT3Blbkhhcm1vbnkgQXBwbGljYXRpb24gUm9vdCBDQTAeFw0y +MTAyMDIxMjE0MThaFw00OTEyMzExMjE0MThaMGgxCzAJBgNVBAYTAkNOMRQwEgYD +VQQKEwtPcGVuSGFybW9ueTEZMBcGA1UECxMQT3Blbkhhcm1vbnkgVGVhbTEoMCYG +A1UEAxMfT3Blbkhhcm1vbnkgQXBwbGljYXRpb24gUm9vdCBDQTB2MBAGByqGSM49 +AgEGBSuBBAAiA2IABE023XmRaw2DnO8NSsb+KG/uY0FtS3u5LQucdr3qWVnRW5ui +QIL6ttNZBEeLTUeYcJZCpayg9Llf+1SmDA7dY4iP2EcRo4UN3rilovtfFfsmH4ty +3SApHVFzWUl+NwdH8KNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC +AQYwHQYDVR0OBBYEFBc6EKGrGXzlAE+s0Zgnsphadw7NMAwGCCqGSM49BAMDBQAD +ZwAwZAIwd1p3JzHN93eoPped1li0j64npgqNzwy4OrkehYAqNXpcpaEcLZ7UxW8E +I2lZJ3SbAjAkqySHb12sIwdSFKSN9KCMMEo/eUT5dUXlcKR2nZz0MJdxT5F51qcX +1CumzkcYhgU= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICYTCCAeWgAwIBAgIEHmXAPTAMBggqhkjOPQQDAwUAMGgxCzAJBgNVBAYTAkNO +MRQwEgYDVQQKEwtPcGVuSGFybW9ueTEZMBcGA1UECxMQT3Blbkhhcm1vbnkgVGVh +bTEoMCYGA1UEAxMfT3Blbkhhcm1vbnkgQXBwbGljYXRpb24gUm9vdCBDQTAeFw0y +MTAyMDIxMjE1MzJaFw00OTEyMzExMjE1MzJaMGMxCzAJBgNVBAYTAkNOMRQwEgYD +VQQKEwtPcGVuSGFybW9ueTEZMBcGA1UECxMQT3Blbkhhcm1vbnkgVGVhbTEjMCEG +A1UEAxMaT3Blbkhhcm1vbnkgQXBwbGljYXRpb24gQ0EwdjAQBgcqhkjOPQIBBgUr +gQQAIgNiAAQhnu7Hna8XNa2KyqRf5+lBJScE4xqf89N0g0OuqAb2re8nGsvWkw26 +uDekfnBYicd+G3Cydqa2zFIwV7Talyg2ULW3r8KbGpyl84mJEPPRmCGJ+H9gtCsf ++OrJ4Y76LVWjYzBhMB8GA1UdIwQYMBaAFBc6EKGrGXzlAE+s0Zgnsphadw7NMA8G +A1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTbhrciFtUL +oUu33SV7ufEFfaItRzAMBggqhkjOPQQDAwUAA2gAMGUCMG3cXjiDmXTvf7D4Omhf +qcc2nuO+EMfWE+N9ZhBP5UhV34mAGWi3SfLU6rcV0urWEQIxAMYIb3epOnKhUrcm +Lfu1WKzFlpYQwmw73RaCHP2I3k6NcuWOYeNwWXSNZ8o0nzvaLg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICMzCCAbegAwIBAgIEaOC/zDAMBggqhkjOPQQDAwUAMGMxCzAJBgNVBAYTAkNO +MRQwEgYDVQQKEwtPcGVuSGFybW9ueTEZMBcGA1UECxMQT3Blbkhhcm1vbnkgVGVh +bTEjMCEGA1UEAxMaT3Blbkhhcm1vbnkgQXBwbGljYXRpb24gQ0EwHhcNMjEwMjAy +MTIxOTMxWhcNNDkxMjMxMTIxOTMxWjBoMQswCQYDVQQGEwJDTjEUMBIGA1UEChML +T3Blbkhhcm1vbnkxGTAXBgNVBAsTEE9wZW5IYXJtb255IFRlYW0xKDAmBgNVBAMT +H09wZW5IYXJtb255IEFwcGxpY2F0aW9uIFJlbGVhc2UwWTATBgcqhkjOPQIBBggq +hkjOPQMBBwNCAATbYOCQQpW5fdkYHN45v0X3AHax12jPBdEDosFRIZ1eXmxOYzSG +JwMfsHhUU90E8lI0TXYZnNmgM1sovubeQqATo1IwUDAfBgNVHSMEGDAWgBTbhrci +FtULoUu33SV7ufEFfaItRzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFPtxruhl +cRBQsJdwcZqLu9oNUVgaMAwGCCqGSM49BAMDBQADaAAwZQIxAJta0PQ2p4DIu/ps +LMdLCDgQ5UH1l0B4PGhBlMgdi2zf8nk9spazEQI/0XNwpft8QAIwHSuA2WelVi/o +zAlF08DnbJrOOtOnQq5wHOPlDYB4OtUzOYJk9scotrEnJxJzGsh/ +-----END CERTIFICATE----- diff --git a/signature/material/ac/abc675a5c73b4251bd7a060b00b60c6e b/signature/material/ac/abc675a5c73b4251bd7a060b00b60c6e new file mode 100644 index 00000000..5053702a --- /dev/null +++ b/signature/material/ac/abc675a5c73b4251bd7a060b00b60c6e @@ -0,0 +1 @@ +[x4s%b5- \ No newline at end of file diff --git a/signature/material/ce/d81bd819e753487cac2130bfb57db2c5 b/signature/material/ce/d81bd819e753487cac2130bfb57db2c5 new file mode 100644 index 00000000..109bd4dc Binary files /dev/null and b/signature/material/ce/d81bd819e753487cac2130bfb57db2c5 differ diff --git a/signature/material/fd/0/11f35390d7f9453582c0ff2f4e37fe17 b/signature/material/fd/0/11f35390d7f9453582c0ff2f4e37fe17 new file mode 100644 index 00000000..b368202b --- /dev/null +++ b/signature/material/fd/0/11f35390d7f9453582c0ff2f4e37fe17 @@ -0,0 +1 @@ +/,DM-K) \ No newline at end of file diff --git a/signature/material/fd/1/396736be19dd49059fa92524fab8f177 b/signature/material/fd/1/396736be19dd49059fa92524fab8f177 new file mode 100644 index 00000000..b24f7d9e --- /dev/null +++ b/signature/material/fd/1/396736be19dd49059fa92524fab8f177 @@ -0,0 +1 @@ +  > \ No newline at end of file diff --git a/signature/material/fd/2/b5261d8c87c14ebb88e7899c2826b34a b/signature/material/fd/2/b5261d8c87c14ebb88e7899c2826b34a new file mode 100644 index 00000000..cf879acf --- /dev/null +++ b/signature/material/fd/2/b5261d8c87c14ebb88e7899c2826b34a @@ -0,0 +1 @@ + !wI4 \ No newline at end of file