diff --git a/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.java b/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.java index 4f42e6bf1d..8856ff7922 100644 --- a/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.java +++ b/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.java @@ -28,6 +28,8 @@ public interface ExtChartViewMapper { void chartCopyWithPanel(@Param("copyId") String copyId); + void chartFiledCopyWithPanel(@Param("copyId") String copyId); + void deleteCircleView(@Param("pid") String pid); void deleteCircleGroup(@Param("pid") String pid); diff --git a/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml b/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml index c4e3e49212..fbe2da6cb3 100644 --- a/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml @@ -592,4 +592,51 @@ + + + INSERT INTO chart_view_field ( + id, + table_id, + chart_id, + `name`, + dataease_name, + group_type, + `type`, + `size`, + de_type, + de_type_format, + de_extract_type, + ext_field, + `checked`, + column_index, + last_sync_time + ) SELECT + uuid() AS id, + chart_view_field.table_id, + chart_view_field.pv_copy.chart_view_id AS chart_id, + chart_view_field.`name`, + chart_view_field.dataease_name, + chart_view_field.group_type, + chart_view_field.`type`, + chart_view_field.`size`, + chart_view_field.de_type, + chart_view_field.de_type_format, + chart_view_field.de_extract_type, + chart_view_field.ext_field, + chart_view_field.`checked`, + chart_view_field.column_index, + chart_view_field.last_sync_time + FROM + ( + SELECT + panel_id, + copy_from_view, + chart_view_id + FROM + panel_view + WHERE + copy_id = #{copyId} + ) pv_copy + INNER JOIN chart_view_field ON chart_view_field.chart_id = pv_copy.copy_from_view + diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index 16a39a302f..8791b91744 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -352,6 +352,8 @@ public class PanelGroupService { extPanelViewMapper.copyFromPanel(newPanelId, sourcePanelId, copyId); //TODO 复制视图 chart_view extChartViewMapper.chartCopyWithPanel(copyId); + //TODO 复制视图字段 chart_view_field + extChartViewMapper.chartFiledCopyWithPanel(copyId); //TODO 替换panel_data viewId 数据 List panelViewList = panelViewService.findPanelViews(copyId); //TODO 复制模板缓存数据