From 54ad6a06afd89bdee3f25df6742fb43b244aac17 Mon Sep 17 00:00:00 2001 From: wangzhiyusss Date: Mon, 7 Nov 2022 21:15:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=80=E5=A4=9A=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangzhiyusss --- .hvigor/outputs/logs/details/details.json | 12 + build-profile.json5 | 39 +- common/component/build-profile.json5 | 20 - common/component/hvigorfile.js | 3 - common/component/index.ets | 21 - common/component/package.json | 17 - common/resources/package.json | 24 +- common/resources/src/main/module.json5 | 2 +- common/utils/package.json | 26 +- common/utils/src/main/module.json5 | 2 +- {product/phone => features}/.gitignore | 3 +- features/build-profile.json5 | 16 + {product/tablet => features}/hvigorfile.js | 2 +- .../component => features}/package-lock.json | 8 +- features/package.json | 17 + .../src/main/ets/components/CusDialogComp.ets | 0 .../main/ets/components/FolderListComp.ets | 26 +- .../src/main/ets/components/NoteContent.ets | 0 .../main/ets/components/NoteContentComp.ets | 0 .../components/NoteContentCompPortrait.ets | 0 .../src/main/ets/components/NoteListComp.ets | 98 ++- .../src/main/module.json5 | 2 +- package-lock.json | 785 ++++-------------- package.json | 7 +- .../component => product/default}/.gitignore | 0 .../{phone => default}/build-profile.json5 | 0 product/{phone => default}/hvigorfile.js | 0 product/{tablet => default}/package-lock.json | 2 +- product/default/package.json | 18 + .../src/main/ets/Application/AbilityStage.ts | 0 .../src/main/ets/MainAbility/MainAbility.ts | 27 +- .../src/main/ets/pages/MyNoteHome.ets | 5 +- .../src/main/ets/pages/NoteContentHome.ets | 27 +- .../src/main/ets/pages/NoteHome.ets | 145 ++-- .../src/main/ets/pages/NoteHomePortrait.ets | 0 .../{tablet => default}/src/main/module.json5 | 17 +- .../main/resources/base/element/color.json | 0 .../main/resources/base/element/string.json | 0 .../resources/base/profile/main_pages.json | 0 .../main/resources/zh_CN/element/string.json | 0 product/phone/package-lock.json | 45 - product/phone/package.json | 18 - .../src/main/ets/MainAbility/MainAbility.ts | 130 --- .../phone/src/main/ets/pages/MyNoteHome.ets | 116 --- .../src/main/ets/pages/NoteContentHome.ets | 56 -- product/phone/src/main/module.json5 | 71 -- .../main/resources/base/element/string.json | 20 - .../resources/base/profile/main_pages.json | 7 - .../main/resources/zh_CN/element/string.json | 16 - product/tablet/.gitignore | 3 - product/tablet/build-profile.json5 | 25 - product/tablet/package.json | 18 - .../src/main/ets/Application/AbilityStage.ts | 7 - .../src/main/ets/pages/NoteHomePortrait.ets | 81 -- .../main/resources/base/element/color.json | 8 - 55 files changed, 503 insertions(+), 1489 deletions(-) create mode 100644 .hvigor/outputs/logs/details/details.json delete mode 100644 common/component/build-profile.json5 delete mode 100644 common/component/hvigorfile.js delete mode 100644 common/component/index.ets delete mode 100644 common/component/package.json rename {product/phone => features}/.gitignore (66%) create mode 100644 features/build-profile.json5 rename {product/tablet => features}/hvigorfile.js (63%) rename {common/component => features}/package-lock.json (60%) create mode 100644 features/package.json rename {common/component => features}/src/main/ets/components/CusDialogComp.ets (100%) rename {common/component => features}/src/main/ets/components/FolderListComp.ets (96%) rename {common/component => features}/src/main/ets/components/NoteContent.ets (100%) rename {common/component => features}/src/main/ets/components/NoteContentComp.ets (100%) rename {common/component => features}/src/main/ets/components/NoteContentCompPortrait.ets (100%) rename {common/component => features}/src/main/ets/components/NoteListComp.ets (93%) rename {common/component => features}/src/main/module.json5 (97%) rename {common/component => product/default}/.gitignore (100%) rename product/{phone => default}/build-profile.json5 (100%) rename product/{phone => default}/hvigorfile.js (100%) rename product/{tablet => default}/package-lock.json (95%) create mode 100644 product/default/package.json rename product/{phone => default}/src/main/ets/Application/AbilityStage.ts (100%) rename product/{tablet => default}/src/main/ets/MainAbility/MainAbility.ts (87%) rename product/{tablet => default}/src/main/ets/pages/MyNoteHome.ets (97%) rename product/{tablet => default}/src/main/ets/pages/NoteContentHome.ets (70%) rename product/{tablet => default}/src/main/ets/pages/NoteHome.ets (47%) rename product/{phone => default}/src/main/ets/pages/NoteHomePortrait.ets (100%) rename product/{tablet => default}/src/main/module.json5 (71%) rename product/{phone => default}/src/main/resources/base/element/color.json (100%) rename product/{tablet => default}/src/main/resources/base/element/string.json (100%) rename product/{tablet => default}/src/main/resources/base/profile/main_pages.json (100%) rename product/{tablet => default}/src/main/resources/zh_CN/element/string.json (100%) delete mode 100644 product/phone/package-lock.json delete mode 100644 product/phone/package.json delete mode 100644 product/phone/src/main/ets/MainAbility/MainAbility.ts delete mode 100644 product/phone/src/main/ets/pages/MyNoteHome.ets delete mode 100644 product/phone/src/main/ets/pages/NoteContentHome.ets delete mode 100644 product/phone/src/main/module.json5 delete mode 100644 product/phone/src/main/resources/base/element/string.json delete mode 100644 product/phone/src/main/resources/base/profile/main_pages.json delete mode 100644 product/phone/src/main/resources/zh_CN/element/string.json delete mode 100644 product/tablet/.gitignore delete mode 100644 product/tablet/build-profile.json5 delete mode 100644 product/tablet/package.json delete mode 100644 product/tablet/src/main/ets/Application/AbilityStage.ts delete mode 100644 product/tablet/src/main/ets/pages/NoteHomePortrait.ets delete mode 100644 product/tablet/src/main/resources/base/element/color.json diff --git a/.hvigor/outputs/logs/details/details.json b/.hvigor/outputs/logs/details/details.json new file mode 100644 index 0000000..a369858 --- /dev/null +++ b/.hvigor/outputs/logs/details/details.json @@ -0,0 +1,12 @@ +{ + "totalTime": 9898082500, + "moduleNum": 4, + "taskTime": { + "sdkDirInit": 4385500, + "compileETS": 8612949500, + "compileJS": 404700, + "compileResource": 148983100, + "packageHap": 258042800, + "signHap": 1543400 + } +} \ No newline at end of file diff --git a/build-profile.json5 b/build-profile.json5 index df83ecd..5c4f2c9 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -1,18 +1,3 @@ -/* - * Copyright (c) 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. - */ - { "app": { "compileSdkVersion": 9, @@ -25,20 +10,8 @@ }, "modules": [ { - "name": "phone", - "srcPath": "./product/phone", - "targets": [ - { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - }, - { - "name": "tablet", - "srcPath": "./product/tablet", + "name": "default", + "srcPath": "./product/default", "targets": [ { "name": "default", @@ -52,13 +25,13 @@ "name": "utils", "srcPath": "./common/utils" }, - { - "name": "component", - "srcPath": "./common/component" - }, { "name": "resources", "srcPath": "./common/resources" + }, + { + "name": "component", + "srcPath": "./features", } ] } \ No newline at end of file diff --git a/common/component/build-profile.json5 b/common/component/build-profile.json5 deleted file mode 100644 index c6e5a1e..0000000 --- a/common/component/build-profile.json5 +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 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. - */ - -{ - "apiType": "stageMode", - "buildOption": { - } -} diff --git a/common/component/hvigorfile.js b/common/component/hvigorfile.js deleted file mode 100644 index 42ed4b4..0000000 --- a/common/component/hvigorfile.js +++ /dev/null @@ -1,3 +0,0 @@ -// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').harTasks - diff --git a/common/component/index.ets b/common/component/index.ets deleted file mode 100644 index 1c1e0b7..0000000 --- a/common/component/index.ets +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 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. - */ - -export * from './src/main/ets/components/CusDialogComp'; -export * from './src/main/ets/components/FolderListComp'; -export * from './src/main/ets/components/NoteContent'; -export { ToolBarComp, NoteContentComp, NoteContentOverViewComp } from './src/main/ets/components/NoteContentComp'; -export { NoteContentCompPortrait } from './src/main/ets/components/NoteContentCompPortrait'; -export * from './src/main/ets/components/NoteListComp'; \ No newline at end of file diff --git a/common/component/package.json b/common/component/package.json deleted file mode 100644 index a378052..0000000 --- a/common/component/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "license":"ISC", - "types":"", - "devDependencies":{}, - "name":"@ohos/component", - "description":"a npm package which contains arkUI2.0 page", - "ohos":{ - "org":"" - }, - "main":"index.ets", - "repository":{}, - "version":"1.0.0", - "dependencies":{ - "@ohos/utils":"file:../utils", - "@ohos/source":"file:../resources" - } -} \ No newline at end of file diff --git a/common/resources/package.json b/common/resources/package.json index e91259f..58e3ac4 100644 --- a/common/resources/package.json +++ b/common/resources/package.json @@ -1,14 +1,14 @@ { - "license":"ISC", - "types":"", - "devDependencies":{}, - "name":"@ohos/resources", - "description":"a npm package which contains arkUI2.0 page", - "ohos":{ - "org":"" + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/resources", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" }, - "main":"index.ets", - "repository":{}, - "version":"1.0.0", - "dependencies":{} -} \ No newline at end of file + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/common/resources/src/main/module.json5 b/common/resources/src/main/module.json5 index ed81e03..ba85f70 100644 --- a/common/resources/src/main/module.json5 +++ b/common/resources/src/main/module.json5 @@ -18,7 +18,7 @@ "name": "resources", "type": "har", "deviceTypes": [ - "phone", + "default", "tablet" ], "uiSyntax": "ets" diff --git a/common/utils/package.json b/common/utils/package.json index acf594b..6581745 100644 --- a/common/utils/package.json +++ b/common/utils/package.json @@ -1,16 +1,16 @@ { - "license":"ISC", - "types":"", - "devDependencies":{}, - "name":"@ohos/utils", - "description":"a npm package which contains arkUI2.0 page", - "ohos":{ - "org":"" + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/utils", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" }, - "main":"index.ets", - "repository":{}, - "version":"1.0.0", - "dependencies":{ - "@ohos/source":"file:../resources" + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": { + "@ohos/source": "file:../resources" } -} \ No newline at end of file +} diff --git a/common/utils/src/main/module.json5 b/common/utils/src/main/module.json5 index 93ca104..1f9bfeb 100644 --- a/common/utils/src/main/module.json5 +++ b/common/utils/src/main/module.json5 @@ -18,7 +18,7 @@ "name": "utils", "type": "har", "deviceTypes": [ - "phone", + "default", "tablet" ], "uiSyntax": "ets" diff --git a/product/phone/.gitignore b/features/.gitignore similarity index 66% rename from product/phone/.gitignore rename to features/.gitignore index 4f9a973..5a6ba80 100644 --- a/product/phone/.gitignore +++ b/features/.gitignore @@ -1,3 +1,4 @@ /node_modules /.preview -/build \ No newline at end of file +/build +/.cxx \ No newline at end of file diff --git a/features/build-profile.json5 b/features/build-profile.json5 new file mode 100644 index 0000000..3d64d69 --- /dev/null +++ b/features/build-profile.json5 @@ -0,0 +1,16 @@ +{ + "apiType": 'stageMode', + "buildOption": { + }, + "entryModules": [ + "tablet" + ], + "targets": [ + { + "name": "default" + }, + { + "name": "ohosTest", + } + ] +} \ No newline at end of file diff --git a/product/tablet/hvigorfile.js b/features/hvigorfile.js similarity index 63% rename from product/tablet/hvigorfile.js rename to features/hvigorfile.js index d7720ee..ec14ea6 100644 --- a/product/tablet/hvigorfile.js +++ b/features/hvigorfile.js @@ -1,2 +1,2 @@ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks +module.exports = require('@ohos/hvigor-ohos-plugin').harTasks \ No newline at end of file diff --git a/common/component/package-lock.json b/features/package-lock.json similarity index 60% rename from common/component/package-lock.json rename to features/package-lock.json index db5fde3..bf24415 100644 --- a/common/component/package-lock.json +++ b/features/package-lock.json @@ -5,16 +5,16 @@ "requires": true, "dependencies": { "@ohos/source": { - "version": "file:../resources" + "version": "file:../common/resources" }, "@ohos/utils": { - "version": "file:../utils", + "version": "file:../common/utils", "requires": { - "@ohos/source": "file:../resources" + "@ohos/source": "file:../common/resources" }, "dependencies": { "@ohos/source": { - "version": "file:../resources" + "version": "file:../common/resources" } } } diff --git a/features/package.json b/features/package.json new file mode 100644 index 0000000..77cec25 --- /dev/null +++ b/features/package.json @@ -0,0 +1,17 @@ +{ + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/component", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" + }, + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": { + "@ohos/utils": "file:../common/utils", + "@ohos/source": "file:../common/resources" + } +} diff --git a/common/component/src/main/ets/components/CusDialogComp.ets b/features/src/main/ets/components/CusDialogComp.ets similarity index 100% rename from common/component/src/main/ets/components/CusDialogComp.ets rename to features/src/main/ets/components/CusDialogComp.ets diff --git a/common/component/src/main/ets/components/FolderListComp.ets b/features/src/main/ets/components/FolderListComp.ets similarity index 96% rename from common/component/src/main/ets/components/FolderListComp.ets rename to features/src/main/ets/components/FolderListComp.ets index d36b5df..574af88 100644 --- a/common/component/src/main/ets/components/FolderListComp.ets +++ b/features/src/main/ets/components/FolderListComp.ets @@ -15,7 +15,14 @@ import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData' import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData' -import { SysDefFolderUuid, TableName, FolderType, FolderTableColumn, NoteTableColumn, Delete, DeleteFileType +import { + SysDefFolderUuid, + TableName, + FolderType, + FolderTableColumn, + NoteTableColumn, + Delete, + DeleteFileType } from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' import { NewOrEditFolderDialog, DeleteDialog } from './CusDialogComp' import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants' @@ -27,9 +34,10 @@ import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' // Folder list component @Component export struct FolderListComp { - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') + @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') @Consume('SectionStatus') sectionStatus: number @Consume('ExpandStatus') expandStatus: boolean // 笔记本折叠展开状态 + @StorageLink('breakPoint') breakPoints: string = 'lg' controllerShow: WebController TAG = "FolderListComp" @@ -42,7 +50,7 @@ export struct FolderListComp { .width(24) .responseRegion({ x: -15.0, y: -15.0, width: 54, height: 54 }) .onClick(() => { - if (this.sectionStatus == 1) { + if (this.breakPoints == 'sm' || this.breakPoints == 'md') { this.expandStatus = !this.expandStatus } else { this.sectionStatus = (this.sectionStatus == 3 ? 2 : 3) @@ -92,18 +100,18 @@ export struct FolderListComp { .height("100%") } - aboutToAppear(): void{ + aboutToAppear(): void { LogUtil.info(this.TAG, "aboutToAppear") } - aboutToDisappear(): void{ + aboutToDisappear(): void { LogUtil.info(this.TAG, "aboutToDisappear") } } @Component export struct NoteAndCreateComp { - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') + @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') @Consume('SelectedColor') selectedColor: string @Consume('PortraitModel') portraitModel: boolean folderCreateDialogCtl: CustomDialogController = new CustomDialogController({ @@ -157,9 +165,9 @@ export struct NoteAndCreateComp { @Component struct FolderItemComp { @State folderItem: FolderData = undefined - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = [] - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = [] - @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] + @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = [] + @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = [] + @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('SelectedNoteData') selectedNoteData: NoteData @Consume('RefreshFlag') refreshFlag: number diff --git a/common/component/src/main/ets/components/NoteContent.ets b/features/src/main/ets/components/NoteContent.ets similarity index 100% rename from common/component/src/main/ets/components/NoteContent.ets rename to features/src/main/ets/components/NoteContent.ets diff --git a/common/component/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets similarity index 100% rename from common/component/src/main/ets/components/NoteContentComp.ets rename to features/src/main/ets/components/NoteContentComp.ets diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/features/src/main/ets/components/NoteContentCompPortrait.ets similarity index 100% rename from common/component/src/main/ets/components/NoteContentCompPortrait.ets rename to features/src/main/ets/components/NoteContentCompPortrait.ets diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/features/src/main/ets/components/NoteListComp.ets similarity index 93% rename from common/component/src/main/ets/components/NoteListComp.ets rename to features/src/main/ets/components/NoteListComp.ets index a87b1f5..eb1f7b6 100644 --- a/common/component/src/main/ets/components/NoteListComp.ets +++ b/features/src/main/ets/components/NoteListComp.ets @@ -16,7 +16,14 @@ import DateUtil from '@ohos/utils/src/main/ets/default/baseUtil/DateUtil' import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData' import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData' -import { TableName, NoteTableColumn, SysDefFolderUuid, Favorite, Delete, Top, NoteType +import { + TableName, + NoteTableColumn, + SysDefFolderUuid, + Favorite, + Delete, + Top, + NoteType } from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' import { NoteDataMoveDialog, DeleteDialog } from './CusDialogComp' import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil' @@ -45,7 +52,7 @@ async function routePage() { // Note list component @Component export struct NoteListComp { - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') + @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('Search') search: boolean controllerShow: WebController @@ -73,19 +80,19 @@ export struct NoteListComp { .width('100%') } - aboutToAppear(): void{ + aboutToAppear(): void { LogUtil.info(TAG, "aboutToAppear") } - aboutToDisappear(): void{ + aboutToDisappear(): void { LogUtil.info(TAG, "aboutToDisappear") } } @Component struct NoteOverViewComp { - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') - @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] + @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') + @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('RefreshFlag') refreshFlag: number @Consume('SectionStatus') sectionStatus: number @@ -93,6 +100,7 @@ struct NoteOverViewComp { @Consume('ExpandStatus') expandStatus: boolean @Consume('Search') search: boolean @Consume('PortraitModel') portraitModel: boolean + @StorageLink('breakPoint') breakPoints: string = 'lg' controllerShow: WebController build() { @@ -102,11 +110,16 @@ struct NoteOverViewComp { Image($r("app.media.suojin_back")) .height(this.portraitModel ? 24 : '12lpx') .width(this.portraitModel ? 24 : '12lpx') - .responseRegion({ x: -15.0, y: -15.0, width: this.portraitModel ? 54 : '27lpx', height: this.portraitModel ? 54 : '27lpx'}) + .responseRegion({ + x: -15.0, + y: -15.0, + width: this.portraitModel ? 54 : '27lpx', + height: this.portraitModel ? 54 : '27lpx' + }) .margin({ right: this.sectionStatus != 3 ? this.portraitModel ? 24 : '12lpx' : 0 }) // 两分栏时缩进图片与右边有个24的间距 - .visibility(this.sectionStatus != 3 ? Visibility.Visible : Visibility.None) + .visibility(this.breakPoints == 'lg' && this.sectionStatus == 3 ? Visibility.None : Visibility.Visible) .onClick(() => { - if (this.sectionStatus == 1) { + if (this.breakPoints == 'sm' || this.breakPoints == 'md') { this.expandStatus = !this.expandStatus } else { this.sectionStatus = (this.sectionStatus == 3 ? 2 : 3) @@ -145,7 +158,12 @@ struct NoteOverViewComp { Image($r("app.media.cross")) .height(this.portraitModel ? 24 : '12lpx') .width(this.portraitModel ? 24 : '12lpx') - .responseRegion({ x: -15.0, y: -15.0, width: this.portraitModel ? 54 : '27lpx', height: this.portraitModel ? 54 : '27lpx' }) + .responseRegion({ + x: -15.0, + y: -15.0, + width: this.portraitModel ? 54 : '27lpx', + height: this.portraitModel ? 54 : '27lpx' + }) .onClick(() => { this.longpress = false this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0) @@ -168,7 +186,10 @@ struct NoteOverViewComp { } .width('100%') .height(this.portraitModel ? 82 : '41lpx') - .padding({ left: this.sectionStatus == 2 ? this.portraitModel ? 24 : '12lpx' : this.portraitModel ? 36 : '18lpx', right: this.portraitModel ? 24 : '12lpx' }) // 两分栏时缩进图标与左侧不需要间距 + .padding({ + left: this.sectionStatus == 2 ? this.portraitModel ? 24 : '12lpx' : this.portraitModel ? 36 : '18lpx', + right: this.portraitModel ? 24 : '12lpx' + }) // 两分栏时缩进图标与左侧不需要间距 .visibility(this.search ? Visibility.None : Visibility.Visible) } } @@ -180,8 +201,8 @@ export struct NoteItemComp { controllerShow: WebController @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('SelectedNoteData') selectedNoteData: NoteData - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') - @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] + @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') + @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] @Consume('Longpress') longpress: boolean @Consume('ChooseNote') chooseNote: boolean @Consume('RefreshFlag') refreshFlag: number @@ -267,7 +288,12 @@ export struct NoteItemComp { } .width('100%') .height(this.portraitModel ? 72 : '36lpx') - .padding({ left: this.portraitModel ? 16 : '8lpx', right: this.portraitModel ? 12 : '6lpx', top: this.portraitModel ? 4 : '2lpx', bottom: this.portraitModel ? 4 : '2lpx' }) + .padding({ + left: this.portraitModel ? 16 : '8lpx', + right: this.portraitModel ? 12 : '6lpx', + top: this.portraitModel ? 4 : '2lpx', + bottom: this.portraitModel ? 4 : '2lpx' + }) .borderRadius(this.portraitModel ? 24 : '12lpx') .linearGradient({ direction: GradientDirection.Right, @@ -327,7 +353,7 @@ export struct NoteItemComp { @Component export struct NoteItemListComp { - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') + @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('RefreshFlag') refreshFlag: number @Consume('Longpress') longpress: boolean @@ -372,7 +398,7 @@ export struct NoteItemListComp { .visibility((FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0) ? Visibility.None : Visibility.Visible) Stack() { - Flex({direction: FlexDirection.Column}) { + Flex({ direction: FlexDirection.Column }) { Flex({ justifyContent: FlexAlign.Center }) { Text($r("app.string.permanently_delete_tips")) .fontSize(12) @@ -414,7 +440,11 @@ export struct NoteItemListComp { } }, noteItem => noteItem.uuid.toString()) } - .margin((FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0) ? { bottom: 0 } : { bottom: 130 }) + .margin((FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0) ? { + bottom: 0 + } : { + bottom: 130 + }) .layoutWeight(1) .listDirection(Axis.Vertical) .edgeEffect(EdgeEffect.Spring) @@ -445,8 +475,8 @@ export struct NoteItemListComp { @Component export struct OperateNoteComp { @Consume('Longpress') longpress: boolean - @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') + @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] + @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('RefreshFlag') refreshFlag: number @Consume('SelectedNoteData') selectedNoteData: NoteData @@ -597,7 +627,7 @@ export struct OperateNoteComp { .onClick(() => { if (this.CheckedNoteArray.length < NoteUtil.getNoteDataArray(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) - .length) { + .length) { NoteUtil.setAllNotesChecked(this.CheckedNoteArray, NoteUtil.getNoteDataArray(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid)) } else { NoteUtil.unsetAllNotesChecked(this.CheckedNoteArray) @@ -613,7 +643,7 @@ export struct OperateNoteComp { @Component export struct AddNoteComp { - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') + @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') @Consume('Longpress') longpress: boolean @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('SelectedNoteData') selectedNoteData: NoteData @@ -633,9 +663,9 @@ export struct AddNoteComp { .onClick(() => { let noteData if (this.selectedFolderData.uuid == SysDefFolderUuid.AllNotes || this.selectedFolderData.uuid == SysDefFolderUuid.MyFavorites) { - noteData = new NoteData(0, "标题", new Date().getTime() + "", SysDefFolderUuid.UnClassified, "", "", NoteType.SysDef, Top.No, Favorite.No, Delete.No, new Date().getTime(), new Date().getTime(), 0,0) + noteData = new NoteData(0, "标题", new Date().getTime() + "", SysDefFolderUuid.UnClassified, "", "", NoteType.SysDef, Top.No, Favorite.No, Delete.No, new Date().getTime(), new Date().getTime(), 0, 0) } else { - noteData = new NoteData(0, "标题", new Date().getTime() + "", this.selectedFolderData.uuid, "", "", NoteType.SysDef, Top.No, Favorite.No, Delete.No, new Date().getTime(), new Date().getTime(), 0,0) + noteData = new NoteData(0, "标题", new Date().getTime() + "", this.selectedFolderData.uuid, "", "", NoteType.SysDef, Top.No, Favorite.No, Delete.No, new Date().getTime(), new Date().getTime(), 0, 0) } this.AllNoteArray.push(noteData) @@ -690,10 +720,10 @@ export struct SearchComp { .backgroundColor(this.longpress ? $r("app.color.search_longpress_bgcolor_f7f8f9") : $r("app.color.color_ffffff")) .caretColor($r("app.color.search_note_caret_color")) .enabled(this.longpress ? false : true) - .padding({ left:6, top:1 }) - .padding({left:6}) + .padding({ left: 6, top: 1 }) + .padding({ left: 6 }) .onEditChange((isEditing: boolean) => { -// this.search = isEditing + // this.search = isEditing }) .onChange((value: string) => { if (!this.longpress) { @@ -709,14 +739,14 @@ export struct SearchComp { this.search = true } }) - // whether the focus is on the search input before coutinue + // whether the focus is on the search input before coutinue .onFocus(() => { this.isFocusOnSearch = true }) .onBlur(() => { this.isFocusOnSearch = false }) - // key for request focus after coutinue + // key for request focus after coutinue .key('searchInput') .restoreId(3) } @@ -734,8 +764,8 @@ export struct SearchComp { @Component export struct OperateNoteCompForPortrait { @Consume('Longpress') longpress: boolean - @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') + @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] + @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('RefreshFlag') @Watch('opacityChange') refreshFlag: number @Consume('SelectedNoteData') selectedNoteData: NoteData @@ -862,7 +892,7 @@ export struct OperateNoteCompForPortrait { .fontColor($r("app.color.delete_font_color")) .padding({ top: 5 }) } - .width(this.selectedFolderData.uuid == SysDefFolderUuid.RecentDeletes? 120 :"25%") + .width(this.selectedFolderData.uuid == SysDefFolderUuid.RecentDeletes ? 120 : "25%") .height("100%") .opacity(this.greyOpacity ? 0.4 : 1) .enabled(this.greyOpacity ? false : true) @@ -931,7 +961,7 @@ export struct OperateNoteCompForPortrait { .fontColor($r("app.color.recover_font_color")) .padding({ top: 5 }) } - .width(this.selectedFolderData.uuid == SysDefFolderUuid.RecentDeletes? 120 :"25%") + .width(this.selectedFolderData.uuid == SysDefFolderUuid.RecentDeletes ? 120 : "25%") .height("100%") .opacity(this.greyOpacity ? 0.4 : 1) .enabled(this.greyOpacity ? false : true) @@ -947,7 +977,7 @@ export struct OperateNoteCompForPortrait { .onClick(() => { if (this.CheckedNoteArray.length < NoteUtil.getNoteDataArray(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) - .length) { + .length) { NoteUtil.setAllNotesChecked(this.CheckedNoteArray, NoteUtil.getNoteDataArray(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid)) } else { NoteUtil.unsetAllNotesChecked(this.CheckedNoteArray) @@ -959,7 +989,7 @@ export struct OperateNoteCompForPortrait { .fontColor($r("app.color.check_all_font_color")) .padding({ top: 5 }) } - .width(this.selectedFolderData.uuid == SysDefFolderUuid.RecentDeletes? 120 :"25%") + .width(this.selectedFolderData.uuid == SysDefFolderUuid.RecentDeletes ? 120 : "25%") .height("100%") .alignItems(HorizontalAlign.Center) .justifyContent(FlexAlign.Center) diff --git a/common/component/src/main/module.json5 b/features/src/main/module.json5 similarity index 97% rename from common/component/src/main/module.json5 rename to features/src/main/module.json5 index b6442a2..f100719 100644 --- a/common/component/src/main/module.json5 +++ b/features/src/main/module.json5 @@ -18,7 +18,7 @@ "name": "component", "type": "har", "deviceTypes": [ - "phone", + "default", "tablet" ], "uiSyntax": "ets" diff --git a/package-lock.json b/package-lock.json index 5248f38..d218d63 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,41 +4,54 @@ "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.0.6", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor/-/@ohos/hvigor-1.0.6.tgz", - "integrity": "sha512-jjp7vpvUOMW1Nf7TdyhOtonwWHoSyBJLUiZTQqIx/GJV4UJyIqsiURUOqFwncQ4L7PDdeHuWly4uEelknYeWhg==", + "version": "1.2.2", + "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor/-/@ohos/hvigor-1.2.2.tgz", + "integrity": "sha512-GfXCf7pDnyEcxWkG7Edd23XPxgym1vY37zdNt/Gj0pZmw0f+FrP+blfCzVWfYQYlI76krzd96+kvD4lgWkIPBQ==", "requires": { - "@ohos/hvigor-base": "1.0.6", + "@ohos/hvigor-base": "1.2.2", + "fs-extra": "10.0.1", "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.0" + "yargs": "7.1.2" } }, "@ohos/hvigor-base": { - "version": "1.0.6", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-base/-/@ohos/hvigor-base-1.0.6.tgz", - "integrity": "sha512-cRDnWICTxmpNiFb9clIioqP5Oik1seLCICztXVhZqultrHuxwTheCRUZrHwlpyWdkSB2Al+FFBqmSwzIgZX4IQ==", + "version": "1.2.2", + "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-base/-/@ohos/hvigor-base-1.2.2.tgz", + "integrity": "sha512-omwL/qjTE7DTCQdHZnMKuAxKlH1JOgOxaVAae1ca8j/oPuNgY6Spn+mpYRDHIktvav6axMmHT9zV1hJykY4GEg==", "requires": { + "fs-extra": "10.0.1", "json5": "2.2.0", "log4js": "6.4.1", - "undertaker": "1.2.1" + "once": "1.4.0", + "pretty-hrtime": "1.0.0" } }, "@ohos/hvigor-ohos-plugin": { - "version": "1.0.6", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-ohos-plugin/-/@ohos/hvigor-ohos-plugin-1.0.6.tgz", - "integrity": "sha512-MAAi8uJxMzODUoSSNfBr+fU4HQ20dfQtkje9I+X4asc7qY2kAplW/q9f5XS8IOvv8zhC8OcSgsAXOAJuLMstOQ==", + "version": "1.2.2", + "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-ohos-plugin/-/@ohos/hvigor-ohos-plugin-1.2.2.tgz", + "integrity": "sha512-gir91UxlhMbf2E/NjTYWJGrsNGBKD/1YYbaEdmswD/qW18UDY7jyuqSVyV/gj0h9+iji+gd53rXWzpLLztG5lg==", "requires": { - "@ohos/hvigor-base": "1.0.6", - "@ohos/sdkmanager-common": "1.1.3", + "@ohos/hos-sdkmanager-common": "1.0.4", + "@ohos/hvigor-base": "1.2.2", + "@ohos/sdkmanager-common": "1.1.8", + "adm-zip": "0.5.9", "ajv": "8.10.0", - "archiver": "5.3.0", "execa": "5.1.1", - "fs-extra": "10.0.0", + "fast-xml-parser": "4.0.3", + "fs-extra": "10.0.1", "glob": "7.2.0", "iconv-lite": "0.6.3", "json5": "2.2.0", @@ -47,27 +60,27 @@ "resolve-package-path": "4.0.3" }, "dependencies": { - "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" - } - }, "pretty-hrtime": { "version": "1.0.3", "resolved": "https://repo.huaweicloud.com/repository/npm/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", - "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=" + "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==" } } }, + "@ohos/hypium": { + "version": "1.0.2", + "resolved": "https://repo.harmonyos.com/npm/@ohos/hypium/-/@ohos/hypium-1.0.2.tgz", + "integrity": "sha512-HWW62q6hbd0PhvPTH96lo4j//owFwyCLj6Q2jmVLDW6mOt1dwJJwUQ7qUH+Cni/6MmcnyXKvt9I0moGAPK1aCw==" + }, "@ohos/sdkmanager-common": { - "version": "1.1.3", - "resolved": "https://repo.harmonyos.com/npm/@ohos/sdkmanager-common/-/@ohos/sdkmanager-common-1.1.3.tgz", - "integrity": "sha512-d2uhVauDDJZIUvyyaWWoavG4N/jLyfF5IH5kEXKV6R8HNf3606H1zDQzA+UZtOfwwJFXhD9djRjnVFNB8xc7aw==" + "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", @@ -83,163 +96,23 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://repo.huaweicloud.com/repository/npm/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "archiver": { - "version": "5.3.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/archiver/-/archiver-5.3.0.tgz", - "integrity": "sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg==", - "requires": { - "archiver-utils": "^2.1.0", - "async": "^3.2.0", - "buffer-crc32": "^0.2.1", - "readable-stream": "^3.6.0", - "readdir-glob": "^1.0.0", - "tar-stream": "^2.2.0", - "zip-stream": "^4.1.0" - } - }, - "archiver-utils": { - "version": "2.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/archiver-utils/-/archiver-utils-2.1.0.tgz", - "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", - "requires": { - "glob": "^7.1.4", - "graceful-fs": "^4.2.0", - "lazystream": "^1.0.0", - "lodash.defaults": "^4.2.0", - "lodash.difference": "^4.5.0", - "lodash.flatten": "^4.4.0", - "lodash.isplainobject": "^4.0.6", - "lodash.union": "^4.6.0", - "normalize-path": "^3.0.0", - "readable-stream": "^2.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - } - } - }, - "arr-filter": { - "version": "1.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/arr-filter/-/arr-filter-1.1.2.tgz", - "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=", - "requires": { - "make-iterator": "^1.0.0" - } - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" - }, - "arr-map": { - "version": "2.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/arr-map/-/arr-map-2.0.2.tgz", - "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=", - "requires": { - "make-iterator": "^1.0.0" - } + "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": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=" - }, - "array-initial": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/array-initial/-/array-initial-1.1.0.tgz", - "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=", - "requires": { - "array-slice": "^1.0.0", - "is-number": "^4.0.0" - } - }, - "array-last": { - "version": "1.3.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/array-last/-/array-last-1.3.0.tgz", - "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==", - "requires": { - "is-number": "^4.0.0" - } + "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==" }, - "async": { - "version": "3.2.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/async/-/async-3.2.3.tgz", - "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" - }, - "async-done": { - "version": "1.3.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/async-done/-/async-done-1.3.2.tgz", - "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.2", - "process-nextick-args": "^2.0.0", - "stream-exhaust": "^1.0.1" - } - }, - "async-settle": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/async-settle/-/async-settle-1.0.0.tgz", - "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=", - "requires": { - "async-done": "^1.2.2" - } - }, - "bach": { - "version": "1.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/bach/-/bach-1.2.0.tgz", - "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=", - "requires": { - "arr-filter": "^1.1.1", - "arr-flatten": "^1.0.1", - "arr-map": "^2.0.0", - "array-each": "^1.0.0", - "array-initial": "^1.0.0", - "array-last": "^1.1.1", - "async-done": "^1.2.2", - "async-settle": "^1.0.0", - "now-and-later": "^2.0.0" - } - }, "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==" }, - "base64-js": { - "version": "1.5.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" - }, - "bl": { - "version": "4.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://repo.huaweicloud.com/repository/npm/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -257,20 +130,6 @@ "fill-range": "^7.0.1" } }, - "buffer": { - "version": "5.7.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "buffer-crc32": { - "version": "0.2.13", - "resolved": "https://repo.huaweicloud.com/repository/npm/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" - }, "call-bind": { "version": "1.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/call-bind/-/call-bind-1.0.2.tgz", @@ -283,12 +142,12 @@ "camelcase": { "version": "3.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" + "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==" }, "cliui": { "version": "3.2.0", "resolved": "https://repo.huaweicloud.com/repository/npm/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==", "requires": { "string-width": "^1.0.1", "strip-ansi": "^3.0.1", @@ -298,52 +157,12 @@ "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": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, - "collection-map": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/collection-map/-/collection-map-1.0.0.tgz", - "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=", - "requires": { - "arr-map": "^2.0.2", - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - } - }, - "compress-commons": { - "version": "4.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/compress-commons/-/compress-commons-4.1.1.tgz", - "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==", - "requires": { - "buffer-crc32": "^0.2.13", - "crc32-stream": "^4.0.2", - "normalize-path": "^3.0.0", - "readable-stream": "^3.6.0" - } + "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": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "core-util-is": { - "version": "1.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" - }, - "crc-32": { - "version": "1.2.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/crc-32/-/crc-32-1.2.2.tgz", - "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==" - }, - "crc32-stream": { - "version": "4.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/crc32-stream/-/crc32-stream-4.0.2.tgz", - "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==", - "requires": { - "crc-32": "^1.2.0", - "readable-stream": "^3.4.0" - } + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "cross-spawn": { "version": "7.0.3", @@ -365,19 +184,10 @@ } } }, - "d": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/d/-/d-1.0.1.tgz", - "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", - "requires": { - "es5-ext": "^0.10.50", - "type": "^1.0.1" - } - }, "date-format": { - "version": "4.0.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/date-format/-/date-format-4.0.7.tgz", - "integrity": "sha512-k5xqlzDGIfv2N/DHR/BR8Kc4N9CRy9ReuDkmdxeX/jNfit94QXd36emWMm40ZOEDKNm/c91yV9EO3uGPkR7wWQ==" + "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", @@ -390,12 +200,7 @@ "decamelize": { "version": "1.2.0", "resolved": "https://repo.huaweicloud.com/repository/npm/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, - "default-resolution": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/default-resolution/-/default-resolution-2.0.0.tgz", - "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=" + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==" }, "define-properties": { "version": "1.1.4", @@ -409,15 +214,7 @@ "detect-file": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=" - }, - "end-of-stream": { - "version": "1.4.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "requires": { - "once": "^1.4.0" - } + "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==" }, "error-ex": { "version": "1.3.2", @@ -427,46 +224,6 @@ "is-arrayish": "^0.2.1" } }, - "es5-ext": { - "version": "0.10.60", - "resolved": "https://repo.huaweicloud.com/repository/npm/es5-ext/-/es5-ext-0.10.60.tgz", - "integrity": "sha512-jpKNXIt60htYG59/9FGf2PYT3pwMpnEbNKysU+k/4FGwyGtMotOvcZOuW+EmXXYASRqYSXQfGL5cVIthOTgbkg==", - "requires": { - "es6-iterator": "^2.0.3", - "es6-symbol": "^3.1.3", - "next-tick": "^1.1.0" - } - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "es6-symbol": { - "version": "3.1.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/es6-symbol/-/es6-symbol-3.1.3.tgz", - "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", - "requires": { - "d": "^1.0.1", - "ext": "^1.1.2" - } - }, - "es6-weak-map": { - "version": "2.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/es6-weak-map/-/es6-weak-map-2.0.3.tgz", - "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", - "requires": { - "d": "1", - "es5-ext": "^0.10.46", - "es6-iterator": "^2.0.3", - "es6-symbol": "^3.1.1" - } - }, "execa": { "version": "5.1.1", "resolved": "https://repo.huaweicloud.com/repository/npm/execa/-/execa-5.1.1.tgz", @@ -486,26 +243,11 @@ "expand-tilde": { "version": "2.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", "requires": { "homedir-polyfill": "^1.0.1" } }, - "ext": { - "version": "1.6.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/ext/-/ext-1.6.0.tgz", - "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==", - "requires": { - "type": "^2.5.0" - }, - "dependencies": { - "type": { - "version": "2.6.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/type/-/type-2.6.0.tgz", - "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==" - } - } - }, "extend": { "version": "3.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/extend/-/extend-3.0.2.tgz", @@ -516,6 +258,14 @@ "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", @@ -527,7 +277,7 @@ "find-up": { "version": "1.1.2", "resolved": "https://repo.huaweicloud.com/repository/npm/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==", "requires": { "path-exists": "^2.0.0", "pinkie-promise": "^2.0.0" @@ -562,32 +312,27 @@ "integrity": "sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==" }, "flatted": { - "version": "3.2.5", - "resolved": "https://repo.huaweicloud.com/repository/npm/flatted/-/flatted-3.2.5.tgz", - "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==" + "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": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + "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": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==", "requires": { "for-in": "^1.0.1" } }, - "fs-constants": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" - }, "fs-extra": { - "version": "10.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "version": "10.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/fs-extra/-/fs-extra-10.0.1.tgz", + "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==", "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -597,7 +342,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "function-bind": { "version": "1.1.1", @@ -610,13 +355,13 @@ "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" }, "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "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.1" + "has-symbols": "^1.0.3" } }, "get-stream": { @@ -650,7 +395,7 @@ "global-prefix": { "version": "1.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", "requires": { "expand-tilde": "^2.0.2", "homedir-polyfill": "^1.0.1", @@ -716,15 +461,10 @@ "safer-buffer": ">= 2.1.2 < 3.0.0" } }, - "ieee754": { - "version": "1.2.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" - }, "inflight": { "version": "1.0.6", "resolved": "https://repo.huaweicloud.com/repository/npm/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "requires": { "once": "^1.3.0", "wrappy": "1" @@ -748,7 +488,7 @@ "invert-kv": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==" }, "is-absolute": { "version": "1.0.0", @@ -762,12 +502,12 @@ "is-arrayish": { "version": "0.2.1", "resolved": "https://repo.huaweicloud.com/repository/npm/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" }, "is-core-module": { - "version": "2.9.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "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" } @@ -775,12 +515,12 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://repo.huaweicloud.com/repository/npm/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + "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": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", "requires": { "number-is-nan": "^1.0.0" } @@ -794,9 +534,9 @@ } }, "is-number": { - "version": "4.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" + "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", @@ -827,27 +567,22 @@ "is-utf8": { "version": "0.2.1", "resolved": "https://repo.huaweicloud.com/repository/npm/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + "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==" }, - "isarray": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, "isexe": { "version": "2.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "isobject": { "version": "3.0.1", "resolved": "https://repo.huaweicloud.com/repository/npm/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==" }, "js-base64": { "version": "3.7.2", @@ -881,43 +616,10 @@ "resolved": "https://repo.huaweicloud.com/repository/npm/kind-of/-/kind-of-6.0.3.tgz", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, - "last-run": { - "version": "1.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/last-run/-/last-run-1.1.1.tgz", - "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=", - "requires": { - "default-resolution": "^2.0.0", - "es6-weak-map": "^2.0.1" - } - }, - "lazystream": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/lazystream/-/lazystream-1.0.1.tgz", - "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", - "requires": { - "readable-stream": "^2.0.5" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - } - } - }, "lcid": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==", "requires": { "invert-kv": "^1.0.0" } @@ -940,7 +642,7 @@ "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": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==", "requires": { "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", @@ -954,31 +656,6 @@ "resolved": "https://repo.huaweicloud.com/repository/npm/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, - "lodash.defaults": { - "version": "4.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" - }, - "lodash.difference": { - "version": "4.5.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.difference/-/lodash.difference-4.5.0.tgz", - "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=" - }, - "lodash.flatten": { - "version": "4.4.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" - }, - "lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" - }, - "lodash.union": { - "version": "4.6.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.union/-/lodash.union-4.6.0.tgz", - "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=" - }, "log4js": { "version": "6.4.1", "resolved": "https://repo.huaweicloud.com/repository/npm/log4js/-/log4js-6.4.1.tgz", @@ -1002,7 +679,7 @@ "map-cache": { "version": "0.2.2", "resolved": "https://repo.huaweicloud.com/repository/npm/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==" }, "merge-stream": { "version": "2.0.0", @@ -1032,9 +709,9 @@ } }, "minimist": { - "version": "1.2.6", - "resolved": "https://repo.huaweicloud.com/repository/npm/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" + "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", @@ -1044,12 +721,7 @@ "mute-stdout": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/mute-stdout/-/mute-stdout-1.0.0.tgz", - "integrity": "sha1-WzLqB+tDyd7WEwQ0z5JvRrKn/U0=" - }, - "next-tick": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/next-tick/-/next-tick-1.1.0.tgz", - "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" + "integrity": "sha512-MaSQenn0f9oxIjtCufclpV00MuYTiHaXPbdcfPIM+quMqoa8cXywjHHx4LhhIAZlXqPWMdcUpYviajfmHtHRJw==" }, "normalize-package-data": { "version": "2.5.0", @@ -1062,19 +734,6 @@ "validate-npm-package-license": "^3.0.1" } }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - }, - "now-and-later": { - "version": "2.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/now-and-later/-/now-and-later-2.0.1.tgz", - "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==", - "requires": { - "once": "^1.3.2" - } - }, "npm-run-path": { "version": "4.0.1", "resolved": "https://repo.huaweicloud.com/repository/npm/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -1086,7 +745,7 @@ "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": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==" }, "object-keys": { "version": "1.1.1", @@ -1094,20 +753,20 @@ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" }, "object.assign": { - "version": "4.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "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.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", + "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": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", + "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==", "requires": { "array-each": "^1.0.1", "array-slice": "^1.0.0", @@ -1118,7 +777,7 @@ "object.map": { "version": "1.0.1", "resolved": "https://repo.huaweicloud.com/repository/npm/object.map/-/object.map-1.0.1.tgz", - "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", + "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==", "requires": { "for-own": "^1.0.0", "make-iterator": "^1.0.0" @@ -1127,24 +786,15 @@ "object.pick": { "version": "1.3.0", "resolved": "https://repo.huaweicloud.com/repository/npm/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", "requires": { "isobject": "^3.0.1" } }, - "object.reduce": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/object.reduce/-/object.reduce-1.0.1.tgz", - "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=", - "requires": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - } - }, "once": { "version": "1.4.0", "resolved": "https://repo.huaweicloud.com/repository/npm/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "requires": { "wrappy": "1" } @@ -1160,7 +810,7 @@ "os-locale": { "version": "1.4.0", "resolved": "https://repo.huaweicloud.com/repository/npm/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==", "requires": { "lcid": "^1.0.0" } @@ -1168,7 +818,7 @@ "parse-filepath": { "version": "1.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", + "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", "requires": { "is-absolute": "^1.0.0", "map-cache": "^0.2.0", @@ -1178,7 +828,7 @@ "parse-json": { "version": "2.2.0", "resolved": "https://repo.huaweicloud.com/repository/npm/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==", "requires": { "error-ex": "^1.2.0" } @@ -1186,12 +836,12 @@ "parse-passwd": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" + "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": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==", "requires": { "pinkie-promise": "^2.0.0" } @@ -1199,7 +849,7 @@ "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": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" }, "path-key": { "version": "3.1.1", @@ -1214,7 +864,7 @@ "path-root": { "version": "0.1.1", "resolved": "https://repo.huaweicloud.com/repository/npm/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", + "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", "requires": { "path-root-regex": "^0.1.0" } @@ -1222,12 +872,12 @@ "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": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=" + "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": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==", "requires": { "graceful-fs": "^4.1.2", "pify": "^2.0.0", @@ -1242,17 +892,17 @@ "pify": { "version": "2.3.0", "resolved": "https://repo.huaweicloud.com/repository/npm/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "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": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + "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": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", "requires": { "pinkie": "^2.0.0" } @@ -1260,12 +910,7 @@ "pretty-hrtime": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/pretty-hrtime/-/pretty-hrtime-1.0.0.tgz", - "integrity": "sha1-9ualItPmBwRSK/Db5oVu0g515Nw=" - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + "integrity": "sha512-CU2l5CYUAptUYq/671ajexQfXuxJFwwg0n243Kdkx8bTjeenedsWgu8TGHPm03vLfNtk3aTXgySKPp3Usykudw==" }, "punycode": { "version": "2.1.1", @@ -1275,7 +920,7 @@ "read-pkg": { "version": "1.1.0", "resolved": "https://repo.huaweicloud.com/repository/npm/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==", "requires": { "load-json-file": "^1.0.0", "normalize-package-data": "^2.3.2", @@ -1285,30 +930,12 @@ "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": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==", "requires": { "find-up": "^1.0.0", "read-pkg": "^1.0.0" } }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "readdir-glob": { - "version": "1.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/readdir-glob/-/readdir-glob-1.1.1.tgz", - "integrity": "sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==", - "requires": { - "minimatch": "^3.0.4" - } - }, "rechoir": { "version": "0.8.0", "resolved": "https://repo.huaweicloud.com/repository/npm/rechoir/-/rechoir-0.8.0.tgz", @@ -1320,7 +947,7 @@ "require-directory": { "version": "2.1.1", "resolved": "https://repo.huaweicloud.com/repository/npm/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" }, "require-from-string": { "version": "2.0.2", @@ -1330,14 +957,14 @@ "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": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==" }, "resolve": { - "version": "1.22.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/resolve/-/resolve-1.22.0.tgz", - "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", + "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.8.1", + "is-core-module": "^2.9.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } @@ -1345,7 +972,7 @@ "resolve-dir": { "version": "1.0.1", "resolved": "https://repo.huaweicloud.com/repository/npm/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", + "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", "requires": { "expand-tilde": "^2.0.0", "global-modules": "^1.0.0" @@ -1364,11 +991,6 @@ "resolved": "https://repo.huaweicloud.com/repository/npm/rfdc/-/rfdc-1.3.0.tgz", "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, "safer-buffer": { "version": "2.1.2", "resolved": "https://repo.huaweicloud.com/repository/npm/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -1382,7 +1004,7 @@ "set-blocking": { "version": "2.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" }, "shebang-command": { "version": "2.0.0", @@ -1426,47 +1048,59 @@ } }, "spdx-license-ids": { - "version": "3.0.11", - "resolved": "https://repo.huaweicloud.com/repository/npm/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", - "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==" - }, - "stream-exhaust": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/stream-exhaust/-/stream-exhaust-1.0.2.tgz", - "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==" + "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.0.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/streamroller/-/streamroller-3.0.7.tgz", - "integrity": "sha512-kh68kwiDGuIPiPDWwRbEC5us+kfARP1e9AsQiaLaSqGrctOvMn0mtL8iNY3r4/o5nIoYi3gPI1jexguZsXDlxw==", + "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.7", + "date-format": "^4.0.14", "debug": "^4.3.4", - "fs-extra": "^10.0.1" + "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" + } + }, + "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" + } + }, + "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==" + } } }, "string-width": { "version": "1.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" } }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - }, "strip-ansi": { "version": "3.0.1", "resolved": "https://repo.huaweicloud.com/repository/npm/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", "requires": { "ansi-regex": "^2.0.0" } @@ -1474,7 +1108,7 @@ "strip-bom": { "version": "2.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==", "requires": { "is-utf8": "^0.2.0" } @@ -1484,68 +1118,28 @@ "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==" }, - "tar-stream": { - "version": "2.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "requires": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - } - }, "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" - }, - "dependencies": { - "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==" - } } }, - "type": { - "version": "1.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/type/-/type-1.2.0.tgz", - "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" - }, "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": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" - }, - "undertaker": { - "version": "1.2.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/undertaker/-/undertaker-1.2.1.tgz", - "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==", - "requires": { - "arr-flatten": "^1.0.1", - "arr-map": "^2.0.0", - "bach": "^1.0.0", - "collection-map": "^1.0.0", - "es6-weak-map": "^2.0.1", - "last-run": "^1.1.0", - "object.defaults": "^1.0.0", - "object.reduce": "^1.0.0", - "undertaker-registry": "^1.0.0" - } - }, - "undertaker-registry": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/undertaker-registry/-/undertaker-registry-1.0.1.tgz", - "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=" + "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==" }, "universalify": { "version": "2.0.0", @@ -1560,11 +1154,6 @@ "punycode": "^2.1.0" } }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, "v8flags": { "version": "3.2.0", "resolved": "https://repo.huaweicloud.com/repository/npm/v8flags/-/v8flags-3.2.0.tgz", @@ -1593,12 +1182,12 @@ "which-module": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" + "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": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==", "requires": { "string-width": "^1.0.1", "strip-ansi": "^3.0.1" @@ -1607,7 +1196,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "y18n": { "version": "3.2.2", @@ -1615,9 +1204,9 @@ "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==" }, "yargs": { - "version": "7.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/yargs/-/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", + "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", @@ -1631,7 +1220,7 @@ "string-width": "^1.0.2", "which-module": "^1.0.0", "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" + "yargs-parser": "^5.0.1" } }, "yargs-parser": { @@ -1642,16 +1231,6 @@ "camelcase": "^3.0.0", "object.assign": "^4.1.0" } - }, - "zip-stream": { - "version": "4.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/zip-stream/-/zip-stream-4.1.0.tgz", - "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==", - "requires": { - "archiver-utils": "^2.1.0", - "compress-commons": "^4.1.0", - "readable-stream": "^3.6.0" - } } } } diff --git a/package.json b/package.json index 6c26569..984f794 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,10 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hvigor": "1.0.6", - "@ohos/hvigor-ohos-plugin": "1.0.6", + "@ohos/hvigor": "1.2.2", + "@ohos/hvigor-ohos-plugin": "1.2.2", "hypium": "^1.0.0", - "js-base64": "^3.7.2" + "js-base64": "^3.7.2", + "@ohos/hypium": "1.0.2" } } diff --git a/common/component/.gitignore b/product/default/.gitignore similarity index 100% rename from common/component/.gitignore rename to product/default/.gitignore diff --git a/product/phone/build-profile.json5 b/product/default/build-profile.json5 similarity index 100% rename from product/phone/build-profile.json5 rename to product/default/build-profile.json5 diff --git a/product/phone/hvigorfile.js b/product/default/hvigorfile.js similarity index 100% rename from product/phone/hvigorfile.js rename to product/default/hvigorfile.js diff --git a/product/tablet/package-lock.json b/product/default/package-lock.json similarity index 95% rename from product/tablet/package-lock.json rename to product/default/package-lock.json index ea624c2..f9baed5 100644 --- a/product/tablet/package-lock.json +++ b/product/default/package-lock.json @@ -5,7 +5,7 @@ "requires": true, "dependencies": { "@ohos/component": { - "version": "file:../../common/component", + "version": "file:../../features", "requires": { "@ohos/source": "file:../../common/resources", "@ohos/utils": "file:../../common/utils" diff --git a/product/default/package.json b/product/default/package.json new file mode 100644 index 0000000..94bb266 --- /dev/null +++ b/product/default/package.json @@ -0,0 +1,18 @@ +{ + "license": "ISC", + "devDependencies": {}, + "name": "default", + "ohos": { + "org": "huawei", + "directoryLevel": "module", + "buildTool": "hvigor" + }, + "description": "example description", + "repository": {}, + "version": "1.0.0", + "dependencies": { + "@ohos/utils": "file:../../common/utils", + "@ohos/component": "file:../../features", + "@ohos/source": "file:../../common/resources" + } +} \ No newline at end of file diff --git a/product/phone/src/main/ets/Application/AbilityStage.ts b/product/default/src/main/ets/Application/AbilityStage.ts similarity index 100% rename from product/phone/src/main/ets/Application/AbilityStage.ts rename to product/default/src/main/ets/Application/AbilityStage.ts diff --git a/product/tablet/src/main/ets/MainAbility/MainAbility.ts b/product/default/src/main/ets/MainAbility/MainAbility.ts similarity index 87% rename from product/tablet/src/main/ets/MainAbility/MainAbility.ts rename to product/default/src/main/ets/MainAbility/MainAbility.ts index ffdf72a..1656847 100644 --- a/product/tablet/src/main/ets/MainAbility/MainAbility.ts +++ b/product/default/src/main/ets/MainAbility/MainAbility.ts @@ -20,7 +20,10 @@ import fileio from '@ohos.fileio' import inputMethod from '@ohos.inputmethod'; import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import { atob } from 'js-base64' +import display from '@ohos.display'; + globalThis.rdbStore = undefined + export default class MainAbility extends Ability { private Tag = "MainAbility_Tablet" @@ -65,6 +68,28 @@ export default class MainAbility extends Ability { } onWindowStageCreate(windowStage) { + let displayClass = null + let screenDpi = null + displayClass = display.getDefaultDisplaySync() + screenDpi = displayClass.densityDPI + windowStage.getMainWindow((err, data) => { + let windowClass = data + try { + windowClass.on('windowSizeChange', (data) => { + let windowWidth = data.width / (screenDpi / 160) + if (windowWidth >= 320 && windowWidth < 520 || windowWidth < 320) { + AppStorage.SetOrCreate('breakPoint', 'sm') + } else if (windowWidth >= 520 && windowWidth < 840) { + AppStorage.SetOrCreate('breakPoint', 'md') + } else if (windowWidth >= 840) { + AppStorage.SetOrCreate('breakPoint', 'lg') + } + }) + } catch (exception) { + LogUtil.info(this.Tag, 'windowSizeChange fail') + } + }) + LogUtil.info(this.Tag, " onWindowStageCreate") windowStage.setUIContent(this.context, "pages/MyNoteHome", null) } @@ -135,7 +160,7 @@ export default class MainAbility extends Ability { return AbilityConstant.OnContinueResult.AGREE } - getSrcFromHtml(html: string): any{ + getSrcFromHtml(html: string): any { let srcArray = [] if (html == undefined || html == null || html == "") { return srcArray diff --git a/product/tablet/src/main/ets/pages/MyNoteHome.ets b/product/default/src/main/ets/pages/MyNoteHome.ets similarity index 97% rename from product/tablet/src/main/ets/pages/MyNoteHome.ets rename to product/default/src/main/ets/pages/MyNoteHome.ets index 33be5c2..eb6b83f 100644 --- a/product/tablet/src/main/ets/pages/MyNoteHome.ets +++ b/product/default/src/main/ets/pages/MyNoteHome.ets @@ -29,6 +29,7 @@ export struct MyNoteHomeComp { @StorageLink('DBQueryFinished') dBQueryFinished: number = 0 @Provide('PortraitModel') portraitModel: boolean = (deviceInfo.deviceType === 'phone' || deviceInfo.deviceType === 'default') @Provide('RefreshFlag') refreshFlag: number = 0 + @StorageLink('breakPoint') breakPoints:string = 'lg' private controllerShow: WebController = new WebController() private context = getContext(this) TAG = "MyNoteHomeComp_Tablet" @@ -36,7 +37,7 @@ export struct MyNoteHomeComp { build() { Row() { if (this.dBQueryFinished == 1) { - if (deviceInfo.deviceType === 'phone' || deviceInfo.deviceType === 'default') { + if (this.breakPoints === 'sm') { NoteHomePortraitComp() } else { NoteHomeComp({ controllerShow: this.controllerShow }) @@ -50,7 +51,7 @@ export struct MyNoteHomeComp { aboutToAppear(): void{ LogUtil.info(this.TAG, "aboutToAppear") - + this.breakPoints = AppStorage.Get('breakPoint') if (this.context == undefined || this.context == null) { LogUtil.warn(this.TAG, "context is error") return diff --git a/product/tablet/src/main/ets/pages/NoteContentHome.ets b/product/default/src/main/ets/pages/NoteContentHome.ets similarity index 70% rename from product/tablet/src/main/ets/pages/NoteContentHome.ets rename to product/default/src/main/ets/pages/NoteContentHome.ets index 0e74967..fd50849 100644 --- a/product/tablet/src/main/ets/pages/NoteContentHome.ets +++ b/product/default/src/main/ets/pages/NoteContentHome.ets @@ -14,9 +14,9 @@ */ import deviceInfo from '@ohos.deviceInfo'; -import {NoteContentCompPortrait} from '@ohos/component/src/main/ets/components/NoteContentCompPortrait' -import {NoteContent} from '@ohos/component/src/main/ets/components/NoteContent' -import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' +import { NoteContentCompPortrait } from '@ohos/component/src/main/ets/components/NoteContentCompPortrait' +import { NoteContent } from '@ohos/component/src/main/ets/components/NoteContent' +import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil' import inputMethod from '@ohos.inputmethod' @@ -26,13 +26,14 @@ struct NoteContentHome { @Provide('RefreshFlag') refreshFlag: number = 0 private controllerShow: WebController = new WebController() @StorageLink('DBQueryFinished') dBQueryFinished: number = 0 + @StorageLink('breakPoint') breakPoints: string = 'lg' TAG = "NoteContentHome_Tablet" build() { // Note content display area Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { if (this.dBQueryFinished == 1) { - if (deviceInfo.deviceType === 'phone' || deviceInfo.deviceType === 'default') { + if (this.breakPoints === 'sm') { NoteContentCompPortrait({ controllerShow: this.controllerShow }) } else { NoteContent({ controllerShow: this.controllerShow }) @@ -45,16 +46,17 @@ struct NoteContentHome { .height('100%') } - onBackPress():void{ - LogUtil.info(this.TAG, "onBackPress") - this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setInputEnabled(false)" }) - this.controllerShow.runJavaScript({ script: "getHtmlContent()" }) - if (deviceInfo.deviceType !== 'phone' && deviceInfo.deviceType !== 'default') { - inputMethod.getInputMethodController().stopInput() - } + onBackPress(): void { + LogUtil.info(this.TAG, "onBackPress") + this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setInputEnabled(false)" }) + this.controllerShow.runJavaScript({ script: "getHtmlContent()" }) + if (deviceInfo.deviceType !== 'phone' && deviceInfo.deviceType !== 'default') { + inputMethod.getInputMethodController().stopInput() + } } - aboutToAppear(): void{ + aboutToAppear(): void { + this.breakPoints = AppStorage.Get('breakPoint') LogUtil.info(this.TAG, "aboutToAppear") let isContinue = AppStorage.Get('IsContinue') LogUtil.info(this.TAG, "aboutToAppear, isContinue : " + isContinue) @@ -65,5 +67,4 @@ struct NoteContentHome { AppStorage.SetOrCreate('NoteContentHomeExist', true) } } - } \ No newline at end of file diff --git a/product/tablet/src/main/ets/pages/NoteHome.ets b/product/default/src/main/ets/pages/NoteHome.ets similarity index 47% rename from product/tablet/src/main/ets/pages/NoteHome.ets rename to product/default/src/main/ets/pages/NoteHome.ets index 1493527..814f220 100644 --- a/product/tablet/src/main/ets/pages/NoteHome.ets +++ b/product/default/src/main/ets/pages/NoteHome.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { FolderListComp } from '@ohos/component/src/main/ets/components/FolderListComp' +import { FolderListComp, FolderListBackGround } from '@ohos/component/src/main/ets/components/FolderListComp' import { NoteListComp } from '@ohos/component/src/main/ets/components/NoteListComp' import { NoteContentComp } from '@ohos/component/src/main/ets/components/NoteContentComp' import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants' @@ -44,75 +44,104 @@ export struct NoteHomeComp { @Provide('SelectedAll') selectedAll: boolean = false @Provide('EditModel') editModel: boolean = false //编辑模式：临时方案 @Provide('Issave') issave: number = 0 + @StorageLink('breakPoint') breakPoints: string = 'lg' controllerShow: WebController TAG = "NoteHomeComp_Tablet" - narrowWinListener = mediaquery.matchMediaSync('(width < 2000)') - - onWinSizeChange(mediaQueryResult) { - if (this.sectionStatus != 1) { - this.sectionStatus = (mediaQueryResult.matches) ? 2 : 3 - // save continue data - AppStorage.SetOrCreate('ContinueSection', this.sectionStatus) - LogUtil.info(this.TAG, "onWinSizeChange, set continue section success") - } - } build() { Flex({ justifyContent: FlexAlign.Start }) { - // Folder list display area - Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.Center }) { - FolderListComp({ controllerShow: this.controllerShow }) - } - .flexShrink(0) - .backgroundColor($r("app.color.folderlist_bgcolor_f1f3f5")) - .width(200) - .height(StyleConstants.PERCENTAGE_100) - .visibility( - LayoutUtil.getWidthWeightMessage(this.sectionStatus) - .folderListVisibility == 0 ? Visibility.None : Visibility.Visible) - .enabled(this.search ? false : true) + if (this.breakPoints === 'lg') { + // Folder list display area + Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.Center }) { + FolderListComp({ controllerShow: this.controllerShow }) + } + .flexShrink(0) + .backgroundColor($r("app.color.folderlist_bgcolor_f1f3f5")) + .width(200) + .height(StyleConstants.PERCENTAGE_100) + .visibility( + LayoutUtil.getWidthWeightMessage(this.sectionStatus) + .folderListVisibility == 0 ? Visibility.None : Visibility.Visible) + .enabled(this.search ? false : true) - // Note list display area - Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { - Divider() - .vertical(true) - .strokeWidth(1) - .color($r("app.color.divider_color_182431")) - .height("100%") - .opacity(StyleConstants.OPACITY_10) - NoteListComp({ controllerShow: this.controllerShow }) - } - .flexShrink(1) - .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) - .layoutWeight(2) - .height(StyleConstants.PERCENTAGE_100) - .visibility( - LayoutUtil.getWidthWeightMessage(this.sectionStatus) - .noteListVisibility == 0 ? Visibility.None : Visibility.Visible) - // Note content display area - Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { - Divider() - .vertical(true) - .strokeWidth(1) - .color($r("app.color.divider_color_182431")) - .height("100%") - .opacity(StyleConstants.OPACITY_10) - NoteContentComp({ controllerShow: this.controllerShow }) + // Note list display area + Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { + Divider() + .vertical(true) + .strokeWidth(1) + .color($r("app.color.divider_color_182431")) + .height("100%") + .opacity(StyleConstants.OPACITY_10) + NoteListComp({ controllerShow: this.controllerShow }) + } + .flexShrink(1) + .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) + .layoutWeight(2) + .height(StyleConstants.PERCENTAGE_100) + .visibility( + LayoutUtil.getWidthWeightMessage(this.sectionStatus) + .noteListVisibility == 0 ? Visibility.None : Visibility.Visible) + // Note content display area + Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { + Divider() + .vertical(true) + .strokeWidth(1) + .color($r("app.color.divider_color_182431")) + .height("100%") + .opacity(StyleConstants.OPACITY_10) + NoteContentComp({ controllerShow: this.controllerShow }) + } + .flexShrink(0) + .backgroundColor($r("app.color.notecontent_color_ffffff")) + .layoutWeight(this.sectionStatus != 1 ? 3 : null) + .height(StyleConstants.PERCENTAGE_100) + .enabled(this.longpress || this.search && this.inputKeyword.length == 0 ? false : true) + } else if (this.breakPoints === 'md') { + Stack({ alignContent: Alignment.Start }) { + Row() { + // Note list display area + Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { + NoteListComp() + } + .width(StyleConstants.PERCENTAGE_100) + .height(StyleConstants.PERCENTAGE_100) + .enabled(this.expandStatus ? false : true) + .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) + + Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { + Divider() + .vertical(true) + .strokeWidth(1) + .color($r("app.color.divider_color_182431")) + .height("100%") + .opacity(StyleConstants.OPACITY_10) + NoteContentComp({ controllerShow: this.controllerShow }) + } + .flexShrink(0) + .backgroundColor($r("app.color.notecontent_color_ffffff")) + .layoutWeight(this.sectionStatus != 1 ? 3 : null) + .height(StyleConstants.PERCENTAGE_100) + .enabled(this.longpress || this.search && this.inputKeyword.length == 0 ? false : true) + } + + //Folder list display area + Stack() { + FolderListBackGround() + FolderListComp() + } + .width(200) + .height(StyleConstants.PERCENTAGE_100) + .visibility(this.expandStatus == false ? Visibility.None : Visibility.Visible) + } + .width(StyleConstants.PERCENTAGE_100).height(StyleConstants.PERCENTAGE_100) } - .flexShrink(0) - .backgroundColor($r("app.color.notecontent_color_ffffff")) - .layoutWeight(this.sectionStatus != 1 ? 3 : null) - .height(StyleConstants.PERCENTAGE_100) - .enabled(this.longpress || this.search && this.inputKeyword.length == 0 ? false : true) } .width(StyleConstants.PERCENTAGE_100) .height(StyleConstants.PERCENTAGE_100) } - aboutToAppear(): void{ + aboutToAppear(): void { LogUtil.info(this.TAG, "aboutToAppear") - this.narrowWinListener.on('change', this.onWinSizeChange.bind(this)) - this.sectionStatus = this.narrowWinListener.matches ? 2 : 3 let isContinue = AppStorage.Get('IsContinue') LogUtil.info(this.TAG, "aboutToAppear, isContinue : " + isContinue) if (isContinue) { @@ -129,7 +158,7 @@ export struct NoteHomeComp { LogUtil.info(this.TAG, "aboutToAppear, set continue section success") } - aboutToDisappear(): void{ + aboutToDisappear(): void { LogUtil.info(this.TAG, "aboutToDisappear") } } \ No newline at end of file diff --git a/product/phone/src/main/ets/pages/NoteHomePortrait.ets b/product/default/src/main/ets/pages/NoteHomePortrait.ets similarity index 100% rename from product/phone/src/main/ets/pages/NoteHomePortrait.ets rename to product/default/src/main/ets/pages/NoteHomePortrait.ets diff --git a/product/tablet/src/main/module.json5 b/product/default/src/main/module.json5 similarity index 71% rename from product/tablet/src/main/module.json5 rename to product/default/src/main/module.json5 index 4de104c..7c50fbe 100644 --- a/product/tablet/src/main/module.json5 +++ b/product/default/src/main/module.json5 @@ -1,21 +1,6 @@ -/* - * Copyright (c) 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. - */ - { "module": { - "name": "tablet", + "name": "default", "type": "entry", "srcEntrance": "./ets/Application/AbilityStage.ts", "description": "$string:entry_MainAbility", diff --git a/product/phone/src/main/resources/base/element/color.json b/product/default/src/main/resources/base/element/color.json similarity index 100% rename from product/phone/src/main/resources/base/element/color.json rename to product/default/src/main/resources/base/element/color.json diff --git a/product/tablet/src/main/resources/base/element/string.json b/product/default/src/main/resources/base/element/string.json similarity index 100% rename from product/tablet/src/main/resources/base/element/string.json rename to product/default/src/main/resources/base/element/string.json diff --git a/product/tablet/src/main/resources/base/profile/main_pages.json b/product/default/src/main/resources/base/profile/main_pages.json similarity index 100% rename from product/tablet/src/main/resources/base/profile/main_pages.json rename to product/default/src/main/resources/base/profile/main_pages.json diff --git a/product/tablet/src/main/resources/zh_CN/element/string.json b/product/default/src/main/resources/zh_CN/element/string.json similarity index 100% rename from product/tablet/src/main/resources/zh_CN/element/string.json rename to product/default/src/main/resources/zh_CN/element/string.json diff --git a/product/phone/package-lock.json b/product/phone/package-lock.json deleted file mode 100644 index e0a40e9..0000000 --- a/product/phone/package-lock.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "phone", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/component": { - "version": "file:../../common/component", - "requires": { - "@ohos/source": "file:../../common/resources", - "@ohos/utils": "file:../../common/utils" - }, - "dependencies": { - "@ohos/source": { - "version": "file:../../common/resources" - }, - "@ohos/utils": { - "version": "file:../../common/utils", - "requires": { - "@ohos/source": "file:../../common/resources" - }, - "dependencies": { - "@ohos/source": { - "version": "file:../../common/resources" - } - } - } - } - }, - "@ohos/source": { - "version": "file:../../common/resources" - }, - "@ohos/utils": { - "version": "file:../../common/utils", - "requires": { - "@ohos/source": "file:../../common/resources" - }, - "dependencies": { - "@ohos/source": { - "version": "file:../../common/resources" - } - } - } - } -} diff --git a/product/phone/package.json b/product/phone/package.json deleted file mode 100644 index e161814..0000000 --- a/product/phone/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "license":"ISC", - "devDependencies":{}, - "name":"phone", - "ohos":{ - "org":"huawei", - "directoryLevel":"module", - "buildTool":"hvigor" - }, - "description":"example description", - "repository":{}, - "version":"1.0.0", - "dependencies":{ - "@ohos/utils":"file:../../common/utils", - "@ohos/component":"file:../../common/component", - "@ohos/source":"file:../../common/resources" - } -} \ No newline at end of file diff --git a/product/phone/src/main/ets/MainAbility/MainAbility.ts b/product/phone/src/main/ets/MainAbility/MainAbility.ts deleted file mode 100644 index ada4b82..0000000 --- a/product/phone/src/main/ets/MainAbility/MainAbility.ts +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright (c) 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 Ability from '@ohos.application.Ability' -import AbilityConstant from '@ohos.application.AbilityConstant' -import fileio from '@ohos.fileio' -import inputMethod from '@ohos.inputmethod' -globalThis.rdbStore = undefined -export default class MainAbility extends Ability { - private Tag = "MainAbility_Phone" - - onCreate(want, launchParam) { - console.info(this.Tag + " onCreate, launchReason is " + launchParam.launchReason) - AppStorage.SetOrCreate('Expand', false) - AppStorage.SetOrCreate('Choose', true) - if (launchParam.launchReason == 3) { - // 设置迁移标记 - AppStorage.SetOrCreate('IsContinue', true) - // 获取对端的迁移数据 - let continueNote: string = want.parameters["ContinueNote"] - AppStorage.SetOrCreate('ContinueNote', continueNote) - // 来自手机的迁移 - let continueChoose: boolean = want.parameters["ContinueChoose"] - if (continueChoose) { - console.info(this.Tag + " continue from phone") - }else{ - AppStorage.SetOrCreate('ContinueFromTablet', true) - console.info(this.Tag + " continue from tablet") - } - this.context.restoreWindowStage(null) - } - globalThis.noteContext = this.context - } - - onDestroy() { - console.info(this.Tag + " onDestroy") - } - - onWindowStageCreate(windowStage) { - console.info(this.Tag + " onWindowStageCreate") - windowStage.setUIContent(this.context, "pages/MyNoteHome", null) - } - - onWindowStageDestroy() { - console.info(this.Tag + " onWindowStageDestroy") - } - - onForeground() { - console.info(this.Tag + " onForeground") - } - - onBackground() { - console.info(this.Tag + " onBackground") - // 退出键盘 - inputMethod.getInputMethodController().stopInput(); - } - - onContinue(wantParam: { [key: string]: any }) { - console.info(this.Tag + " onContinue") - // 获取本端的迁移数据 - let continueNote = AppStorage.Get('ContinueNote') - if (continueNote == undefined || continueNote == null) { - console.info(this.Tag + " onContinue, continueNote is error, default [0]") - continueNote = JSON.stringify(AppStorage.Get('AllNoteArray')[0].toNoteObject()) - } - - // 保存本端的迁移数据 - wantParam["ContinueNote"] = continueNote - wantParam["ContinueChoose"] = true - - // save img to DisFileDir - console.info(this.Tag + " onContinue, save img to DisFileDir") - let continueNoteObj = JSON.parse(continueNote) - let srcArray = this.getSrcFromHtml(continueNoteObj.content_text) - srcArray.forEach((src: string) => { - let lastIndex = src.lastIndexOf('/') - if (lastIndex != -1) { - let imgName = src.substring(lastIndex + 1) - this.writeToDisFileDir(imgName) - } - }) - console.info(this.Tag + " onContinue end") - return AbilityConstant.OnContinueResult.AGREE; - } - - getSrcFromHtml(html: string): any{ - let srcArray = [] - if (html == undefined || html == null || html == "") { - return srcArray - } - let imgReg = /]+>/g - let srcReg = /src=[\'\"]?([^\'\"]*)[\'\"]?/i - let imgArray = html.match(imgReg) - if (imgArray != null) { - for (let i = 0; i < imgArray.length; i++) { - let src = imgArray[i].match(srcReg) - if (src != null && src.length > 1) { - srcArray.push(src[1]) - } - } - } - return srcArray - } - - writeToDisFileDir(fileName: string) { - console.info(this.Tag + " writeToDisFileDir, fileName : " + fileName) - let filesDir = this.context.filesDir - let srcPath = filesDir + "/" + fileName - let distributedFilesDir = this.context.distributedFilesDir - let desPath = distributedFilesDir + "/" + fileName - try { - fileio.copyFileSync(srcPath, desPath) - console.info(this.Tag + " onContinue, writeToDisFileDir, copyFile successfully") - } catch (err) { - console.warn(this.Tag + " onContinue, writeToDisFileDir, copyFile failed : " + err) - } - } -} \ No newline at end of file diff --git a/product/phone/src/main/ets/pages/MyNoteHome.ets b/product/phone/src/main/ets/pages/MyNoteHome.ets deleted file mode 100644 index 5989b0a..0000000 --- a/product/phone/src/main/ets/pages/MyNoteHome.ets +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (c) 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 fileio from '@ohos.fileio' -import bundle from '@ohos.bundle' -import abilityAccessCtrl from '@ohos.abilityAccessCtrl' -import {NoteHomePortraitComp} from './NoteHomePortrait' -import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' -import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil' -import inputMethod from '@ohos.inputmethod' -import router from '@system.router' - -@Entry -@Component -export struct MyNoteHomeComp { - @StorageLink('DBQueryFinished') dBQueryFinished: number = 0 - @Provide('PortraitModel') portraitModel: boolean = true - @Provide('RefreshFlag') refreshFlag: number = 0 - private context = getContext(this) - TAG = "MyNoteHomeComp_Phone" - - build() { - Flex() { - if (this.dBQueryFinished == 1) { - NoteHomePortraitComp() - } - } - .width('100%').height('100%') - } - - aboutToAppear(): void{ - LogUtil.info(this.TAG, "aboutToAppear") - - if (this.context == undefined || this.context == null) { - LogUtil.warn(this.TAG, "context is error") - return - } - - let permissionList: Array = [ - "ohos.permission.READ_MEDIA", - "ohos.permission.MEDIA_LOCATION", - "ohos.permission.DISTRIBUTED_DATASYNC" - ] - LogUtil.info(this.TAG, 'permissions need to require from user') - let context: any = getContext(this); - context.requestPermissionsFromUser(permissionList).then((data) => { - LogUtil.info(this.TAG, 'data permissions : ' + data.permissions) - LogUtil.info(this.TAG, 'data result: ' + data.authResults) - let sum = 0 - for (let i = 0; i < data.authResults.length; i++) { - sum += data.authResults[i] - } - LogUtil.info(this.TAG, 'request permissions sum: ' + sum) - }, (err) => { - LogUtil.warn(this.TAG, 'failed to requestPermissionsFromUser : ' + err.code); - }) - - let dbExist = false; - let dbPath = context.databaseDir + "/db/note.db" - try { - fileio.accessSync(dbPath) - LogUtil.info(this.TAG, "db has created") - RdbStoreUtil.initAppStorage(this.context) - dbExist = true - } catch (err) { - LogUtil.info(this.TAG, "db has not created, find to rdb folder") - } - if (!dbExist) { - dbPath = context.databaseDir + "/rdb/note.db" - try{ - fileio.accessSync(dbPath) - LogUtil.info(this.TAG,"db has created") - RdbStoreUtil.initAppStorage(this.context) - } catch (err) { - LogUtil.info(this.TAG,"db has not created, start to create db") - RdbStoreUtil.createRdbStore(this.context) - } - } - } - - aboutToDisappear(): void{ - LogUtil.info(this.TAG, "aboutToDisappear") - } - - onPageShow(): void{ - LogUtil.info(this.TAG, "onPageShow") - this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0) - // continue from tablet - let continueFromTablet = AppStorage.Get('ContinueFromTablet') - LogUtil.info(this.TAG, "onPageShow, continueFromTablet : " + continueFromTablet) - let noteContentHomeExist = AppStorage.Get('NoteContentHomeExist') - LogUtil.info(this.TAG, "onPageShow, noteContentHomeExist : " + noteContentHomeExist) - if (continueFromTablet && !noteContentHomeExist) { - router.push({ uri: 'pages/NoteContentHome' }) - AppStorage.SetOrCreate('ContinueFromTablet', false) - } - } - - onBackPress():void{ - LogUtil.info(this.TAG, "onBackPress") - // 退出键盘 - inputMethod.getInputMethodController().stopInput(); - } -} \ No newline at end of file diff --git a/product/phone/src/main/ets/pages/NoteContentHome.ets b/product/phone/src/main/ets/pages/NoteContentHome.ets deleted file mode 100644 index d12a18e..0000000 --- a/product/phone/src/main/ets/pages/NoteContentHome.ets +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 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 {NoteContentCompPortrait} from '@ohos/component/src/main/ets/components/NoteContentCompPortrait' -import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' -import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil' - -@Entry -@Component -struct NoteContentHome { - @Provide('RefreshFlag') refreshFlag: number = 0 - private controllerShow: WebController = new WebController() - @StorageLink('DBQueryFinished') dBQueryFinished: number = 0 - TAG = "NoteContentHome_Phone" - - build() { - // Note content display area - Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { - if (this.dBQueryFinished == 1) { - NoteContentCompPortrait({ controllerShow: this.controllerShow }) - } - } - .backgroundColor($r("app.color.notecontent_color_ffffff")) - .width('100%') - .height('100%') - } - - onBackPress():void{ - LogUtil.info(this.TAG, "onBackPress") - this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setInputEnabled(false)" }) - this.controllerShow.runJavaScript({ script: "getHtmlContent()" }) - } - - aboutToAppear(): void{ - LogUtil.info(this.TAG, "aboutToAppear") - let isContinue = AppStorage.Get('IsContinue') - LogUtil.info(this.TAG, "aboutToAppear, isContinue : " + isContinue) - if (isContinue) { - RdbStoreUtil.initAppStorage(globalThis.noteContext) - } - AppStorage.SetOrCreate('NoteContentHomeExist', true) - } - -} \ No newline at end of file diff --git a/product/phone/src/main/module.json5 b/product/phone/src/main/module.json5 deleted file mode 100644 index 4ae9bc0..0000000 --- a/product/phone/src/main/module.json5 +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 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. - */ - -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:entry_MainAbility", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - ], - "requestPermissions": [ - { - "name": "ohos.permission.INTERNET" - }, - { - "name": "ohos.permission.READ_MEDIA", - "reason": "$string:read_media_permission" - }, - { - "name": "ohos.permission.MEDIA_LOCATION", - "reason": "$string:media_location_permission" - }, - { - "name": "ohos.permission.DISTRIBUTED_DATASYNC", - "reason": "$string:distributed_dataSync_permission" - }, - ], - "deliveryWithInstall": true, - "installationFree": false, - "pages": "$profile:main_pages", - "uiSyntax": "ets", - "abilities": [ - { - "name": "MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:entry_MainAbility", - "icon": "$media:note", - "label": "$string:entry_MainAbility", - "visible": true, - "continuable": true, - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "startWindowBackground": "$color:color_1", - "startWindowIcon": "$media:note" - } - ] - } -} \ No newline at end of file diff --git a/product/phone/src/main/resources/base/element/string.json b/product/phone/src/main/resources/base/element/string.json deleted file mode 100644 index 3650d72..0000000 --- a/product/phone/src/main/resources/base/element/string.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "备忘录" - }, - { - "name": "read_media_permission", - "value": "Used to read media file information in external storage of users" - }, - { - "name": "media_location_permission", - "value": "Used for memo access to geographic location information in user media files" - }, - { - "name": "distributed_dataSync_permission", - "value": "Used for memo data exchange between different equipment" - } - ] -} \ No newline at end of file diff --git a/product/phone/src/main/resources/base/profile/main_pages.json b/product/phone/src/main/resources/base/profile/main_pages.json deleted file mode 100644 index 3ed4365..0000000 --- a/product/phone/src/main/resources/base/profile/main_pages.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "src": [ - "pages/MyNoteHome", - "pages/NoteContentHome", - "pages/NoteHomePortrait" - ] -} \ No newline at end of file diff --git a/product/phone/src/main/resources/zh_CN/element/string.json b/product/phone/src/main/resources/zh_CN/element/string.json deleted file mode 100644 index 215a916..0000000 --- a/product/phone/src/main/resources/zh_CN/element/string.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "string": [ - { - "name": "read_media_permission", - "value": "用于备忘录读取用户外部存储中的媒体文件信息" - }, - { - "name": "media_location_permission", - "value": "用于备忘录访问用户媒体文件中的地理位置信息" - }, - { - "name": "distributed_dataSync_permission", - "value": "用于备忘录进行不同设备间的数据交换" - } - ] -} \ No newline at end of file diff --git a/product/tablet/.gitignore b/product/tablet/.gitignore deleted file mode 100644 index 4f9a973..0000000 --- a/product/tablet/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/node_modules -/.preview -/build \ No newline at end of file diff --git a/product/tablet/build-profile.json5 b/product/tablet/build-profile.json5 deleted file mode 100644 index a011ff8..0000000 --- a/product/tablet/build-profile.json5 +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 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. - */ - -{ - "apiType": 'stageMode', - "buildOption": { - }, - "targets": [ - { - "name": "default", - } - ] -} \ No newline at end of file diff --git a/product/tablet/package.json b/product/tablet/package.json deleted file mode 100644 index 4cfedc4..0000000 --- a/product/tablet/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "license":"ISC", - "devDependencies":{}, - "name":"tablet", - "ohos":{ - "org":"huawei", - "directoryLevel":"module", - "buildTool":"hvigor" - }, - "description":"example description", - "repository":{}, - "version":"1.0.0", - "dependencies":{ - "@ohos/utils":"file:../../common/utils", - "@ohos/component":"file:../../common/component", - "@ohos/source":"file:../../common/resources" - } -} \ No newline at end of file diff --git a/product/tablet/src/main/ets/Application/AbilityStage.ts b/product/tablet/src/main/ets/Application/AbilityStage.ts deleted file mode 100644 index 32dfe93..0000000 --- a/product/tablet/src/main/ets/Application/AbilityStage.ts +++ /dev/null @@ -1,7 +0,0 @@ -import AbilityStage from "@ohos.application.AbilityStage" - -export default class MyAbilityStage extends AbilityStage { - onCreate() { - console.log("[Demo] MyAbilityStage onCreate") - } -} \ No newline at end of file diff --git a/product/tablet/src/main/ets/pages/NoteHomePortrait.ets b/product/tablet/src/main/ets/pages/NoteHomePortrait.ets deleted file mode 100644 index ec185df..0000000 --- a/product/tablet/src/main/ets/pages/NoteHomePortrait.ets +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 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 { FolderListComp, FolderListBackGround } from '@ohos/component/src/main/ets/components/FolderListComp' -import { NoteListComp } from '@ohos/component/src/main/ets/components/NoteListComp' -import { NoteContentCompPortrait } from '@ohos/component/src/main/ets/components/NoteContentCompPortrait' -import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants' -import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' -import { circleColorArray } from '@ohos/utils/src/main/ets/default/model/NoteBaseData' -import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData' -import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData' -import { SysDefFolderUuid } from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' -import LayoutUtil from '@ohos/utils/src/main/ets/default/baseUtil/LayoutUtil' -import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil' - -@Entry -@Component -export struct NoteHomePortraitComp { - // 当前文件夹、笔记、分栏 - @Provide('SelectedFolderData') selectedFolderData: FolderData = AppStorage.Get('Folder') - @Provide('SelectedNoteData') selectedNoteData: NoteData = AppStorage.Get('Note') - @Provide('SectionStatus') sectionStatus: number = 1; // 表示分栏状态， 3表示三分栏， 2表示二分栏，1表示一分栏 - @Provide('LastSectionStatus') lastSectionStatus: number = 1; // 记录分栏上一次的状态 - @Provide('SelectedColor') selectedColor: string = circleColorArray[0]; - @Provide('Longpress') longpress: boolean = false // 第二栏长按状态 - - // 分栏状态 - @Provide('ExpandStatus') expandStatus: boolean = AppStorage.Get('Expand') // 笔记本折叠展开状态 - @Provide('ChooseNote') chooseNote: boolean = AppStorage.Get('Choose') // 是否选择笔记进行打开 - - @Provide('Search') search: boolean = false // 是否处于搜索状态 - @Provide('SearchResultList') searchResultList: NoteData[] = [] // 搜索得到的笔记列表 - @Provide('InputKeyword') inputKeyword: string = '' // 搜索的字串 - @Provide('SelectedAll') selectedAll: boolean = false; - @Provide('EditModel') editModel: boolean = false - TAG = "NoteHomePortraitComp_Phone" - - build() { - Stack({ alignContent: Alignment.Start }) { - - // Note list display area - Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { - NoteListComp() - } - .width(StyleConstants.PERCENTAGE_100) - .height(StyleConstants.PERCENTAGE_100) - .enabled(this.expandStatus ? false : true) - .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) - - //Folder list display area - Stack() { - FolderListBackGround() - FolderListComp() - } - .width(200) - .height(StyleConstants.PERCENTAGE_100) - .visibility(this.expandStatus == false ? Visibility.None : Visibility.Visible) - } - .width(StyleConstants.PERCENTAGE_100).height(StyleConstants.PERCENTAGE_100) - } - - aboutToAppear(): void{ - LogUtil.info(this.TAG, "aboutToAppear") - } - - aboutToDisappear(): void{ - LogUtil.info(this.TAG, "aboutToDisappear") - } -} \ No newline at end of file diff --git a/product/tablet/src/main/resources/base/element/color.json b/product/tablet/src/main/resources/base/element/color.json deleted file mode 100644 index 0c413af..0000000 --- a/product/tablet/src/main/resources/base/element/color.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "color": [ - { - "name": "color_1", - "value": "#fff" - } - ] -} \ No newline at end of file -- Gitee From 884d8030c4eea87d7852dafe82be96b3d91cb5f0 Mon Sep 17 00:00:00 2001 From: wangzhiyusss Date: Mon, 7 Nov 2022 21:15:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=80=E5=A4=9A=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangzhiyusss --- .hvigor/outputs/logs/details/details.json | 12 + build-profile.json5 | 39 +- common/component/build-profile.json5 | 20 - common/component/hvigorfile.js | 3 - common/component/index.ets | 21 - common/component/package.json | 17 - common/resources/package.json | 24 +- common/resources/src/main/module.json5 | 2 +- .../main/resources/rawfile/editor_style.css | 2 +- .../src/main/resources/rawfile/rich_editor.js | 4 +- common/utils/package.json | 26 +- common/utils/src/main/module.json5 | 2 +- {product/phone => features}/.gitignore | 3 +- features/build-profile.json5 | 16 + {product/tablet => features}/hvigorfile.js | 2 +- .../component => features}/package-lock.json | 8 +- features/package.json | 17 + .../src/main/ets/components/CusDialogComp.ets | 0 .../main/ets/components/FolderListComp.ets | 26 +- .../src/main/ets/components/NoteContent.ets | 0 .../main/ets/components/NoteContentComp.ets | 0 .../components/NoteContentCompPortrait.ets | 0 .../src/main/ets/components/NoteListComp.ets | 180 ++-- .../src/main/module.json5 | 2 +- package-lock.json | 785 ++++-------------- package.json | 7 +- .../component => product/default}/.gitignore | 0 .../{phone => default}/build-profile.json5 | 0 product/{phone => default}/hvigorfile.js | 0 product/{tablet => default}/package-lock.json | 2 +- product/default/package.json | 18 + .../src/main/ets/Application/AbilityStage.ts | 0 .../src/main/ets/MainAbility/MainAbility.ts | 27 +- .../src/main/ets/pages/MyNoteHome.ets | 13 +- .../src/main/ets/pages/NoteContentHome.ets | 27 +- .../src/main/ets/pages/NoteHome.ets | 154 ++-- .../src/main/ets/pages/NoteHomePortrait.ets | 2 +- .../{tablet => default}/src/main/module.json5 | 17 +- .../main/resources/base/element/color.json | 0 .../main/resources/base/element/string.json | 0 .../resources/base/profile/main_pages.json | 0 .../main/resources/zh_CN/element/string.json | 0 product/phone/package-lock.json | 45 - product/phone/package.json | 18 - .../src/main/ets/MainAbility/MainAbility.ts | 130 --- .../phone/src/main/ets/pages/MyNoteHome.ets | 116 --- .../src/main/ets/pages/NoteContentHome.ets | 56 -- .../src/main/ets/pages/NoteHomePortrait.ets | 81 -- product/phone/src/main/module.json5 | 71 -- .../main/resources/base/element/string.json | 20 - .../resources/base/profile/main_pages.json | 7 - .../main/resources/zh_CN/element/string.json | 16 - product/tablet/.gitignore | 3 - product/tablet/build-profile.json5 | 25 - product/tablet/package.json | 18 - .../src/main/ets/Application/AbilityStage.ts | 7 - .../main/resources/base/element/color.json | 8 - 57 files changed, 567 insertions(+), 1532 deletions(-) create mode 100644 .hvigor/outputs/logs/details/details.json delete mode 100644 common/component/build-profile.json5 delete mode 100644 common/component/hvigorfile.js delete mode 100644 common/component/index.ets delete mode 100644 common/component/package.json rename {product/phone => features}/.gitignore (66%) create mode 100644 features/build-profile.json5 rename {product/tablet => features}/hvigorfile.js (63%) rename {common/component => features}/package-lock.json (60%) create mode 100644 features/package.json rename {common/component => features}/src/main/ets/components/CusDialogComp.ets (100%) rename {common/component => features}/src/main/ets/components/FolderListComp.ets (96%) rename {common/component => features}/src/main/ets/components/NoteContent.ets (100%) rename {common/component => features}/src/main/ets/components/NoteContentComp.ets (100%) rename {common/component => features}/src/main/ets/components/NoteContentCompPortrait.ets (100%) rename {common/component => features}/src/main/ets/components/NoteListComp.ets (89%) rename {common/component => features}/src/main/module.json5 (97%) rename {common/component => product/default}/.gitignore (100%) rename product/{phone => default}/build-profile.json5 (100%) rename product/{phone => default}/hvigorfile.js (100%) rename product/{tablet => default}/package-lock.json (95%) create mode 100644 product/default/package.json rename product/{phone => default}/src/main/ets/Application/AbilityStage.ts (100%) rename product/{tablet => default}/src/main/ets/MainAbility/MainAbility.ts (87%) rename product/{tablet => default}/src/main/ets/pages/MyNoteHome.ets (94%) rename product/{tablet => default}/src/main/ets/pages/NoteContentHome.ets (70%) rename product/{tablet => default}/src/main/ets/pages/NoteHome.ets (45%) rename product/{tablet => default}/src/main/ets/pages/NoteHomePortrait.ets (96%) rename product/{tablet => default}/src/main/module.json5 (71%) rename product/{phone => default}/src/main/resources/base/element/color.json (100%) rename product/{tablet => default}/src/main/resources/base/element/string.json (100%) rename product/{tablet => default}/src/main/resources/base/profile/main_pages.json (100%) rename product/{tablet => default}/src/main/resources/zh_CN/element/string.json (100%) delete mode 100644 product/phone/package-lock.json delete mode 100644 product/phone/package.json delete mode 100644 product/phone/src/main/ets/MainAbility/MainAbility.ts delete mode 100644 product/phone/src/main/ets/pages/MyNoteHome.ets delete mode 100644 product/phone/src/main/ets/pages/NoteContentHome.ets delete mode 100644 product/phone/src/main/ets/pages/NoteHomePortrait.ets delete mode 100644 product/phone/src/main/module.json5 delete mode 100644 product/phone/src/main/resources/base/element/string.json delete mode 100644 product/phone/src/main/resources/base/profile/main_pages.json delete mode 100644 product/phone/src/main/resources/zh_CN/element/string.json delete mode 100644 product/tablet/.gitignore delete mode 100644 product/tablet/build-profile.json5 delete mode 100644 product/tablet/package.json delete mode 100644 product/tablet/src/main/ets/Application/AbilityStage.ts delete mode 100644 product/tablet/src/main/resources/base/element/color.json diff --git a/.hvigor/outputs/logs/details/details.json b/.hvigor/outputs/logs/details/details.json new file mode 100644 index 0000000..a369858 --- /dev/null +++ b/.hvigor/outputs/logs/details/details.json @@ -0,0 +1,12 @@ +{ + "totalTime": 9898082500, + "moduleNum": 4, + "taskTime": { + "sdkDirInit": 4385500, + "compileETS": 8612949500, + "compileJS": 404700, + "compileResource": 148983100, + "packageHap": 258042800, + "signHap": 1543400 + } +} \ No newline at end of file diff --git a/build-profile.json5 b/build-profile.json5 index df83ecd..5c4f2c9 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -1,18 +1,3 @@ -/* - * Copyright (c) 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. - */ - { "app": { "compileSdkVersion": 9, @@ -25,20 +10,8 @@ }, "modules": [ { - "name": "phone", - "srcPath": "./product/phone", - "targets": [ - { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - }, - { - "name": "tablet", - "srcPath": "./product/tablet", + "name": "default", + "srcPath": "./product/default", "targets": [ { "name": "default", @@ -52,13 +25,13 @@ "name": "utils", "srcPath": "./common/utils" }, - { - "name": "component", - "srcPath": "./common/component" - }, { "name": "resources", "srcPath": "./common/resources" + }, + { + "name": "component", + "srcPath": "./features", } ] } \ No newline at end of file diff --git a/common/component/build-profile.json5 b/common/component/build-profile.json5 deleted file mode 100644 index c6e5a1e..0000000 --- a/common/component/build-profile.json5 +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 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. - */ - -{ - "apiType": "stageMode", - "buildOption": { - } -} diff --git a/common/component/hvigorfile.js b/common/component/hvigorfile.js deleted file mode 100644 index 42ed4b4..0000000 --- a/common/component/hvigorfile.js +++ /dev/null @@ -1,3 +0,0 @@ -// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').harTasks - diff --git a/common/component/index.ets b/common/component/index.ets deleted file mode 100644 index 1c1e0b7..0000000 --- a/common/component/index.ets +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 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. - */ - -export * from './src/main/ets/components/CusDialogComp'; -export * from './src/main/ets/components/FolderListComp'; -export * from './src/main/ets/components/NoteContent'; -export { ToolBarComp, NoteContentComp, NoteContentOverViewComp } from './src/main/ets/components/NoteContentComp'; -export { NoteContentCompPortrait } from './src/main/ets/components/NoteContentCompPortrait'; -export * from './src/main/ets/components/NoteListComp'; \ No newline at end of file diff --git a/common/component/package.json b/common/component/package.json deleted file mode 100644 index a378052..0000000 --- a/common/component/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "license":"ISC", - "types":"", - "devDependencies":{}, - "name":"@ohos/component", - "description":"a npm package which contains arkUI2.0 page", - "ohos":{ - "org":"" - }, - "main":"index.ets", - "repository":{}, - "version":"1.0.0", - "dependencies":{ - "@ohos/utils":"file:../utils", - "@ohos/source":"file:../resources" - } -} \ No newline at end of file diff --git a/common/resources/package.json b/common/resources/package.json index e91259f..58e3ac4 100644 --- a/common/resources/package.json +++ b/common/resources/package.json @@ -1,14 +1,14 @@ { - "license":"ISC", - "types":"", - "devDependencies":{}, - "name":"@ohos/resources", - "description":"a npm package which contains arkUI2.0 page", - "ohos":{ - "org":"" + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/resources", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" }, - "main":"index.ets", - "repository":{}, - "version":"1.0.0", - "dependencies":{} -} \ No newline at end of file + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/common/resources/src/main/module.json5 b/common/resources/src/main/module.json5 index ed81e03..ba85f70 100644 --- a/common/resources/src/main/module.json5 +++ b/common/resources/src/main/module.json5 @@ -18,7 +18,7 @@ "name": "resources", "type": "har", "deviceTypes": [ - "phone", + "default", "tablet" ], "uiSyntax": "ets" diff --git a/common/resources/src/main/resources/rawfile/editor_style.css b/common/resources/src/main/resources/rawfile/editor_style.css index 150ad9b..142d6c2 100644 --- a/common/resources/src/main/resources/rawfile/editor_style.css +++ b/common/resources/src/main/resources/rawfile/editor_style.css @@ -46,7 +46,7 @@ body { #editorjs[placeholder]:empty:not(:focus):before { content: attr(placeholder); - font-size: 16px; + font-size: 16lpx; color: #9b9b9b; } diff --git a/common/resources/src/main/resources/rawfile/rich_editor.js b/common/resources/src/main/resources/rawfile/rich_editor.js index 08ce432..4383f8f 100644 --- a/common/resources/src/main/resources/rawfile/rich_editor.js +++ b/common/resources/src/main/resources/rawfile/rich_editor.js @@ -253,10 +253,10 @@ RICH_EDITOR.setOutdent = function () { var parents = document.getElementById('editorjs'); parents.removeAttribute('padding-left'); if (pad === 24) { - parents.style.paddingLeft = 24 + 'px'; + parents.style.paddingLeft = 24 + 'lpx'; } else { pad = pad - 24; - parents.style.paddingLeft = pad + 'px'; + parents.style.paddingLeft = pad + 'lpx'; } }; diff --git a/common/utils/package.json b/common/utils/package.json index acf594b..6581745 100644 --- a/common/utils/package.json +++ b/common/utils/package.json @@ -1,16 +1,16 @@ { - "license":"ISC", - "types":"", - "devDependencies":{}, - "name":"@ohos/utils", - "description":"a npm package which contains arkUI2.0 page", - "ohos":{ - "org":"" + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/utils", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" }, - "main":"index.ets", - "repository":{}, - "version":"1.0.0", - "dependencies":{ - "@ohos/source":"file:../resources" + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": { + "@ohos/source": "file:../resources" } -} \ No newline at end of file +} diff --git a/common/utils/src/main/module.json5 b/common/utils/src/main/module.json5 index 93ca104..1f9bfeb 100644 --- a/common/utils/src/main/module.json5 +++ b/common/utils/src/main/module.json5 @@ -18,7 +18,7 @@ "name": "utils", "type": "har", "deviceTypes": [ - "phone", + "default", "tablet" ], "uiSyntax": "ets" diff --git a/product/phone/.gitignore b/features/.gitignore similarity index 66% rename from product/phone/.gitignore rename to features/.gitignore index 4f9a973..5a6ba80 100644 --- a/product/phone/.gitignore +++ b/features/.gitignore @@ -1,3 +1,4 @@ /node_modules /.preview -/build \ No newline at end of file +/build +/.cxx \ No newline at end of file diff --git a/features/build-profile.json5 b/features/build-profile.json5 new file mode 100644 index 0000000..3d64d69 --- /dev/null +++ b/features/build-profile.json5 @@ -0,0 +1,16 @@ +{ + "apiType": 'stageMode', + "buildOption": { + }, + "entryModules": [ + "tablet" + ], + "targets": [ + { + "name": "default" + }, + { + "name": "ohosTest", + } + ] +} \ No newline at end of file diff --git a/product/tablet/hvigorfile.js b/features/hvigorfile.js similarity index 63% rename from product/tablet/hvigorfile.js rename to features/hvigorfile.js index d7720ee..ec14ea6 100644 --- a/product/tablet/hvigorfile.js +++ b/features/hvigorfile.js @@ -1,2 +1,2 @@ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks +module.exports = require('@ohos/hvigor-ohos-plugin').harTasks \ No newline at end of file diff --git a/common/component/package-lock.json b/features/package-lock.json similarity index 60% rename from common/component/package-lock.json rename to features/package-lock.json index db5fde3..bf24415 100644 --- a/common/component/package-lock.json +++ b/features/package-lock.json @@ -5,16 +5,16 @@ "requires": true, "dependencies": { "@ohos/source": { - "version": "file:../resources" + "version": "file:../common/resources" }, "@ohos/utils": { - "version": "file:../utils", + "version": "file:../common/utils", "requires": { - "@ohos/source": "file:../resources" + "@ohos/source": "file:../common/resources" }, "dependencies": { "@ohos/source": { - "version": "file:../resources" + "version": "file:../common/resources" } } } diff --git a/features/package.json b/features/package.json new file mode 100644 index 0000000..77cec25 --- /dev/null +++ b/features/package.json @@ -0,0 +1,17 @@ +{ + "license": "ISC", + "types": "", + "devDependencies": {}, + "name": "@ohos/component", + "description": "a npm package which contains arkUI2.0 page", + "ohos": { + "org": "" + }, + "main": "index.ets", + "repository": {}, + "version": "1.0.0", + "dependencies": { + "@ohos/utils": "file:../common/utils", + "@ohos/source": "file:../common/resources" + } +} diff --git a/common/component/src/main/ets/components/CusDialogComp.ets b/features/src/main/ets/components/CusDialogComp.ets similarity index 100% rename from common/component/src/main/ets/components/CusDialogComp.ets rename to features/src/main/ets/components/CusDialogComp.ets diff --git a/common/component/src/main/ets/components/FolderListComp.ets b/features/src/main/ets/components/FolderListComp.ets similarity index 96% rename from common/component/src/main/ets/components/FolderListComp.ets rename to features/src/main/ets/components/FolderListComp.ets index d36b5df..574af88 100644 --- a/common/component/src/main/ets/components/FolderListComp.ets +++ b/features/src/main/ets/components/FolderListComp.ets @@ -15,7 +15,14 @@ import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData' import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData' -import { SysDefFolderUuid, TableName, FolderType, FolderTableColumn, NoteTableColumn, Delete, DeleteFileType +import { + SysDefFolderUuid, + TableName, + FolderType, + FolderTableColumn, + NoteTableColumn, + Delete, + DeleteFileType } from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' import { NewOrEditFolderDialog, DeleteDialog } from './CusDialogComp' import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants' @@ -27,9 +34,10 @@ import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' // Folder list component @Component export struct FolderListComp { - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') + @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') @Consume('SectionStatus') sectionStatus: number @Consume('ExpandStatus') expandStatus: boolean // 笔记本折叠展开状态 + @StorageLink('breakPoint') breakPoints: string = 'lg' controllerShow: WebController TAG = "FolderListComp" @@ -42,7 +50,7 @@ export struct FolderListComp { .width(24) .responseRegion({ x: -15.0, y: -15.0, width: 54, height: 54 }) .onClick(() => { - if (this.sectionStatus == 1) { + if (this.breakPoints == 'sm' || this.breakPoints == 'md') { this.expandStatus = !this.expandStatus } else { this.sectionStatus = (this.sectionStatus == 3 ? 2 : 3) @@ -92,18 +100,18 @@ export struct FolderListComp { .height("100%") } - aboutToAppear(): void{ + aboutToAppear(): void { LogUtil.info(this.TAG, "aboutToAppear") } - aboutToDisappear(): void{ + aboutToDisappear(): void { LogUtil.info(this.TAG, "aboutToDisappear") } } @Component export struct NoteAndCreateComp { - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') + @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') @Consume('SelectedColor') selectedColor: string @Consume('PortraitModel') portraitModel: boolean folderCreateDialogCtl: CustomDialogController = new CustomDialogController({ @@ -157,9 +165,9 @@ export struct NoteAndCreateComp { @Component struct FolderItemComp { @State folderItem: FolderData = undefined - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = [] - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = [] - @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] + @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = [] + @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = [] + @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('SelectedNoteData') selectedNoteData: NoteData @Consume('RefreshFlag') refreshFlag: number diff --git a/common/component/src/main/ets/components/NoteContent.ets b/features/src/main/ets/components/NoteContent.ets similarity index 100% rename from common/component/src/main/ets/components/NoteContent.ets rename to features/src/main/ets/components/NoteContent.ets diff --git a/common/component/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets similarity index 100% rename from common/component/src/main/ets/components/NoteContentComp.ets rename to features/src/main/ets/components/NoteContentComp.ets diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/features/src/main/ets/components/NoteContentCompPortrait.ets similarity index 100% rename from common/component/src/main/ets/components/NoteContentCompPortrait.ets rename to features/src/main/ets/components/NoteContentCompPortrait.ets diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/features/src/main/ets/components/NoteListComp.ets similarity index 89% rename from common/component/src/main/ets/components/NoteListComp.ets rename to features/src/main/ets/components/NoteListComp.ets index a87b1f5..4dda2c3 100644 --- a/common/component/src/main/ets/components/NoteListComp.ets +++ b/features/src/main/ets/components/NoteListComp.ets @@ -16,7 +16,14 @@ import DateUtil from '@ohos/utils/src/main/ets/default/baseUtil/DateUtil' import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData' import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData' -import { TableName, NoteTableColumn, SysDefFolderUuid, Favorite, Delete, Top, NoteType +import { + TableName, + NoteTableColumn, + SysDefFolderUuid, + Favorite, + Delete, + Top, + NoteType } from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' import { NoteDataMoveDialog, DeleteDialog } from './CusDialogComp' import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil' @@ -45,7 +52,7 @@ async function routePage() { // Note list component @Component export struct NoteListComp { - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') + @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('Search') search: boolean controllerShow: WebController @@ -73,19 +80,19 @@ export struct NoteListComp { .width('100%') } - aboutToAppear(): void{ + aboutToAppear(): void { LogUtil.info(TAG, "aboutToAppear") } - aboutToDisappear(): void{ + aboutToDisappear(): void { LogUtil.info(TAG, "aboutToDisappear") } } @Component struct NoteOverViewComp { - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') - @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] + @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') + @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('RefreshFlag') refreshFlag: number @Consume('SectionStatus') sectionStatus: number @@ -93,6 +100,7 @@ struct NoteOverViewComp { @Consume('ExpandStatus') expandStatus: boolean @Consume('Search') search: boolean @Consume('PortraitModel') portraitModel: boolean + @StorageLink('breakPoint') breakPoints: string = 'lg' controllerShow: WebController build() { @@ -100,13 +108,18 @@ struct NoteOverViewComp { Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center }) { Column() { Image($r("app.media.suojin_back")) - .height(this.portraitModel ? 24 : '12lpx') - .width(this.portraitModel ? 24 : '12lpx') - .responseRegion({ x: -15.0, y: -15.0, width: this.portraitModel ? 54 : '27lpx', height: this.portraitModel ? 54 : '27lpx'}) - .margin({ right: this.sectionStatus != 3 ? this.portraitModel ? 24 : '12lpx' : 0 }) // 两分栏时缩进图片与右边有个24的间距 - .visibility(this.sectionStatus != 3 ? Visibility.Visible : Visibility.None) + .height(24) + .width(24) + .responseRegion({ + x: -15.0, + y: -15.0, + width: 54, + height: 54 + }) + .margin({ right: 24}) // 两分栏时缩进图片与右边有个24的间距 + .visibility(this.breakPoints == 'lg' && this.sectionStatus == 3 ? Visibility.None : Visibility.Visible) .onClick(() => { - if (this.sectionStatus == 1) { + if (this.breakPoints == 'sm' || this.breakPoints == 'md') { this.expandStatus = !this.expandStatus } else { this.sectionStatus = (this.sectionStatus == 3 ? 2 : 3) @@ -124,42 +137,50 @@ struct NoteOverViewComp { alignItems: ItemAlign.Start }) { Text(FolderUtil.getFolderText(this.selectedFolderData)) - .fontSize(this.portraitModel ? 30 : '15lpx') + .fontSize(30) .fontColor($r("app.color.all_notes_font_color")) .fontWeight(FontWeight.Medium) .textOverflow({ overflow: TextOverflow.Ellipsis }) + .maxLines(1) Row() { Text(FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid).toString()) - .fontSize(this.portraitModel ? 14 : '7lpx') + .maxLines(1) + .fontSize(14) .fontColor($r("app.color.num_of_notes_font_color")) Text($r("app.string.noteslist")) - .fontSize(this.portraitModel ? 14 : '7lpx') + .maxLines(1) + .fontSize(14) .fontColor($r("app.color.num_of_notes_font_color")) .textOverflow({ overflow: TextOverflow.Ellipsis }) } - .margin({ top: this.portraitModel ? 5 : '2.5lpx' }) + .margin({ top: 5 }) .visibility((FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0) ? Visibility.None : Visibility.Visible) }.visibility(this.longpress ? Visibility.None : Visibility.Visible) Row() { Image($r("app.media.cross")) - .height(this.portraitModel ? 24 : '12lpx') - .width(this.portraitModel ? 24 : '12lpx') - .responseRegion({ x: -15.0, y: -15.0, width: this.portraitModel ? 54 : '27lpx', height: this.portraitModel ? 54 : '27lpx' }) + .height(24) + .width(24) + .responseRegion({ + x: -15.0, + y: -15.0, + width: 54, + height: 54 + }) .onClick(() => { this.longpress = false this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0) NoteUtil.unsetAllNotesChecked(this.CheckedNoteArray) }) Text(this.CheckedNoteArray.length == 0 ? $r("app.string.none_selected") : $r("app.string.selected", this.CheckedNoteArray.length)) - .fontSize(this.portraitModel ? 20 : '10lpx') + .fontSize(20) .fontColor($r("app.color.note_selected_font_color")) - .margin({ left: this.portraitModel ? 16 : '8lpx' }) + .margin({ left: 16 }) .textOverflow({ overflow: TextOverflow.Ellipsis }) .fontWeight(FontWeight.Medium) }.alignItems(VerticalAlign.Center) .visibility(this.longpress ? Visibility.Visible : Visibility.None) - }.padding({ top: this.portraitModel ? 8 : '4lpx', bottom: this.portraitModel ? 8 : '4lpx' }) + }.padding({ top: 8, bottom: 8 }) .height('100%') AddNoteComp({ controllerShow: this.controllerShow }) @@ -167,8 +188,11 @@ struct NoteOverViewComp { Text(this.refreshFlag.toString()).visibility(Visibility.None) } .width('100%') - .height(this.portraitModel ? 82 : '41lpx') - .padding({ left: this.sectionStatus == 2 ? this.portraitModel ? 24 : '12lpx' : this.portraitModel ? 36 : '18lpx', right: this.portraitModel ? 24 : '12lpx' }) // 两分栏时缩进图标与左侧不需要间距 + .height(82) + .padding({ + left: this.sectionStatus == 2 ? 24 : 36, + right: 24 + }) // 两分栏时缩进图标与左侧不需要间距 .visibility(this.search ? Visibility.None : Visibility.Visible) } } @@ -180,8 +204,8 @@ export struct NoteItemComp { controllerShow: WebController @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('SelectedNoteData') selectedNoteData: NoteData - @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') - @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] + @StorageLink('AllFolderArray') AllFolderArray: FolderData[] = AppStorage.Link('AllFolderArray') + @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] @Consume('Longpress') longpress: boolean @Consume('ChooseNote') chooseNote: boolean @Consume('RefreshFlag') refreshFlag: number @@ -196,8 +220,8 @@ export struct NoteItemComp { Column({ space: 2 }) { Row({ space: 8 }) { Image($r("app.media.verticalBar")) - .height(this.portraitModel ? 16 : '8lpx') - .width(this.portraitModel ? 4 : '2lpx') + .height(16) + .width(4) .fillColor(NoteUtil.getVerticalBarBgColor(AppStorage.Get('AllFolderArray'), this.noteItem.folder_uuid)) Text() { ForEach(this.spans.map((item1, index1) => { @@ -207,68 +231,76 @@ export struct NoteItemComp { if (item.data.type == 0) { Span(item.data.text) .fontColor($r("app.color.note_title_font_color")) - .fontSize(this.portraitModel ? 16 : '8lpx') + .fontSize(16) .fontWeight(FontWeight.Medium) } else if (item.data.type == 1) { Span(item.data.text) .fontColor($r("app.color.note_title_font_color_blue")) - .fontSize(this.portraitModel ? 16 : '8lpx') + .fontSize(16) .fontWeight(FontWeight.Medium) } }, item => item.index) - }.textOverflow({ overflow: TextOverflow.Ellipsis }) + } + .maxLines(1) + .textOverflow({ overflow: TextOverflow.Ellipsis }) } Row({ space: 4 }) { Text(DateUtil.formateDateForNoteTitle(new Date(this.noteItem.modified_time))) - .fontSize(this.portraitModel ? 14 : '7lpx') + .maxLines(1) + .fontSize(14) .fontColor($r("app.color.list_modified_time_font_color")) .fontWeight(FontWeight.Regular) .textOverflow({ overflow: TextOverflow.Ellipsis }) Image($r("app.media.favorite")) - .height(this.portraitModel ? 16 : '8lpx') - .width(this.portraitModel ? 16 : '8lpx') + .height(16) + .width(16) .visibility(this.noteItem.is_favorite == Favorite.Yes ? Visibility.Visible : Visibility.None) Image($r("app.media.topped")) - .height(this.portraitModel ? 16 : '8lpx') - .width(this.portraitModel ? 16 : '8lpx') + .height(16) + .width(16) .visibility(this.noteItem.is_top == Top.Yes ? Visibility.Visible : Visibility.None) } - .padding({ left: this.portraitModel ? 12 : '6lpx' }) + .padding({ left: 12 }) }.alignItems(HorizontalAlign.Start) }.flexShrink(1) Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { Stack({ alignContent: Alignment.Center }) { Image(this.noteItem.content_img) - .height(this.portraitModel ? 47 : '23.5lpx') - .width(this.portraitModel ? 47 : '23.5lpx') - .borderRadius(this.portraitModel ? 12 : '6lpx') - .border({ width: this.portraitModel ? 0.5 : '0.25lpx', color: '#19182431' }) + .height(47) + .width(47) + .borderRadius(12) + .border({ width: 0.5, color: '#19182431' }) .visibility(this.noteItem.content_img ? Visibility.Visible : Visibility.None) } Stack({ alignContent: Alignment.Center }) { Image($r("app.media.unChecked")) - .height(this.portraitModel ? 24 : '12lpx') - .width(this.portraitModel ? 24 : '12lpx') + .height(24) + .width(24) Image($r("app.media.checked")) - .width(this.portraitModel ? 24 : '12lpx') - .height(this.portraitModel ? 24 : '12lpx') + .width(24) + .height(24) .visibility(NoteUtil.isNoteChecked(this.CheckedNoteArray, this.noteItem) ? Visibility.Visible : Visibility.None) - }.width(this.portraitModel ? 24 : '12lpx') - .height(this.portraitModel ? 24 : '12lpx') + }.width(24) + .height(24) .visibility(this.longpress ? Visibility.Visible : Visibility.None) } .flexShrink(0) - .height(this.portraitModel ? 48 : '24lpx') - .width(this.longpress ? this.portraitModel ? 80 : '40lpx' : this.portraitModel ? 48 : '24lpx') + .height(48) + .width(this.longpress ? 80 : 48) } .width('100%') - .height(this.portraitModel ? 72 : '36lpx') - .padding({ left: this.portraitModel ? 16 : '8lpx', right: this.portraitModel ? 12 : '6lpx', top: this.portraitModel ? 4 : '2lpx', bottom: this.portraitModel ? 4 : '2lpx' }) - .borderRadius(this.portraitModel ? 24 : '12lpx') + .height(72) + .padding({ + left: 16, + right: 12, + top: 4, + bottom: 4 + }) + .borderRadius(24) .linearGradient({ direction: GradientDirection.Right, colors: this.selectedNoteData.uuid == this.noteItem.uuid ? [[0xffcdae, 0.0], [0xFfece2, 1.0]] : [[0xffffff, 0.0], [0xffffff, 1.0]] @@ -327,7 +359,7 @@ export struct NoteItemComp { @Component export struct NoteItemListComp { - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') + @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('RefreshFlag') refreshFlag: number @Consume('Longpress') longpress: boolean @@ -372,7 +404,7 @@ export struct NoteItemListComp { .visibility((FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0) ? Visibility.None : Visibility.Visible) Stack() { - Flex({direction: FlexDirection.Column}) { + Flex({ direction: FlexDirection.Column }) { Flex({ justifyContent: FlexAlign.Center }) { Text($r("app.string.permanently_delete_tips")) .fontSize(12) @@ -414,7 +446,11 @@ export struct NoteItemListComp { } }, noteItem => noteItem.uuid.toString()) } - .margin((FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0) ? { bottom: 0 } : { bottom: 130 }) + .margin((FolderUtil.getNoteCount(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) == 0) ? { + bottom: 0 + } : { + bottom: 130 + }) .layoutWeight(1) .listDirection(Axis.Vertical) .edgeEffect(EdgeEffect.Spring) @@ -445,8 +481,8 @@ export struct NoteItemListComp { @Component export struct OperateNoteComp { @Consume('Longpress') longpress: boolean - @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') + @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] + @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('RefreshFlag') refreshFlag: number @Consume('SelectedNoteData') selectedNoteData: NoteData @@ -597,7 +633,7 @@ export struct OperateNoteComp { .onClick(() => { if (this.CheckedNoteArray.length < NoteUtil.getNoteDataArray(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) - .length) { + .length) { NoteUtil.setAllNotesChecked(this.CheckedNoteArray, NoteUtil.getNoteDataArray(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid)) } else { NoteUtil.unsetAllNotesChecked(this.CheckedNoteArray) @@ -613,7 +649,7 @@ export struct OperateNoteComp { @Component export struct AddNoteComp { - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') + @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') @Consume('Longpress') longpress: boolean @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('SelectedNoteData') selectedNoteData: NoteData @@ -633,9 +669,9 @@ export struct AddNoteComp { .onClick(() => { let noteData if (this.selectedFolderData.uuid == SysDefFolderUuid.AllNotes || this.selectedFolderData.uuid == SysDefFolderUuid.MyFavorites) { - noteData = new NoteData(0, "标题", new Date().getTime() + "", SysDefFolderUuid.UnClassified, "", "", NoteType.SysDef, Top.No, Favorite.No, Delete.No, new Date().getTime(), new Date().getTime(), 0,0) + noteData = new NoteData(0, "标题", new Date().getTime() + "", SysDefFolderUuid.UnClassified, "", "", NoteType.SysDef, Top.No, Favorite.No, Delete.No, new Date().getTime(), new Date().getTime(), 0, 0) } else { - noteData = new NoteData(0, "标题", new Date().getTime() + "", this.selectedFolderData.uuid, "", "", NoteType.SysDef, Top.No, Favorite.No, Delete.No, new Date().getTime(), new Date().getTime(), 0,0) + noteData = new NoteData(0, "标题", new Date().getTime() + "", this.selectedFolderData.uuid, "", "", NoteType.SysDef, Top.No, Favorite.No, Delete.No, new Date().getTime(), new Date().getTime(), 0, 0) } this.AllNoteArray.push(noteData) @@ -690,10 +726,10 @@ export struct SearchComp { .backgroundColor(this.longpress ? $r("app.color.search_longpress_bgcolor_f7f8f9") : $r("app.color.color_ffffff")) .caretColor($r("app.color.search_note_caret_color")) .enabled(this.longpress ? false : true) - .padding({ left:6, top:1 }) - .padding({left:6}) + .padding({ left: 6, top: 1 }) + .padding({ left: 6 }) .onEditChange((isEditing: boolean) => { -// this.search = isEditing + // this.search = isEditing }) .onChange((value: string) => { if (!this.longpress) { @@ -709,14 +745,14 @@ export struct SearchComp { this.search = true } }) - // whether the focus is on the search input before coutinue + // whether the focus is on the search input before coutinue .onFocus(() => { this.isFocusOnSearch = true }) .onBlur(() => { this.isFocusOnSearch = false }) - // key for request focus after coutinue + // key for request focus after coutinue .key('searchInput') .restoreId(3) } @@ -734,8 +770,8 @@ export struct SearchComp { @Component export struct OperateNoteCompForPortrait { @Consume('Longpress') longpress: boolean - @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] - @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') + @StorageLink('CheckedNoteArray') CheckedNoteArray: NoteData[] = [] + @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') @Consume('SelectedFolderData') selectedFolderData: FolderData @Consume('RefreshFlag') @Watch('opacityChange') refreshFlag: number @Consume('SelectedNoteData') selectedNoteData: NoteData @@ -862,7 +898,7 @@ export struct OperateNoteCompForPortrait { .fontColor($r("app.color.delete_font_color")) .padding({ top: 5 }) } - .width(this.selectedFolderData.uuid == SysDefFolderUuid.RecentDeletes? 120 :"25%") + .width(this.selectedFolderData.uuid == SysDefFolderUuid.RecentDeletes ? 120 : "25%") .height("100%") .opacity(this.greyOpacity ? 0.4 : 1) .enabled(this.greyOpacity ? false : true) @@ -931,7 +967,7 @@ export struct OperateNoteCompForPortrait { .fontColor($r("app.color.recover_font_color")) .padding({ top: 5 }) } - .width(this.selectedFolderData.uuid == SysDefFolderUuid.RecentDeletes? 120 :"25%") + .width(this.selectedFolderData.uuid == SysDefFolderUuid.RecentDeletes ? 120 : "25%") .height("100%") .opacity(this.greyOpacity ? 0.4 : 1) .enabled(this.greyOpacity ? false : true) @@ -947,7 +983,7 @@ export struct OperateNoteCompForPortrait { .onClick(() => { if (this.CheckedNoteArray.length < NoteUtil.getNoteDataArray(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid) - .length) { + .length) { NoteUtil.setAllNotesChecked(this.CheckedNoteArray, NoteUtil.getNoteDataArray(AppStorage.Get('AllNoteArray'), this.selectedFolderData.uuid)) } else { NoteUtil.unsetAllNotesChecked(this.CheckedNoteArray) @@ -959,7 +995,7 @@ export struct OperateNoteCompForPortrait { .fontColor($r("app.color.check_all_font_color")) .padding({ top: 5 }) } - .width(this.selectedFolderData.uuid == SysDefFolderUuid.RecentDeletes? 120 :"25%") + .width(this.selectedFolderData.uuid == SysDefFolderUuid.RecentDeletes ? 120 : "25%") .height("100%") .alignItems(HorizontalAlign.Center) .justifyContent(FlexAlign.Center) diff --git a/common/component/src/main/module.json5 b/features/src/main/module.json5 similarity index 97% rename from common/component/src/main/module.json5 rename to features/src/main/module.json5 index b6442a2..f100719 100644 --- a/common/component/src/main/module.json5 +++ b/features/src/main/module.json5 @@ -18,7 +18,7 @@ "name": "component", "type": "har", "deviceTypes": [ - "phone", + "default", "tablet" ], "uiSyntax": "ets" diff --git a/package-lock.json b/package-lock.json index 5248f38..d218d63 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,41 +4,54 @@ "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.0.6", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor/-/@ohos/hvigor-1.0.6.tgz", - "integrity": "sha512-jjp7vpvUOMW1Nf7TdyhOtonwWHoSyBJLUiZTQqIx/GJV4UJyIqsiURUOqFwncQ4L7PDdeHuWly4uEelknYeWhg==", + "version": "1.2.2", + "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor/-/@ohos/hvigor-1.2.2.tgz", + "integrity": "sha512-GfXCf7pDnyEcxWkG7Edd23XPxgym1vY37zdNt/Gj0pZmw0f+FrP+blfCzVWfYQYlI76krzd96+kvD4lgWkIPBQ==", "requires": { - "@ohos/hvigor-base": "1.0.6", + "@ohos/hvigor-base": "1.2.2", + "fs-extra": "10.0.1", "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.0" + "yargs": "7.1.2" } }, "@ohos/hvigor-base": { - "version": "1.0.6", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-base/-/@ohos/hvigor-base-1.0.6.tgz", - "integrity": "sha512-cRDnWICTxmpNiFb9clIioqP5Oik1seLCICztXVhZqultrHuxwTheCRUZrHwlpyWdkSB2Al+FFBqmSwzIgZX4IQ==", + "version": "1.2.2", + "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-base/-/@ohos/hvigor-base-1.2.2.tgz", + "integrity": "sha512-omwL/qjTE7DTCQdHZnMKuAxKlH1JOgOxaVAae1ca8j/oPuNgY6Spn+mpYRDHIktvav6axMmHT9zV1hJykY4GEg==", "requires": { + "fs-extra": "10.0.1", "json5": "2.2.0", "log4js": "6.4.1", - "undertaker": "1.2.1" + "once": "1.4.0", + "pretty-hrtime": "1.0.0" } }, "@ohos/hvigor-ohos-plugin": { - "version": "1.0.6", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-ohos-plugin/-/@ohos/hvigor-ohos-plugin-1.0.6.tgz", - "integrity": "sha512-MAAi8uJxMzODUoSSNfBr+fU4HQ20dfQtkje9I+X4asc7qY2kAplW/q9f5XS8IOvv8zhC8OcSgsAXOAJuLMstOQ==", + "version": "1.2.2", + "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-ohos-plugin/-/@ohos/hvigor-ohos-plugin-1.2.2.tgz", + "integrity": "sha512-gir91UxlhMbf2E/NjTYWJGrsNGBKD/1YYbaEdmswD/qW18UDY7jyuqSVyV/gj0h9+iji+gd53rXWzpLLztG5lg==", "requires": { - "@ohos/hvigor-base": "1.0.6", - "@ohos/sdkmanager-common": "1.1.3", + "@ohos/hos-sdkmanager-common": "1.0.4", + "@ohos/hvigor-base": "1.2.2", + "@ohos/sdkmanager-common": "1.1.8", + "adm-zip": "0.5.9", "ajv": "8.10.0", - "archiver": "5.3.0", "execa": "5.1.1", - "fs-extra": "10.0.0", + "fast-xml-parser": "4.0.3", + "fs-extra": "10.0.1", "glob": "7.2.0", "iconv-lite": "0.6.3", "json5": "2.2.0", @@ -47,27 +60,27 @@ "resolve-package-path": "4.0.3" }, "dependencies": { - "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" - } - }, "pretty-hrtime": { "version": "1.0.3", "resolved": "https://repo.huaweicloud.com/repository/npm/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", - "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=" + "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==" } } }, + "@ohos/hypium": { + "version": "1.0.2", + "resolved": "https://repo.harmonyos.com/npm/@ohos/hypium/-/@ohos/hypium-1.0.2.tgz", + "integrity": "sha512-HWW62q6hbd0PhvPTH96lo4j//owFwyCLj6Q2jmVLDW6mOt1dwJJwUQ7qUH+Cni/6MmcnyXKvt9I0moGAPK1aCw==" + }, "@ohos/sdkmanager-common": { - "version": "1.1.3", - "resolved": "https://repo.harmonyos.com/npm/@ohos/sdkmanager-common/-/@ohos/sdkmanager-common-1.1.3.tgz", - "integrity": "sha512-d2uhVauDDJZIUvyyaWWoavG4N/jLyfF5IH5kEXKV6R8HNf3606H1zDQzA+UZtOfwwJFXhD9djRjnVFNB8xc7aw==" + "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", @@ -83,163 +96,23 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://repo.huaweicloud.com/repository/npm/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "archiver": { - "version": "5.3.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/archiver/-/archiver-5.3.0.tgz", - "integrity": "sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg==", - "requires": { - "archiver-utils": "^2.1.0", - "async": "^3.2.0", - "buffer-crc32": "^0.2.1", - "readable-stream": "^3.6.0", - "readdir-glob": "^1.0.0", - "tar-stream": "^2.2.0", - "zip-stream": "^4.1.0" - } - }, - "archiver-utils": { - "version": "2.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/archiver-utils/-/archiver-utils-2.1.0.tgz", - "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", - "requires": { - "glob": "^7.1.4", - "graceful-fs": "^4.2.0", - "lazystream": "^1.0.0", - "lodash.defaults": "^4.2.0", - "lodash.difference": "^4.5.0", - "lodash.flatten": "^4.4.0", - "lodash.isplainobject": "^4.0.6", - "lodash.union": "^4.6.0", - "normalize-path": "^3.0.0", - "readable-stream": "^2.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - } - } - }, - "arr-filter": { - "version": "1.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/arr-filter/-/arr-filter-1.1.2.tgz", - "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=", - "requires": { - "make-iterator": "^1.0.0" - } - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" - }, - "arr-map": { - "version": "2.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/arr-map/-/arr-map-2.0.2.tgz", - "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=", - "requires": { - "make-iterator": "^1.0.0" - } + "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": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=" - }, - "array-initial": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/array-initial/-/array-initial-1.1.0.tgz", - "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=", - "requires": { - "array-slice": "^1.0.0", - "is-number": "^4.0.0" - } - }, - "array-last": { - "version": "1.3.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/array-last/-/array-last-1.3.0.tgz", - "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==", - "requires": { - "is-number": "^4.0.0" - } + "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==" }, - "async": { - "version": "3.2.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/async/-/async-3.2.3.tgz", - "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" - }, - "async-done": { - "version": "1.3.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/async-done/-/async-done-1.3.2.tgz", - "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.2", - "process-nextick-args": "^2.0.0", - "stream-exhaust": "^1.0.1" - } - }, - "async-settle": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/async-settle/-/async-settle-1.0.0.tgz", - "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=", - "requires": { - "async-done": "^1.2.2" - } - }, - "bach": { - "version": "1.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/bach/-/bach-1.2.0.tgz", - "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=", - "requires": { - "arr-filter": "^1.1.1", - "arr-flatten": "^1.0.1", - "arr-map": "^2.0.0", - "array-each": "^1.0.0", - "array-initial": "^1.0.0", - "array-last": "^1.1.1", - "async-done": "^1.2.2", - "async-settle": "^1.0.0", - "now-and-later": "^2.0.0" - } - }, "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==" }, - "base64-js": { - "version": "1.5.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" - }, - "bl": { - "version": "4.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://repo.huaweicloud.com/repository/npm/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -257,20 +130,6 @@ "fill-range": "^7.0.1" } }, - "buffer": { - "version": "5.7.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "buffer-crc32": { - "version": "0.2.13", - "resolved": "https://repo.huaweicloud.com/repository/npm/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" - }, "call-bind": { "version": "1.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/call-bind/-/call-bind-1.0.2.tgz", @@ -283,12 +142,12 @@ "camelcase": { "version": "3.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" + "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==" }, "cliui": { "version": "3.2.0", "resolved": "https://repo.huaweicloud.com/repository/npm/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==", "requires": { "string-width": "^1.0.1", "strip-ansi": "^3.0.1", @@ -298,52 +157,12 @@ "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": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, - "collection-map": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/collection-map/-/collection-map-1.0.0.tgz", - "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=", - "requires": { - "arr-map": "^2.0.2", - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - } - }, - "compress-commons": { - "version": "4.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/compress-commons/-/compress-commons-4.1.1.tgz", - "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==", - "requires": { - "buffer-crc32": "^0.2.13", - "crc32-stream": "^4.0.2", - "normalize-path": "^3.0.0", - "readable-stream": "^3.6.0" - } + "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": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "core-util-is": { - "version": "1.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" - }, - "crc-32": { - "version": "1.2.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/crc-32/-/crc-32-1.2.2.tgz", - "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==" - }, - "crc32-stream": { - "version": "4.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/crc32-stream/-/crc32-stream-4.0.2.tgz", - "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==", - "requires": { - "crc-32": "^1.2.0", - "readable-stream": "^3.4.0" - } + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "cross-spawn": { "version": "7.0.3", @@ -365,19 +184,10 @@ } } }, - "d": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/d/-/d-1.0.1.tgz", - "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", - "requires": { - "es5-ext": "^0.10.50", - "type": "^1.0.1" - } - }, "date-format": { - "version": "4.0.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/date-format/-/date-format-4.0.7.tgz", - "integrity": "sha512-k5xqlzDGIfv2N/DHR/BR8Kc4N9CRy9ReuDkmdxeX/jNfit94QXd36emWMm40ZOEDKNm/c91yV9EO3uGPkR7wWQ==" + "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", @@ -390,12 +200,7 @@ "decamelize": { "version": "1.2.0", "resolved": "https://repo.huaweicloud.com/repository/npm/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, - "default-resolution": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/default-resolution/-/default-resolution-2.0.0.tgz", - "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=" + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==" }, "define-properties": { "version": "1.1.4", @@ -409,15 +214,7 @@ "detect-file": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=" - }, - "end-of-stream": { - "version": "1.4.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "requires": { - "once": "^1.4.0" - } + "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==" }, "error-ex": { "version": "1.3.2", @@ -427,46 +224,6 @@ "is-arrayish": "^0.2.1" } }, - "es5-ext": { - "version": "0.10.60", - "resolved": "https://repo.huaweicloud.com/repository/npm/es5-ext/-/es5-ext-0.10.60.tgz", - "integrity": "sha512-jpKNXIt60htYG59/9FGf2PYT3pwMpnEbNKysU+k/4FGwyGtMotOvcZOuW+EmXXYASRqYSXQfGL5cVIthOTgbkg==", - "requires": { - "es6-iterator": "^2.0.3", - "es6-symbol": "^3.1.3", - "next-tick": "^1.1.0" - } - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "es6-symbol": { - "version": "3.1.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/es6-symbol/-/es6-symbol-3.1.3.tgz", - "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", - "requires": { - "d": "^1.0.1", - "ext": "^1.1.2" - } - }, - "es6-weak-map": { - "version": "2.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/es6-weak-map/-/es6-weak-map-2.0.3.tgz", - "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", - "requires": { - "d": "1", - "es5-ext": "^0.10.46", - "es6-iterator": "^2.0.3", - "es6-symbol": "^3.1.1" - } - }, "execa": { "version": "5.1.1", "resolved": "https://repo.huaweicloud.com/repository/npm/execa/-/execa-5.1.1.tgz", @@ -486,26 +243,11 @@ "expand-tilde": { "version": "2.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", "requires": { "homedir-polyfill": "^1.0.1" } }, - "ext": { - "version": "1.6.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/ext/-/ext-1.6.0.tgz", - "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==", - "requires": { - "type": "^2.5.0" - }, - "dependencies": { - "type": { - "version": "2.6.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/type/-/type-2.6.0.tgz", - "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==" - } - } - }, "extend": { "version": "3.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/extend/-/extend-3.0.2.tgz", @@ -516,6 +258,14 @@ "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", @@ -527,7 +277,7 @@ "find-up": { "version": "1.1.2", "resolved": "https://repo.huaweicloud.com/repository/npm/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==", "requires": { "path-exists": "^2.0.0", "pinkie-promise": "^2.0.0" @@ -562,32 +312,27 @@ "integrity": "sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==" }, "flatted": { - "version": "3.2.5", - "resolved": "https://repo.huaweicloud.com/repository/npm/flatted/-/flatted-3.2.5.tgz", - "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==" + "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": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + "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": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==", "requires": { "for-in": "^1.0.1" } }, - "fs-constants": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" - }, "fs-extra": { - "version": "10.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "version": "10.0.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/fs-extra/-/fs-extra-10.0.1.tgz", + "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==", "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -597,7 +342,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "function-bind": { "version": "1.1.1", @@ -610,13 +355,13 @@ "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" }, "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "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.1" + "has-symbols": "^1.0.3" } }, "get-stream": { @@ -650,7 +395,7 @@ "global-prefix": { "version": "1.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", "requires": { "expand-tilde": "^2.0.2", "homedir-polyfill": "^1.0.1", @@ -716,15 +461,10 @@ "safer-buffer": ">= 2.1.2 < 3.0.0" } }, - "ieee754": { - "version": "1.2.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" - }, "inflight": { "version": "1.0.6", "resolved": "https://repo.huaweicloud.com/repository/npm/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "requires": { "once": "^1.3.0", "wrappy": "1" @@ -748,7 +488,7 @@ "invert-kv": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==" }, "is-absolute": { "version": "1.0.0", @@ -762,12 +502,12 @@ "is-arrayish": { "version": "0.2.1", "resolved": "https://repo.huaweicloud.com/repository/npm/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" }, "is-core-module": { - "version": "2.9.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "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" } @@ -775,12 +515,12 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://repo.huaweicloud.com/repository/npm/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + "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": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", "requires": { "number-is-nan": "^1.0.0" } @@ -794,9 +534,9 @@ } }, "is-number": { - "version": "4.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" + "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", @@ -827,27 +567,22 @@ "is-utf8": { "version": "0.2.1", "resolved": "https://repo.huaweicloud.com/repository/npm/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + "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==" }, - "isarray": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, "isexe": { "version": "2.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "isobject": { "version": "3.0.1", "resolved": "https://repo.huaweicloud.com/repository/npm/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==" }, "js-base64": { "version": "3.7.2", @@ -881,43 +616,10 @@ "resolved": "https://repo.huaweicloud.com/repository/npm/kind-of/-/kind-of-6.0.3.tgz", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, - "last-run": { - "version": "1.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/last-run/-/last-run-1.1.1.tgz", - "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=", - "requires": { - "default-resolution": "^2.0.0", - "es6-weak-map": "^2.0.1" - } - }, - "lazystream": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/lazystream/-/lazystream-1.0.1.tgz", - "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", - "requires": { - "readable-stream": "^2.0.5" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - } - } - }, "lcid": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==", "requires": { "invert-kv": "^1.0.0" } @@ -940,7 +642,7 @@ "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": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==", "requires": { "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", @@ -954,31 +656,6 @@ "resolved": "https://repo.huaweicloud.com/repository/npm/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, - "lodash.defaults": { - "version": "4.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" - }, - "lodash.difference": { - "version": "4.5.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.difference/-/lodash.difference-4.5.0.tgz", - "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=" - }, - "lodash.flatten": { - "version": "4.4.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" - }, - "lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" - }, - "lodash.union": { - "version": "4.6.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/lodash.union/-/lodash.union-4.6.0.tgz", - "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=" - }, "log4js": { "version": "6.4.1", "resolved": "https://repo.huaweicloud.com/repository/npm/log4js/-/log4js-6.4.1.tgz", @@ -1002,7 +679,7 @@ "map-cache": { "version": "0.2.2", "resolved": "https://repo.huaweicloud.com/repository/npm/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==" }, "merge-stream": { "version": "2.0.0", @@ -1032,9 +709,9 @@ } }, "minimist": { - "version": "1.2.6", - "resolved": "https://repo.huaweicloud.com/repository/npm/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" + "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", @@ -1044,12 +721,7 @@ "mute-stdout": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/mute-stdout/-/mute-stdout-1.0.0.tgz", - "integrity": "sha1-WzLqB+tDyd7WEwQ0z5JvRrKn/U0=" - }, - "next-tick": { - "version": "1.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/next-tick/-/next-tick-1.1.0.tgz", - "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" + "integrity": "sha512-MaSQenn0f9oxIjtCufclpV00MuYTiHaXPbdcfPIM+quMqoa8cXywjHHx4LhhIAZlXqPWMdcUpYviajfmHtHRJw==" }, "normalize-package-data": { "version": "2.5.0", @@ -1062,19 +734,6 @@ "validate-npm-package-license": "^3.0.1" } }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - }, - "now-and-later": { - "version": "2.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/now-and-later/-/now-and-later-2.0.1.tgz", - "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==", - "requires": { - "once": "^1.3.2" - } - }, "npm-run-path": { "version": "4.0.1", "resolved": "https://repo.huaweicloud.com/repository/npm/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -1086,7 +745,7 @@ "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": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==" }, "object-keys": { "version": "1.1.1", @@ -1094,20 +753,20 @@ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" }, "object.assign": { - "version": "4.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "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.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", + "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": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", + "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==", "requires": { "array-each": "^1.0.1", "array-slice": "^1.0.0", @@ -1118,7 +777,7 @@ "object.map": { "version": "1.0.1", "resolved": "https://repo.huaweicloud.com/repository/npm/object.map/-/object.map-1.0.1.tgz", - "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", + "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==", "requires": { "for-own": "^1.0.0", "make-iterator": "^1.0.0" @@ -1127,24 +786,15 @@ "object.pick": { "version": "1.3.0", "resolved": "https://repo.huaweicloud.com/repository/npm/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", "requires": { "isobject": "^3.0.1" } }, - "object.reduce": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/object.reduce/-/object.reduce-1.0.1.tgz", - "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=", - "requires": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - } - }, "once": { "version": "1.4.0", "resolved": "https://repo.huaweicloud.com/repository/npm/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "requires": { "wrappy": "1" } @@ -1160,7 +810,7 @@ "os-locale": { "version": "1.4.0", "resolved": "https://repo.huaweicloud.com/repository/npm/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==", "requires": { "lcid": "^1.0.0" } @@ -1168,7 +818,7 @@ "parse-filepath": { "version": "1.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", + "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", "requires": { "is-absolute": "^1.0.0", "map-cache": "^0.2.0", @@ -1178,7 +828,7 @@ "parse-json": { "version": "2.2.0", "resolved": "https://repo.huaweicloud.com/repository/npm/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==", "requires": { "error-ex": "^1.2.0" } @@ -1186,12 +836,12 @@ "parse-passwd": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" + "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": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==", "requires": { "pinkie-promise": "^2.0.0" } @@ -1199,7 +849,7 @@ "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": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" }, "path-key": { "version": "3.1.1", @@ -1214,7 +864,7 @@ "path-root": { "version": "0.1.1", "resolved": "https://repo.huaweicloud.com/repository/npm/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", + "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", "requires": { "path-root-regex": "^0.1.0" } @@ -1222,12 +872,12 @@ "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": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=" + "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": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==", "requires": { "graceful-fs": "^4.1.2", "pify": "^2.0.0", @@ -1242,17 +892,17 @@ "pify": { "version": "2.3.0", "resolved": "https://repo.huaweicloud.com/repository/npm/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "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": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + "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": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", "requires": { "pinkie": "^2.0.0" } @@ -1260,12 +910,7 @@ "pretty-hrtime": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/pretty-hrtime/-/pretty-hrtime-1.0.0.tgz", - "integrity": "sha1-9ualItPmBwRSK/Db5oVu0g515Nw=" - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + "integrity": "sha512-CU2l5CYUAptUYq/671ajexQfXuxJFwwg0n243Kdkx8bTjeenedsWgu8TGHPm03vLfNtk3aTXgySKPp3Usykudw==" }, "punycode": { "version": "2.1.1", @@ -1275,7 +920,7 @@ "read-pkg": { "version": "1.1.0", "resolved": "https://repo.huaweicloud.com/repository/npm/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==", "requires": { "load-json-file": "^1.0.0", "normalize-package-data": "^2.3.2", @@ -1285,30 +930,12 @@ "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": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==", "requires": { "find-up": "^1.0.0", "read-pkg": "^1.0.0" } }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "readdir-glob": { - "version": "1.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/readdir-glob/-/readdir-glob-1.1.1.tgz", - "integrity": "sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==", - "requires": { - "minimatch": "^3.0.4" - } - }, "rechoir": { "version": "0.8.0", "resolved": "https://repo.huaweicloud.com/repository/npm/rechoir/-/rechoir-0.8.0.tgz", @@ -1320,7 +947,7 @@ "require-directory": { "version": "2.1.1", "resolved": "https://repo.huaweicloud.com/repository/npm/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" }, "require-from-string": { "version": "2.0.2", @@ -1330,14 +957,14 @@ "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": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==" }, "resolve": { - "version": "1.22.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/resolve/-/resolve-1.22.0.tgz", - "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", + "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.8.1", + "is-core-module": "^2.9.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } @@ -1345,7 +972,7 @@ "resolve-dir": { "version": "1.0.1", "resolved": "https://repo.huaweicloud.com/repository/npm/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", + "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", "requires": { "expand-tilde": "^2.0.0", "global-modules": "^1.0.0" @@ -1364,11 +991,6 @@ "resolved": "https://repo.huaweicloud.com/repository/npm/rfdc/-/rfdc-1.3.0.tgz", "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, "safer-buffer": { "version": "2.1.2", "resolved": "https://repo.huaweicloud.com/repository/npm/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -1382,7 +1004,7 @@ "set-blocking": { "version": "2.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" }, "shebang-command": { "version": "2.0.0", @@ -1426,47 +1048,59 @@ } }, "spdx-license-ids": { - "version": "3.0.11", - "resolved": "https://repo.huaweicloud.com/repository/npm/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", - "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==" - }, - "stream-exhaust": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/stream-exhaust/-/stream-exhaust-1.0.2.tgz", - "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==" + "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.0.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/streamroller/-/streamroller-3.0.7.tgz", - "integrity": "sha512-kh68kwiDGuIPiPDWwRbEC5us+kfARP1e9AsQiaLaSqGrctOvMn0mtL8iNY3r4/o5nIoYi3gPI1jexguZsXDlxw==", + "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.7", + "date-format": "^4.0.14", "debug": "^4.3.4", - "fs-extra": "^10.0.1" + "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" + } + }, + "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" + } + }, + "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==" + } } }, "string-width": { "version": "1.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" } }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - }, "strip-ansi": { "version": "3.0.1", "resolved": "https://repo.huaweicloud.com/repository/npm/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", "requires": { "ansi-regex": "^2.0.0" } @@ -1474,7 +1108,7 @@ "strip-bom": { "version": "2.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==", "requires": { "is-utf8": "^0.2.0" } @@ -1484,68 +1118,28 @@ "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==" }, - "tar-stream": { - "version": "2.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "requires": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - } - }, "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" - }, - "dependencies": { - "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==" - } } }, - "type": { - "version": "1.2.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/type/-/type-1.2.0.tgz", - "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" - }, "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": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" - }, - "undertaker": { - "version": "1.2.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/undertaker/-/undertaker-1.2.1.tgz", - "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==", - "requires": { - "arr-flatten": "^1.0.1", - "arr-map": "^2.0.0", - "bach": "^1.0.0", - "collection-map": "^1.0.0", - "es6-weak-map": "^2.0.1", - "last-run": "^1.1.0", - "object.defaults": "^1.0.0", - "object.reduce": "^1.0.0", - "undertaker-registry": "^1.0.0" - } - }, - "undertaker-registry": { - "version": "1.0.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/undertaker-registry/-/undertaker-registry-1.0.1.tgz", - "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=" + "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==" }, "universalify": { "version": "2.0.0", @@ -1560,11 +1154,6 @@ "punycode": "^2.1.0" } }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, "v8flags": { "version": "3.2.0", "resolved": "https://repo.huaweicloud.com/repository/npm/v8flags/-/v8flags-3.2.0.tgz", @@ -1593,12 +1182,12 @@ "which-module": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" + "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": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==", "requires": { "string-width": "^1.0.1", "strip-ansi": "^3.0.1" @@ -1607,7 +1196,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "y18n": { "version": "3.2.2", @@ -1615,9 +1204,9 @@ "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==" }, "yargs": { - "version": "7.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/yargs/-/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", + "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", @@ -1631,7 +1220,7 @@ "string-width": "^1.0.2", "which-module": "^1.0.0", "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" + "yargs-parser": "^5.0.1" } }, "yargs-parser": { @@ -1642,16 +1231,6 @@ "camelcase": "^3.0.0", "object.assign": "^4.1.0" } - }, - "zip-stream": { - "version": "4.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/zip-stream/-/zip-stream-4.1.0.tgz", - "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==", - "requires": { - "archiver-utils": "^2.1.0", - "compress-commons": "^4.1.0", - "readable-stream": "^3.6.0" - } } } } diff --git a/package.json b/package.json index 6c26569..984f794 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,10 @@ "repository": {}, "version": "1.0.0", "dependencies": { - "@ohos/hvigor": "1.0.6", - "@ohos/hvigor-ohos-plugin": "1.0.6", + "@ohos/hvigor": "1.2.2", + "@ohos/hvigor-ohos-plugin": "1.2.2", "hypium": "^1.0.0", - "js-base64": "^3.7.2" + "js-base64": "^3.7.2", + "@ohos/hypium": "1.0.2" } } diff --git a/common/component/.gitignore b/product/default/.gitignore similarity index 100% rename from common/component/.gitignore rename to product/default/.gitignore diff --git a/product/phone/build-profile.json5 b/product/default/build-profile.json5 similarity index 100% rename from product/phone/build-profile.json5 rename to product/default/build-profile.json5 diff --git a/product/phone/hvigorfile.js b/product/default/hvigorfile.js similarity index 100% rename from product/phone/hvigorfile.js rename to product/default/hvigorfile.js diff --git a/product/tablet/package-lock.json b/product/default/package-lock.json similarity index 95% rename from product/tablet/package-lock.json rename to product/default/package-lock.json index ea624c2..f9baed5 100644 --- a/product/tablet/package-lock.json +++ b/product/default/package-lock.json @@ -5,7 +5,7 @@ "requires": true, "dependencies": { "@ohos/component": { - "version": "file:../../common/component", + "version": "file:../../features", "requires": { "@ohos/source": "file:../../common/resources", "@ohos/utils": "file:../../common/utils" diff --git a/product/default/package.json b/product/default/package.json new file mode 100644 index 0000000..94bb266 --- /dev/null +++ b/product/default/package.json @@ -0,0 +1,18 @@ +{ + "license": "ISC", + "devDependencies": {}, + "name": "default", + "ohos": { + "org": "huawei", + "directoryLevel": "module", + "buildTool": "hvigor" + }, + "description": "example description", + "repository": {}, + "version": "1.0.0", + "dependencies": { + "@ohos/utils": "file:../../common/utils", + "@ohos/component": "file:../../features", + "@ohos/source": "file:../../common/resources" + } +} \ No newline at end of file diff --git a/product/phone/src/main/ets/Application/AbilityStage.ts b/product/default/src/main/ets/Application/AbilityStage.ts similarity index 100% rename from product/phone/src/main/ets/Application/AbilityStage.ts rename to product/default/src/main/ets/Application/AbilityStage.ts diff --git a/product/tablet/src/main/ets/MainAbility/MainAbility.ts b/product/default/src/main/ets/MainAbility/MainAbility.ts similarity index 87% rename from product/tablet/src/main/ets/MainAbility/MainAbility.ts rename to product/default/src/main/ets/MainAbility/MainAbility.ts index ffdf72a..1656847 100644 --- a/product/tablet/src/main/ets/MainAbility/MainAbility.ts +++ b/product/default/src/main/ets/MainAbility/MainAbility.ts @@ -20,7 +20,10 @@ import fileio from '@ohos.fileio' import inputMethod from '@ohos.inputmethod'; import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import { atob } from 'js-base64' +import display from '@ohos.display'; + globalThis.rdbStore = undefined + export default class MainAbility extends Ability { private Tag = "MainAbility_Tablet" @@ -65,6 +68,28 @@ export default class MainAbility extends Ability { } onWindowStageCreate(windowStage) { + let displayClass = null + let screenDpi = null + displayClass = display.getDefaultDisplaySync() + screenDpi = displayClass.densityDPI + windowStage.getMainWindow((err, data) => { + let windowClass = data + try { + windowClass.on('windowSizeChange', (data) => { + let windowWidth = data.width / (screenDpi / 160) + if (windowWidth >= 320 && windowWidth < 520 || windowWidth < 320) { + AppStorage.SetOrCreate('breakPoint', 'sm') + } else if (windowWidth >= 520 && windowWidth < 840) { + AppStorage.SetOrCreate('breakPoint', 'md') + } else if (windowWidth >= 840) { + AppStorage.SetOrCreate('breakPoint', 'lg') + } + }) + } catch (exception) { + LogUtil.info(this.Tag, 'windowSizeChange fail') + } + }) + LogUtil.info(this.Tag, " onWindowStageCreate") windowStage.setUIContent(this.context, "pages/MyNoteHome", null) } @@ -135,7 +160,7 @@ export default class MainAbility extends Ability { return AbilityConstant.OnContinueResult.AGREE } - getSrcFromHtml(html: string): any{ + getSrcFromHtml(html: string): any { let srcArray = [] if (html == undefined || html == null || html == "") { return srcArray diff --git a/product/tablet/src/main/ets/pages/MyNoteHome.ets b/product/default/src/main/ets/pages/MyNoteHome.ets similarity index 94% rename from product/tablet/src/main/ets/pages/MyNoteHome.ets rename to product/default/src/main/ets/pages/MyNoteHome.ets index 33be5c2..c4174cf 100644 --- a/product/tablet/src/main/ets/pages/MyNoteHome.ets +++ b/product/default/src/main/ets/pages/MyNoteHome.ets @@ -32,11 +32,18 @@ export struct MyNoteHomeComp { private controllerShow: WebController = new WebController() private context = getContext(this) TAG = "MyNoteHomeComp_Tablet" - + @StorageLink('breakPoint')@Watch('onBreakPointChange') breakPoints:string = 'lg' + onBreakPointChange(){ + if(this.breakPoints == 'sm'){ + this.portraitModel = true + }else{ + this.portraitModel = false + } + } build() { Row() { if (this.dBQueryFinished == 1) { - if (deviceInfo.deviceType === 'phone' || deviceInfo.deviceType === 'default') { + if (this.breakPoints === 'sm') { NoteHomePortraitComp() } else { NoteHomeComp({ controllerShow: this.controllerShow }) @@ -50,7 +57,7 @@ export struct MyNoteHomeComp { aboutToAppear(): void{ LogUtil.info(this.TAG, "aboutToAppear") - + this.breakPoints = AppStorage.Get('breakPoint') if (this.context == undefined || this.context == null) { LogUtil.warn(this.TAG, "context is error") return diff --git a/product/tablet/src/main/ets/pages/NoteContentHome.ets b/product/default/src/main/ets/pages/NoteContentHome.ets similarity index 70% rename from product/tablet/src/main/ets/pages/NoteContentHome.ets rename to product/default/src/main/ets/pages/NoteContentHome.ets index 0e74967..fd50849 100644 --- a/product/tablet/src/main/ets/pages/NoteContentHome.ets +++ b/product/default/src/main/ets/pages/NoteContentHome.ets @@ -14,9 +14,9 @@ */ import deviceInfo from '@ohos.deviceInfo'; -import {NoteContentCompPortrait} from '@ohos/component/src/main/ets/components/NoteContentCompPortrait' -import {NoteContent} from '@ohos/component/src/main/ets/components/NoteContent' -import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' +import { NoteContentCompPortrait } from '@ohos/component/src/main/ets/components/NoteContentCompPortrait' +import { NoteContent } from '@ohos/component/src/main/ets/components/NoteContent' +import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil' import inputMethod from '@ohos.inputmethod' @@ -26,13 +26,14 @@ struct NoteContentHome { @Provide('RefreshFlag') refreshFlag: number = 0 private controllerShow: WebController = new WebController() @StorageLink('DBQueryFinished') dBQueryFinished: number = 0 + @StorageLink('breakPoint') breakPoints: string = 'lg' TAG = "NoteContentHome_Tablet" build() { // Note content display area Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { if (this.dBQueryFinished == 1) { - if (deviceInfo.deviceType === 'phone' || deviceInfo.deviceType === 'default') { + if (this.breakPoints === 'sm') { NoteContentCompPortrait({ controllerShow: this.controllerShow }) } else { NoteContent({ controllerShow: this.controllerShow }) @@ -45,16 +46,17 @@ struct NoteContentHome { .height('100%') } - onBackPress():void{ - LogUtil.info(this.TAG, "onBackPress") - this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setInputEnabled(false)" }) - this.controllerShow.runJavaScript({ script: "getHtmlContent()" }) - if (deviceInfo.deviceType !== 'phone' && deviceInfo.deviceType !== 'default') { - inputMethod.getInputMethodController().stopInput() - } + onBackPress(): void { + LogUtil.info(this.TAG, "onBackPress") + this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setInputEnabled(false)" }) + this.controllerShow.runJavaScript({ script: "getHtmlContent()" }) + if (deviceInfo.deviceType !== 'phone' && deviceInfo.deviceType !== 'default') { + inputMethod.getInputMethodController().stopInput() + } } - aboutToAppear(): void{ + aboutToAppear(): void { + this.breakPoints = AppStorage.Get('breakPoint') LogUtil.info(this.TAG, "aboutToAppear") let isContinue = AppStorage.Get('IsContinue') LogUtil.info(this.TAG, "aboutToAppear, isContinue : " + isContinue) @@ -65,5 +67,4 @@ struct NoteContentHome { AppStorage.SetOrCreate('NoteContentHomeExist', true) } } - } \ No newline at end of file diff --git a/product/tablet/src/main/ets/pages/NoteHome.ets b/product/default/src/main/ets/pages/NoteHome.ets similarity index 45% rename from product/tablet/src/main/ets/pages/NoteHome.ets rename to product/default/src/main/ets/pages/NoteHome.ets index 1493527..87af438 100644 --- a/product/tablet/src/main/ets/pages/NoteHome.ets +++ b/product/default/src/main/ets/pages/NoteHome.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { FolderListComp } from '@ohos/component/src/main/ets/components/FolderListComp' +import { FolderListComp, FolderListBackGround } from '@ohos/component/src/main/ets/components/FolderListComp' import { NoteListComp } from '@ohos/component/src/main/ets/components/NoteListComp' import { NoteContentComp } from '@ohos/component/src/main/ets/components/NoteContentComp' import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants' @@ -44,75 +44,113 @@ export struct NoteHomeComp { @Provide('SelectedAll') selectedAll: boolean = false @Provide('EditModel') editModel: boolean = false //编辑模式：临时方案 @Provide('Issave') issave: number = 0 + @StorageLink('breakPoint') breakPoints: string = 'lg' controllerShow: WebController TAG = "NoteHomeComp_Tablet" - narrowWinListener = mediaquery.matchMediaSync('(width < 2000)') - - onWinSizeChange(mediaQueryResult) { - if (this.sectionStatus != 1) { - this.sectionStatus = (mediaQueryResult.matches) ? 2 : 3 - // save continue data - AppStorage.SetOrCreate('ContinueSection', this.sectionStatus) - LogUtil.info(this.TAG, "onWinSizeChange, set continue section success") - } - } build() { Flex({ justifyContent: FlexAlign.Start }) { - // Folder list display area - Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.Center }) { - FolderListComp({ controllerShow: this.controllerShow }) - } - .flexShrink(0) - .backgroundColor($r("app.color.folderlist_bgcolor_f1f3f5")) - .width(200) - .height(StyleConstants.PERCENTAGE_100) - .visibility( - LayoutUtil.getWidthWeightMessage(this.sectionStatus) - .folderListVisibility == 0 ? Visibility.None : Visibility.Visible) - .enabled(this.search ? false : true) + if (this.breakPoints === 'lg') { + // Folder list display area + Flex({ direction: FlexDirection.Column, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.Center }) { + FolderListComp({ controllerShow: this.controllerShow }) + } + .flexShrink(0) + .backgroundColor($r("app.color.folderlist_bgcolor_f1f3f5")) + .width(200) + .height(StyleConstants.PERCENTAGE_100) + .visibility( + LayoutUtil.getWidthWeightMessage(this.sectionStatus) + .folderListVisibility == 0 ? Visibility.None : Visibility.Visible) + .enabled(this.search ? false : true) - // Note list display area - Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { - Divider() - .vertical(true) - .strokeWidth(1) - .color($r("app.color.divider_color_182431")) - .height("100%") - .opacity(StyleConstants.OPACITY_10) - NoteListComp({ controllerShow: this.controllerShow }) - } - .flexShrink(1) - .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) - .layoutWeight(2) - .height(StyleConstants.PERCENTAGE_100) - .visibility( - LayoutUtil.getWidthWeightMessage(this.sectionStatus) - .noteListVisibility == 0 ? Visibility.None : Visibility.Visible) - // Note content display area - Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { - Divider() - .vertical(true) - .strokeWidth(1) - .color($r("app.color.divider_color_182431")) - .height("100%") - .opacity(StyleConstants.OPACITY_10) - NoteContentComp({ controllerShow: this.controllerShow }) + // Note list display area + Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { + Divider() + .vertical(true) + .strokeWidth(1) + .color($r("app.color.divider_color_182431")) + .height("100%") + .opacity(StyleConstants.OPACITY_10) + NoteListComp({ controllerShow: this.controllerShow }) + } + .flexShrink(1) + .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) + .layoutWeight(2) + .height(StyleConstants.PERCENTAGE_100) + .visibility( + LayoutUtil.getWidthWeightMessage(this.sectionStatus) + .noteListVisibility == 0 ? Visibility.None : Visibility.Visible) + // Note content display area + Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { + Divider() + .vertical(true) + .strokeWidth(1) + .color($r("app.color.divider_color_182431")) + .height("100%") + .opacity(StyleConstants.OPACITY_10) + NoteContentComp({ controllerShow: this.controllerShow }) + } + .flexShrink(0) + .backgroundColor($r("app.color.notecontent_color_ffffff")) + .layoutWeight(this.sectionStatus != 1 ? 3 : null) + .height(StyleConstants.PERCENTAGE_100) + .enabled(this.longpress || this.search && this.inputKeyword.length == 0 ? false : true) + } else if (this.breakPoints === 'md') { + Stack({ alignContent: Alignment.Start }) { + Row() { + // Note list display area + Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { + Divider() + .vertical(true) + .strokeWidth(1) + .color($r("app.color.divider_color_182431")) + .height("100%") + .opacity(StyleConstants.OPACITY_10) + NoteListComp({ controllerShow: this.controllerShow }) + } + .flexShrink(1) + .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) + .layoutWeight(2) + .height(StyleConstants.PERCENTAGE_100) + .visibility( + LayoutUtil.getWidthWeightMessage(this.sectionStatus) + .noteListVisibility == 0 ? Visibility.None : Visibility.Visible) + + Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { + Divider() + .vertical(true) + .strokeWidth(1) + .color($r("app.color.divider_color_182431")) + .height("100%") + .opacity(StyleConstants.OPACITY_10) + NoteContentComp({ controllerShow: this.controllerShow }) + } + .flexShrink(0) + .backgroundColor($r("app.color.notecontent_color_ffffff")) + .layoutWeight(this.sectionStatus != 1 ? 3 : null) + .height(StyleConstants.PERCENTAGE_100) + .enabled(this.longpress || this.search && this.inputKeyword.length == 0 ? false : true) + } + + //Folder list display area + Stack() { + FolderListBackGround() + FolderListComp() + } + .width(200) + .height(StyleConstants.PERCENTAGE_100) + .visibility(this.expandStatus == false ? Visibility.None : Visibility.Visible) + } + .width(StyleConstants.PERCENTAGE_100).height(StyleConstants.PERCENTAGE_100) } - .flexShrink(0) - .backgroundColor($r("app.color.notecontent_color_ffffff")) - .layoutWeight(this.sectionStatus != 1 ? 3 : null) - .height(StyleConstants.PERCENTAGE_100) - .enabled(this.longpress || this.search && this.inputKeyword.length == 0 ? false : true) } .width(StyleConstants.PERCENTAGE_100) .height(StyleConstants.PERCENTAGE_100) } - aboutToAppear(): void{ + aboutToAppear(): void { LogUtil.info(this.TAG, "aboutToAppear") - this.narrowWinListener.on('change', this.onWinSizeChange.bind(this)) - this.sectionStatus = this.narrowWinListener.matches ? 2 : 3 let isContinue = AppStorage.Get('IsContinue') LogUtil.info(this.TAG, "aboutToAppear, isContinue : " + isContinue) if (isContinue) { @@ -129,7 +167,7 @@ export struct NoteHomeComp { LogUtil.info(this.TAG, "aboutToAppear, set continue section success") } - aboutToDisappear(): void{ + aboutToDisappear(): void { LogUtil.info(this.TAG, "aboutToDisappear") } } \ No newline at end of file diff --git a/product/tablet/src/main/ets/pages/NoteHomePortrait.ets b/product/default/src/main/ets/pages/NoteHomePortrait.ets similarity index 96% rename from product/tablet/src/main/ets/pages/NoteHomePortrait.ets rename to product/default/src/main/ets/pages/NoteHomePortrait.ets index ec185df..ca43229 100644 --- a/product/tablet/src/main/ets/pages/NoteHomePortrait.ets +++ b/product/default/src/main/ets/pages/NoteHomePortrait.ets @@ -37,7 +37,7 @@ export struct NoteHomePortraitComp { @Provide('Longpress') longpress: boolean = false // 第二栏长按状态 // 分栏状态 - @Provide('ExpandStatus') expandStatus: boolean = AppStorage.Get('Expand') // 笔记本折叠展开状态 + @Provide('ExpandStatus') expandStatus: boolean = false // 笔记本折叠展开状态 @Provide('ChooseNote') chooseNote: boolean = AppStorage.Get('Choose') // 是否选择笔记进行打开 @Provide('Search') search: boolean = false // 是否处于搜索状态 diff --git a/product/tablet/src/main/module.json5 b/product/default/src/main/module.json5 similarity index 71% rename from product/tablet/src/main/module.json5 rename to product/default/src/main/module.json5 index 4de104c..7c50fbe 100644 --- a/product/tablet/src/main/module.json5 +++ b/product/default/src/main/module.json5 @@ -1,21 +1,6 @@ -/* - * Copyright (c) 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. - */ - { "module": { - "name": "tablet", + "name": "default", "type": "entry", "srcEntrance": "./ets/Application/AbilityStage.ts", "description": "$string:entry_MainAbility", diff --git a/product/phone/src/main/resources/base/element/color.json b/product/default/src/main/resources/base/element/color.json similarity index 100% rename from product/phone/src/main/resources/base/element/color.json rename to product/default/src/main/resources/base/element/color.json diff --git a/product/tablet/src/main/resources/base/element/string.json b/product/default/src/main/resources/base/element/string.json similarity index 100% rename from product/tablet/src/main/resources/base/element/string.json rename to product/default/src/main/resources/base/element/string.json diff --git a/product/tablet/src/main/resources/base/profile/main_pages.json b/product/default/src/main/resources/base/profile/main_pages.json similarity index 100% rename from product/tablet/src/main/resources/base/profile/main_pages.json rename to product/default/src/main/resources/base/profile/main_pages.json diff --git a/product/tablet/src/main/resources/zh_CN/element/string.json b/product/default/src/main/resources/zh_CN/element/string.json similarity index 100% rename from product/tablet/src/main/resources/zh_CN/element/string.json rename to product/default/src/main/resources/zh_CN/element/string.json diff --git a/product/phone/package-lock.json b/product/phone/package-lock.json deleted file mode 100644 index e0a40e9..0000000 --- a/product/phone/package-lock.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "phone", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/component": { - "version": "file:../../common/component", - "requires": { - "@ohos/source": "file:../../common/resources", - "@ohos/utils": "file:../../common/utils" - }, - "dependencies": { - "@ohos/source": { - "version": "file:../../common/resources" - }, - "@ohos/utils": { - "version": "file:../../common/utils", - "requires": { - "@ohos/source": "file:../../common/resources" - }, - "dependencies": { - "@ohos/source": { - "version": "file:../../common/resources" - } - } - } - } - }, - "@ohos/source": { - "version": "file:../../common/resources" - }, - "@ohos/utils": { - "version": "file:../../common/utils", - "requires": { - "@ohos/source": "file:../../common/resources" - }, - "dependencies": { - "@ohos/source": { - "version": "file:../../common/resources" - } - } - } - } -} diff --git a/product/phone/package.json b/product/phone/package.json deleted file mode 100644 index e161814..0000000 --- a/product/phone/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "license":"ISC", - "devDependencies":{}, - "name":"phone", - "ohos":{ - "org":"huawei", - "directoryLevel":"module", - "buildTool":"hvigor" - }, - "description":"example description", - "repository":{}, - "version":"1.0.0", - "dependencies":{ - "@ohos/utils":"file:../../common/utils", - "@ohos/component":"file:../../common/component", - "@ohos/source":"file:../../common/resources" - } -} \ No newline at end of file diff --git a/product/phone/src/main/ets/MainAbility/MainAbility.ts b/product/phone/src/main/ets/MainAbility/MainAbility.ts deleted file mode 100644 index ada4b82..0000000 --- a/product/phone/src/main/ets/MainAbility/MainAbility.ts +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright (c) 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 Ability from '@ohos.application.Ability' -import AbilityConstant from '@ohos.application.AbilityConstant' -import fileio from '@ohos.fileio' -import inputMethod from '@ohos.inputmethod' -globalThis.rdbStore = undefined -export default class MainAbility extends Ability { - private Tag = "MainAbility_Phone" - - onCreate(want, launchParam) { - console.info(this.Tag + " onCreate, launchReason is " + launchParam.launchReason) - AppStorage.SetOrCreate('Expand', false) - AppStorage.SetOrCreate('Choose', true) - if (launchParam.launchReason == 3) { - // 设置迁移标记 - AppStorage.SetOrCreate('IsContinue', true) - // 获取对端的迁移数据 - let continueNote: string = want.parameters["ContinueNote"] - AppStorage.SetOrCreate('ContinueNote', continueNote) - // 来自手机的迁移 - let continueChoose: boolean = want.parameters["ContinueChoose"] - if (continueChoose) { - console.info(this.Tag + " continue from phone") - }else{ - AppStorage.SetOrCreate('ContinueFromTablet', true) - console.info(this.Tag + " continue from tablet") - } - this.context.restoreWindowStage(null) - } - globalThis.noteContext = this.context - } - - onDestroy() { - console.info(this.Tag + " onDestroy") - } - - onWindowStageCreate(windowStage) { - console.info(this.Tag + " onWindowStageCreate") - windowStage.setUIContent(this.context, "pages/MyNoteHome", null) - } - - onWindowStageDestroy() { - console.info(this.Tag + " onWindowStageDestroy") - } - - onForeground() { - console.info(this.Tag + " onForeground") - } - - onBackground() { - console.info(this.Tag + " onBackground") - // 退出键盘 - inputMethod.getInputMethodController().stopInput(); - } - - onContinue(wantParam: { [key: string]: any }) { - console.info(this.Tag + " onContinue") - // 获取本端的迁移数据 - let continueNote = AppStorage.Get('ContinueNote') - if (continueNote == undefined || continueNote == null) { - console.info(this.Tag + " onContinue, continueNote is error, default [0]") - continueNote = JSON.stringify(AppStorage.Get('AllNoteArray')[0].toNoteObject()) - } - - // 保存本端的迁移数据 - wantParam["ContinueNote"] = continueNote - wantParam["ContinueChoose"] = true - - // save img to DisFileDir - console.info(this.Tag + " onContinue, save img to DisFileDir") - let continueNoteObj = JSON.parse(continueNote) - let srcArray = this.getSrcFromHtml(continueNoteObj.content_text) - srcArray.forEach((src: string) => { - let lastIndex = src.lastIndexOf('/') - if (lastIndex != -1) { - let imgName = src.substring(lastIndex + 1) - this.writeToDisFileDir(imgName) - } - }) - console.info(this.Tag + " onContinue end") - return AbilityConstant.OnContinueResult.AGREE; - } - - getSrcFromHtml(html: string): any{ - let srcArray = [] - if (html == undefined || html == null || html == "") { - return srcArray - } - let imgReg = /]+>/g - let srcReg = /src=[\'\"]?([^\'\"]*)[\'\"]?/i - let imgArray = html.match(imgReg) - if (imgArray != null) { - for (let i = 0; i < imgArray.length; i++) { - let src = imgArray[i].match(srcReg) - if (src != null && src.length > 1) { - srcArray.push(src[1]) - } - } - } - return srcArray - } - - writeToDisFileDir(fileName: string) { - console.info(this.Tag + " writeToDisFileDir, fileName : " + fileName) - let filesDir = this.context.filesDir - let srcPath = filesDir + "/" + fileName - let distributedFilesDir = this.context.distributedFilesDir - let desPath = distributedFilesDir + "/" + fileName - try { - fileio.copyFileSync(srcPath, desPath) - console.info(this.Tag + " onContinue, writeToDisFileDir, copyFile successfully") - } catch (err) { - console.warn(this.Tag + " onContinue, writeToDisFileDir, copyFile failed : " + err) - } - } -} \ No newline at end of file diff --git a/product/phone/src/main/ets/pages/MyNoteHome.ets b/product/phone/src/main/ets/pages/MyNoteHome.ets deleted file mode 100644 index 5989b0a..0000000 --- a/product/phone/src/main/ets/pages/MyNoteHome.ets +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (c) 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 fileio from '@ohos.fileio' -import bundle from '@ohos.bundle' -import abilityAccessCtrl from '@ohos.abilityAccessCtrl' -import {NoteHomePortraitComp} from './NoteHomePortrait' -import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' -import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil' -import inputMethod from '@ohos.inputmethod' -import router from '@system.router' - -@Entry -@Component -export struct MyNoteHomeComp { - @StorageLink('DBQueryFinished') dBQueryFinished: number = 0 - @Provide('PortraitModel') portraitModel: boolean = true - @Provide('RefreshFlag') refreshFlag: number = 0 - private context = getContext(this) - TAG = "MyNoteHomeComp_Phone" - - build() { - Flex() { - if (this.dBQueryFinished == 1) { - NoteHomePortraitComp() - } - } - .width('100%').height('100%') - } - - aboutToAppear(): void{ - LogUtil.info(this.TAG, "aboutToAppear") - - if (this.context == undefined || this.context == null) { - LogUtil.warn(this.TAG, "context is error") - return - } - - let permissionList: Array = [ - "ohos.permission.READ_MEDIA", - "ohos.permission.MEDIA_LOCATION", - "ohos.permission.DISTRIBUTED_DATASYNC" - ] - LogUtil.info(this.TAG, 'permissions need to require from user') - let context: any = getContext(this); - context.requestPermissionsFromUser(permissionList).then((data) => { - LogUtil.info(this.TAG, 'data permissions : ' + data.permissions) - LogUtil.info(this.TAG, 'data result: ' + data.authResults) - let sum = 0 - for (let i = 0; i < data.authResults.length; i++) { - sum += data.authResults[i] - } - LogUtil.info(this.TAG, 'request permissions sum: ' + sum) - }, (err) => { - LogUtil.warn(this.TAG, 'failed to requestPermissionsFromUser : ' + err.code); - }) - - let dbExist = false; - let dbPath = context.databaseDir + "/db/note.db" - try { - fileio.accessSync(dbPath) - LogUtil.info(this.TAG, "db has created") - RdbStoreUtil.initAppStorage(this.context) - dbExist = true - } catch (err) { - LogUtil.info(this.TAG, "db has not created, find to rdb folder") - } - if (!dbExist) { - dbPath = context.databaseDir + "/rdb/note.db" - try{ - fileio.accessSync(dbPath) - LogUtil.info(this.TAG,"db has created") - RdbStoreUtil.initAppStorage(this.context) - } catch (err) { - LogUtil.info(this.TAG,"db has not created, start to create db") - RdbStoreUtil.createRdbStore(this.context) - } - } - } - - aboutToDisappear(): void{ - LogUtil.info(this.TAG, "aboutToDisappear") - } - - onPageShow(): void{ - LogUtil.info(this.TAG, "onPageShow") - this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0) - // continue from tablet - let continueFromTablet = AppStorage.Get('ContinueFromTablet') - LogUtil.info(this.TAG, "onPageShow, continueFromTablet : " + continueFromTablet) - let noteContentHomeExist = AppStorage.Get('NoteContentHomeExist') - LogUtil.info(this.TAG, "onPageShow, noteContentHomeExist : " + noteContentHomeExist) - if (continueFromTablet && !noteContentHomeExist) { - router.push({ uri: 'pages/NoteContentHome' }) - AppStorage.SetOrCreate('ContinueFromTablet', false) - } - } - - onBackPress():void{ - LogUtil.info(this.TAG, "onBackPress") - // 退出键盘 - inputMethod.getInputMethodController().stopInput(); - } -} \ No newline at end of file diff --git a/product/phone/src/main/ets/pages/NoteContentHome.ets b/product/phone/src/main/ets/pages/NoteContentHome.ets deleted file mode 100644 index d12a18e..0000000 --- a/product/phone/src/main/ets/pages/NoteContentHome.ets +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 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 {NoteContentCompPortrait} from '@ohos/component/src/main/ets/components/NoteContentCompPortrait' -import {LogUtil} from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' -import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil' - -@Entry -@Component -struct NoteContentHome { - @Provide('RefreshFlag') refreshFlag: number = 0 - private controllerShow: WebController = new WebController() - @StorageLink('DBQueryFinished') dBQueryFinished: number = 0 - TAG = "NoteContentHome_Phone" - - build() { - // Note content display area - Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { - if (this.dBQueryFinished == 1) { - NoteContentCompPortrait({ controllerShow: this.controllerShow }) - } - } - .backgroundColor($r("app.color.notecontent_color_ffffff")) - .width('100%') - .height('100%') - } - - onBackPress():void{ - LogUtil.info(this.TAG, "onBackPress") - this.controllerShow.runJavaScript({ script: "RICH_EDITOR.setInputEnabled(false)" }) - this.controllerShow.runJavaScript({ script: "getHtmlContent()" }) - } - - aboutToAppear(): void{ - LogUtil.info(this.TAG, "aboutToAppear") - let isContinue = AppStorage.Get('IsContinue') - LogUtil.info(this.TAG, "aboutToAppear, isContinue : " + isContinue) - if (isContinue) { - RdbStoreUtil.initAppStorage(globalThis.noteContext) - } - AppStorage.SetOrCreate('NoteContentHomeExist', true) - } - -} \ No newline at end of file diff --git a/product/phone/src/main/ets/pages/NoteHomePortrait.ets b/product/phone/src/main/ets/pages/NoteHomePortrait.ets deleted file mode 100644 index ec185df..0000000 --- a/product/phone/src/main/ets/pages/NoteHomePortrait.ets +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 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 { FolderListComp, FolderListBackGround } from '@ohos/component/src/main/ets/components/FolderListComp' -import { NoteListComp } from '@ohos/component/src/main/ets/components/NoteListComp' -import { NoteContentCompPortrait } from '@ohos/component/src/main/ets/components/NoteContentCompPortrait' -import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants' -import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' -import { circleColorArray } from '@ohos/utils/src/main/ets/default/model/NoteBaseData' -import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData' -import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData' -import { SysDefFolderUuid } from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' -import LayoutUtil from '@ohos/utils/src/main/ets/default/baseUtil/LayoutUtil' -import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil' - -@Entry -@Component -export struct NoteHomePortraitComp { - // 当前文件夹、笔记、分栏 - @Provide('SelectedFolderData') selectedFolderData: FolderData = AppStorage.Get('Folder') - @Provide('SelectedNoteData') selectedNoteData: NoteData = AppStorage.Get('Note') - @Provide('SectionStatus') sectionStatus: number = 1; // 表示分栏状态， 3表示三分栏， 2表示二分栏，1表示一分栏 - @Provide('LastSectionStatus') lastSectionStatus: number = 1; // 记录分栏上一次的状态 - @Provide('SelectedColor') selectedColor: string = circleColorArray[0]; - @Provide('Longpress') longpress: boolean = false // 第二栏长按状态 - - // 分栏状态 - @Provide('ExpandStatus') expandStatus: boolean = AppStorage.Get('Expand') // 笔记本折叠展开状态 - @Provide('ChooseNote') chooseNote: boolean = AppStorage.Get('Choose') // 是否选择笔记进行打开 - - @Provide('Search') search: boolean = false // 是否处于搜索状态 - @Provide('SearchResultList') searchResultList: NoteData[] = [] // 搜索得到的笔记列表 - @Provide('InputKeyword') inputKeyword: string = '' // 搜索的字串 - @Provide('SelectedAll') selectedAll: boolean = false; - @Provide('EditModel') editModel: boolean = false - TAG = "NoteHomePortraitComp_Phone" - - build() { - Stack({ alignContent: Alignment.Start }) { - - // Note list display area - Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap, justifyContent: FlexAlign.Start }) { - NoteListComp() - } - .width(StyleConstants.PERCENTAGE_100) - .height(StyleConstants.PERCENTAGE_100) - .enabled(this.expandStatus ? false : true) - .backgroundColor($r("app.color.notelist_bgcolor_f1f3f5")) - - //Folder list display area - Stack() { - FolderListBackGround() - FolderListComp() - } - .width(200) - .height(StyleConstants.PERCENTAGE_100) - .visibility(this.expandStatus == false ? Visibility.None : Visibility.Visible) - } - .width(StyleConstants.PERCENTAGE_100).height(StyleConstants.PERCENTAGE_100) - } - - aboutToAppear(): void{ - LogUtil.info(this.TAG, "aboutToAppear") - } - - aboutToDisappear(): void{ - LogUtil.info(this.TAG, "aboutToDisappear") - } -} \ No newline at end of file diff --git a/product/phone/src/main/module.json5 b/product/phone/src/main/module.json5 deleted file mode 100644 index 4ae9bc0..0000000 --- a/product/phone/src/main/module.json5 +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 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. - */ - -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:entry_MainAbility", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - ], - "requestPermissions": [ - { - "name": "ohos.permission.INTERNET" - }, - { - "name": "ohos.permission.READ_MEDIA", - "reason": "$string:read_media_permission" - }, - { - "name": "ohos.permission.MEDIA_LOCATION", - "reason": "$string:media_location_permission" - }, - { - "name": "ohos.permission.DISTRIBUTED_DATASYNC", - "reason": "$string:distributed_dataSync_permission" - }, - ], - "deliveryWithInstall": true, - "installationFree": false, - "pages": "$profile:main_pages", - "uiSyntax": "ets", - "abilities": [ - { - "name": "MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:entry_MainAbility", - "icon": "$media:note", - "label": "$string:entry_MainAbility", - "visible": true, - "continuable": true, - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "startWindowBackground": "$color:color_1", - "startWindowIcon": "$media:note" - } - ] - } -} \ No newline at end of file diff --git a/product/phone/src/main/resources/base/element/string.json b/product/phone/src/main/resources/base/element/string.json deleted file mode 100644 index 3650d72..0000000 --- a/product/phone/src/main/resources/base/element/string.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "备忘录" - }, - { - "name": "read_media_permission", - "value": "Used to read media file information in external storage of users" - }, - { - "name": "media_location_permission", - "value": "Used for memo access to geographic location information in user media files" - }, - { - "name": "distributed_dataSync_permission", - "value": "Used for memo data exchange between different equipment" - } - ] -} \ No newline at end of file diff --git a/product/phone/src/main/resources/base/profile/main_pages.json b/product/phone/src/main/resources/base/profile/main_pages.json deleted file mode 100644 index 3ed4365..0000000 --- a/product/phone/src/main/resources/base/profile/main_pages.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "src": [ - "pages/MyNoteHome", - "pages/NoteContentHome", - "pages/NoteHomePortrait" - ] -} \ No newline at end of file diff --git a/product/phone/src/main/resources/zh_CN/element/string.json b/product/phone/src/main/resources/zh_CN/element/string.json deleted file mode 100644 index 215a916..0000000 --- a/product/phone/src/main/resources/zh_CN/element/string.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "string": [ - { - "name": "read_media_permission", - "value": "用于备忘录读取用户外部存储中的媒体文件信息" - }, - { - "name": "media_location_permission", - "value": "用于备忘录访问用户媒体文件中的地理位置信息" - }, - { - "name": "distributed_dataSync_permission", - "value": "用于备忘录进行不同设备间的数据交换" - } - ] -} \ No newline at end of file diff --git a/product/tablet/.gitignore b/product/tablet/.gitignore deleted file mode 100644 index 4f9a973..0000000 --- a/product/tablet/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/node_modules -/.preview -/build \ No newline at end of file diff --git a/product/tablet/build-profile.json5 b/product/tablet/build-profile.json5 deleted file mode 100644 index a011ff8..0000000 --- a/product/tablet/build-profile.json5 +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 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. - */ - -{ - "apiType": 'stageMode', - "buildOption": { - }, - "targets": [ - { - "name": "default", - } - ] -} \ No newline at end of file diff --git a/product/tablet/package.json b/product/tablet/package.json deleted file mode 100644 index 4cfedc4..0000000 --- a/product/tablet/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "license":"ISC", - "devDependencies":{}, - "name":"tablet", - "ohos":{ - "org":"huawei", - "directoryLevel":"module", - "buildTool":"hvigor" - }, - "description":"example description", - "repository":{}, - "version":"1.0.0", - "dependencies":{ - "@ohos/utils":"file:../../common/utils", - "@ohos/component":"file:../../common/component", - "@ohos/source":"file:../../common/resources" - } -} \ No newline at end of file diff --git a/product/tablet/src/main/ets/Application/AbilityStage.ts b/product/tablet/src/main/ets/Application/AbilityStage.ts deleted file mode 100644 index 32dfe93..0000000 --- a/product/tablet/src/main/ets/Application/AbilityStage.ts +++ /dev/null @@ -1,7 +0,0 @@ -import AbilityStage from "@ohos.application.AbilityStage" - -export default class MyAbilityStage extends AbilityStage { - onCreate() { - console.log("[Demo] MyAbilityStage onCreate") - } -} \ No newline at end of file diff --git a/product/tablet/src/main/resources/base/element/color.json b/product/tablet/src/main/resources/base/element/color.json deleted file mode 100644 index 0c413af..0000000 --- a/product/tablet/src/main/resources/base/element/color.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "color": [ - { - "name": "color_1", - "value": "#fff" - } - ] -} \ No newline at end of file -- Gitee