Commit d8f0f48578ff5eeacc65c207c05c005902dc5ceb

Authored by fengwotao
1 parent 45797988

perf(src/packages): 修改组合为其他,移动三维模型到小组件里的三维

1   -import { ChartFrameEnum, ConfigType } from '@/packages/index.d'
2   -import { EPackagesCategoryEnum } from '@/packages/components/external/types'
3   -import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
4   -import { useWidgetKey } from '@/packages/external/useWidgetKey'
5   -
6   -const { key, chartKey, conKey } = useWidgetKey('ThreeDimensional')
7   -export const ThreeDimensionalConfig: ConfigType = {
8   - key,
9   - chartKey,
10   - conKey,
11   - title: '三维模型',
12   - category: ChatCategoryEnum.MORE,
13   - categoryName: ChatCategoryEnumName.MORE,
14   - package: EPackagesCategoryEnum.COMPOSES,
15   - chartFrame: ChartFrameEnum.NAIVE_UI,
16   - image: 'threeDimensional.png'
17   -}
... ... @@ -3,6 +3,5 @@ import { Title2Config } from './Title2/index'
3 3 import { Title3Config } from './Title3/index'
4 4 import { CameraConfig } from './Camera/index'
5 5 import { SingleCameraConfig } from './SingleCamera/index'
6   -import { ThreeDimensionalConfig } from './ThreeDimensional/index'
7 6
8   -export default [Title1Config, Title2Config, Title3Config, CameraConfig, SingleCameraConfig, ThreeDimensionalConfig]
  7 +export default [Title1Config, Title2Config, Title3Config, CameraConfig, SingleCameraConfig]
... ...
src/packages/components/external/Decorates/Three/ThreeDimensional/components/FileUpload.vue renamed from src/packages/components/external/Composes/Mores/ThreeDimensional/components/FileUpload.vue
src/packages/components/external/Decorates/Three/ThreeDimensional/config.ts renamed from src/packages/components/external/Composes/Mores/ThreeDimensional/config.ts
src/packages/components/external/Decorates/Three/ThreeDimensional/config.vue renamed from src/packages/components/external/Composes/Mores/ThreeDimensional/config.vue
  1 +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
  2 +import { ChatCategoryEnum, ChatCategoryEnumName } from '@/packages/components/Decorates/index.d'
  3 +import { useWidgetKey } from '@/packages/external/useWidgetKey'
  4 +
  5 +const { key, chartKey, conKey } = useWidgetKey('ThreeDimensional',true)
  6 +export const ThreeDimensionalConfig: ConfigType = {
  7 + key,
  8 + chartKey,
  9 + conKey,
  10 + title: '三维模型',
  11 + category: ChatCategoryEnum.THREE,
  12 + categoryName: ChatCategoryEnumName.THREE,
  13 + package: PackagesCategoryEnum.DECORATES,
  14 + chartFrame: ChartFrameEnum.STATIC,
  15 + image: 'threeDimensional.png'
  16 +}
... ...
src/packages/components/external/Decorates/Three/ThreeDimensional/index.vue renamed from src/packages/components/external/Composes/Mores/ThreeDimensional/index.vue
... ... @@ -36,7 +36,7 @@
36 36 import { PropType, ref } from 'vue'
37 37 import { option } from './config'
38 38 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
39   -import FileUpload from '../../../Composes/Mores/ThreeDimensional/components/FileUpload.vue'
  39 +import FileUpload from '../../../Decorates/Three/ThreeDimensional/components/FileUpload.vue'
40 40 import type { UploadFileInfo } from 'naive-ui'
41 41
42 42 //视频类型
... ...
... ... @@ -13,7 +13,7 @@ export type EPackagesType = {
13 13
14 14 // 包分类名称
15 15 export enum EPackagesCategoryName {
16   - COMPOSES = '组合',
  16 + COMPOSES = '其他',
17 17 }
18 18
19 19 // icon边框类型
... ...
... ... @@ -23,6 +23,7 @@ import { OverrideILoadConfigurationframeConfig } from '@/packages/components/ext
23 23 import { OverrideVideoConfig } from '@/packages/components/external/Informations/Mores/OverrideVideo'
24 24 import { OverrideWaterPoloConfig } from '@/packages/components/external/Charts/Mores/OverrideWaterPolo'
25 25 import { OverrideLineRealTimeConfig } from '@/packages/components/external/Charts/Lines/OverrideLineRealTime'
  26 +import { ThreeDimensionalConfig } from '@/packages/components/external/Decorates/Three/ThreeDimensional'
26 27
27 28 /**
28 29 * 重写动态注入
... ... @@ -30,12 +31,13 @@ import { OverrideLineRealTimeConfig } from '@/packages/components/external/Chart
30 31 export function useInjectLib(packagesList: EPackagesType) {
31 32 packagesList[EPackagesCategoryEnum.COMPOSES] = ComposesList
32 33
33   - //新增小组件更多里的图标和天气
  34 + //小组件
34 35 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.DECORATES, PickIconConfig)//新增小组件图标
35 36 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.DECORATES, WeatherConfig)//新增小组件天气
  37 + addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.DECORATES, ThreeDimensionalConfig)//三维模型
36 38 //
37 39
38   - //重写信息相关组件
  40 + //信息
39 41 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.INFORMATIONS, OverrideImageConfig)//重写信息下的图片
40 42 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.INFORMATIONS, OverrideCarouselConfig)//重写信息下的轮播图
41 43 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.INFORMATIONS, OverrideSelectConfig)//重写信息下的select
... ... @@ -54,7 +56,7 @@ export function useInjectLib(packagesList: EPackagesType) {
54 56 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.INFORMATIONS, OverrideVideoConfig)//重写信息下的视频
55 57 //
56 58
57   - //重写图表相关组件
  59 + //图表
58 60 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.CHARTS, OverrideBarCommonConfig)//重写图表下的柱状图
59 61 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.CHARTS, OverrideLineCommonConfig)//重写图表下的折线图
60 62 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.CHARTS, OverrideLineGradientsConfig)//重写图表下的渐变折线图
... ...