From 02df8cb956f1521469bcef5b62cc42a2ff21db1f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 10 Mar 2022 11:06:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=86=E5=9B=BE=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=A7=BB=E5=88=B0=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/domain/ChartViewCacheWithBLOBs.java  |  2 ++
 .../base/mapper/ChartViewCacheMapper.xml      | 23 +++++++++++--
 .../base/mapper/ext/ExtChartViewMapper.xml    |  3 +-
 .../main/resources/db/migration/V33__1.9.sql  | 33 +++++++++++++++++++
 .../src/main/resources/generatorConfig.xml    |  2 +-
 frontend/src/lang/en.js                       |  2 +-
 frontend/src/lang/tw.js                       |  2 +-
 7 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewCacheWithBLOBs.java b/backend/src/main/java/io/dataease/base/domain/ChartViewCacheWithBLOBs.java
index 424a2d89ea..9e181a9dcb 100644
--- a/backend/src/main/java/io/dataease/base/domain/ChartViewCacheWithBLOBs.java
+++ b/backend/src/main/java/io/dataease/base/domain/ChartViewCacheWithBLOBs.java
@@ -29,6 +29,8 @@ public class ChartViewCacheWithBLOBs extends ChartViewCache implements Serializa
 
     private String drillFields;
 
+    private String senior;
+
     private String snapshot;
 
     private static final long serialVersionUID = 1L;
diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartViewCacheMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ChartViewCacheMapper.xml
index cbe53167c6..caa9ebfbb4 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ChartViewCacheMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ChartViewCacheMapper.xml
@@ -29,6 +29,7 @@
     <result column="custom_style" jdbcType="LONGVARCHAR" property="customStyle" />
     <result column="custom_filter" jdbcType="LONGVARCHAR" property="customFilter" />
     <result column="drill_fields" jdbcType="LONGVARCHAR" property="drillFields" />
+    <result column="senior" jdbcType="LONGVARCHAR" property="senior" />
     <result column="snapshot" jdbcType="LONGVARCHAR" property="snapshot" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -95,7 +96,7 @@
   </sql>
   <sql id="Blob_Column_List">
     x_axis, x_axis_ext, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, 
-    custom_filter, drill_fields, snapshot
+    custom_filter, drill_fields, senior, snapshot
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="io.dataease.base.domain.ChartViewCacheExample" resultMap="ResultMapWithBLOBs">
     select
@@ -154,7 +155,8 @@
       x_axis, x_axis_ext, y_axis, 
       y_axis_ext, ext_stack, ext_bubble, 
       custom_attr, custom_style, custom_filter, 
-      drill_fields, snapshot)
+      drill_fields, senior, snapshot
+      )
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, 
       #{sceneId,jdbcType=VARCHAR}, #{tableId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
       #{render,jdbcType=VARCHAR}, #{resultCount,jdbcType=INTEGER}, #{resultMode,jdbcType=VARCHAR}, 
@@ -163,7 +165,8 @@
       #{xAxis,jdbcType=LONGVARCHAR}, #{xAxisExt,jdbcType=LONGVARCHAR}, #{yAxis,jdbcType=LONGVARCHAR}, 
       #{yAxisExt,jdbcType=LONGVARCHAR}, #{extStack,jdbcType=LONGVARCHAR}, #{extBubble,jdbcType=LONGVARCHAR}, 
       #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, #{customFilter,jdbcType=LONGVARCHAR}, 
-      #{drillFields,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR})
+      #{drillFields,jdbcType=LONGVARCHAR}, #{senior,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.base.domain.ChartViewCacheWithBLOBs">
     insert into chart_view_cache
@@ -243,6 +246,9 @@
       <if test="drillFields != null">
         drill_fields,
       </if>
+      <if test="senior != null">
+        senior,
+      </if>
       <if test="snapshot != null">
         snapshot,
       </if>
@@ -323,6 +329,9 @@
       <if test="drillFields != null">
         #{drillFields,jdbcType=LONGVARCHAR},
       </if>
+      <if test="senior != null">
+        #{senior,jdbcType=LONGVARCHAR},
+      </if>
       <if test="snapshot != null">
         #{snapshot,jdbcType=LONGVARCHAR},
       </if>
@@ -412,6 +421,9 @@
       <if test="record.drillFields != null">
         drill_fields = #{record.drillFields,jdbcType=LONGVARCHAR},
       </if>
+      <if test="record.senior != null">
+        senior = #{record.senior,jdbcType=LONGVARCHAR},
+      </if>
       <if test="record.snapshot != null">
         snapshot = #{record.snapshot,jdbcType=LONGVARCHAR},
       </if>
@@ -447,6 +459,7 @@
       custom_style = #{record.customStyle,jdbcType=LONGVARCHAR},
       custom_filter = #{record.customFilter,jdbcType=LONGVARCHAR},
       drill_fields = #{record.drillFields,jdbcType=LONGVARCHAR},
+      senior = #{record.senior,jdbcType=LONGVARCHAR},
       snapshot = #{record.snapshot,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -548,6 +561,9 @@
       <if test="drillFields != null">
         drill_fields = #{drillFields,jdbcType=LONGVARCHAR},
       </if>
