source/Behavior/Behavior.ts

@@ -5,10 +5,9 @@ import { Brownian } from "./Brownian";
 import { BoundaryConstraint } from "./BoundaryConstraint"; 
 
 const AllBehaviors: IAnyBehaviorRecorder[] = [
-    new BehaviorRecorder(Template),
     new BehaviorRecorder(Dynamics),
     new BehaviorRecorder(Brownian),
-    new BehaviorRecorder(BoundaryConstraint),
+    new BehaviorRecorder(BoundaryConstraint)
 ]
 
 /**

source/Behavior/BoundaryConstraint.ts

@@ -26,7 +26,8 @@ class BoundaryConstraint extends Behavior<IBoundaryConstraintBehaviorParameter,
 	public override parameterOption = {
 		range: {
 			type: "LR",
-			name: "$range"
+			name: "$range",
+			defaultValue: undefined
 		}
 	};
 
@@ -42,7 +43,15 @@ class BoundaryConstraint extends Behavior<IBoundaryConstraintBehaviorParameter,
     };
 
     public effect(individual: Individual, group: Group, model: Model, t: number): void {
-        let rangeList: Range[] = this.parameter.range.objects;
+        let rangeList: Range[] = [];
+		if (this.parameter.range instanceof Range) {
+			rangeList.push(this.parameter.range);
+		}
+		if (this.parameter.range instanceof Label) {
+			rangeList = model.getObjectByLabel(this.parameter.range).filter((obj) => {
+				return obj instanceof Range
+			}) as any;
+		}
 		for (let i = 0; i < rangeList.length; i++) {
 
 			let rx = rangeList[i].position[0] - individual.position[0];

source/Behavior/Template.ts

@@ -4,14 +4,7 @@ import { Individual } from "@Model/Individual";
 import { Model } from "@Model/Model";
 
 type ITemplateBehaviorParameter = {
-    testNumber: "number";
+    
-    testString: "string";
-    testBoolean: "boolean";
-    testR: "R";
-    testG: "G";
-    testLR: "LR";
-    testLG: "LG";
-    testVec: "vec";
 }
 
 type ITemplateBehaviorEvent = {}
@@ -28,53 +21,6 @@ class Template extends Behavior<ITemplateBehaviorParameter, ITemplateBehaviorEve
 
     public override category: string = "$Category";
 
-    public override parameterOption = {
-        testNumber: {
-            name: "$Test",
-            type: "number",
-            defaultValue: 1,
-            numberMax: 10,
-            numberMin: 0,
-            numberStep: 1
-        },
-        testString: {
-            name: "$Test",
-            type: "string",
-            defaultValue: "default",
-            maxLength: 12
-        },
-        testBoolean: {
-            name: "$Test",
-            type: "boolean",
-            defaultValue: false,
-            iconName: "Send"
-        },
-        testR: {
-            name: "$Test",
-            type: "R"
-        },
-        testG: {
-            name: "$Test",
-            type: "G"
-        },
-        testLR: {
-            name: "$Test",
-            type: "LR"
-        },
-        testLG: {
-            name: "$Test",
-            type: "LG"
-        },
-        testVec: {
-            name: "$Test",
-            type: "vec",
-            defaultValue: [1, 2, 3],
-            numberMax: 10,
-            numberMin: 0,
-            numberStep: 1
-        }
-    };
-
     public override terms: Record<string, Record<string, string>> = {
         "$Title": {
             "ZH_CN": "行为",
@@ -83,10 +29,6 @@ class Template extends Behavior<ITemplateBehaviorParameter, ITemplateBehaviorEve
         "$Intro": {
             "ZH_CN": "这是一个模板行为",
             "EN_US": "This is a template behavior"
-        },
-        "$Test": {
-            "ZH_CN": "测试参数",
-            "EN_US": "Test Parameter"
         }
     };
 

source/Component/TextField/TextField.tsx

@@ -6,7 +6,6 @@ import "./TextField.scss";
 interface ITextFieldProps {
     className?: string;
     keyI18n: AllI18nKeys;
-    keyI18nOption?: Record<string, string>;
     infoI18n?: AllI18nKeys;
     disableI18n?: AllI18nKeys;
     disableI18nOption?: Record<string, string>;
@@ -83,7 +82,7 @@ class TextField extends Component<ITextFieldProps> {
         return <>
             <Theme className="text-field-root" fontLevel={FontLevel.normal}>
                 <div className="text-field-intro">
-                    <Localization i18nKey={this.props.keyI18n} options={this.props.keyI18nOption}/>
+                    <Localization i18nKey={this.props.keyI18n}/>
                 </div>
                 <div className="text-field-container">
                     {

source/Context/Status.tsx

@@ -136,17 +136,6 @@ class Status extends Emitter<IStatusEvent> {
         this.model.on("individualChange", () => {
             this.emit("individualChange");
         });
-
-        // 当模型中的标签和对象改变时，更新全部行为参数中的受控对象
-        const updateBehaviorParameter = () => {
-            this.model.updateBehaviorParameter();
-        }
-        this.on("objectChange", updateBehaviorParameter);
-        this.on("behaviorChange", updateBehaviorParameter);
-        this.on("labelChange", updateBehaviorParameter);
-        this.on("groupLabelChange", updateBehaviorParameter);
-        this.on("rangeLabelChange", updateBehaviorParameter);
-        this.on("behaviorAttrChange", updateBehaviorParameter);
     }
 
     public bindRenderer(renderer: AbstractRenderer) {
@@ -209,16 +198,15 @@ class Status extends Emitter<IStatusEvent> {
      * 修改群属性
      */
     public changeBehaviorAttrib<K extends IBehaviorParameter, P extends keyof K | keyof Behavior<K>>
