From d466332a87c6023b4f345db9af681a0ca701986d Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 13 Jun 2024 16:20:07 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E6=94=AF=E6=8C=81=E5=A4=8D?= =?UTF-8?q?=E7=94=A8=E7=BB=84=E4=BB=B6=E5=8A=9F=E8=83=BD=20#9545?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/svg/other_text.svg | 2 +- .../data-visualization/DvToolbar.vue | 22 +- .../src/views/common/MultiplexingCanvas.vue | 14 +- .../MultiplexPreviewShow.vue | 527 ++++++++++++++++++ .../views/data-visualization/PreviewShow.vue | 29 +- 5 files changed, 586 insertions(+), 8 deletions(-) create mode 100644 core/core-frontend/src/views/data-visualization/MultiplexPreviewShow.vue diff --git a/core/core-frontend/src/assets/svg/other_text.svg b/core/core-frontend/src/assets/svg/other_text.svg index 91565885ae..408d02ce6c 100644 --- a/core/core-frontend/src/assets/svg/other_text.svg +++ b/core/core-frontend/src/assets/svg/other_text.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/core/core-frontend/src/components/data-visualization/DvToolbar.vue b/core/core-frontend/src/components/data-visualization/DvToolbar.vue index 3e644639ff..8cb9023442 100644 --- a/core/core-frontend/src/components/data-visualization/DvToolbar.vue +++ b/core/core-frontend/src/components/data-visualization/DvToolbar.vue @@ -21,6 +21,8 @@ import { useCache } from '@/hooks/web/useCache' import QueryGroup from '@/custom-component/component-group/QueryGroup.vue' import ComponentButton from '@/components/visualization/ComponentButton.vue' import OuterParamsSet from '@/components/visualization/OuterParamsSet.vue' +import MultiplexingCanvas from '@/views/common/MultiplexingCanvas.vue' +import ComponentButtonLabel from '@/components/visualization/ComponentButtonLabel.vue' let nameEdit = ref(false) let inputName = ref('') let nameInput = ref(null) @@ -166,6 +168,7 @@ const getFullScale = () => { } const appStore = useAppStoreWithOut() const isDataEaseBi = computed(() => appStore.getIsDataEaseBi) +const multiplexingRef = ref(null) eventBus.on('preview', preview) eventBus.on('save', saveCanvasWithCheck) @@ -182,6 +185,10 @@ const openOuterParamsSet = () => { } outerParamsSetRef.value.optInit() } + +const multiplexingCanvasOpen = () => { + multiplexingRef.value.dialogInit('dataV') +}
@@ -316,6 +335,7 @@ const openOuterParamsSet = () => { ref="resourceGroupOpt" />
+ diff --git a/core/core-frontend/src/views/common/MultiplexingCanvas.vue b/core/core-frontend/src/views/common/MultiplexingCanvas.vue index 6eb868c4d2..e353d359ab 100644 --- a/core/core-frontend/src/views/common/MultiplexingCanvas.vue +++ b/core/core-frontend/src/views/common/MultiplexingCanvas.vue @@ -8,12 +8,19 @@ custom-class="custom-drawer" > +