From b08636ec69274a8b5d62a946a09308ab8c82fbcd Mon Sep 17 00:00:00 2001 From: QuietlyChan <1013893148@qq.com> Date: Fri, 28 Jul 2023 10:11:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=85=A8?= =?UTF-8?q?=E5=B1=8F=E6=8C=89=E9=92=AE=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/chart/decorates/fullScreen.png | Bin 0 -> 6161 bytes .../Decorates/Mores/FullScreen/config.ts | 17 +++ .../Decorates/Mores/FullScreen/config.vue | 28 +++++ .../Decorates/Mores/FullScreen/index.ts | 14 +++ .../Decorates/Mores/FullScreen/index.vue | 111 ++++++++++++++++++ .../components/Decorates/Mores/index.ts | 12 +- 6 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 src/assets/images/chart/decorates/fullScreen.png create mode 100644 src/packages/components/Decorates/Mores/FullScreen/config.ts create mode 100644 src/packages/components/Decorates/Mores/FullScreen/config.vue create mode 100644 src/packages/components/Decorates/Mores/FullScreen/index.ts create mode 100644 src/packages/components/Decorates/Mores/FullScreen/index.vue diff --git a/src/assets/images/chart/decorates/fullScreen.png b/src/assets/images/chart/decorates/fullScreen.png new file mode 100644 index 0000000000000000000000000000000000000000..04167ed69e0f1fdb4bcaa774cf4af1f2c9a9a2a7 GIT binary patch literal 6161 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 P(!9E|j#8C^P1yefNS3H7 literal 0 HcmV?d00001 diff --git a/src/packages/components/Decorates/Mores/FullScreen/config.ts b/src/packages/components/Decorates/Mores/FullScreen/config.ts new file mode 100644 index 00000000..f6a1a938 --- /dev/null +++ b/src/packages/components/Decorates/Mores/FullScreen/config.ts @@ -0,0 +1,17 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { FullScreenConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + border: 6, + bgColor: '#84a5e9', + borderColor: '#84a5e9' +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = FullScreenConfig.key + public attr = { w: 150, h: 150 } + public chartConfig = cloneDeep(FullScreenConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Decorates/Mores/FullScreen/config.vue b/src/packages/components/Decorates/Mores/FullScreen/config.vue new file mode 100644 index 00000000..450752d7 --- /dev/null +++ b/src/packages/components/Decorates/Mores/FullScreen/config.vue @@ -0,0 +1,28 @@ + + + diff --git a/src/packages/components/Decorates/Mores/FullScreen/index.ts b/src/packages/components/Decorates/Mores/FullScreen/index.ts new file mode 100644 index 00000000..19e37683 --- /dev/null +++ b/src/packages/components/Decorates/Mores/FullScreen/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const FullScreenConfig: ConfigType = { + key: 'FullScreen', + chartKey: 'VFullScreen', + conKey: 'VCFullScreen', + title: '全屏按钮', + category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, + package: PackagesCategoryEnum.DECORATES, + chartFrame: ChartFrameEnum.STATIC, + image: 'fullScreen.png' +} diff --git a/src/packages/components/Decorates/Mores/FullScreen/index.vue b/src/packages/components/Decorates/Mores/FullScreen/index.vue new file mode 100644 index 00000000..805c8294 --- /dev/null +++ b/src/packages/components/Decorates/Mores/FullScreen/index.vue @@ -0,0 +1,111 @@ + + + + + diff --git a/src/packages/components/Decorates/Mores/index.ts b/src/packages/components/Decorates/Mores/index.ts index 7223832b..489b9c5c 100644 --- a/src/packages/components/Decorates/Mores/index.ts +++ b/src/packages/components/Decorates/Mores/index.ts @@ -1,9 +1,19 @@ import { NumberConfig } from './Number/index' import { TimeCommonConfig } from './TimeCommon/index' import { ClockConfig } from './Clock/index' +import { FullScreenConfig } from './FullScreen/index' import { CountDownConfig } from './CountDown/index' import { FlipperNumberConfig } from './FlipperNumber' import { PipelineHConfig } from './PipelineH/index' import { PipelineVConfig } from './PipelineV/index' -export default [NumberConfig, FlipperNumberConfig, TimeCommonConfig, CountDownConfig, ClockConfig, PipelineHConfig, PipelineVConfig] +export default [ + NumberConfig, + FlipperNumberConfig, + TimeCommonConfig, + CountDownConfig, + ClockConfig, + FullScreenConfig, + PipelineHConfig, + PipelineVConfig +] From 99c82de77cb47b707143b5e148017191f4332913 Mon Sep 17 00:00:00 2001 From: QuietlyChan <1013893148@qq.com> Date: Fri, 28 Jul 2023 14:34:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E4=B8=8D=E8=83=BD=E6=8B=96=E6=8B=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/components/Decorates/Mores/FullScreen/config.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/packages/components/Decorates/Mores/FullScreen/config.ts b/src/packages/components/Decorates/Mores/FullScreen/config.ts index f6a1a938..bed59c06 100644 --- a/src/packages/components/Decorates/Mores/FullScreen/config.ts +++ b/src/packages/components/Decorates/Mores/FullScreen/config.ts @@ -1,5 +1,6 @@ import { PublicConfigClass } from '@/packages/public' import { CreateComponentType } from '@/packages/index.d' +import { chartInitConfig } from '@/settings/designSetting' import { FullScreenConfig } from './index' import cloneDeep from 'lodash/cloneDeep' @@ -11,7 +12,7 @@ export const option = { export default class Config extends PublicConfigClass implements CreateComponentType { public key = FullScreenConfig.key - public attr = { w: 150, h: 150 } + public attr = { ...chartInitConfig, w: 150, h: 150 } public chartConfig = cloneDeep(FullScreenConfig) public option = cloneDeep(option) }