-    (id: ObjectID, key: P, val: IParamValue<K[P]>, noParameter?: boolean) {
+    (id: ObjectID, key: P, val: IParamValue<K[P]>) {
         const behavior = this.model.getBehaviorById(id);
         if (behavior) {
-            if (noParameter) {
+            if (key === "color") {
-                behavior[key as keyof Behavior<K>] = val as never;
+                behavior.color = val as number[];
+            } else if (key === "name") {
+                behavior.name = val as string;
             } else {
                 behavior.parameter[key] = val;
-                behavior.parameterOption[key]?.onChange ?
-                    behavior.parameterOption[key]?.onChange!(val) :
-                    undefined;
             }
             this.emit("behaviorAttrChange");
         }

source/Localization/EN-US.ts

@@ -113,9 +113,5 @@ const EN_US = {
     "Panel.Info.Label.List.Error.Nodata": "There are no labels in the model, click the button to create",
     "Panel.Info.Behavior.Details.Error.Not.Behavior": "Please specify a behavior first to view the details",
     "Panel.Info.Behavior.Details.Behavior.Props": "{behavior} parameter",
-    "Panel.Info.Behavior.Details.Parameter.Key": "{key}",
-    "Panel.Info.Behavior.Details.Parameter.Key.Vec.X": "{key} X",
-    "Panel.Info.Behavior.Details.Parameter.Key.Vec.Y": "{key} Y",
-    "Panel.Info.Behavior.Details.Parameter.Key.Vec.Z": "{key} Z",
 }
 export default EN_US;

source/Localization/ZH-CN.ts

@@ -113,9 +113,5 @@ const ZH_CN = {
     "Panel.Info.Label.List.Error.Nodata": "模型中没有标签，点击按钮以创建",
     "Panel.Info.Behavior.Details.Error.Not.Behavior": "请先指定一个行为以查看详情",
     "Panel.Info.Behavior.Details.Behavior.Props": "{behavior}参数",
-    "Panel.Info.Behavior.Details.Parameter.Key": "{key}",
-    "Panel.Info.Behavior.Details.Parameter.Key.Vec.X": "{key} X 坐标",
-    "Panel.Info.Behavior.Details.Parameter.Key.Vec.Y": "{key} Y 坐标",
-    "Panel.Info.Behavior.Details.Parameter.Key.Vec.Z": "{key} Z 坐标",
 }
 export default ZH_CN;

source/Model/Behavior.ts

@@ -24,7 +24,7 @@ type IMapObjectParamTypeKeyToType = {
     "R": IObjectParamCacheType<Range | undefined>;
     "G": IObjectParamCacheType<Group | undefined>;
     "LR": IObjectParamCacheType<Label | Range | undefined, Range[]>;
-    "LG": IObjectParamCacheType<Label | Group | undefined, Group[]>;
+    "LG": IObjectParamCacheType<Label | Group | undefined, Range[]>;
 }
 
 type IMapVectorParamTypeKeyToType = {
@@ -87,7 +87,7 @@ interface IBehaviorParameterOptionItem<T extends IParamType = IParamType> {
     /**
      * 字符长度
      */
-    maxLength?: number;
+    stringLength?: number;
 
     /**
      * 数字步长
@@ -417,7 +417,6 @@ type IRenderBehavior = BehaviorInfo | Behavior;
 
 export {
     Behavior, BehaviorRecorder, IBehaviorParameterOption, IBehaviorParameterOptionItem, IParamValue,
-    IAnyBehavior, IAnyBehaviorRecorder, BehaviorInfo, IRenderBehavior, IBehaviorParameter,
+    IAnyBehavior, IAnyBehaviorRecorder, BehaviorInfo, IRenderBehavior, IBehaviorParameter
-    isObjectType, isVectorType
 };
 export default { Behavior };

source/Model/Model.ts

@@ -5,7 +5,7 @@ import { Emitter, EventType, EventMixin } from "./Emitter";
 import { CtrlObject } from "./CtrlObject";
 import { ObjectID, AbstractRenderer } from "./Renderer";
 import { Label } from "./Label";
-import { Behavior, IAnyBehavior, IAnyBehaviorRecorder, IParamValue } from "./Behavior";
+import { Behavior, IAnyBehavior, IAnyBehaviorRecorder } from "./Behavior";
 
 type ModelEvent = {
     labelChange: Label[];
@@ -206,68 +206,6 @@ class Model extends Emitter<ModelEvent> {
         }
     }
 
-    /**
-     * 更新全部行为的参数
-     */
-    public updateBehaviorParameter() {
-        for (let i = 0; i < this.behaviorPool.length; i++) {
-            const behavior = this.behaviorPool[i];
-            
-            for (let key in behavior.parameterOption) {
-                switch (behavior.parameterOption[key].type) {
-
-                    case "R":
-                        const dataR: IParamValue<"R"> = behavior.parameter[key];
-                        dataR.objects = undefined;
-                        
-                        if (dataR.picker instanceof Range && !dataR.picker.isDeleted()) {
-                            dataR.objects = dataR.picker;
-                        }
-                        break;
-
-                    case "G":
-                        const dataG: IParamValue<"G"> = behavior.parameter[key];
-                        dataG.objects = undefined;
-                        
-                        if (dataG.picker instanceof Group && !dataG.picker.isDeleted()) {
-                            dataG.objects = dataG.picker;
-                        }
-                        break;
-
-                    case "LR":
-                        const dataLR: IParamValue<"LR"> = behavior.parameter[key];
-                        dataLR.objects = [];
-
-                        if (dataLR.picker instanceof Range && !dataLR.picker.isDeleted()) {
-                            dataLR.objects.push(dataLR.picker);
-                        }
-
-                        if (dataLR.picker instanceof Label && !dataLR.picker.isDeleted()) {
-                            dataLR.objects = this.getObjectByLabel(dataLR.picker).filter((obj) => {
-                                return obj instanceof Range;
-                            }) as any;
-                        }
-                        break;
-
-                    case "LG":
-                        const dataLG: IParamValue<"LG"> = behavior.parameter[key];
-                        dataLG.objects = [];
-
-                        if (dataLG.picker instanceof Group && !dataLG.picker.isDeleted()) {
-                            dataLG.objects.push(dataLG.picker);
-                        }
-
-                        if (dataLG.picker instanceof Label && !dataLG.picker.isDeleted()) {
-                            dataLG.objects = this.getObjectByLabel(dataLG.picker).filter((obj) => {
-                                return obj instanceof Group;
-                            }) as any;
-                        }
-                        break;
-                }
-            }
-        }
-    }
-
     /**
      * 搜索并删除一个 Behavior
      * @param name 搜索值

source/Page/SimulatorWeb/SimulatorWeb.tsx

@@ -55,16 +55,13 @@ class SimulatorWeb extends Component {
             this.status.model.update(0);
             this.status.newLabel().name = "New Label";
             this.status.newLabel().name = "Test Label 01";
-            let template = this.status.model.addBehavior(AllBehaviors[0]);
+            let dynamic = this.status.model.addBehavior(AllBehaviors[0]);
-            template.name = "Template"; template.color = [150, 20, 220];
-            let dynamic = this.status.model.addBehavior(AllBehaviors[1]);
             dynamic.name = "Dynamic"; dynamic.color = [250, 200, 80];
-            let brownian = this.status.model.addBehavior(AllBehaviors[2]);
+            let brownian = this.status.model.addBehavior(AllBehaviors[1]);
             brownian.name = "Brownian"; brownian.color = [200, 80, 250];
-            let boundary = this.status.model.addBehavior(AllBehaviors[3]);
+            let boundary = this.status.model.addBehavior(AllBehaviors[2]);
             boundary.name = "Boundary"; boundary.color = [80, 200, 250];
-            // boundary.parameter.range = this.status.model.allRangeLabel;
+            boundary.parameter.range = this.status.model.allRangeLabel;
-            group.addBehavior(template);
             group.addBehavior(dynamic);
             group.addBehavior(brownian);
             group.addBehavior(boundary);

source/Panel/BehaviorDetails/BehaviorDetails.tsx

@@ -1,26 +1,19 @@
-import { Component, Fragment, ReactNode} from "react";
+import { Component, ReactNode} from "react";
-import { useSettingWithEvent, IMixinSettingProps } from "@Context/Setting";
 import { useStatusWithEvent, IMixinStatusProps } from "@Context/Status";
-import { Behavior, IBehaviorParameter, isObjectType, isVectorType } from "@Model/Behavior";
+import { Behavior } from "@Model/Behavior";
 import { Message } from "@Component/Message/Message";
 import { AttrInput } from "@Component/AttrInput/AttrInput";
 import { ColorInput } from "@Component/ColorInput/ColorInput";
 import { TogglesInput } from "@Component/TogglesInput/TogglesInput";
 import { ConfirmPopup } from "@Component/ConfirmPopup/ConfirmPopup";
-import { ObjectPicker } from "@Component/ObjectPicker/ObjectPicker";
 import "./BehaviorDetails.scss";
 
 interface IBehaviorDetailsProps {}
 
-@useSettingWithEvent("language")
 @useStatusWithEvent("focusBehaviorChange", "behaviorAttrChange")
-class BehaviorDetails extends Component<IBehaviorDetailsProps & IMixinStatusProps & IMixinSettingProps> {
+class BehaviorDetails extends Component<IBehaviorDetailsProps & IMixinStatusProps> {
-
-	private renderFrom<T extends IBehaviorParameter>
-    (behavior: Behavior<T, Record<string, any>>): ReactNode {
-
-        const allParameterKeys = Object.getOwnPropertyNames(behavior.parameterOption);
 
+	private renderFrom(behavior: Behavior): ReactNode {
 		return <>
         
             <Message i18nKey="Common.Attr.Title.Basic" isTitle first/>
@@ -28,7 +21,7 @@ class BehaviorDetails extends Component<IBehaviorDetailsProps & IMixinStatusProp
             <AttrInput
                 id={behavior.id} keyI18n="Common.Attr.Key.Display.Name" value={behavior.name}
                 valueChange={(val) => {
-                    this.props.status?.changeBehaviorAttrib(behavior.id, "name", val, true);
+                    this.props.status?.changeBehaviorAttrib(behavior.id, "name", val);
                 }}
             />
 
@@ -36,7 +29,7 @@ class BehaviorDetails extends Component<IBehaviorDetailsProps & IMixinStatusProp
                 keyI18n="Common.Attr.Key.Color"
                 value={behavior.color}
                 valueChange={(color) => {
-                    this.props.status?.changeBehaviorAttrib(behavior.id, "color", color, true);
+                    this.props.status?.changeBehaviorAttrib(behavior.id, "color", color);
                 }}
             />
 
@@ -60,132 +53,22 @@ class BehaviorDetails extends Component<IBehaviorDetailsProps & IMixinStatusProp
 				}}
 			/>
 
-            {
-                allParameterKeys.length > 0 ?
             <Message
                 isTitle
                 i18nKey="Panel.Info.Behavior.Details.Behavior.Props"
                 options={{
-                            behavior: behavior.getTerms(behavior.behaviorName, this.props.setting?.language)
+                    behavior: behavior.getTerms(behavior.behaviorName)
                 }}
-                    /> : null
+            />
-            }
-            
-            {
-                allParameterKeys.map((key) => {
-                    return this.renderParameter(behavior, key);
-                })
-            }
 
         </>;
 	}
 
-    private renderParameter<T extends IBehaviorParameter>
-    (behavior: Behavior<T, Record<string, any>>, key: keyof T): ReactNode {
-        const type = behavior.parameterOption[key];
-        const value = behavior.parameter[key];
-        const indexKey = `${behavior.id}-${key}`;
-
-        if (type.type === "number") {
-            return <AttrInput
-                keyI18n="Panel.Info.Behavior.Details.Parameter.Key"
-                keyI18nOption={{ key: behavior.getTerms(type.name, this.props.setting?.language) }}
-                key={indexKey} id={indexKey} isNumber={true} step={type.numberStep} maxLength={type.maxLength}
-                max={type.numberMax} min={type.numberMin}
-                value={(value as number) ?? 0}
-                valueChange={(val) => {
-                    this.props.status?.changeBehaviorAttrib(behavior.id, key as string, (val as any) / 1);
-                }}
-            />
-        }
-
-        if (type.type === "string") {
-            return <AttrInput
-                keyI18n="Panel.Info.Behavior.Details.Parameter.Key"
-                keyI18nOption={{ key: behavior.getTerms(type.name, this.props.setting?.language) }}
-                key={indexKey} id={indexKey} maxLength={type.maxLength}
-                value={(value as string) ?? ""}
-                valueChange={(val) => {
-                    this.props.status?.changeBehaviorAttrib(behavior.id, key as string, val);
-                }}
-            />
-        }
-
-        if (type.type === "boolean") {
-            return <TogglesInput
-                keyI18n="Panel.Info.Behavior.Details.Parameter.Key"
-                keyI18nOption={{ key: behavior.getTerms(type.name, this.props.setting?.language) }}
-				onIconName={type.iconName} key={indexKey} value={(value as boolean) ?? false}
-				valueChange={(val) => {
-					this.props.status?.changeBehaviorAttrib(behavior.id, key as string, val);
-				}}
-			/>
-        }
-
-        if (isObjectType(type.type as any)) {
-            return <ObjectPicker
-                keyI18n="Panel.Info.Behavior.Details.Parameter.Key"
-                keyI18nOption={{ key: behavior.getTerms(type.name, this.props.setting?.language) }}
-                type={type.type} value={(value as any).picker}
-                valueChange={(obj) => {
-                    (value as any).picker = obj;
-                    this.props.status?.changeBehaviorAttrib(behavior.id, key as string, value);
-                }}
-                cleanValue={() => {
-                    (value as any).picker = undefined;
-                    this.props.status?.changeBehaviorAttrib(behavior.id, key as string, value);
-                }}
-            />
-        }
-
-        if (isVectorType(type.type as any)) {
-            return <Fragment key={indexKey}>
-                
-                <AttrInput
-                    keyI18n="Panel.Info.Behavior.Details.Parameter.Key.Vec.X"
-                    keyI18nOption={{ key: behavior.getTerms(type.name, this.props.setting?.language) }}
-                    key={`${indexKey}-X`} id={indexKey} isNumber={true} step={type.numberStep} maxLength={type.maxLength}
-                    max={type.numberMax} min={type.numberMin}
-                    value={(value as number[])[0] ?? 0}
-                    valueChange={(val) => {
-                        (value as number[])[0] = (val as any) / 1;
-                        this.props.status?.changeBehaviorAttrib(behavior.id, key as string, value);
-                    }}
-                />
-
-                <AttrInput
-                    keyI18n="Panel.Info.Behavior.Details.Parameter.Key.Vec.Y"
-                    keyI18nOption={{ key: behavior.getTerms(type.name, this.props.setting?.language) }}
-                    key={`${indexKey}-Y`} id={indexKey} isNumber={true} step={type.numberStep} maxLength={type.maxLength}
-                    max={type.numberMax} min={type.numberMin}
-                    value={(value as number[])[1] ?? 0}
-                    valueChange={(val) => {
-                        (value as number[])[1] = (val as any) / 1;
-                        this.props.status?.changeBehaviorAttrib(behavior.id, key as string, value);
-                    }}
-                />
-
-                <AttrInput
-                    keyI18n="Panel.Info.Behavior.Details.Parameter.Key.Vec.Z"
-                    keyI18nOption={{ key: behavior.getTerms(type.name, this.props.setting?.language) }}
-                    key={`${indexKey}-Z`} id={indexKey} isNumber={true} step={type.numberStep} maxLength={type.maxLength}
-                    max={type.numberMax} min={type.numberMin}
-                    value={(value as number[])[2] ?? 0}
-                    valueChange={(val) => {
-                        (value as number[])[2] = (val as any) / 1;
-                        this.props.status?.changeBehaviorAttrib(behavior.id, key as string, value);
-                    }}
-                />
-
-            </Fragment>
-        }
-
-        return <Fragment key={indexKey}/>
-    }
-
 	public render(): ReactNode {
-		if (this.props.status && this.props.status.focusBehavior) {
+		if (this.props.status) {
+            if (this.props.status.focusBehavior) {
                 return this.renderFrom(this.props.status.focusBehavior);
+            }
         }
 		return <Message i18nKey="Panel.Info.Behavior.Details.Error.Not.Behavior"/>;
 	}