From 9988985e6457402c6b219c6ee1664dd209ac1028 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 15 May 2024 23:11:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E6=B5=81?= =?UTF-8?q?=E5=AA=92=E4=BD=93=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/svg/db-more-web.svg | 2 +- .../src/assets/svg/icon-stream.svg | 2 +- .../src/assets/svg/icon-video.svg | 2 +- .../src/components/dashboard/DbToolbar.vue | 3 +- .../data-visualization/DvToolbar.vue | 8 +- .../visualization/ComponentGroup.vue | 6 +- .../component-group/MediaGroup.vue | 7 + .../src/custom-component/component-list.ts | 10 +- .../custom-component/de-stream-media/Attr.vue | 10 +- .../de-stream-media/Component.vue | 17 +- .../de-stream-media/StreamMediaLinks.vue | 179 ++++++++++++++++++ core/core-frontend/src/locales/zh-CN.ts | 2 +- 12 files changed, 230 insertions(+), 18 deletions(-) create mode 100644 core/core-frontend/src/custom-component/de-stream-media/StreamMediaLinks.vue diff --git a/core/core-frontend/src/assets/svg/db-more-web.svg b/core/core-frontend/src/assets/svg/db-more-web.svg index 9bc701c656..d0c9a5abcd 100644 --- a/core/core-frontend/src/assets/svg/db-more-web.svg +++ b/core/core-frontend/src/assets/svg/db-more-web.svg @@ -1 +1 @@ - + diff --git a/core/core-frontend/src/assets/svg/icon-stream.svg b/core/core-frontend/src/assets/svg/icon-stream.svg index a52a91d463..45b0fdc914 100644 --- a/core/core-frontend/src/assets/svg/icon-stream.svg +++ b/core/core-frontend/src/assets/svg/icon-stream.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/core/core-frontend/src/assets/svg/icon-video.svg b/core/core-frontend/src/assets/svg/icon-video.svg index 1d7e84e93f..1e0c4ede65 100644 --- a/core/core-frontend/src/assets/svg/icon-video.svg +++ b/core/core-frontend/src/assets/svg/icon-video.svg @@ -1 +1 @@ - + diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue index 17df09763c..a1a57a20a6 100644 --- a/core/core-frontend/src/components/dashboard/DbToolbar.vue +++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue @@ -444,7 +444,8 @@ const initOpenHandler = newWindow => { diff --git a/core/core-frontend/src/components/data-visualization/DvToolbar.vue b/core/core-frontend/src/components/data-visualization/DvToolbar.vue index 0561404ca2..506b1df64e 100644 --- a/core/core-frontend/src/components/data-visualization/DvToolbar.vue +++ b/core/core-frontend/src/components/data-visualization/DvToolbar.vue @@ -230,7 +230,13 @@ eventBus.on('clearCanvas', clearCanvas) - + diff --git a/core/core-frontend/src/components/visualization/ComponentGroup.vue b/core/core-frontend/src/components/visualization/ComponentGroup.vue index 0dc544ffff..757f8061ea 100644 --- a/core/core-frontend/src/components/visualization/ComponentGroup.vue +++ b/core/core-frontend/src/components/visualization/ComponentGroup.vue @@ -17,6 +17,10 @@ const props = defineProps({ themes: { type: String, default: 'dark' + }, + placement: { + type: String, + default: 'bottom-start' } }) @@ -25,7 +29,7 @@ const { title, iconName, baseWidth, themes } = toRefs(props) diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts index 16c51b8bae..277b7b0fbe 100644 --- a/core/core-frontend/src/custom-component/component-list.ts +++ b/core/core-frontend/src/custom-component/component-list.ts @@ -166,7 +166,15 @@ export const commonAttr = { maintainRadio: false, // 布局时保持宽高比例 aspectRatio: 1, // 锁定时的宽高比例 isShow: true, // 是否显示组件 - collapseName: ['position', 'background', 'style', 'picture', 'frameLinks', 'videoLinks'], // 编辑组件时记录当前使用的是哪个折叠面板，再次回来时恢复上次打开的折叠面板，优化用户体验 + collapseName: [ + 'position', + 'background', + 'style', + 'picture', + 'frameLinks', + 'videoLinks', + 'streamLinks' + ], // 编辑组件时记录当前使用的是哪个折叠面板，再次回来时恢复上次打开的折叠面板，优化用户体验 linkage: { duration: 0, // 过渡持续时间 data: [ diff --git a/core/core-frontend/src/custom-component/de-stream-media/Attr.vue b/core/core-frontend/src/custom-component/de-stream-media/Attr.vue index c49fe3ad8e..c372a81591 100644 --- a/core/core-frontend/src/custom-component/de-stream-media/Attr.vue +++ b/core/core-frontend/src/custom-component/de-stream-media/Attr.vue @@ -4,10 +4,13 @@ - + @@ -18,6 +21,7 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import CommonAttr from '@/custom-component/common/CommonAttr.vue' import { storeToRefs } from 'pinia' import VideoLinks from '@/custom-component/de-video/VideoLinks.vue' +import StreamMediaLinks from '@/custom-component/de-stream-media/StreamMediaLinks.vue' const dvMainStore = dvMainStoreWithOut() const { curComponent } = storeToRefs(dvMainStore) withDefaults( diff --git a/core/core-frontend/src/custom-component/de-stream-media/Component.vue b/core/core-frontend/src/custom-component/de-stream-media/Component.vue index 08cfa3168b..ed1ed95ee6 100644 --- a/core/core-frontend/src/custom-component/de-stream-media/Component.vue +++ b/core/core-frontend/src/custom-component/de-stream-media/Component.vue @@ -12,20 +12,19 @@ :controls="inScreen" muted /> -
- {{ $t('panel.link_add_tips_pre') }} - - {{ $t('panel.stream_media_add_tips') }} + {{ t('visualization.stream_media_add_tips') }}
+ + diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 68e7b0ad82..ddb56c9597 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -1888,7 +1888,7 @@ export default { yes: '是', no: '否', live_tips: '优先HTTPS链接', - stream_media_add_tips: '添加流媒体信息...', + stream_media_add_tips: '请在右侧添加流媒体信息...', stream_mobile_tips: 'IOS终端可能无法显示', json_params_error: '第三方参数解析失败，请检查参数格式是否正确', inner_padding: '内边距',