fix: 新增 isGroup 标识

src/packages/index.d.ts

@@ -27,12 +27,12 @@ export type ConfigType = {
 
 // 数据请求
 interface requestConfig {
-  request: RequestConfigType,
+  request: RequestConfigType
 }
 
 // Echarts 数据类型
 interface EchartsDataType {
-  dimensions: string[],
+  dimensions: string[]
   source: any[]
 }
 
@@ -56,26 +56,27 @@ export enum FilterEnum {
 
   // 倾斜
   SKEW_X = 'skewX',
-  SKEW_Y = 'skewY',
+  SKEW_Y = 'skewY'
 }
 
 // 组件实例类
 export interface PublicConfigType {
   id: string
+  isGroup: boolean
   attr: { x: number; y: number; w: number; h: number; zIndex: number }
   styles: {
-    [FilterEnum.OPACITY]: number;
-    [FilterEnum.SATURATE]: number;
-    [FilterEnum.CONTRAST]: number;
-    [FilterEnum.HUE_ROTATE]: number;
-    [FilterEnum.BRIGHTNESS]: number;
-
-    [FilterEnum.ROTATE_Z]: number;
-    [FilterEnum.ROTATE_X]: number;
-    [FilterEnum.ROTATE_Y]: number;
-
-    [FilterEnum.SKEW_X]: number;
-    [FilterEnum.SKEW_Y]: number;
+    [FilterEnum.OPACITY]: number
+    [FilterEnum.SATURATE]: number
+    [FilterEnum.CONTRAST]: number
+    [FilterEnum.HUE_ROTATE]: number
+    [FilterEnum.BRIGHTNESS]: number
+
+    [FilterEnum.ROTATE_Z]: number
+    [FilterEnum.ROTATE_X]: number
+    [FilterEnum.ROTATE_Y]: number
+
+    [FilterEnum.SKEW_X]: number
+    [FilterEnum.SKEW_Y]: number
     // 动画
     animations: string[]
   }
@@ -91,8 +92,9 @@ export interface CreateComponentType extends PublicConfigType, requestConfig {
 
 // 组件成组实例类 (部分属性用不到设置为 any)
 export interface CreateComponentGroupType extends PublicConfigType {
+  // 保持结构一致, 设置组件名称
   chartConfig: {
-    categoryName: string
+    title: ConfigType.title
   }
   groupList: Array<CreateComponentType>
 }

src/packages/public/publicConfig.ts

@@ -37,6 +37,7 @@ const requestConfig: RequestConfigType = {
 // 单实例类
 export class publicConfig implements PublicConfigType {
   public id = getUUID()
+  public isGroup = false
   // 基本信息
   public attr = { ...chartInitConfig, zIndex: -1 }
   // 基本样式
@@ -78,10 +79,17 @@ export class publicConfig implements PublicConfigType {
 
 // 成组类 (部分属性不需要, 不继承 publicConfig)
 export class PublicGroupConfigClass implements CreateComponentGroupType {
-  public id = getUUID()
-  chartConfig = {
-    categoryName: '分组'
+  // 成组
+  public isGroup = true
+  // 名称
+  public chartConfig = {
+    title: '分组'
   }
+  // 组成员列表
+  public groupList: Array<CreateComponentType> = []
+  // ---- 原有 ---
+  // 标识
+  public id = getUUID()
   // 基本信息
   public attr = { ...chartInitConfig, zIndex: -1 }
   // 基本样式
@@ -109,8 +117,6 @@ export class PublicGroupConfigClass implements CreateComponentGroupType {
     // 动画
     animations: []
   }
-  // 组成员列表
-  public groupList: Array<CreateComponentType> = []
   // 设置坐标
   public setPosition(x: number, y: number): void {
     this.attr.x = x