Commit aedcc42832a2b9f8d161ade9c58ab68e0143ac04
1 parent
08949663
feat(packages/external): 修复小组件下图标配置显示不出来问题,原因(更新版本新增图标和此图标命名冲突)
Showing
6 changed files
with
7 additions
and
7 deletions
src/packages/components/external/Decorates/Mores/PickIcon/SvgBorder.vue
renamed from
src/packages/components/external/Decorates/Mores/Icon/SvgBorder.vue
src/packages/components/external/Decorates/Mores/PickIcon/config.ts
renamed from
src/packages/components/external/Decorates/Mores/Icon/config.ts
| 1 | 1 | import { PublicConfigClass } from '@/packages/public' |
| 2 | 2 | import { CreateComponentType } from '@/packages/index.d' |
| 3 | -import { ClockConfig } from './index' | |
| 3 | +import { PickIconConfig } from './index' | |
| 4 | 4 | import cloneDeep from 'lodash/cloneDeep' |
| 5 | 5 | import { IconBorderEnum, IconBorderStyleEnum, IconDynamicEffectEnum } from '../../../types' |
| 6 | 6 | import { chartInitConfig } from '@/settings/designSetting' |
| ... | ... | @@ -32,8 +32,8 @@ export const option: IconOptions = { |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | export default class Config extends PublicConfigClass implements CreateComponentType { |
| 35 | - public key = ClockConfig.key | |
| 35 | + public key = PickIconConfig.key | |
| 36 | 36 | public attr = { ...chartInitConfig, zIndex: 1, w: 50, h: 50 } |
| 37 | - public chartConfig = cloneDeep(ClockConfig) | |
| 37 | + public chartConfig = cloneDeep(PickIconConfig) | |
| 38 | 38 | public option = cloneDeep(option) |
| 39 | 39 | } | ... | ... |
src/packages/components/external/Decorates/Mores/PickIcon/config.vue
renamed from
src/packages/components/external/Decorates/Mores/Icon/config.vue
src/packages/components/external/Decorates/Mores/PickIcon/index.ts
renamed from
src/packages/components/external/Decorates/Mores/Icon/index.ts
| ... | ... | @@ -2,9 +2,9 @@ import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/ind |
| 2 | 2 | import { ChatCategoryEnum, ChatCategoryEnumName } from '@/packages/components/Decorates/index.d' |
| 3 | 3 | import { useWidgetKey } from '@/packages/external/useWidgetKey' |
| 4 | 4 | |
| 5 | -const { key, conKey, chartKey } = useWidgetKey('Icon', true) | |
| 5 | +const { key, conKey, chartKey } = useWidgetKey('PickIcon', true) | |
| 6 | 6 | |
| 7 | -export const ClockConfig: ConfigType = { | |
| 7 | +export const PickIconConfig: ConfigType = { | |
| 8 | 8 | key, |
| 9 | 9 | chartKey, |
| 10 | 10 | conKey, | ... | ... |
src/packages/components/external/Decorates/Mores/PickIcon/index.vue
renamed from
src/packages/components/external/Decorates/Mores/Icon/index.vue
| 1 | 1 | import { EPackagesCategoryEnum, EPackagesType } from '@/packages/components/external/types' |
| 2 | 2 | import { ComposesList } from '@/packages/components/external/Composes' |
| 3 | 3 | import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' |
| 4 | -import { ClockConfig } from '@/packages/components/external/Decorates/Mores/Icon' | |
| 4 | +import { PickIconConfig } from '@/packages/components/external/Decorates/Mores/PickIcon' | |
| 5 | 5 | import { WeatherConfig } from '@/packages/components/external/Decorates/Mores/Weather' |
| 6 | 6 | import { OverrideImageConfig } from '@/packages/components/external/Informations/Mores/OverrideImage' |
| 7 | 7 | import { OverrideCarouselConfig } from '@/packages/components/external/Informations/Mores/OverrideCarousel' |
| ... | ... | @@ -18,7 +18,7 @@ export function useInjectLib(packagesList: EPackagesType) { |
| 18 | 18 | |
| 19 | 19 | packagesList[EPackagesCategoryEnum.COMPOSES] = ComposesList |
| 20 | 20 | |
| 21 | - addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.DECORATES, ClockConfig) | |
| 21 | + addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.DECORATES, PickIconConfig) | |
| 22 | 22 | addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.DECORATES, WeatherConfig) |
| 23 | 23 | addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.INFORMATIONS, OverrideImageConfig) |
| 24 | 24 | addWidgetToCategoryByCategoryName(packagesList, PackagesCategoryEnum.INFORMATIONS, OverrideCarouselConfig) | ... | ... |