Importing ArkTS files in JS and TS files is forbidden.

Signed-off-by: gengzhengxing <gengzhengxing1@h-partners.com>

common/component.ets

@@ -0,0 +1,29 @@
+/**
+ * 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 {
+  AppGrid,
+  AppName,
+  AppIcon,
+  AppMenu,
+  AppBubble,
+  ScrollerComponent,
+  RemoveFormDialog,
+  UninstallDialog,
+  FolderComponent,
+  FormManagerDialog,
+  FormItemComponent,
+  RemoteWindowWrapper
+} from './src/main/ets/default/uicomponents'

common/index.ts

@@ -13,80 +13,91 @@
  * limitations under the License.
  */
 
-export { Log }  from './src/main/ets/default/utils/Log'
-export { Trace }  from './src/main/ets/default/utils/Trace'
-export { PinyinSort }  from './src/main/ets/default/utils/PinyinSort'
-export { CheckEmptyUtils }  from './src/main/ets/default/utils/CheckEmptyUtils'
-export { MenuInfo }  from './src/main/ets/default/bean/MenuInfo'
-export { MissionInfo }  from './src/main/ets/default/bean/MissionInfo'
-export { AppItemInfo }  from './src/main/ets/default/bean/AppItemInfo'
-export { DockItemInfo }  from './src/main/ets/default/bean/DockItemInfo'
-export { CardItemInfo }  from './src/main/ets/default/bean/CardItemInfo'
-export { LauncherDragItemInfo } from './src/main/ets/default/bean/LauncherDragItemInfo'
-export { FolderItemInfo } from './src/main/ets/default/bean/FolderItemInfo'
-export { SnapShotInfo }  from './src/main/ets/default/bean/SnapShotInfo'
-export { SettingItemInfo }  from './src/main/ets/default/bean/SettingItemInfo'
-export { RecentMissionInfo }  from './src/main/ets/default/bean/RecentMissionInfo'
-export { RecentBundleMissionInfo }  from './src/main/ets/default/bean/RecentBundleMissionInfo'
-export { EventConstants }  from './src/main/ets/default/constants/EventConstants'
-export { FormConstants }  from './src/main/ets/default/constants/FormConstants'
-export { StyleConstants }  from './src/main/ets/default/constants/StyleConstants'
-export { CommonConstants }  from './src/main/ets/default/constants/CommonConstants'
-export { PresetStyleConstants }  from './src/main/ets/default/constants/PresetStyleConstants'
-export { AppGrid }  from './src/main/ets/default/uicomponents/AppGrid'
-export { AppName }  from './src/main/ets/default/uicomponents/AppName'
-export { AppIcon }  from './src/main/ets/default/uicomponents/AppIcon'
-export { AppMenu }  from './src/main/ets/default/uicomponents/AppMenu'
-export { AppBubble }  from './src/main/ets/default/uicomponents/AppBubble'
-export { ScrollerComponent } from './src/main/ets/default/uicomponents/ScrollerComponent';
-export { RemoveFormDialog }  from './src/main/ets/default/uicomponents/RemoveFormDialog'
-export { UninstallDialog }  from './src/main/ets/default/uicomponents/UninstallDialog'
-export { FolderComponent }  from './src/main/ets/default/uicomponents/FolderComponent'
-export { FormManagerDialog }  from './src/main/ets/default/uicomponents/FormManagerDialog'
-export { FormItemComponent }  from './src/main/ets/default/uicomponents/FormItemComponent'
-export { RemoteWindowWrapper }  from './src/main/ets/default/uicomponents/RemoteWindowWrapper'
-export { FormManager }  from './src/main/ets/default/manager/FormManager'
-export { BadgeManager }  from './src/main/ets/default/manager/BadgeManager'
-export { windowManager }  from './src/main/ets/default/manager/WindowManager'
-export { RdbStoreManager }  from './src/main/ets/default/manager/RdbStoreManager'
-export { ResourceManager }  from './src/main/ets/default/manager/ResourceManager'
-export { localEventManager }  from './src/main/ets/default/manager/LocalEventManager'
-export { amsMissionManager }  from './src/main/ets/default/manager/AmsMissionManager'
-export { InputMethodManager }  from './src/main/ets/default/manager/InputMethodManager'
-export { settingsDataManager }  from './src/main/ets/default/manager/SettingsDataManager'
-export { layoutConfigManager }  from './src/main/ets/default/layoutconfig/LayoutConfigManager'
-export { launcherAbilityManager }  from './src/main/ets/default/manager/LauncherAbilityManager'
-export { navigationBarCommonEventManager }  from './src/main/ets/default/manager/NavigationBarCommonEventManager'
-export { CloseAppManager } from './src/main/ets/default/manager/CloseAppManager'
-export { ILayoutConfig }  from './src/main/ets/default/layoutconfig/ILayoutConfig'
-export { FormLayoutConfig }  from './src/main/ets/default/layoutconfig/FormLayoutConfig'
-export { FolderLayoutConfig }  from './src/main/ets/default/layoutconfig/FolderLayoutConfig'
-export { AppListStyleConfig }  from './src/main/ets/default/layoutconfig/AppListStyleConfig'
-export { AppGridStyleConfig }  from './src/main/ets/default/layoutconfig/AppGridStyleConfig'
-export { RecentsModeConfig }  from './src/main/ets/default/layoutconfig/RecentsModeConfig'
-export { PageDesktopModeConfig }  from './src/main/ets/default/layoutconfig/PageDesktopModeConfig'
-export { PageDesktopLayoutConfig }  from './src/main/ets/default/layoutconfig/PageDesktopLayoutConfig'
-export { PageDesktopAppModeConfig }  from './src/main/ets/default/layoutconfig/PageDesktopAppModeConfig'
-export { LauncherLayoutStyleConfig }  from './src/main/ets/default/layoutconfig/LauncherLayoutStyleConfig'
-export { BaseStage }  from './src/main/ets/default/base/BaseStage'
-export { BaseDragHandler }  from './src/main/ets/default/base/BaseDragHandler'
-export { BaseViewModel }  from './src/main/ets/default/base/BaseViewModel'
-export { BaseModulePreLoader }  from './src/main/ets/default/base/BaseModulePreLoader'
-export { BaseCloseAppHandler } from './src/main/ets/default/base/BaseCloseAppHandler'
-export { BaseStartAppHandler} from './src/main/ets/default/base/BaseStartAppHandler'
-export { LayoutViewModel }  from './src/main/ets/default/viewmodel/LayoutViewModel'
-export { AppModel }  from './src/main/ets/default/model/AppModel'
-export { FormModel }  from './src/main/ets/default/model/FormModel'
-export { SettingsModel }  from './src/main/ets/default/model/SettingsModel'
-export { PageDesktopModel }  from './src/main/ets/default/model/PageDesktopModel'
-export { RecentMissionsModel }  from './src/main/ets/default/model/RecentMissionsModel'
-export { SettingsModelObserver }  from './src/main/ets/default/model/SettingsModelObserver'
+export {
+  Log, Trace, PinyinSort, CheckEmptyUtils, ObjectCopyUtil
+} from './src/main/ets/default/utils'
+
+export {
+  BaseStage,
+  BaseDragHandler,
+  BaseViewModel,
+  BaseModulePreLoader,
+  BaseCloseAppHandler,
+  BaseStartAppHandler
+} from './src/main/ets/default/base'
+
+export {
+  MenuInfo,
+  MissionInfo,
+  AppItemInfo,
+  DockItemInfo,
+  CardItemInfo,
+  LauncherDragItemInfo,
+  FolderItemInfo,
+  SnapShotInfo,
+  SettingItemInfo,
+  RecentMissionInfo,
+  RecentBundleMissionInfo
+} from './src/main/ets/default/bean'
+
+export {
+  EventConstants,
+  FormConstants,
+  StyleConstants,
+  CommonConstants,
+  PresetStyleConstants,
+  NumberConstants
+} from './src/main/ets/default/constants'
+
+export {
+  FormManager,
+  BadgeManager,
+  windowManager,
+  RdbStoreManager,
+  ResourceManager,
+  localEventManager,
+  amsMissionManager,
+  InputMethodManager,
+  settingsDataManager,
+  launcherAbilityManager,
+  navigationBarCommonEventManager,
+  CloseAppManager
+} from './src/main/ets/default/manager'
+
+export {
+  DragArea, DragItemPosition
+} from './src/main/ets/default/interface'
+
+export {
+  AppModel,
+  FormModel,
+  SettingsModel,
+  PageDesktopModel,
+  RecentMissionsModel,
+  SettingsModelObserver,
+  AtomicServiceAppModel
+} from './src/main/ets/default/model'
+
+export {
+  layoutConfigManager,
+  ILayoutConfig,
+  FormLayoutConfig,
+  FolderLayoutConfig,
+  AppListStyleConfig,
+  AppGridStyleConfig,
+  RecentsModeConfig,
+  PageDesktopModeConfig,
+  PageDesktopLayoutConfig,
+  PageDesktopAppModeConfig,
+  LauncherLayoutStyleConfig
+} from './src/main/ets/default/layoutconfig'
+
 export { FormListInfoCacheManager } from './src/main/ets/default/cache/FormListInfoCacheManager'
