From e607009d73a8033bd418b259d3c1b9a31d8387e6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 30 Aug 2022 16:17:32 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=A4=8D=E5=88=B6=E6=97=B6=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E5=A4=8D=E5=88=B6=E8=A7=86=E5=9B=BE=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/ext/ExtChartViewMapper.java   |  2 +
 .../io/dataease/ext/ExtChartViewMapper.xml    | 47 +++++++++++++++++++
 .../service/panel/PanelGroupService.java      |  2 +
 3 files changed, 51 insertions(+)

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 @@
     <select id="chartOptions" resultType="io.dataease.dto.chart.ViewOption">
         select id, title as  name  from chart_view where scene_id = #{panelId}
     </select>
+
+    <insert id='chartFiledCopyWithPanel'>
+        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
+    </insert>
 </mapper>
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<PanelView> panelViewList = panelViewService.findPanelViews(copyId);
         //TODO 复制模板缓存数据