+      <if test="senior != null">
+        senior = #{senior,jdbcType=LONGVARCHAR},
+      </if>
       <if test="snapshot != null">
         snapshot = #{snapshot,jdbcType=LONGVARCHAR},
       </if>
@@ -580,6 +596,7 @@
       custom_style = #{customStyle,jdbcType=LONGVARCHAR},
       custom_filter = #{customFilter,jdbcType=LONGVARCHAR},
       drill_fields = #{drillFields,jdbcType=LONGVARCHAR},
+      senior = #{senior,jdbcType=LONGVARCHAR},
       snapshot = #{snapshot,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
index 3f5dd6a57c..22ecb27697 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
@@ -332,7 +332,8 @@
             cv.custom_style = cve.custom_style,
             cv.custom_filter = cve.custom_filter,
             cv.drill_fields = cve.drill_fields,
-            cv.SNAPSHOT = cve.SNAPSHOT where cve.id = cv.id  and cv.id in
+           cv.senior = cve.senior,
+        cv.SNAPSHOT = cve.SNAPSHOT where cve.id = cv.id  and cv.id in
         <foreach collection="viewIds" item="viewId" open='(' separator=',' close=')'>
             #{viewId}
         </foreach>
diff --git a/backend/src/main/resources/db/migration/V33__1.9.sql b/backend/src/main/resources/db/migration/V33__1.9.sql
index d182498b0b..7694874363 100644
--- a/backend/src/main/resources/db/migration/V33__1.9.sql
+++ b/backend/src/main/resources/db/migration/V33__1.9.sql
@@ -1,2 +1,35 @@
 ALTER TABLE `chart_view` ADD COLUMN `senior` LONGTEXT COMMENT '高级' AFTER `drill_fields`;
 UPDATE `chart_view` SET `senior` = '{}';
+
+CREATE TABLE `chart_view_cache` (
+  `id` varchar(50) NOT NULL COMMENT 'ID',
+  `name` varchar(1024) DEFAULT NULL COMMENT '名称',
+  `title` varchar(1024) DEFAULT NULL COMMENT 'EChart标题',
+  `scene_id` varchar(50) NOT NULL COMMENT '场景ID chart_type为private的时候 是仪表板id',
+  `table_id` varchar(50) NOT NULL COMMENT '数据集表ID',
+  `type` varchar(50) DEFAULT NULL COMMENT '图表类型',
+  `render` varchar(50) DEFAULT NULL COMMENT '视图渲染方式',
+  `result_count` int(10) DEFAULT NULL COMMENT '展示结果',
+  `result_mode` varchar(50) DEFAULT NULL COMMENT '展示模式',
+  `x_axis` longtext COMMENT '横轴field',
+  `x_axis_ext` longtext COMMENT 'table-row',
+  `y_axis` longtext COMMENT '纵轴field',
+  `y_axis_ext` longtext COMMENT '副轴',
+  `ext_stack` longtext COMMENT '堆叠项',
+  `ext_bubble` longtext COMMENT '气泡大小',
+  `custom_attr` longtext COMMENT '图形属性',
+  `custom_style` longtext COMMENT '组件样式',
+  `custom_filter` longtext COMMENT '结果过滤',
+  `drill_fields` longtext COMMENT '钻取字段',
+  `senior` longtext COMMENT '高级',
+  `create_by` varchar(50) DEFAULT NULL COMMENT '创建人ID',
+  `create_time` bigint(13) DEFAULT NULL COMMENT '创建时间',
+  `update_time` bigint(13) DEFAULT NULL COMMENT '更新时间',
+  `snapshot` longtext COMMENT '缩略图 ',
+  `style_priority` varchar(255) DEFAULT 'panel' COMMENT '样式优先级 panel 仪表板 view 视图',
+  `chart_type` varchar(255) DEFAULT 'private' COMMENT '视图类型 public 公共 历史可复用的视图，private 私有 专属某个仪表板',
+  `is_plugin` bit(1) DEFAULT NULL COMMENT '是否插件',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml
index 9cbb2f2d7a..0c9e0bc55b 100644
--- a/backend/src/main/resources/generatorConfig.xml
+++ b/backend/src/main/resources/generatorConfig.xml
@@ -61,7 +61,7 @@
 
         <!--要生成的数据库表 -->
 <!--        <table tableName="dataease_code_version"/>-->
-        <table tableName="chart_view"/>
+<!--        <table tableName="chart_view"/>-->
         <table tableName="chart_view_cache"/>
 <!--        <table tableName="chart_view"/>-->
 <!--        <table tableName="panel_view"/>-->
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 32fbe656ac..f5eafb711e 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1030,7 +1030,7 @@ export default {
     table_align_left: 'Left',
     table_align_center: 'Center',
     table_align_right: 'Right',
-    draw_back: 'Draw Back'
+    draw_back: 'Draw Back',
     senior: 'Senior',
     senior_cfg: 'Senior Config',
     function_cfg: 'Function Config',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 5e08ce5d66..c9f61df9e1 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1030,7 +1030,7 @@ export default {
     table_align_left: '左對齊',
     table_align_center: '居中',
     table_align_right: '右對齊',
-    draw_back: '收回'
+    draw_back: '收回',
     senior: '高級',
     senior_cfg: '高級設置',
     function_cfg: '功能設置',