+
+export { LayoutViewModel } from './src/main/ets/default/viewmodel/LayoutViewModel'
+
 export { SettingItemsConfig } from './src/main/ets/default/configs/SettingItemsConfig'
+
 export { SettingItemsManager } from './src/main/ets/default/settings/SettingItemsManager'
+
 export { SettingItemOptionsChecker } from './src/main/ets/default/settings/SettingItemOptionsChecker'
-export { DragArea }  from './src/main/ets/default/interface/DragArea'
-export { DragItemPosition }  from './src/main/ets/default/interface/DragItemPosition'
-export { NumberConstants } from './src/main/ets/default/constants/NumberConstants'
-export { ObjectCopyUtil } from './src/main/ets/default/utils/ObjectCopyUtil'
-export { AtomicServiceAppModel } from './src/main/ets/default/model/AtomicServiceAppModel'

common/src/main/ets/default/base/index.ts

@@ -0,0 +1,26 @@
+/**
+ * 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 { BaseStage } from './BaseStage'
+
+export { BaseDragHandler } from './BaseDragHandler'
+
+export { BaseViewModel } from './BaseViewModel'
+
+export { BaseModulePreLoader } from './BaseModulePreLoader'
+
+export { BaseCloseAppHandler } from './BaseCloseAppHandler'
+
+export { BaseStartAppHandler } from './BaseStartAppHandler'

common/src/main/ets/default/bean/index.ts

@@ -0,0 +1,36 @@
+/**
+ * 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 { MenuInfo } from './MenuInfo'
+
+export { MissionInfo } from './MissionInfo'
+
+export { AppItemInfo } from './AppItemInfo'
+
+export { DockItemInfo } from './DockItemInfo'
+
+export { CardItemInfo } from './CardItemInfo'
+
+export { LauncherDragItemInfo } from './LauncherDragItemInfo'
+
+export { FolderItemInfo } from './FolderItemInfo'
+
+export { SnapShotInfo } from './SnapShotInfo'
+
+export { SettingItemInfo } from './SettingItemInfo'
+
+export { RecentMissionInfo } from './RecentMissionInfo'
+
+export { RecentBundleMissionInfo } from './RecentBundleMissionInfo'

common/src/main/ets/default/constants/index.ts

@@ -0,0 +1,26 @@
+/**
+ * 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 { EventConstants } from './EventConstants'
+
+export { FormConstants } from './FormConstants'
+
+export { StyleConstants } from './StyleConstants'
+
+export { CommonConstants } from './CommonConstants'
+
+export { PresetStyleConstants } from './PresetStyleConstants'
+
+export { NumberConstants } from './NumberConstants'

common/src/main/ets/default/interface/index.ts

@@ -0,0 +1,18 @@
+/**
+ * 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 { DragArea } from './DragArea'
+
+export { DragItemPosition } from './DragItemPosition'

common/src/main/ets/default/layoutconfig/index.ts

@@ -0,0 +1,36 @@
+/**
+ * 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 { layoutConfigManager } from './LayoutConfigManager'
+
+export { ILayoutConfig } from './ILayoutConfig'
+
+export { FormLayoutConfig } from './FormLayoutConfig'
+
+export { FolderLayoutConfig } from './FolderLayoutConfig'
+
+export { AppListStyleConfig } from './AppListStyleConfig'
+
+export { AppGridStyleConfig } from './AppGridStyleConfig'
+
+export { RecentsModeConfig } from './RecentsModeConfig'
+
+export { PageDesktopModeConfig } from './PageDesktopModeConfig'
+
+export { PageDesktopLayoutConfig } from './PageDesktopLayoutConfig'
+
+export { PageDesktopAppModeConfig } from './PageDesktopAppModeConfig'
+
+export { LauncherLayoutStyleConfig } from './LauncherLayoutStyleConfig'

common/src/main/ets/default/manager/index.ts

@@ -0,0 +1,38 @@
+/**
+ * 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 { FormManager } from './FormManager'
+
+export { BadgeManager } from './BadgeManager'
+
+export { windowManager } from './WindowManager'
+
+export { RdbStoreManager } from './RdbStoreManager'
+
+export { ResourceManager } from './ResourceManager'
+
+export { localEventManager } from './LocalEventManager'
+
+export { amsMissionManager } from './AmsMissionManager'
+
+export { InputMethodManager } from './InputMethodManager'
+
+export { settingsDataManager } from './SettingsDataManager'
+
+export { launcherAbilityManager } from './LauncherAbilityManager'
+
+export { navigationBarCommonEventManager } from './NavigationBarCommonEventManager'
+
+export { CloseAppManager } from './CloseAppManager'

common/src/main/ets/default/model/index.ts

@@ -0,0 +1,28 @@
+/**
+ * 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 { AppModel } from './AppModel'
+
+export { FormModel } from './FormModel'
+
+export { SettingsModel } from './SettingsModel'
+
+export { PageDesktopModel } from './PageDesktopModel'
+
+export { RecentMissionsModel } from './RecentMissionsModel'
+
+export { SettingsModelObserver } from './SettingsModelObserver'
+
+export { AtomicServiceAppModel } from './AtomicServiceAppModel'

common/src/main/ets/default/uicomponents/index.ets

@@ -0,0 +1,38 @@
+/**
+ * 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 { AppGrid } from './AppGrid'
+
+export { AppName } from './AppName'
+
+export { AppIcon } from './AppIcon'
+
+export { AppMenu } from './AppMenu'
+
+export { AppBubble } from './AppBubble'
+
+export { ScrollerComponent } from './ScrollerComponent'
+
+export { RemoveFormDialog } from './RemoveFormDialog'
+
+export { UninstallDialog } from './UninstallDialog'
+
+export { FolderComponent } from './FolderComponent'
+
+export { FormManagerDialog } from './FormManagerDialog'
+
+export { FormItemComponent } from './FormItemComponent'
+
+export { RemoteWindowWrapper } from './RemoteWindowWrapper'

common/src/main/ets/default/utils/index.ts

@@ -0,0 +1,24 @@
+/**
+ * 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 { Log } from './Log'
+
+export { Trace } from './Trace'
+
+export { PinyinSort } from './PinyinSort'
+
+export { CheckEmptyUtils } from './CheckEmptyUtils'
+
+export { ObjectCopyUtil } from './ObjectCopyUtil'

feature/appcenter/src/main/ets/default/layout/AppGridLayout.ets

@@ -19,8 +19,8 @@ import { Trace } from '@ohos/common';
 import { StyleConstants } from '@ohos/common';
 import { CommonConstants } from '@ohos/common';
 import { EventConstants } from '@ohos/common';
-import { AppGrid } from '@ohos/common';
-import { UninstallDialog } from '@ohos/common';
+import { AppGrid } from '@ohos/common/component';
+import { UninstallDialog } from '@ohos/common/component';
 import { MenuInfo } from '@ohos/common';
 import { ResourceManager } from '@ohos/common';
 import { localEventManager } from '@ohos/common';

feature/bigfolder/src/main/ets/default/common/uicomponents/FolderAppListDialog.ets

@@ -14,8 +14,8 @@
  */
 
 import { AppItemInfo, Log } from '@ohos/common';
