diff --git a/src/assets/images/chart/decorates/clock.png b/src/assets/images/chart/decorates/clock.png new file mode 100644 index 00000000..7ab6d718 Binary files /dev/null and b/src/assets/images/chart/decorates/clock.png differ diff --git a/src/assets/images/chart/decorates/decorates06.png b/src/assets/images/chart/decorates/decorates06.png new file mode 100644 index 00000000..87442069 Binary files /dev/null and b/src/assets/images/chart/decorates/decorates06.png differ diff --git a/src/packages/components/Decorates/Decorates/Decorates03/config.ts b/src/packages/components/Decorates/Decorates/Decorates03/config.ts index 1543ddb8..5874b2bd 100644 --- a/src/packages/components/Decorates/Decorates/Decorates03/config.ts +++ b/src/packages/components/Decorates/Decorates/Decorates03/config.ts @@ -2,16 +2,18 @@ import { PublicConfigClass } from '@/packages/public' import { CreateComponentType } from '@/packages/index.d' import { Decorates03Config } from './index' import cloneDeep from 'lodash/cloneDeep' +import { chartInitConfig } from '@/settings/designSetting' export const option = { dataset: '我是标题', textColor: '#fff', textSize: 32, - colors: ['#1dc1f5', '#1dc1f5'], + colors: ['#1dc1f5', '#1dc1f5'] } export default class Config extends PublicConfigClass implements CreateComponentType { public key = Decorates03Config.key + public attr = { ...chartInitConfig, w: 500, h: 70, zIndex: 1 } public chartConfig = cloneDeep(Decorates03Config) public option = cloneDeep(option) } diff --git a/src/packages/components/Decorates/Decorates/Decorates06/config.ts b/src/packages/components/Decorates/Decorates/Decorates06/config.ts new file mode 100644 index 00000000..f07b18c3 --- /dev/null +++ b/src/packages/components/Decorates/Decorates/Decorates06/config.ts @@ -0,0 +1,19 @@ +import { PublicConfigClass } from '@/packages/public' +import { chartInitConfig } from '@/settings/designSetting' +import { CreateComponentType } from '@/packages/index.d' +import { Decorates06Config } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + colors: ['#1DC1F533', '#1DC1F5FF'], + dataset: '我是标题', + textColor: '#fff', + textSize: 32 +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = Decorates06Config.key + public attr = { ...chartInitConfig, w: 500, h: 70, zIndex: 1 } + public chartConfig = cloneDeep(Decorates06Config) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Decorates/Decorates/Decorates06/config.vue b/src/packages/components/Decorates/Decorates/Decorates06/config.vue new file mode 100644 index 00000000..464e71c4 --- /dev/null +++ b/src/packages/components/Decorates/Decorates/Decorates06/config.vue @@ -0,0 +1,42 @@ + + + diff --git a/src/packages/components/Decorates/Decorates/Decorates06/index.ts b/src/packages/components/Decorates/Decorates/Decorates06/index.ts new file mode 100644 index 00000000..3d779c2e --- /dev/null +++ b/src/packages/components/Decorates/Decorates/Decorates06/index.ts @@ -0,0 +1,14 @@ +import image from '@/assets/images/chart/decorates/decorates06.png' +import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const Decorates06Config: ConfigType = { + key: 'Decorates06', + chartKey: 'VDecorates06', + conKey: 'VCDecorates06', + title: '装饰-06', + category: ChatCategoryEnum.DECORATE, + categoryName: ChatCategoryEnumName.DECORATE, + package: PackagesCategoryEnum.DECORATES, + image +} diff --git a/src/packages/components/Decorates/Decorates/Decorates06/index.vue b/src/packages/components/Decorates/Decorates/Decorates06/index.vue new file mode 100644 index 00000000..d221d4fe --- /dev/null +++ b/src/packages/components/Decorates/Decorates/Decorates06/index.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/packages/components/Decorates/Decorates/index.ts b/src/packages/components/Decorates/Decorates/index.ts index ddecd0ed..0d9d4604 100644 --- a/src/packages/components/Decorates/Decorates/index.ts +++ b/src/packages/components/Decorates/Decorates/index.ts @@ -3,6 +3,7 @@ import { Decorates02Config } from './Decorates02/index' import { Decorates03Config } from './Decorates03/index' import { Decorates04Config } from './Decorates04/index' import { Decorates05Config } from './Decorates05/index' +import { Decorates06Config } from './Decorates06/index' export default [ Decorates01Config, @@ -10,4 +11,5 @@ export default [ Decorates03Config, Decorates04Config, Decorates05Config, + Decorates06Config ] diff --git a/src/packages/components/Decorates/Mores/Clock/config.ts b/src/packages/components/Decorates/Mores/Clock/config.ts new file mode 100644 index 00000000..a29bfaa2 --- /dev/null +++ b/src/packages/components/Decorates/Mores/Clock/config.ts @@ -0,0 +1,17 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { ClockConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + border: 6, + color: '#ffffff', + bgColor: '#20b7af', + borderColor: '#ffffff' +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = ClockConfig.key + public chartConfig = cloneDeep(ClockConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Decorates/Mores/Clock/config.vue b/src/packages/components/Decorates/Mores/Clock/config.vue new file mode 100644 index 00000000..c762b163 --- /dev/null +++ b/src/packages/components/Decorates/Mores/Clock/config.vue @@ -0,0 +1,33 @@ + + + diff --git a/src/packages/components/Decorates/Mores/Clock/index.ts b/src/packages/components/Decorates/Mores/Clock/index.ts new file mode 100644 index 00000000..52c63130 --- /dev/null +++ b/src/packages/components/Decorates/Mores/Clock/index.ts @@ -0,0 +1,14 @@ +import image from '@/assets/images/chart/decorates/clock.png' +import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const ClockConfig: ConfigType = { + key: 'Clock', + chartKey: 'VClock', + conKey: 'VCClock', + title: '时钟', + category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, + package: PackagesCategoryEnum.DECORATES, + image +} diff --git a/src/packages/components/Decorates/Mores/Clock/index.vue b/src/packages/components/Decorates/Mores/Clock/index.vue new file mode 100644 index 00000000..e37f1b2c --- /dev/null +++ b/src/packages/components/Decorates/Mores/Clock/index.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/src/packages/components/Decorates/Mores/index.ts b/src/packages/components/Decorates/Mores/index.ts index 61863aa2..9aff3b7d 100644 --- a/src/packages/components/Decorates/Mores/index.ts +++ b/src/packages/components/Decorates/Mores/index.ts @@ -1,4 +1,5 @@ import { NumberConfig } from './Number/index' import { TimeCommonConfig } from './TimeCommon/index' +import { ClockConfig } from './Clock/index' -export default [TimeCommonConfig, NumberConfig] +export default [TimeCommonConfig, NumberConfig, ClockConfig]