Commit 22fb46f92a9c265c0016b24eaf9ccffb83a29be4

Authored by fengwotao
1 parent d8f0f485

perf(src/packages): 修改组合为其他,移动大标题小标题到小组件里

Showing 35 changed files with 124 additions and 115 deletions
1   -import { ChartFrameEnum } from '@/packages/index.d'
2   -import { ConfigType } from '@/packages/index.d'
3   -import { EPackagesCategoryEnum } from '@/packages/components/external/types'
4   -import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
5   -import { useWidgetKey } from '@/packages/external/useWidgetKey'
6   -
7   -const { key, chartKey, conKey } = useWidgetKey('LeftCenterRightHeadAnimat')
8   -
9   -export const LeftCenterRightHeadAnimatConfig: ConfigType = {
10   - key,
11   - chartKey,
12   - conKey,
13   - title: '大标题2',
14   - category: ChatCategoryEnum.HEADCOMBINATION,
15   - categoryName: ChatCategoryEnumName.HEADCOMBINATION,
16   - package: EPackagesCategoryEnum.COMPOSES,
17   - chartFrame: ChartFrameEnum.COMMON,
18   - image: 'decorates07.png',
19   -}
1   -import { LeftCenterRightHeadConfig } from './LeftCenterRightHead/index'
2   -import { LeftCenterRightHeadAnimatConfig } from './LeftCenterRightHeadAnimat/index'
3   -
4   -export default [LeftCenterRightHeadConfig, LeftCenterRightHeadAnimatConfig]
src/packages/components/external/Composes/Mores/OverrideILoadConfigurationframe/config.ts renamed from src/packages/components/external/Informations/Mores/OverrideILoadConfigurationframe/config.ts
src/packages/components/external/Composes/Mores/OverrideILoadConfigurationframe/config.vue renamed from src/packages/components/external/Informations/Mores/OverrideILoadConfigurationframe/config.vue
src/packages/components/external/Composes/Mores/OverrideILoadConfigurationframe/index.ts renamed from src/packages/components/external/Informations/Mores/OverrideILoadConfigurationframe/index.ts
1   -import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
2   -import { ChatCategoryEnum, ChatCategoryEnumName } from '@/packages/components/Informations/index.d'
  1 +import { ChartFrameEnum, ConfigType } from '@/packages/index.d'
  2 +import { EPackagesCategoryEnum } from '@/packages/components/external/types'
  3 +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
3 4 import { useWidgetKey } from '@/packages/external/useWidgetKey'
4 5
5   -const { key, conKey, chartKey } = useWidgetKey('OverrideILoadConfigurationframe', true)
  6 +const { key, conKey, chartKey } = useWidgetKey('OverrideILoadConfigurationframe')
