Merge branch 'dev' into pr@dev@refactor_panel-edit

backend/src/main/java/io/dataease/base/domain/ChartView.java

@@ -19,6 +19,10 @@ public class ChartView implements Serializable {
     private String type;
     @ApiModelProperty("chart渲染方式")
     private String render;
+    @ApiModelProperty("展示结果")
+    private Integer resultCount;
+    @ApiModelProperty("展示模式")
+    private String resultMode;
     @ApiModelProperty("标题")
     private String title;
     @ApiModelProperty("创建人")
@@ -31,4 +35,4 @@ public class ChartView implements Serializable {
     private String stylePriority;
 
     private static final long serialVersionUID = 1L;
-}
+}

backend/src/main/java/io/dataease/base/domain/ChartViewExample.java

@@ -524,6 +524,136 @@ public class ChartViewExample {
             return (Criteria) this;
         }
 
+        public Criteria andResultCountIsNull() {
+            addCriterion("result_count is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountIsNotNull() {
+            addCriterion("result_count is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountEqualTo(Integer value) {
+            addCriterion("result_count =", value, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountNotEqualTo(Integer value) {
+            addCriterion("result_count <>", value, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountGreaterThan(Integer value) {
+            addCriterion("result_count >", value, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("result_count >=", value, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountLessThan(Integer value) {
+            addCriterion("result_count <", value, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountLessThanOrEqualTo(Integer value) {
+            addCriterion("result_count <=", value, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountIn(List<Integer> values) {
+            addCriterion("result_count in", values, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountNotIn(List<Integer> values) {
+            addCriterion("result_count not in", values, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountBetween(Integer value1, Integer value2) {
+            addCriterion("result_count between", value1, value2, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("result_count not between", value1, value2, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeIsNull() {
+            addCriterion("result_mode is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeIsNotNull() {
+            addCriterion("result_mode is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeEqualTo(String value) {
+            addCriterion("result_mode =", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeNotEqualTo(String value) {
+            addCriterion("result_mode <>", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeGreaterThan(String value) {
+            addCriterion("result_mode >", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeGreaterThanOrEqualTo(String value) {
+            addCriterion("result_mode >=", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeLessThan(String value) {
+            addCriterion("result_mode <", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeLessThanOrEqualTo(String value) {
+            addCriterion("result_mode <=", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeLike(String value) {
+            addCriterion("result_mode like", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeNotLike(String value) {
+            addCriterion("result_mode not like", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeIn(List<String> values) {
+            addCriterion("result_mode in", values, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeNotIn(List<String> values) {
+            addCriterion("result_mode not in", values, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeBetween(String value1, String value2) {
+            addCriterion("result_mode between", value1, value2, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeNotBetween(String value1, String value2) {
+            addCriterion("result_mode not between", value1, value2, "resultMode");
+            return (Criteria) this;
+        }
+
         public Criteria andTitleIsNull() {
             addCriterion("title is null");
             return (Criteria) this;
@@ -947,4 +1077,4 @@ public class ChartViewExample {
             this(condition, value, secondValue, null);
         }
     }
-}
+}

backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml

@@ -8,6 +8,8 @@
     <result column="table_id" jdbcType="VARCHAR" property="tableId" />
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="render" jdbcType="VARCHAR" property="render" />
+    <result column="result_count" jdbcType="INTEGER" property="resultCount" />
+    <result column="result_mode" jdbcType="VARCHAR" property="resultMode" />
     <result column="title" jdbcType="VARCHAR" property="title" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
@@ -85,11 +87,11 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, scene_id, table_id, `type`, render, title, create_by, create_time, update_time,
+    id, `name`, scene_id, table_id, `type`, render, result_count, result_mode, title, 
-    style_priority
+    create_by, create_time, update_time, style_priority
   </sql>
   <sql id="Blob_Column_List">
-    x_axis, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, custom_filter,
+    x_axis, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, custom_filter, 
     drill_fields, snapshot
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="io.dataease.base.domain.ChartViewExample" resultMap="ResultMapWithBLOBs">
@@ -123,7 +125,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select
+    select 
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
@@ -141,22 +143,22 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.dataease.base.domain.ChartViewWithBLOBs">
-    insert into chart_view (id, `name`, scene_id,
+    insert into chart_view (id, `name`, scene_id, 
-      table_id, `type`, render,
+      table_id, `type`, render, 
-      title, create_by, create_time,
+      result_count, result_mode, title, 
-      update_time, style_priority, x_axis,
+      create_by, create_time, update_time, 
-      y_axis, y_axis_ext, ext_stack,
+      style_priority, x_axis, y_axis, 
-      ext_bubble, custom_attr, custom_style,
+      y_axis_ext, ext_stack, ext_bubble, 
-      custom_filter, drill_fields, snapshot
+      custom_attr, custom_style, custom_filter, 
-      )
+      drill_fields, snapshot)
-    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR},
+    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR}, 
-      #{tableId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{render,jdbcType=VARCHAR},
+      #{tableId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{render,jdbcType=VARCHAR}, 
-      #{title,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT},
+      #{resultCount,jdbcType=INTEGER}, #{resultMode,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=BIGINT}, #{stylePriority,jdbcType=VARCHAR}, #{xAxis,jdbcType=LONGVARCHAR},
+      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
-      #{yAxis,jdbcType=LONGVARCHAR}, #{yAxisExt,jdbcType=LONGVARCHAR}, #{extStack,jdbcType=LONGVARCHAR},
+      #{stylePriority,jdbcType=VARCHAR}, #{xAxis,jdbcType=LONGVARCHAR}, #{yAxis,jdbcType=LONGVARCHAR}, 
-      #{extBubble,jdbcType=LONGVARCHAR}, #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR},
+      #{yAxisExt,jdbcType=LONGVARCHAR}, #{extStack,jdbcType=LONGVARCHAR}, #{extBubble,jdbcType=LONGVARCHAR}, 
-      #{customFilter,jdbcType=LONGVARCHAR}, #{drillFields,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR}
+      #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, #{customFilter,jdbcType=LONGVARCHAR}, 
-      )
+      #{drillFields,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.base.domain.ChartViewWithBLOBs">
     insert into chart_view
@@ -179,6 +181,12 @@
       <if test="render != null">
         render,
       </if>
+      <if test="resultCount != null">
+        result_count,
+      </if>
+      <if test="resultMode != null">
+        result_mode,
+      </if>
       <if test="title != null">
         title,
       </if>
@@ -244,6 +252,12 @@
       <if test="render != null">
         #{render,jdbcType=VARCHAR},
       </if>
+      <if test="resultCount != null">
+        #{resultCount,jdbcType=INTEGER},
+      </if>
+      <if test="resultMode != null">
+        #{resultMode,jdbcType=VARCHAR},
+      </if>
       <if test="title != null">
         #{title,jdbcType=VARCHAR},
       </if>
@@ -318,6 +332,12 @@
       <if test="record.render != null">
         render = #{record.render,jdbcType=VARCHAR},
       </if>
+      <if test="record.resultCount != null">
+        result_count = #{record.resultCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.resultMode != null">
+        result_mode = #{record.resultMode,jdbcType=VARCHAR},
+      </if>
       <if test="record.title != null">
         title = #{record.title,jdbcType=VARCHAR},
       </if>
@@ -376,6 +396,8 @@
       table_id = #{record.tableId,jdbcType=VARCHAR},
       `type` = #{record.type,jdbcType=VARCHAR},
       render = #{record.render,jdbcType=VARCHAR},
+      result_count = #{record.resultCount,jdbcType=INTEGER},
+      result_mode = #{record.resultMode,jdbcType=VARCHAR},
       title = #{record.title,jdbcType=VARCHAR},
       create_by = #{record.createBy,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
@@ -403,6 +425,8 @@
       table_id = #{record.tableId,jdbcType=VARCHAR},
       `type` = #{record.type,jdbcType=VARCHAR},
       render = #{record.render,jdbcType=VARCHAR},
+      result_count = #{record.resultCount,jdbcType=INTEGER},
+      result_mode = #{record.resultMode,jdbcType=VARCHAR},
       title = #{record.title,jdbcType=VARCHAR},
       create_by = #{record.createBy,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
@@ -430,6 +454,12 @@
       <if test="render != null">
         render = #{render,jdbcType=VARCHAR},
       </if>
+      <if test="resultCount != null">
+        result_count = #{resultCount,jdbcType=INTEGER},
+      </if>
+      <if test="resultMode != null">
+        result_mode = #{resultMode,jdbcType=VARCHAR},
+      </if>
       <if test="title != null">
         title = #{title,jdbcType=VARCHAR},
       </if>
@@ -485,6 +515,8 @@
       table_id = #{tableId,jdbcType=VARCHAR},
       `type` = #{type,jdbcType=VARCHAR},
       render = #{render,jdbcType=VARCHAR},
+      result_count = #{resultCount,jdbcType=INTEGER},
+      result_mode = #{resultMode,jdbcType=VARCHAR},
       title = #{title,jdbcType=VARCHAR},
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
@@ -509,6 +541,8 @@
       table_id = #{tableId,jdbcType=VARCHAR},
       `type` = #{type,jdbcType=VARCHAR},
       render = #{render,jdbcType=VARCHAR},
+      result_count = #{resultCount,jdbcType=INTEGER},
+      result_mode = #{resultMode,jdbcType=VARCHAR},
       title = #{title,jdbcType=VARCHAR},
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
@@ -516,4 +550,4 @@
       style_priority = #{stylePriority,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-</mapper>
+</mapper>

backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml

@@ -102,7 +102,9 @@
             `ext_stack`,
             `ext_bubble`,
             `y_axis_ext`,
-            `render`
+            `render`,
+            `result_count`,
+            `result_mode`
         ) SELECT
         #{newChartId},
         GET_CHART_VIEW_COPY_NAME ( #{oldChartId} ),
@@ -123,7 +125,9 @@
         `ext_stack`,
         `ext_bubble`,
         `y_axis_ext`,
-        `render`
+        `render`,
+        `result_count`,
+        `result_mode`
         FROM
             chart_view
         WHERE

backend/src/main/java/io/dataease/service/chart/ChartViewService.java

@@ -435,8 +435,9 @@ public class ChartViewService {
                 }
             }
         }
-        if (StringUtils.containsIgnoreCase(view.getType(), "pie") && data.size() > 1000) {
+        // 返回数据量判定
-            data = data.subList(0, 1000);
+        if (StringUtils.equalsIgnoreCase("custom", view.getResultMode()) && data.size() > view.getResultCount()) {
+            data = data.subList(0, view.getResultCount());
         }
 
         Map<String, Object> map = new TreeMap<>();

backend/src/main/resources/db/migration/V27__de1.4.sql

@@ -44,3 +44,8 @@ COMMIT;
 ALTER TABLE `chart_view`
 MODIFY COLUMN `name` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称' AFTER `id`,
 MODIFY COLUMN `title` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'EChart标题' AFTER `result_mode`;
+
+ALTER TABLE `chart_view` ADD COLUMN `result_count` int(10)  COMMENT '展示结果' AFTER `render`;
+ALTER TABLE `chart_view` ADD COLUMN `result_mode` varchar(50)  COMMENT '展示模式' AFTER `result_count`;
+UPDATE `chart_view` SET `result_count` = 1000;
+UPDATE `chart_view` SET `result_mode` = 'custom';

backend/src/main/resources/generatorConfig.xml

@@ -68,6 +68,7 @@
         <table tableName="panel_link_jump"/>
         <table tableName="panel_link_jump_info"/>
         <table tableName="panel_link_jump_target_view_info"/>
+        <table tableName="chart_view"/>
 
 <!--        <table tableName="sys_dict_item"/>-->
 <!--        <table tableName="dataset_table_field"/>-->

frontend/src/lang/en.js

@@ -942,7 +942,9 @@ export default {
     pie_inner_radius_percent: 'Inner Radius(%)',
     pie_outer_radius_size: 'Outer Radius',
     table_page_size: 'Page Size',
-    table_page_size_unit: 'Item/Page'
+    table_page_size_unit: 'Item/Page',
+    result_count: 'Result',
+    result_mode_all: 'ALL'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',

frontend/src/lang/tw.js

@@ -943,7 +943,9 @@ export default {
     pie_inner_radius_percent: '內徑占比',
     pie_outer_radius_size: '外徑大小',
     table_page_size: '分頁',
-    table_page_size_unit: '條/頁'
+    table_page_size_unit: '條/頁',
+    result_count: '結果展示',
+    result_mode_all: '全部'
   },
   dataset: {
     sheet_warn: '有多個 Sheet 頁，默認抽取第一個',

frontend/src/lang/zh.js

@@ -945,7 +945,9 @@ export default {
     pie_inner_radius_percent: '内径占比',
     pie_outer_radius_size: '外径大小',
     table_page_size: '分页',
-    table_page_size_unit: '条/页'
+    table_page_size_unit: '条/页',
+    result_count: '结果展示',
+    result_mode_all: '全部'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',

frontend/src/views/chart/group/Group.vue

@@ -730,6 +730,8 @@ export default {
       view.tableId = this.table.id
       view.type = 'bar'
       view.render = 'antv'
+      view.resultMode = 'custom'
+      view.resultCount = 1000
       view.customAttr = JSON.stringify({
         color: DEFAULT_COLOR_CASE,
         tableColor: DEFAULT_COLOR_CASE,

frontend/src/views/chart/view/ChartEdit.vue

@@ -138,6 +138,19 @@
               </div>
               <div style="overflow:auto;border-top: 1px solid #e6e6e6" class="attr-style theme-border-class">
                 <el-row style="height: 100%;">
+                  <el-row class="padding-lr">
+                    <span style="width: 80px;text-align: right;">
+                      {{ $t('chart.result_count') }}
+                    </span>
+                    <el-row>
+                      <el-radio-group v-model="view.resultMode" :disabled="!hasDataPermission('manage',param.privileges)" size="mini" @change="save">
+                        <el-radio label="all"><span>{{ $t('chart.result_mode_all') }}</span></el-radio>
+                        <el-radio label="custom">
+                          <el-input v-model="view.resultCount" class="result-count" size="mini" @change="save" />
+                        </el-radio>
+                      </el-radio-group>
+                    </el-row>
+                  </el-row>
                   <el-row v-if="view.type ==='map'" class="padding-lr">
                     <span style="width: 80px;text-align: right;">
                       <span>{{ $t('chart.map_range') }}</span>
@@ -796,6 +809,19 @@ export default {
       }
     },
     save(getData, trigger, needRefreshGroup = false, switchType = false) {
+      if (!this.view.resultCount ||
+          this.view.resultCount === '' ||
+          this.view.resultCount.length > 4 ||
+          isNaN(Number(this.view.resultCount)) ||
+          String(this.view.resultCount).includes('.') ||
+          parseInt(this.view.resultCount) < 1) {
+        this.$message({
+          message: this.$t('dataset.pls_input_less_5'),
+          type: 'error',
+          showClose: true
+        })
+        return
+      }
       if (switchType && (this.view.type === 'table-info' || this.chart.type === 'table-info') && this.view.xaxis.length > 0) {
         this.$message({
           showClose: true,
@@ -1877,5 +1903,8 @@ export default {
   .blackTheme .icon-class{
     color: #cccccc;
   }
+  .result-count{
+    width:80px;
+  }
 
 </style>

frontend/src/views/dataset/data/TabDataPreview.vue

@@ -139,7 +139,12 @@ export default {
       }, 10)
     },
     reSearch() {
-      if (!this.form.row || this.form.row === '' || this.form.row.length > 4 || isNaN(Number(this.form.row)) || String(this.form.row).includes('.')) {
+      if (!this.form.row ||
+          this.form.row === '' ||
+          this.form.row.length > 4 ||
+          isNaN(Number(this.form.row)) ||
+          String(this.form.row).includes('.') ||
+          parseInt(this.form.row) < 1) {
         this.$message({
           message: this.$t('dataset.pls_input_less_5'),
           type: 'error',