feat: 数据集编辑字段，增加维度指标选项，而非老版本中通过字段类型判定

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

@@ -18,14 +18,20 @@ public class DatasetTableField implements Serializable {
 
     private String dataeaseName;
 
+    private String groupType;
+
     private String type;
 
     private Integer size;
 
     private Integer deType;
 
+    private Integer deTypeFormat;
+
     private Integer deExtractType;
 
+    private Integer extField;
+
     private Boolean checked;
 
     private Integer columnIndex;

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

@@ -454,6 +454,76 @@ public class DatasetTableFieldExample {
             return (Criteria) this;
         }
 
+        public Criteria andGroupTypeIsNull() {
+            addCriterion("group_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupTypeIsNotNull() {
+            addCriterion("group_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupTypeEqualTo(String value) {
+            addCriterion("group_type =", value, "groupType");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupTypeNotEqualTo(String value) {
+            addCriterion("group_type <>", value, "groupType");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupTypeGreaterThan(String value) {
+            addCriterion("group_type >", value, "groupType");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("group_type >=", value, "groupType");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupTypeLessThan(String value) {
+            addCriterion("group_type <", value, "groupType");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupTypeLessThanOrEqualTo(String value) {
+            addCriterion("group_type <=", value, "groupType");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupTypeLike(String value) {
+            addCriterion("group_type like", value, "groupType");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupTypeNotLike(String value) {
+            addCriterion("group_type not like", value, "groupType");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupTypeIn(List<String> values) {
+            addCriterion("group_type in", values, "groupType");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupTypeNotIn(List<String> values) {
+            addCriterion("group_type not in", values, "groupType");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupTypeBetween(String value1, String value2) {
+            addCriterion("group_type between", value1, value2, "groupType");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupTypeNotBetween(String value1, String value2) {
+            addCriterion("group_type not between", value1, value2, "groupType");
+            return (Criteria) this;
+        }
+
         public Criteria andTypeIsNull() {
             addCriterion("`type` is null");
             return (Criteria) this;
@@ -644,6 +714,66 @@ public class DatasetTableFieldExample {
             return (Criteria) this;
         }
 
+        public Criteria andDeTypeFormatIsNull() {
+            addCriterion("de_type_format is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeTypeFormatIsNotNull() {
+            addCriterion("de_type_format is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeTypeFormatEqualTo(Integer value) {
+            addCriterion("de_type_format =", value, "deTypeFormat");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeTypeFormatNotEqualTo(Integer value) {
+            addCriterion("de_type_format <>", value, "deTypeFormat");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeTypeFormatGreaterThan(Integer value) {
+            addCriterion("de_type_format >", value, "deTypeFormat");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeTypeFormatGreaterThanOrEqualTo(Integer value) {
+            addCriterion("de_type_format >=", value, "deTypeFormat");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeTypeFormatLessThan(Integer value) {
+            addCriterion("de_type_format <", value, "deTypeFormat");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeTypeFormatLessThanOrEqualTo(Integer value) {
+            addCriterion("de_type_format <=", value, "deTypeFormat");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeTypeFormatIn(List<Integer> values) {
+            addCriterion("de_type_format in", values, "deTypeFormat");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeTypeFormatNotIn(List<Integer> values) {
+            addCriterion("de_type_format not in", values, "deTypeFormat");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeTypeFormatBetween(Integer value1, Integer value2) {
+            addCriterion("de_type_format between", value1, value2, "deTypeFormat");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeTypeFormatNotBetween(Integer value1, Integer value2) {
+            addCriterion("de_type_format not between", value1, value2, "deTypeFormat");
+            return (Criteria) this;
+        }
+
         public Criteria andDeExtractTypeIsNull() {
             addCriterion("de_extract_type is null");
             return (Criteria) this;
@@ -704,6 +834,66 @@ public class DatasetTableFieldExample {
             return (Criteria) this;
         }
 
+        public Criteria andExtFieldIsNull() {
+            addCriterion("ext_field is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExtFieldIsNotNull() {
+            addCriterion("ext_field is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExtFieldEqualTo(Integer value) {
+            addCriterion("ext_field =", value, "extField");
+            return (Criteria) this;
+        }
+
+        public Criteria andExtFieldNotEqualTo(Integer value) {
+            addCriterion("ext_field <>", value, "extField");
+            return (Criteria) this;
+        }
+
+        public Criteria andExtFieldGreaterThan(Integer value) {
+            addCriterion("ext_field >", value, "extField");
+            return (Criteria) this;
+        }
+
+        public Criteria andExtFieldGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ext_field >=", value, "extField");
+            return (Criteria) this;
+        }
+
+        public Criteria andExtFieldLessThan(Integer value) {
+            addCriterion("ext_field <", value, "extField");
+            return (Criteria) this;
+        }
+
+        public Criteria andExtFieldLessThanOrEqualTo(Integer value) {
+            addCriterion("ext_field <=", value, "extField");
+            return (Criteria) this;
+        }
+
+        public Criteria andExtFieldIn(List<Integer> values) {
+            addCriterion("ext_field in", values, "extField");
+            return (Criteria) this;
+        }
+
+        public Criteria andExtFieldNotIn(List<Integer> values) {
+            addCriterion("ext_field not in", values, "extField");
+            return (Criteria) this;
+        }
+
+        public Criteria andExtFieldBetween(Integer value1, Integer value2) {
+            addCriterion("ext_field between", value1, value2, "extField");
+            return (Criteria) this;
+        }
+
+        public Criteria andExtFieldNotBetween(Integer value1, Integer value2) {
+            addCriterion("ext_field not between", value1, value2, "extField");
+            return (Criteria) this;
+        }
+
         public Criteria andCheckedIsNull() {
             addCriterion("`checked` is null");
             return (Criteria) this;

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

@@ -7,10 +7,13 @@
     <result column="origin_name" jdbcType="VARCHAR" property="originName" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="dataease_name" jdbcType="VARCHAR" property="dataeaseName" />
+    <result column="group_type" jdbcType="VARCHAR" property="groupType" />
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="size" jdbcType="INTEGER" property="size" />
     <result column="de_type" jdbcType="INTEGER" property="deType" />
+    <result column="de_type_format" jdbcType="INTEGER" property="deTypeFormat" />
     <result column="de_extract_type" jdbcType="INTEGER" property="deExtractType" />
+    <result column="ext_field" jdbcType="INTEGER" property="extField" />
     <result column="checked" jdbcType="BIT" property="checked" />
     <result column="column_index" jdbcType="INTEGER" property="columnIndex" />
     <result column="last_sync_time" jdbcType="BIGINT" property="lastSyncTime" />
@@ -74,8 +77,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, table_id, origin_name, `name`, dataease_name, `type`, `size`, de_type, de_extract_type, 
-    `checked`, column_index, last_sync_time
+    id, table_id, origin_name, `name`, dataease_name, group_type, `type`, `size`, de_type, 
+    de_type_format, de_extract_type, ext_field, `checked`, column_index, last_sync_time
   </sql>
   <select id="selectByExample" parameterType="io.dataease.base.domain.DatasetTableFieldExample" resultMap="BaseResultMap">
     select
@@ -109,13 +112,15 @@
   </delete>
   <insert id="insert" parameterType="io.dataease.base.domain.DatasetTableField">
     insert into dataset_table_field (id, table_id, origin_name, 
-      `name`, dataease_name, `type`, 
-      `size`, de_type, de_extract_type, 
+      `name`, dataease_name, group_type, 
+      `type`, `size`, de_type, 
+      de_type_format, de_extract_type, ext_field, 
       `checked`, column_index, last_sync_time
       )
     values (#{id,jdbcType=VARCHAR}, #{tableId,jdbcType=VARCHAR}, #{originName,jdbcType=VARCHAR}, 
-      #{name,jdbcType=VARCHAR}, #{dataeaseName,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
-      #{size,jdbcType=INTEGER}, #{deType,jdbcType=INTEGER}, #{deExtractType,jdbcType=INTEGER}, 
+      #{name,jdbcType=VARCHAR}, #{dataeaseName,jdbcType=VARCHAR}, #{groupType,jdbcType=VARCHAR}, 
+      #{type,jdbcType=VARCHAR}, #{size,jdbcType=INTEGER}, #{deType,jdbcType=INTEGER}, 
+      #{deTypeFormat,jdbcType=INTEGER}, #{deExtractType,jdbcType=INTEGER}, #{extField,jdbcType=INTEGER}, 
       #{checked,jdbcType=BIT}, #{columnIndex,jdbcType=INTEGER}, #{lastSyncTime,jdbcType=BIGINT}
       )
   </insert>
@@ -137,6 +142,9 @@
       <if test="dataeaseName != null">
         dataease_name,
       </if>
+      <if test="groupType != null">
+        group_type,
+      </if>
       <if test="type != null">
         `type`,
       </if>
@@ -146,9 +154,15 @@
       <if test="deType != null">
         de_type,
       </if>
+      <if test="deTypeFormat != null">
+        de_type_format,
+      </if>
       <if test="deExtractType != null">
         de_extract_type,
       </if>
+      <if test="extField != null">
+        ext_field,
+      </if>
       <if test="checked != null">
         `checked`,
       </if>
@@ -175,6 +189,9 @@
       <if test="dataeaseName != null">
         #{dataeaseName,jdbcType=VARCHAR},
       </if>
+      <if test="groupType != null">
+        #{groupType,jdbcType=VARCHAR},
+      </if>
       <if test="type != null">
         #{type,jdbcType=VARCHAR},
       </if>
@@ -184,9 +201,15 @@
       <if test="deType != null">
         #{deType,jdbcType=INTEGER},
       </if>
+      <if test="deTypeFormat != null">
+        #{deTypeFormat,jdbcType=INTEGER},
+      </if>
       <if test="deExtractType != null">
         #{deExtractType,jdbcType=INTEGER},
       </if>
+      <if test="extField != null">
+        #{extField,jdbcType=INTEGER},
+      </if>
       <if test="checked != null">
         #{checked,jdbcType=BIT},
       </if>
@@ -222,6 +245,9 @@
       <if test="record.dataeaseName != null">
         dataease_name = #{record.dataeaseName,jdbcType=VARCHAR},
       </if>
+      <if test="record.groupType != null">
+        group_type = #{record.groupType,jdbcType=VARCHAR},
+      </if>
       <if test="record.type != null">
         `type` = #{record.type,jdbcType=VARCHAR},
       </if>
@@ -231,9 +257,15 @@
       <if test="record.deType != null">
         de_type = #{record.deType,jdbcType=INTEGER},
       </if>
+      <if test="record.deTypeFormat != null">
+        de_type_format = #{record.deTypeFormat,jdbcType=INTEGER},
+      </if>
       <if test="record.deExtractType != null">
         de_extract_type = #{record.deExtractType,jdbcType=INTEGER},
       </if>
+      <if test="record.extField != null">
+        ext_field = #{record.extField,jdbcType=INTEGER},
+      </if>
       <if test="record.checked != null">
         `checked` = #{record.checked,jdbcType=BIT},
       </if>
@@ -255,10 +287,13 @@
       origin_name = #{record.originName,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
       dataease_name = #{record.dataeaseName,jdbcType=VARCHAR},
+      group_type = #{record.groupType,jdbcType=VARCHAR},
       `type` = #{record.type,jdbcType=VARCHAR},
       `size` = #{record.size,jdbcType=INTEGER},
       de_type = #{record.deType,jdbcType=INTEGER},
+      de_type_format = #{record.deTypeFormat,jdbcType=INTEGER},
       de_extract_type = #{record.deExtractType,jdbcType=INTEGER},
+      ext_field = #{record.extField,jdbcType=INTEGER},
       `checked` = #{record.checked,jdbcType=BIT},
       column_index = #{record.columnIndex,jdbcType=INTEGER},
       last_sync_time = #{record.lastSyncTime,jdbcType=BIGINT}
@@ -281,6 +316,9 @@
       <if test="dataeaseName != null">
         dataease_name = #{dataeaseName,jdbcType=VARCHAR},
       </if>
+      <if test="groupType != null">
+        group_type = #{groupType,jdbcType=VARCHAR},
+      </if>
       <if test="type != null">
         `type` = #{type,jdbcType=VARCHAR},
       </if>
@@ -290,9 +328,15 @@
       <if test="deType != null">
         de_type = #{deType,jdbcType=INTEGER},
       </if>
+      <if test="deTypeFormat != null">
+        de_type_format = #{deTypeFormat,jdbcType=INTEGER},
+      </if>
       <if test="deExtractType != null">
         de_extract_type = #{deExtractType,jdbcType=INTEGER},
       </if>
+      <if test="extField != null">
+        ext_field = #{extField,jdbcType=INTEGER},
+      </if>
       <if test="checked != null">
         `checked` = #{checked,jdbcType=BIT},
       </if>
@@ -311,10 +355,13 @@
       origin_name = #{originName,jdbcType=VARCHAR},
       `name` = #{name,jdbcType=VARCHAR},
       dataease_name = #{dataeaseName,jdbcType=VARCHAR},
+      group_type = #{groupType,jdbcType=VARCHAR},
       `type` = #{type,jdbcType=VARCHAR},
       `size` = #{size,jdbcType=INTEGER},
       de_type = #{deType,jdbcType=INTEGER},
+      de_type_format = #{deTypeFormat,jdbcType=INTEGER},
       de_extract_type = #{deExtractType,jdbcType=INTEGER},
+      ext_field = #{extField,jdbcType=INTEGER},
       `checked` = #{checked,jdbcType=BIT},
       column_index = #{columnIndex,jdbcType=INTEGER},
       last_sync_time = #{lastSyncTime,jdbcType=BIGINT}

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -242,7 +242,7 @@ public class DataSetTableService {
         List<DatasetTableField> quota = new ArrayList<>();
 
         fields.forEach(field -> {
-            if (field.getDeType() == 2 || field.getDeType() == 3) {
+            if (StringUtils.equalsIgnoreCase("q", field.getGroupType())) {
                 quota.add(field);
             } else {
                 dimension.add(field);
@@ -259,6 +259,8 @@ public class DataSetTableService {
                 .checked(true)
                 .columnIndex(999)
                 .deType(2)
+                .extField(1)
+                .groupType("q")
                 .build();
         quota.add(count);
 
@@ -694,6 +696,8 @@ public class DataSetTableService {
                 datasetTableField.setChecked(true);
                 datasetTableField.setColumnIndex(i);
                 datasetTableField.setLastSyncTime(syncTime);
+                datasetTableField.setExtField(0);
+                datasetTableField.setGroupType(datasetTableField.getDeType() < 2 ? "d" : "q");
                 dataSetTableFieldsService.save(datasetTableField);
             }
         }