source/Component/CommandBar/CommandBar.tsx

@@ -33,13 +33,7 @@ class CommandBar extends Component<ICommandBarProps & IMixinSettingProps & IMixi
             }}
         >
             <div>
-                {this.getRenderButton({
+                {this.getRenderButton({ iconName: "Save", i18NKey: "Command.Bar.Save.Info" })}
-                    iconName: "Save",
-                    i18NKey: "Command.Bar.Save.Info",
-                    click: () => {
-                        this.props.status?.archive.save(this.props.status.model);
-                    }
-                })}
                 {this.getRenderButton({
                     iconName: this.props.status?.actuator.start() ? "Pause" : "Play",
                     i18NKey: "Command.Bar.Play.Info",

source/Model/Archive.ts

@@ -1,18 +1,10 @@
 import { Emitter, EventType } from "@Model/Emitter";
-import { IArchiveCtrlObject } from "@Model/CtrlObject";
+import { Model } from "./Model";
-import { Model } from "@Model/Model";
-import { IArchiveLabel } from "@Model/Label";
 
 interface IArchiveEvent {
     fileChange: Archive;
 }
 
-interface IArchiveObject {
-    nextIndividualId: number;
-    objectPool: IArchiveCtrlObject[];
-    labelPool: IArchiveLabel[];
-}
-
 class Archive<
     M extends any = any,
     E extends Record<EventType, any> = {}
@@ -43,32 +35,17 @@ class Archive<
      * 模型转换为文件
      */
     public save(model: Model): string {
+        let fileData: Record<string, any> = {};
+        
+        // 保存对象
+        fileData.objects = [];
+        
+        // 记录
+        model.objectPool.map((object) => {
 
-        // 存贮 CtrlObject
-        const objectPool: IArchiveCtrlObject[] = [];
-        model.objectPool.forEach(obj => {
-            objectPool.push(obj.toArchive());
         })
 
-        // 存储 Label
+        return JSON.stringify(model);
-        const labelPool: IArchiveLabel[] = [];
-        model.labelPool.forEach(obj => {
-            labelPool.push(obj.toArchive());
-        })
-
-        const fileData: IArchiveObject = {
-            nextIndividualId: model.nextIndividualId,
-            objectPool: objectPool,
-            labelPool: labelPool
-        };
-
-        console.log(fileData);
-        console.log({value: JSON.stringify(fileData)});
-
-        this.isSaved = true;
-        this.emit( ...["fileChange", this] as any );
-
-        return "";
     }
 
     /**

source/Model/CtrlObject.ts

@@ -1,11 +1,8 @@
 import { LabelObject } from "@Model/Label"
 import { v4 as uuid } from "uuid";
+import { parameter2ArchiveObject, archiveObject2Parameter, IArchiveParseFn } from "@Model/Parameter";
 import type { IAnyObject, Model } from "@Model/Model";
 import type { ObjectID } from "@Model/Model";
-import {
-    parameter2ArchiveObject, archiveObject2Parameter,
-    IArchiveParseFn, IObjectParamArchiveType, object2ArchiveObject
-} from "@Model/Parameter";
 
 interface IArchiveCtrlObject {
     displayName: CtrlObject["displayName"];
@@ -15,7 +12,6 @@ interface IArchiveCtrlObject {
     id: string;
     renderParameter: any;
     deleteFlag: CtrlObject["deleteFlag"];
-    labels: IObjectParamArchiveType[];
 }
 
 /**
@@ -121,26 +117,20 @@ class CtrlObject<A extends IAnyObject = IAnyObject> extends LabelObject {
             update: !!this.update,
             id: this.id,
             renderParameter: parameter2ArchiveObject(this.renderParameter),
-            deleteFlag: !!this.deleteFlag,
+            deleteFlag: !!this.deleteFlag
-            labels: this.labels.map((label) => {
-                return object2ArchiveObject(label);
-            })
         } as any;
     }
 
-    public fromArchive(archive: IArchiveCtrlObject & A, paster: IArchiveParseFn): void {
+    public fromArchive(archive: IArchiveCtrlObject & A, paster?: IArchiveParseFn): void {
         this.displayName = archive.displayName;
         this.color = archive.color.concat([]);
         this.display = !!archive.display;
         this.update = !!archive.update;
         this.id = archive.id;
-        this.deleteFlag = !!archive.deleteFlag;
         this.renderParameter = archiveObject2Parameter(
-            archive.renderParameter, paster
+            archive.renderParameter, paster ?? (() => undefined)
         );
-        this.labels = archive.labels.map((obj) => {
+        this.deleteFlag = !!archive.deleteFlag;
-            return paster(obj) as any;
-        }).filter((c) => !!c);
     }
 }
 

source/Model/Group.ts

@@ -1,10 +1,10 @@
 import { Individual } from "@Model/Individual";
-import { CtrlObject, IArchiveCtrlObject } from "@Model/CtrlObject";
+import { CtrlObject } from "@Model/CtrlObject";
 import type { Behavior, IAnyBehavior } from "@Model/Behavior"; 
 import { Label } from "@Model/Label";
 import { Range } from "@Model/Range";
 import { Model, ObjectID } from "@Model/Model";
-import { getDefaultValue, IArchiveParseFn, IObjectParamArchiveType, object2ArchiveObject } from "@Model/Parameter";
+import { getDefaultValue, IObjectParamArchiveType } from "@Model/Parameter";
 
 enum GenMod {
     Point = "p",
@@ -12,6 +12,7 @@ enum GenMod {
 }
 
 interface IArchiveGroup {
+    individuals: IObjectParamArchiveType[];
     genMethod: Group["genMethod"];
     genPoint: Group["genPoint"];
     genRange: IObjectParamArchiveType | undefined;
@@ -417,34 +418,6 @@ class Group extends CtrlObject<IArchiveGroup> {
         });
         return dataBuffer;
     }
-
-    public override toArchive(): IArchiveCtrlObject & IArchiveGroup {
-        return {
-            ...super.toArchive(),
-            genMethod: this.genMethod,
-            genPoint: this.genPoint.concat([]),
-            genRange: object2ArchiveObject(this.genRange) as IObjectParamArchiveType,
-            genCount: this.genCount,
-            genErrorMessage: this.genErrorMessage,
-            genErrorMessageShowCount: this.genErrorMessageShowCount,
-            killCount: this.killCount,
-            behaviors: object2ArchiveObject(this.behaviors) as IObjectParamArchiveType[]
-        };
-    }
-
-    public override fromArchive(archive: IArchiveCtrlObject & IArchiveGroup, paster: IArchiveParseFn): void {
-        super.fromArchive(archive, paster);
-        this.genMethod = archive.genMethod,
-        this.genPoint = archive.genPoint.concat([]),
-        this.genRange = archive.genRange ? paster(archive.genRange) as any : undefined,
-        this.genCount = archive.genCount,
-        this.genErrorMessage = archive.genErrorMessage,
-        this.genErrorMessageShowCount = archive.genErrorMessageShowCount,
-        this.killCount = archive.killCount,
-        this.behaviors = archive.behaviors.map((item) => {
-            return item ? paster(item) as any : undefined;
-        }).filter(c => !!c);
-    }
     
     public constructor(model: Model) {
 

source/Model/Individual.ts

@@ -1,15 +1,5 @@
 import type { Group } from "@Model/Group";
-import { IAnyObject, ObjectID } from "@Model/Model";
+import { ObjectID } from "@Model/Model";
-import { IArchiveParseFn, object2ArchiveObject, isArchiveObjectType } from "@Model/Parameter";
-
-interface IArchiveIndividual {
-    id: string;
-    position: number[];
-    velocity: number[];
-    acceleration: number[];
-    force: number[];
-    metaData: IAnyObject;
-}
 
 /**
  * 群中的个体类型
@@ -180,67 +170,6 @@ class Individual {
         this.metaData.set(key, value);
         return value;
     }
-
-    public toArchive(): IArchiveIndividual {
-
-        const metaDataArchive = {} as IAnyObject;
-        this.metaData.forEach((value, key) => {
-            
-            // 处理内置对象
-            let ltObject = object2ArchiveObject(value);
-            if (ltObject) {
-                metaDataArchive[key] = ltObject;
-            }
-
-            // 处理数组
-            else if (Array.isArray(value)) {
-                metaDataArchive[key] = value.concat([]);
-            }
-
-            // 处理值
-            else {
-                metaDataArchive[key] = value;
-            }
-        });
-
-        return {
-            id: this.id,
-            position: this.position.concat([]),
-            velocity: this.velocity.concat([]),
-            acceleration: this.acceleration.concat([]),
-            force: this.force.concat([]),
-            metaData: metaDataArchive
-        };
-    }
-
-    public fromArchive(archive: IArchiveIndividual, paster: IArchiveParseFn): void {
-
-        const metaData = new Map() as Map<ObjectID, any>;
-        for (const key in archive.metaData) {
-            
-            const value = archive.metaData[key];
-
-            // 处理内置对象
-            if (value instanceof Object && isArchiveObjectType(value)) {
-                metaData.set(key, paster(value));
-            }
-
-            else if (Array.isArray(value)) {
-                metaData.set(key, value.concat([]));
-            }
-
-            else {
-                metaData.set(key, value);
-            }
-        }
-
-        this.id = this.id,
-        this.position = this.position.concat([]),
-        this.velocity = this.velocity.concat([]),
-        this.acceleration = this.acceleration.concat([]),
-        this.force = this.force.concat([]),
-        this.metaData = metaData;
-    }
 }
 
 export { Individual };

source/Model/Label.ts

@@ -1,14 +1,6 @@
 import type { Model, ObjectID } from "@Model/Model";
 import { v4 as uuid } from "uuid";
 
-interface IArchiveLabel {
-    isBuildIn: boolean;
-    id: string;
-    name: string;
-    color: number[];
-    deleteFlag: boolean;
-}
-
 /**
  * 数据标签
  */
@@ -91,24 +83,6 @@ class Label {
         this.isBuildIn = true;
         return this;
     }
-
-    public toArchive(): IArchiveLabel {
-        return {
-            isBuildIn: this.isBuildIn,
-            id: this.id,
-            name: this.name,
-            color: this.color.concat([]),
-            deleteFlag: this.deleteFlag
-        } as any;
-    }
-
-    public fromArchive(archive: IArchiveLabel): void {
-        this.isBuildIn = archive.isBuildIn,
-        this.id = archive.id,
-        this.name = archive.name,
-        this.color = archive.color.concat([]),
-        this.deleteFlag = archive.deleteFlag
-    }
 }
 
 /**
@@ -119,7 +93,7 @@ class LabelObject {
     /**
      * 标签集合
      */
-    public labels: Label[] = [];
+    private labels: Label[] = [];
 
     /**
      * 获取全部 Label
@@ -159,4 +133,4 @@ class LabelObject {
     }
 }
 
-export { Label, LabelObject, IArchiveLabel };
+export { Label, LabelObject };

source/Model/Parameter.ts

@@ -1,7 +1,7 @@
 import { Group } from "@Model/Group";
 import { Range } from "@Model/Range";
 import { Label } from "@Model/Label";
-import { Behavior, IAnyBehavior } from "@Model/Behavior";
+import { Behavior } from "@Model/Behavior";
 import { Individual } from "@Model/Individual";
 
 type IObjectParamArchiveType = {
@@ -225,7 +225,7 @@ function getDefaultValue<P extends IParameter> (option: IParameterOption<P>): IP
     return defaultObj;
 }
 
-type IRealObjectType = Range | Group | Label | IAnyBehavior;
+type IRealObjectType = Range | Group | Label | Behavior;
 type IArchiveParseFn = (archive: IObjectParamArchiveType) => IRealObjectType | undefined;
 
 function object2ArchiveObject(object: IRealObjectType | IRealObjectType[] | any, testArray: boolean = true): 
@@ -358,5 +358,5 @@ export {
     IParamType, IParamValue, isObjectType, isVectorType, getDefaultValue,
     IParameterOptionItem, IParameter, IParameterOption, IParameterValue,
     object2ArchiveObject, parameter2ArchiveObject, archiveObject2Parameter,
-    IArchiveParseFn, IObjectParamArchiveType, isArchiveObjectType
+    IArchiveParseFn, IObjectParamArchiveType
 }

source/Model/Range.ts

@@ -39,7 +39,7 @@ class Range extends CtrlObject<IArchiveRange> {
         };
     }
 
-    public override fromArchive(archive: IArchiveCtrlObject & IArchiveRange, paster: IArchiveParseFn): void {
+    public override fromArchive(archive: IArchiveCtrlObject & IArchiveRange, paster?: IArchiveParseFn): void {
         super.fromArchive(archive, paster);
         this.position = archive.position.concat([]),
         this.radius = archive.radius.concat([])