6 7
7 8 export const OverrideILoadConfigurationframeConfig: ConfigType = {
8 9 key,
... ... @@ -11,7 +12,7 @@ export const OverrideILoadConfigurationframeConfig: ConfigType = {
11 12 title: '加载组态',
12 13 category: ChatCategoryEnum.MORE,
13 14 categoryName: ChatCategoryEnumName.MORE,
14   - package: PackagesCategoryEnum.INFORMATIONS,
  15 + package: EPackagesCategoryEnum.COMPOSES,
15 16 chartFrame: ChartFrameEnum.COMMON,
16 17 image: 'configuration.png'
17 18 }
... ...
src/packages/components/external/Composes/Mores/OverrideILoadConfigurationframe/index.vue renamed from src/packages/components/external/Informations/Mores/OverrideILoadConfigurationframe/index.vue
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('Title1')
7   -export const Title1Config: ConfigType = {
8   - key,
9   - chartKey,
10   - conKey,
11   - title: '小标题1',
12   - category: ChatCategoryEnum.MORE,
13   - categoryName: ChatCategoryEnumName.MORE,
14   - package: EPackagesCategoryEnum.COMPOSES,
15   - chartFrame: ChartFrameEnum.NAIVE_UI,
16   - image: 'title1.png'
17   -}
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('Title2')
7   -export const Title2Config: ConfigType = {
8   - key,
9   - chartKey,
10   - conKey,
11   - title: '小标题2',
12   - category: ChatCategoryEnum.MORE,
13   - categoryName: ChatCategoryEnumName.MORE,
14   - package: EPackagesCategoryEnum.COMPOSES,
15   - chartFrame: ChartFrameEnum.NAIVE_UI,
16   - image: 'title2.png'
17   -}
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('Title3')
7   -export const Title3Config: ConfigType = {
8   - key,
9   - chartKey,
10   - conKey,
11   - title: '小标题3',
12   - category: ChatCategoryEnum.MORE,
13   - categoryName: ChatCategoryEnumName.MORE,
14   - package: EPackagesCategoryEnum.COMPOSES,
15   - chartFrame: ChartFrameEnum.NAIVE_UI,
16   - image: 'title3.png'
17   -}
1   -import { Title1Config } from './Title1/index'
2   -import { Title2Config } from './Title2/index'
3   -import { Title3Config } from './Title3/index'
4 1 import { CameraConfig } from './Camera/index'
5 2 import { SingleCameraConfig } from './SingleCamera/index'
  3 +import { OverrideILoadConfigurationframeConfig } from './OverrideILoadConfigurationframe/index'
6 4
7   -export default [Title1Config, Title2Config, Title3Config, CameraConfig, SingleCameraConfig]
  5 +export default [SingleCameraConfig, CameraConfig, OverrideILoadConfigurationframeConfig]
... ...
1 1 export enum ChatCategoryEnum {
2   - HEADCOMBINATION = 'HeadCombinations',
3 2 MORE = 'Mores'
4 3 }
5 4
6 5 export enum ChatCategoryEnumName {
7   - HEADCOMBINATION = '头部组合',
8 6 MORE = '更多'
9 7 }
10 8
... ...
1   -import HeadCombinations from './HeadCombinations'
2 1 import Mores from './Mores'
3 2
4   -export const ComposesList = [...HeadCombinations, ...Mores]
  3 +export const ComposesList = [...Mores]
... ...
src/packages/components/external/Decorates/Headline/Headline1/config.ts renamed from src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHead/config.ts
1 1 import { PublicConfigClass } from '@/packages/public'
2 2 import { CreateComponentType } from '@/packages/index.d'
3   -import { LeftCenterRightHeadConfig } from './index'
  3 +import { Headline1Config } from './index'
4 4 import cloneDeep from 'lodash/cloneDeep'
5 5 import { chartInitConfig } from '@/settings/designSetting'
6 6
... ... @@ -20,8 +20,8 @@ export const option = {
20 20 }
21 21
22 22 export default class Config extends PublicConfigClass implements CreateComponentType {
23   - public key = LeftCenterRightHeadConfig.key
  23 + public key = Headline1Config.key
24 24 public attr = { ...chartInitConfig, zIndex: 1, w: 1920, h: 100 }
25   - public chartConfig = cloneDeep(LeftCenterRightHeadConfig)
  25 + public chartConfig = cloneDeep(Headline1Config)
26 26 public option = cloneDeep(option)
27 27 }
... ...
src/packages/components/external/Decorates/Headline/Headline1/config.vue renamed from src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHead/config.vue
src/packages/components/external/Decorates/Headline/Headline1/index.ts renamed from src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHead/index.ts
1   -import { ChartFrameEnum } from '@/packages/index.d'
2   -import { ConfigType } from '@/packages/index.d'
3   -import { EPackagesCategoryEnum } from '@/packages/components/external/types'
4 1 import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
  2 +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
5 3 import { useWidgetKey } from '@/packages/external/useWidgetKey'
6 4
7   -const { key, chartKey, conKey } = useWidgetKey('LeftCenterRightHead')
  5 +const { key, chartKey, conKey } = useWidgetKey('Headline1',true)
8 6
9   -export const LeftCenterRightHeadConfig: ConfigType = {
  7 +export const Headline1Config: ConfigType = {
10 8 key,
11 9 chartKey,
12 10 conKey,
13 11 title: '大标题1',
14   - category: ChatCategoryEnum.HEADCOMBINATION,
15   - categoryName: ChatCategoryEnumName.HEADCOMBINATION,
16   - package: EPackagesCategoryEnum.COMPOSES,
  12 + category: ChatCategoryEnum.HEADLINE,
  13 + categoryName: ChatCategoryEnumName.HEADLINE,
  14 + package: PackagesCategoryEnum.DECORATES,
17 15 chartFrame: ChartFrameEnum.COMMON,
18 16 image: 'customHead1.png',
19 17 }
... ...
src/packages/components/external/Decorates/Headline/Headline1/index.vue renamed from src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHead/index.vue
src/packages/components/external/Decorates/Headline/Headline2/config.ts renamed from src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHeadAnimat/config.ts
1 1 import { PublicConfigClass } from '@/packages/public'
2 2 import { CreateComponentType } from '@/packages/index.d'
3   -import { LeftCenterRightHeadAnimatConfig } from './index'
  3 +import { Headline2Config } from './index'
4 4 import cloneDeep from 'lodash/cloneDeep'
5 5 import { chartInitConfig } from '@/settings/designSetting'
6 6
... ... @@ -26,8 +26,8 @@ export const option = {
26 26 }
27 27
28 28 export default class Config extends PublicConfigClass implements CreateComponentType {
29   - public key = LeftCenterRightHeadAnimatConfig.key
  29 + public key = Headline2Config.key
30 30 public attr = { ...chartInitConfig, zIndex: 1, w: 1920, h: 130 }
31   - public chartConfig = cloneDeep(LeftCenterRightHeadAnimatConfig)
  31 + public chartConfig = cloneDeep(Headline2Config)
32 32 public option = cloneDeep(option)
33 33 }
... ...
src/packages/components/external/Decorates/Headline/Headline2/config.vue renamed from src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHeadAnimat/config.vue
  1 +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
  2 +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
  3 +import { useWidgetKey } from '@/packages/external/useWidgetKey'
  4 +
  5 +const { key, chartKey, conKey } = useWidgetKey('Headline2',true)
  6 +
  7 +export const Headline2Config: ConfigType = {
  8 + key,
  9 + chartKey,
  10 + conKey,
  11 + title: '大标题2',
  12 + category: ChatCategoryEnum.HEADLINE,
  13 + categoryName: ChatCategoryEnumName.HEADLINE,
  14 + package: PackagesCategoryEnum.DECORATES,
  15 + chartFrame: ChartFrameEnum.COMMON,
  16 + image: 'customHead2.png',
  17 +}
... ...
src/packages/components/external/Decorates/Headline/Headline2/index.vue renamed from src/packages/components/external/Composes/HeadCombinations/LeftCenterRightHeadAnimat/index.vue
src/packages/components/external/Decorates/Subtitle/Subtitle1/config.ts renamed from src/packages/components/external/Composes/Mores/Title1/config.ts
1 1 import { PublicConfigClass } from '@/packages/public'
2 2 import { CreateComponentType } from '@/packages/index.d'
3   -import { Title1Config } from './index'
  3 +import { Subtitle1Config } from './index'
4 4 import cloneDeep from 'lodash/cloneDeep'
5 5 import { chartInitConfig } from '@/settings/designSetting'
6 6
... ... @@ -19,8 +19,8 @@ export const option = {
19 19 }
20 20
21 21 export default class Config extends PublicConfigClass implements CreateComponentType {
22   - public key = Title1Config.key
  22 + public key = Subtitle1Config.key
23 23 public attr = { ...chartInitConfig, zIndex: 1, w: 550, h: 60 }
24   - public chartConfig = cloneDeep(Title1Config)
  24 + public chartConfig = cloneDeep(Subtitle1Config)
25 25 public option = cloneDeep(option)
26 26 }
... ...
src/packages/components/external/Decorates/Subtitle/Subtitle1/config.vue renamed from src/packages/components/external/Composes/Mores/Title1/config.vue
  1 +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
  2 +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
  3 +import { useWidgetKey } from '@/packages/external/useWidgetKey'
  4 +
  5 +const { key, chartKey, conKey } = useWidgetKey('Subtitle1',true)
  6 +
  7 +export const Subtitle1Config: ConfigType = {
  8 + key,
  9 + chartKey,
  10 + conKey,
  11 + title: '小标题1',
  12 + category: ChatCategoryEnum.SUBTITLE,
  13 + categoryName: ChatCategoryEnumName.SUBTITLE,
  14 + package: PackagesCategoryEnum.DECORATES,
  15 + chartFrame: ChartFrameEnum.COMMON,
  16 + image: 'title1.png',
  17 +}
... ...
src/packages/components/external/Decorates/Subtitle/Subtitle1/index.vue renamed from src/packages/components/external/Composes/Mores/Title1/index.vue
src/packages/components/external/Decorates/Subtitle/Subtitle2/config.ts renamed from src/packages/components/external/Composes/Mores/Title2/config.ts
1 1 import { PublicConfigClass } from '@/packages/public'
2 2 import { CreateComponentType } from '@/packages/index.d'
3   -import { Title2Config } from './index'
  3 +import { Subtitle2Config } from './index'
4 4 import cloneDeep from 'lodash/cloneDeep'
5 5 import { chartInitConfig } from '@/settings/designSetting'
6 6
... ... @@ -18,8 +18,8 @@ export const option = {
18 18 }
19 19
20 20 export default class Config extends PublicConfigClass implements CreateComponentType {
21   - public key = Title2Config.key
  21 + public key = Subtitle2Config.key
22 22 public attr = { ...chartInitConfig, zIndex: 1, w: 550, h: 60 }
23   - public chartConfig = cloneDeep(Title2Config)
  23 + public chartConfig = cloneDeep(Subtitle2Config)
24 24 public option = cloneDeep(option)
25 25 }
... ...
src/packages/components/external/Decorates/Subtitle/Subtitle2/config.vue renamed from src/packages/components/external/Composes/Mores/Title2/config.vue
  1 +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
  2 +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
  3 +import { useWidgetKey } from '@/packages/external/useWidgetKey'
  4 +
  5 +const { key, chartKey, conKey } = useWidgetKey('Subtitle2',true)
  6 +
  7 +export const Subtitle2Config: ConfigType = {
  8 + key,
  9 + chartKey,
  10 + conKey,
  11 + title: '小标题2',
  12 + category: ChatCategoryEnum.SUBTITLE,
  13 + categoryName: ChatCategoryEnumName.SUBTITLE,
  14 + package: PackagesCategoryEnum.DECORATES,
  15 + chartFrame: ChartFrameEnum.COMMON,
  16 + image: 'title2.png',
  17 +}
... ...
src/packages/components/external/Decorates/Subtitle/Subtitle2/index.vue renamed from src/packages/components/external/Composes/Mores/Title2/index.vue
src/packages/components/external/Decorates/Subtitle/Subtitle3/config.ts renamed from src/packages/components/external/Composes/Mores/Title3/config.ts
1 1 import { PublicConfigClass } from '@/packages/public'
2 2 import { CreateComponentType } from '@/packages/index.d'
3   -import { Title3Config } from './index'
  3 +import { Subtitle3Config } from './index'
4 4 import cloneDeep from 'lodash/cloneDeep'
5 5 import { chartInitConfig } from '@/settings/designSetting'
6 6
... ... @@ -31,8 +31,8 @@ export const option = {
31 31 }
32 32
33 33 export default class Config extends PublicConfigClass implements CreateComponentType {
34   - public key = Title3Config.key
  34 + public key = Subtitle3Config.key
35 35 public attr = { ...chartInitConfig, zIndex: 1, w: 550, h: 60 }
36   - public chartConfig = cloneDeep(Title3Config)
  36 + public chartConfig = cloneDeep(Subtitle3Config)
37 37 public option = cloneDeep(option)
38 38 }
... ...
src/packages/components/external/Decorates/Subtitle/Subtitle3/config.vue renamed from src/packages/components/external/Composes/Mores/Title3/config.vue
  1 +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
  2 +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
  3 +import { useWidgetKey } from '@/packages/external/useWidgetKey'
  4 +
  5 +const { key, chartKey, conKey } = useWidgetKey('Subtitle3',true)
  6 +
  7 +export const Subtitle3Config: ConfigType = {
  8 + key,
  9 + chartKey,
  10 + conKey,
  11 + title: '小标题3',
  12 + category: ChatCategoryEnum.SUBTITLE,
  13 + categoryName: ChatCategoryEnumName.SUBTITLE,
  14 + package: PackagesCategoryEnum.DECORATES,
  15 + chartFrame: ChartFrameEnum.COMMON,
  16 + image: 'title3.png',
  17 +}
... ...
src/packages/components/external/Decorates/Subtitle/Subtitle3/index.vue renamed from src/packages/components/external/Composes/Mores/Title3/index.vue
  1 +export enum ChatCategoryEnum {
  2 + BORDER = 'Borders',
  3 + DECORATE = 'Decorates',
  4 + THREE = 'Three',
  5 + HEADLINE = 'Headline',
  6 + SUBTITLE = 'Subtitle',
  7 + MORE = 'Mores',
  8 +}
  9 +
  10 +export enum ChatCategoryEnumName {
  11 + BORDER = '边框',
  12 + DECORATE = '装饰',
  13 + THREE = '三维',
  14 + HEADLINE = '大标题',
  15 + SUBTITLE = '小标题',
  16 + MORE = '更多',
  17 +}
\ No newline at end of file
... ...
... ... @@ -19,11 +19,15 @@ import { OverrideLineGradientsConfig } from '@/packages/components/external/Char
19 19 import { OverrideProcessConfig } from '@/packages/components/external/Charts/Mores/OverrideProcess'
20 20 import { OverridePieCircleConfig } from '@/packages/components/external/Charts/Pies/OverridePieCircle'
21 21 import { OverrideMapBaseConfig } from '@/packages/components/external/Charts/Maps/OverrideMapBase'
22   -import { OverrideILoadConfigurationframeConfig } from '@/packages/components/external/Informations/Mores/OverrideILoadConfigurationframe'
23 22 import { OverrideVideoConfig } from '@/packages/components/external/Informations/Mores/OverrideVideo'
24 23 import { OverrideWaterPoloConfig } from '@/packages/components/external/Charts/Mores/OverrideWaterPolo'
25 24 import { OverrideLineRealTimeConfig } from '@/packages/components/external/Charts/Lines/OverrideLineRealTime'
26 25 import { ThreeDimensionalConfig } from '@/packages/components/external/Decorates/Three/ThreeDimensional'
  26 +import { Headline1Config } from '@/packages/components/external/Decorates/Headline/Headline1'
  27 +import { Headline2Config } from '@/packages/components/external/Decorates/Headline/Headline2'
  28 +import { Subtitle1Config } from '@/packages/components/external/Decorates/Subtitle/Subtitle1'
  29 +import { Subtitle2Config } from '@/packages/components/external/Decorates/Subtitle/Subtitle2'
  30 +import { Subtitle3Config } from '@/packages/components/external/Decorates/Subtitle/Subtitle3'
27 31
28 32 /**
29 33 * 重写动态注入
... ... @@ -35,6 +39,11 @@ export function useInjectLib(packagesList: EPackagesType) {
35 39 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.DECORATES, PickIconConfig)//新增小组件图标
36 40 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.DECORATES, WeatherConfig)//新增小组件天气
37 41 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.DECORATES, ThreeDimensionalConfig)//三维模型
  42 + addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.DECORATES, Headline1Config)//大标题1
  43 + addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.DECORATES, Headline2Config)//大标题2
  44 + addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.DECORATES, Subtitle1Config)//小标题1
  45 + addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.DECORATES, Subtitle2Config)//小标题2
  46 + addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.DECORATES, Subtitle3Config)//小标题3
38 47 //
39 48
40 49 //信息
... ... @@ -48,11 +57,6 @@ export function useInjectLib(packagesList: EPackagesType) {
48 57 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.INFORMATIONS, OverrideTextCommonConfig)//重写信息下的文字
49 58 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.INFORMATIONS, OverrideTextBarrageConfig)//重写信息下的弹幕文字
50 59 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.INFORMATIONS, OverrideTextGradientConfig)//重写信息下的渐变文字
51   - addWidgetToCategoryByCategoryName(
52   - packagesList,
53   - PackagesCategoryEnum.INFORMATIONS,
54   - OverrideILoadConfigurationframeConfig
55   - )//新增信息下的加载组态
56 60 addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.INFORMATIONS, OverrideVideoConfig)//重写信息下的视频
57 61 //
58 62
... ...