From a2e2373dfd2693599c91a6beb89841c75b601d22 Mon Sep 17 00:00:00 2001 From: tnt group Date: Sun, 18 Sep 2022 13:07:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E7=BB=84=E4=BB=B6(=E6=94=AF=E6=8C=81=E6=B7=B7?= =?UTF-8?q?=E5=90=88=E6=A8=A1=E5=BC=8F=E8=A7=86=E9=A2=91=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E9=80=8F=E6=98=8E)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Informations/Mores/Video/config.ts | 21 ++++++ .../Informations/Mores/Video/config.vue | 64 +++++++++++++++++ .../Informations/Mores/Video/index.ts | 14 ++++ .../Informations/Mores/Video/index.vue | 69 +++++++++++++++++++ .../components/Informations/Mores/index.ts | 3 +- .../components/EditShapeBox/index.vue | 4 ++ 6 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 src/packages/components/Informations/Mores/Video/config.ts create mode 100644 src/packages/components/Informations/Mores/Video/config.vue create mode 100644 src/packages/components/Informations/Mores/Video/index.ts create mode 100644 src/packages/components/Informations/Mores/Video/index.vue diff --git a/src/packages/components/Informations/Mores/Video/config.ts b/src/packages/components/Informations/Mores/Video/config.ts new file mode 100644 index 00000000..43c38cc1 --- /dev/null +++ b/src/packages/components/Informations/Mores/Video/config.ts @@ -0,0 +1,21 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { VideoConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + // 视频路径 + dataset: '', + // 适应方式 + fit: 'contain', + // 圆角 + borderRadius: 0, + // 透明度 + opacity: 1 +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = VideoConfig.key + public chartConfig = cloneDeep(VideoConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Informations/Mores/Video/config.vue b/src/packages/components/Informations/Mores/Video/config.vue new file mode 100644 index 00000000..7ece81b8 --- /dev/null +++ b/src/packages/components/Informations/Mores/Video/config.vue @@ -0,0 +1,64 @@ + + + diff --git a/src/packages/components/Informations/Mores/Video/index.ts b/src/packages/components/Informations/Mores/Video/index.ts new file mode 100644 index 00000000..01998cb7 --- /dev/null +++ b/src/packages/components/Informations/Mores/Video/index.ts @@ -0,0 +1,14 @@ +import image from '@/assets/images/chart/informations/photo.png' +import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const VideoConfig: ConfigType = { + key: 'Video', + chartKey: 'VVideo', + conKey: 'VCVideo', + title: '视频', + category: ChatCategoryEnum.MORE, + categoryName: ChatCategoryEnumName.MORE, + package: PackagesCategoryEnum.INFORMATIONS, + image +} diff --git a/src/packages/components/Informations/Mores/Video/index.vue b/src/packages/components/Informations/Mores/Video/index.vue new file mode 100644 index 00000000..2a4c0ac2 --- /dev/null +++ b/src/packages/components/Informations/Mores/Video/index.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/packages/components/Informations/Mores/index.ts b/src/packages/components/Informations/Mores/index.ts index eb12db36..19648094 100644 --- a/src/packages/components/Informations/Mores/index.ts +++ b/src/packages/components/Informations/Mores/index.ts @@ -1,4 +1,5 @@ import { TextCloudConfig } from './TextCloud/index' import { ImageConfig } from './Image/index' +import { VideoConfig } from './Video/index' -export default [ImageConfig, TextCloudConfig] +export default [ImageConfig, VideoConfig, TextCloudConfig] diff --git a/src/views/chart/ContentEdit/components/EditShapeBox/index.vue b/src/views/chart/ContentEdit/components/EditShapeBox/index.vue index dc521ad8..93450fed 100644 --- a/src/views/chart/ContentEdit/components/EditShapeBox/index.vue +++ b/src/views/chart/ContentEdit/components/EditShapeBox/index.vue @@ -69,6 +69,10 @@ const select = computed(() => { @include go(shape-box) { position: absolute; cursor: move; + + // 混合模式 + mix-blend-mode: screen; + /* 锚点 */ .shape-point { z-index: 1; From 4f55b881db51d334e417bb383b4ecb282e642cd5 Mon Sep 17 00:00:00 2001 From: tnt group Date: Mon, 19 Sep 2022 12:32:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E5=AE=8C=E6=88=90=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E7=BB=84=E4=BB=B6,=E5=B9=B6=E6=94=AF=E6=8C=81=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=AE=9E=E6=97=B6=E6=8E=A7=E5=88=B6video=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Informations/Mores/Video/config.ts | 19 +++-- .../Informations/Mores/Video/config.vue | 76 +++++++++---------- .../Informations/Mores/Video/index.vue | 69 +++++++++-------- 3 files changed, 83 insertions(+), 81 deletions(-) diff --git a/src/packages/components/Informations/Mores/Video/config.ts b/src/packages/components/Informations/Mores/Video/config.ts index 43c38cc1..c3c9474a 100644 --- a/src/packages/components/Informations/Mores/Video/config.ts +++ b/src/packages/components/Informations/Mores/Video/config.ts @@ -3,15 +3,22 @@ import { CreateComponentType } from '@/packages/index.d' import { VideoConfig } from './index' import cloneDeep from 'lodash/cloneDeep' +export const VideoList = [ + { label: '数字楼宇', value: 'https://video.699pic.com/videos/76/09/36/b_D4DKnb48qdCI1631760936.mp4' }, + { label: '旋转魔方', value: 'https://video.699pic.com/videos/90/02/69/b_YjJAJZMT6vRK1554900269.mp4' }, + { label: '旋转地球', value: 'https://video.699pic.com/videos/32/13/12/b_7dng21IHECP51553321312.mp4' }, + { label: '声音示例', value: 'https://video.699pic.com/videos/80/62/39/a_qmbxMqNvK9jr1583806239.mp4' } +] + export const option = { // 视频路径 dataset: '', - // 适应方式 - fit: 'contain', - // 圆角 - borderRadius: 0, - // 透明度 - opacity: 1 + // 循环播放 + loop: true, + // 自动播放 + autoplay: true, + // 静音 + muted: true } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Informations/Mores/Video/config.vue b/src/packages/components/Informations/Mores/Video/config.vue index 7ece81b8..512fc26a 100644 --- a/src/packages/components/Informations/Mores/Video/config.vue +++ b/src/packages/components/Informations/Mores/Video/config.vue @@ -1,26 +1,40 @@ + + @@ -49,5 +49,6 @@ const props = defineProps({ diff --git a/src/views/preview/components/PreviewRenderList/index.vue b/src/views/preview/components/PreviewRenderList/index.vue index c943be66..9094dba0 100644 --- a/src/views/preview/components/PreviewRenderList/index.vue +++ b/src/views/preview/components/PreviewRenderList/index.vue @@ -63,5 +63,6 @@ const themeColor = computed(() => { From 491246205e42ecf51cef2195dacefea4e1e14657 Mon Sep 17 00:00:00 2001 From: tnt group Date: Mon, 19 Sep 2022 16:12:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=BB=84=E4=BB=B6=E6=97=B6=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E7=94=BB=E6=9D=BF=E7=BC=A9=E7=95=A5=E5=9B=BE=E7=9A=84=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/components/Informations/Mores/Video/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/packages/components/Informations/Mores/Video/index.vue b/src/packages/components/Informations/Mores/Video/index.vue index 0e488250..25805a87 100644 --- a/src/packages/components/Informations/Mores/Video/index.vue +++ b/src/packages/components/Informations/Mores/Video/index.vue @@ -1,9 +1,11 @@ diff --git a/src/packages/components/Informations/Mores/Video/index.vue b/src/packages/components/Informations/Mores/Video/index.vue index 25805a87..ba016d2c 100644 --- a/src/packages/components/Informations/Mores/Video/index.vue +++ b/src/packages/components/Informations/Mores/Video/index.vue @@ -64,7 +64,8 @@ watch(