代码优化与bug修复

Author: huanghaiyang

src/modules/command/helpers/CommandHelper.ts

@@ -224,6 +224,27 @@ export default class CommandHelper {
     );
   }
 
+  /**
+   * 创建组件组合添加命令
+   *
+   * @param uDataList 组件数据
+   * @param rDataList 组件数据
+   * @param store 画板
+   * @returns
+   */
+  static createGroupAddedCommand(uDataList: Array<ICommandElementObject>, rDataList: Array<ICommandElementObject>, store: IStageStore): ICommand<IElementCommandPayload> {
+    const command = new GroupAddedCommand(
+      nanoid(),
+      {
+        type: ElementCommandTypes.GroupAdded,
+        uDataList,
+        rDataList,
+      },
+      store,
+    );
+    return command;
+  }
+
   /**
    * 组合创建命令
    *
@@ -232,36 +253,45 @@ export default class CommandHelper {
    * @param store 画板
    * @returns
    */
-  static async createGroupAddedCommand(elements: IElement[], groupAddFunction: () => { group: IElementGroup; elements: IElement[] }, store: IStageStore): Promise<ICommand<IElementCommandPayload>> {
+  static async createGroupAddedCommandBy(elements: IElement[], groupAddFunction: () => { group: IElementGroup; elements: IElement[] }, store: IStageStore): Promise<ICommand<IElementCommandPayload>> {
     const uDataList: Array<IGroupCommandElementObject> = await Promise.all(
       elements.map(async element => ({ model: { id: element.id }, isGroupSubject: !element.isGroupSubject, ...CommandHelper.createRearrangeModel(element) })),
     );
-    const { group, elements: newElements } = groupAddFunction();
+    const { group, elements: newElements } = groupAddFunction() || {};
     if (group) {
       uDataList.push({
         model: { id: group.id },
         isGroup: true,
       } as IGroupCommandElementObject);
       const rDataList = await CommandHelper.createGroupAddedDataList(group, newElements);
-      const command = new GroupAddedCommand(
-        nanoid(),
-        {
-          type: ElementCommandTypes.GroupAdded,
-          uDataList,
-          rDataList,
-        },
-        store,
-      );
-      return command;
+      return CommandHelper.createGroupAddedCommand(uDataList, rDataList, store);
     }
   }
 
+  /**
+   * 创建组件组合移除命令
+   *
+   * @param elements 组件列表
+   * @param store 画板
+   */
+  static createGroupRemovedCommand(uDataList: Array<ICommandElementObject>, store: IStageStore): ICommand<IElementCommandPayload> {
+    const command = new GroupRemovedCommand(
+      nanoid(),
+      {
+        type: ElementCommandTypes.GroupRemoved,
+        uDataList,
+      },
+      store,
+    );
+    return command;
+  }
+
   /**
    * 创建组件组合取消命令
    *
    * @param groups 组合列表
    */
-  static async createGroupRemovedCommand(groups: IElementGroup[], store: IStageStore): Promise<ICommand<IElementCommandPayload>> {
+  static async createGroupRemovedCommandBy(groups: IElementGroup[], store: IStageStore): Promise<ICommand<IElementCommandPayload>> {
     const uDataList: Array<IGroupCommandElementObject> = [];
     await Promise.all(
       groups.map(async group => {
@@ -278,15 +308,7 @@ export default class CommandHelper {
         });
       }),
     );
-    const command = new GroupRemovedCommand(
-      nanoid(),
-      {
-        type: ElementCommandTypes.GroupRemoved,
-        uDataList,
-      },
-      store,
-    );
-    return command;
+    return CommandHelper.createGroupRemovedCommand(uDataList, store);
   }
 
   /**

src/modules/stage/StageShield.ts

@@ -2273,16 +2273,20 @@ export default class StageShield extends DrawerBase implements IStageShield, ISt
   async _handleSelectGroup(): Promise<void> {
     if (this.isElementsBusy) return;
     if (this.store.isSelectedEmpty) return;
-    const command = await CommandHelper.createGroupAddedCommand(
+    const command = await CommandHelper.createGroupAddedCommandBy(
       this.store.selectedElements,
       (): { group: IElementGroup; elements: IElement[] } => {
-        const group = this.store.selectToGroup();
-        this.store.selectGroup(group);
-        return { group, elements: this.store.selectedElements };
+        const group = this.store.createGroup(this.store.selectedElements);
+        if (group) {
+          this.store.selectGroup(group);
+          return { group, elements: this.store.selectedElements };
+        }
       },
       this.store,
     );
-    this.undoRedo.add(command);
+    if (command) {
+      this.undoRedo.add(command);
+    }
   }
 
   /**
@@ -2292,7 +2296,7 @@ export default class StageShield extends DrawerBase implements IStageShield, ISt
     if (this.isElementsBusy) return;
     const groups = this.store.getSelectedAncestorElementGroups();
     if (groups.length === 0) return;
-    const command = await CommandHelper.createGroupRemovedCommand(groups, this.store);
+    const command = await CommandHelper.createGroupRemovedCommandBy(groups, this.store);
     this.undoRedo.add(command);
     this.store.cancelGroups(groups);
     groups.forEach(group => {

src/modules/stage/StageStore.ts

@@ -2497,9 +2497,10 @@ export default class StageStore implements IStageStore {
 
   /**
    * 将选中的组件转换为组合
+   * 
+   * @param elements
    */
-  selectToGroup(): IElementGroup {
-    const elements = this.selectedElements;
+  createGroup(elements: IElement[]): IElementGroup {
     if (elements.length < 2) {
       return null;
     }

src/types/IStageStore.ts

@@ -175,7 +175,7 @@ export default interface IStageStore extends IStageSetter {
   // 删除组合
   removeElementGroup(group: IElementGroup): void;
   // 将选中的组件转换为组合
-  selectToGroup(): IElementGroup;
+  createGroup(elements: IElement[]): IElementGroup;
   // 取消组合
   cancelGroups(groups: IElementGroup[]): void;
   // 获取选中的根组合