From e9deb711a1bba768f2b5906d7a84c9bfb02bdbbe Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 14 Mar 2024 17:47:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E5=A4=96=E9=83=A8=E5=8F=82=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=A4=96=E9=83=A8=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=AF=B9=E6=89=80=E6=9C=89=E5=9B=BE=E8=A1=A8=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=80=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ExtDataVisualizationMapper.java | 4 + .../server/DataVisualizationServer.java | 6 + .../mybatis/ExtDataVisualizationMapper.xml | 151 ++++--- .../ExtVisualizationOuterParamsMapper.xml | 16 +- .../api/visualization/dataVisualization.ts | 4 +- .../src/api/visualization/outerParams.ts | 4 +- .../src/components/dashboard/DbToolbar.vue | 7 + .../visualization/OuterParamsSet.vue | 380 +++++++++++------- .../modules/data-visualization/dvMain.ts | 69 ++++ .../views/chart/components/views/index.vue | 1 + .../data-visualization/PreviewCanvas.vue | 22 + .../visualization/DataVisualizationApi.java | 5 + .../VisualizationOuterParamsApi.java | 2 +- .../dto/VisualizationViewTableDTO.java | 21 + 14 files changed, 462 insertions(+), 230 deletions(-) create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationViewTableDTO.java diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java index f3b73cbbe8..d823ec0db2 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java @@ -2,6 +2,7 @@ package io.dataease.visualization.dao.ext.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import io.dataease.api.visualization.dto.VisualizationViewTableDTO; import io.dataease.api.visualization.vo.DataVisualizationBaseVO; import io.dataease.api.visualization.vo.DataVisualizationVO; import io.dataease.api.visualization.vo.VisualizationResourceVO; @@ -45,4 +46,7 @@ public interface ExtDataVisualizationMapper { void copyLinkageField(@Param("copyId") Long copyId); + List getVisualizationViewDetails(@Param("dvId") Long dvId); + + } diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index d969a742fa..a9ac3b277a 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -6,6 +6,7 @@ import io.dataease.api.chart.dto.ChartViewDTO; import io.dataease.api.template.dto.TemplateManageFileDTO; import io.dataease.api.template.dto.VisualizationTemplateExtendDataDTO; import io.dataease.api.visualization.DataVisualizationApi; +import io.dataease.api.visualization.dto.VisualizationViewTableDTO; import io.dataease.api.visualization.request.DataVisualizationBaseRequest; import io.dataease.api.visualization.request.VisualizationWorkbranchQueryRequest; import io.dataease.api.visualization.vo.DataVisualizationVO; @@ -354,6 +355,11 @@ public class DataVisualizationServer implements DataVisualizationApi { return null; } + @Override + public List detailList(Long dvId) { + return extDataVisualizationMapper.getVisualizationViewDetails(dvId); + } + @Override public void nameCheck(DataVisualizationBaseRequest request) { diff --git a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml index 1cf4a33155..1085d36146 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml @@ -41,7 +41,8 @@ `copy_id`) SELECT core_chart_view.`id` + #{copyId} as id, `title`, - #{newDvId} as scene_id, `table_id`, + #{newDvId} as scene_id, + `table_id`, `type`, `render`, `result_count`, @@ -73,7 +74,8 @@ `refresh_time`, `linkage_active`, `jump_active`, - core_chart_view.`id` as copy_from, #{copyId} as copy_id + core_chart_view.`id` as copy_from, + #{copyId} as copy_id FROM core_chart_view WHERE core_chart_view.scene_id = #{sourceDvId} @@ -160,65 +162,58 @@ @@ -270,7 +265,7 @@ visualization_link_jump_info.`checked`, visualization_link_jump_info.`attach_params`, visualization_link_jump_info.`id` AS copy_from, - #{copyId} AS copy_id + #{copyId} AS copy_id FROM visualization_link_jump_info INNER JOIN (SELECT id AS t_id, copy_from AS s_id @@ -294,7 +289,7 @@ visualization_link_jump_target_view_info.`target_view_id`, visualization_link_jump_target_view_info.`target_field_id`, visualization_link_jump_target_view_info.`target_id` AS copy_from, - #{copyId} AS copy_id + #{copyId} AS copy_id FROM visualization_link_jump_target_view_info INNER JOIN (SELECT id AS t_id, copy_from AS s_id @@ -370,4 +365,36 @@ WHERE copy_id = #{copyId}) pvlf_copy ON visualization_linkage_field.linkage_id = pvlf_copy.s_id + + + + + + + + + + + + + + + + + + diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml index f68145932c..b4c7d781f5 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationOuterParamsMapper.xml @@ -61,14 +61,14 @@ diff --git a/core/core-frontend/src/api/visualization/dataVisualization.ts b/core/core-frontend/src/api/visualization/dataVisualization.ts index 73f5143273..bc08ec025b 100644 --- a/core/core-frontend/src/api/visualization/dataVisualization.ts +++ b/core/core-frontend/src/api/visualization/dataVisualization.ts @@ -74,9 +74,9 @@ export const storeStatusApi = (id: string): Promise => { export const decompression = data => request.post({ url: '/dataVisualization/decompression', data }) -export const detailList = dvId => { +export const viewDetailList = dvId => { return request.get({ - url: '/dataVisualization/view/detailList/' + dvId, + url: '/dataVisualization/viewDetailList/' + dvId, method: 'get', loading: false }) diff --git a/core/core-frontend/src/api/visualization/outerParams.ts b/core/core-frontend/src/api/visualization/outerParams.ts index faa57deea5..6d6a6dc334 100644 --- a/core/core-frontend/src/api/visualization/outerParams.ts +++ b/core/core-frontend/src/api/visualization/outerParams.ts @@ -1,8 +1,8 @@ import request from '@/config/axios' -export function queryWithDvId(dvId) { +export function queryWithVisualizationId(dvId) { return request.get({ - url: '/outerParams/queryWithDvId/' + dvId + url: '/outerParams/queryWithVisualizationId/' + dvId }) } diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue index 4fcace3eaa..e061d993a0 100644 --- a/core/core-frontend/src/components/dashboard/DbToolbar.vue +++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue @@ -434,6 +434,13 @@ const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)