From ffb6b2f68c86bd92ec83678bf16b28abbe62bb65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Sat, 6 Aug 2022 13:04:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=20isGroup=20=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/index.d.ts             | 30 +++++++++++++++--------------
 src/packages/public/publicConfig.ts | 16 ++++++++++-----
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts
index 9e0c88d7..5cf6b84f 100644
--- a/src/packages/index.d.ts
+++ b/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.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.ROTATE_Z]: number
+    [FilterEnum.ROTATE_X]: number
+    [FilterEnum.ROTATE_Y]: number
 
-    [FilterEnum.SKEW_X]: number;
-    [FilterEnum.SKEW_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>
 }
diff --git a/src/packages/public/publicConfig.ts b/src/packages/public/publicConfig.ts
index 33d1113c..37b8fb05 100644
--- a/src/packages/public/publicConfig.ts
+++ b/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