feat(数据集): 数据集字段增加分组

core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author fit2cloud
- * @since 2024-08-07
+ * @since 2025-02-06
  */
 @TableName("core_dataset_table_field")
 public class CoreDatasetTableField implements Serializable {
@@ -66,6 +66,16 @@ public class CoreDatasetTableField implements Serializable {
      */
     private String fieldShortName;
 
+    /**
+     * 分组设置
+     */
+    private String groups;
+
+    /**
+     * 未分组的值
+     */
+    private String otherGroup;
+
     /**
      * 维度/指标标识 d:维度，q:指标
      */
@@ -211,6 +221,22 @@ public class CoreDatasetTableField implements Serializable {
         this.fieldShortName = fieldShortName;
     }
 
+    public String getGroups() {
+        return groups;
+    }
+
+    public void setGroups(String groups) {
+        this.groups = groups;
+    }
+
+    public String getOtherGroup() {
+        return otherGroup;
+    }
+
+    public void setOtherGroup(String otherGroup) {
+        this.otherGroup = otherGroup;
+    }
+
     public String getGroupType() {
         return groupType;
     }
@@ -328,6 +354,8 @@ public class CoreDatasetTableField implements Serializable {
         ", description = " + description +
         ", dataeaseName = " + dataeaseName +
         ", fieldShortName = " + fieldShortName +
+        ", groups = " + groups +
+        ", otherGroup = " + otherGroup +
         ", groupType = " + groupType +
         ", type = " + type +
         ", size = " + size +

core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetTableFieldMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author fit2cloud
- * @since 2024-08-07
+ * @since 2025-02-06
  */
 @Mapper
 public interface CoreDatasetTableFieldMapper extends BaseMapper<CoreDatasetTableField> {

core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `core_dataset_table_field`
+    ADD COLUMN `groups` longtext NULL;
+
+ALTER TABLE `core_dataset_table_field`
+    ADD COLUMN `other_group` longtext NULL;

core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `core_dataset_table_field`
+    ADD COLUMN `groups` longtext NULL COMMENT '分组设置' AFTER `field_short_name`;
+
+ALTER TABLE `core_dataset_table_field`
+    ADD COLUMN `other_group` longtext NULL COMMENT '未分组的值' AFTER `groups`;