-import { AppIcon } from '@ohos/common';
-import { AppName } from '@ohos/common';
+import { AppIcon } from '@ohos/common/component';
+import { AppName } from '@ohos/common/component';
 import { CommonConstants } from '@ohos/common';
 import { StyleConstants } from '@ohos/common';
 import { ResourceManager } from '@ohos/common';

feature/bigfolder/src/main/ets/default/view/FolderOpenComponent.ets

@@ -19,10 +19,10 @@ import { EventConstants } from '@ohos/common';
 import { StyleConstants } from '@ohos/common';
 import { CommonConstants } from '@ohos/common';
 import { PresetStyleConstants } from '@ohos/common';
-import { AppName } from '@ohos/common';
-import { AppBubble } from '@ohos/common';
-import { UninstallDialog } from '@ohos/common';
-import { FormManagerDialog } from '@ohos/common';
+import { AppName } from '@ohos/common/component';
+import { AppBubble } from '@ohos/common/component';
+import { UninstallDialog } from '@ohos/common/component';
+import { FormManagerDialog } from '@ohos/common/component';
 import { ResourceManager } from '@ohos/common';
 import { localEventManager } from '@ohos/common';
 import { InputMethodManager } from '@ohos/common';

feature/form/src/main/ets/default/view/FormServiceComponent.ets

@@ -13,6 +13,10 @@
  * limitations under the License.
  */
 
+import {
+  AppMenu,
+  FormManagerDialog,
+} from '@ohos/common/component'
 import {
   CommonConstants,
   StyleConstants,
@@ -25,8 +29,6 @@ import {
   AppItemInfo,
   ResourceManager,
   MenuInfo,
-  AppMenu,
-  FormManagerDialog,
   AppModel,
   localEventManager,
   EventConstants

feature/pagedesktop/src/main/ets/default/common/components/AppItem.ets

@@ -13,6 +13,12 @@
  * limitations under the License.
  */
 
+import {
+  AppBubble,
+  UninstallDialog,
+  FormManagerDialog,
+  AppIcon,
+} from '@ohos/common/component'
 import {
   AppItemInfo,
   CardItemInfo,
@@ -21,11 +27,7 @@ import {
   Trace,
   StyleConstants,
   PresetStyleConstants,
-  AppBubble,
-  UninstallDialog,
-  FormManagerDialog,
   ResourceManager,
-  AppIcon,
   CommonConstants
 } from '@ohos/common';
 import { PageDesktopDragHandler } from '../PageDesktopDragHandler';

feature/pagedesktop/src/main/ets/default/common/components/FolderItem.ets

@@ -13,13 +13,15 @@
  * limitations under the License.
  */
 
+import {
+  FolderComponent,
+} from '@ohos/common/component'
 import {
   LauncherDragItemInfo,
   Log,
   Trace,
   StyleConstants,
   CommonConstants,
-  FolderComponent,
   PresetStyleConstants
 } from '@ohos/common';
 import {

feature/pagedesktop/src/main/ets/default/common/components/FormItem.ets

@@ -13,6 +13,11 @@
  * limitations under the License.
  */
 
+import {
+  RemoveFormDialog,
+  FormManagerDialog,
+  FormItemComponent,
+} from '@ohos/common/component'
 import {
   CardItemInfo,
   LauncherDragItemInfo,
@@ -20,9 +25,6 @@ import {
   StyleConstants,
   PresetStyleConstants,
   ResourceManager,
-  RemoveFormDialog,
-  FormManagerDialog,
-  FormItemComponent,
   CommonConstants
 } from '@ohos/common';
 import {

feature/pagedesktop/src/main/ets/default/common/components/GridSwiper.ets

@@ -13,12 +13,14 @@
  * limitations under the License.
  */
 
+import {
+  AppMenu,
+} from '@ohos/common/component'
 import {
   Log,
   Trace,
   StyleConstants,
   CommonConstants,
-  AppMenu,
   MenuInfo,
   localEventManager,
   EventConstants,

feature/smartdock/src/main/ets/default/layout/RecentLayout.ets

@@ -15,10 +15,12 @@
 
 import {
   AppMenu,
-  LauncherDragItemInfo,
   AppIcon,
-  DockItemInfo,
   ScrollerComponent,
+} from '@ohos/common/component'
+import {
+  LauncherDragItemInfo,
+  DockItemInfo,
   CommonConstants,
   StyleConstants,
   ResourceManager,

feature/smartdock/src/main/ets/default/layout/ResidentLayout.ets

@@ -17,6 +17,8 @@
 import {
   AppMenu,
   AppIcon,
+} from '@ohos/common/component'
+import {
   DockItemInfo,
   LauncherDragItemInfo,
   CommonConstants,

feature/smartdock/src/main/ets/default/layout/SmartDock.ets

@@ -13,11 +13,14 @@
  * limitations under the License.
  */
 
+import {
+  UninstallDialog,
+} from '@ohos/common/component'
 import {
   Log,
   CommonConstants,
   ResourceManager,
-  UninstallDialog, RecentBundleMissionInfo
+  RecentBundleMissionInfo
 } from '@ohos/common';
 import RecentLayout from './RecentLayout';
 import ResidentLayout from './ResidentLayout';

product/pad/src/main/ets/pages/EntryView.ets

@@ -21,8 +21,8 @@ import { CommonConstants } from '@ohos/common';
 import { EventConstants } from '@ohos/common';
 import { windowManager } from '@ohos/common';
 import { localEventManager } from '@ohos/common';
-import { SettingsModel } from '@ohos/common';
-import { LayoutViewModel , RemoteWindowWrapper } from '@ohos/common';
+import { SettingsModel, LayoutViewModel } from '@ohos/common';
+import { RemoteWindowWrapper } from '@ohos/common/component';
 import { SmartDock } from '@ohos/smartdock';
 import { PageDesktopLayout } from '@ohos/pagedesktop';
 import { BigFolderConstants } from '@ohos/bigfolder';