Add combo input into parameter

source/Behavior/BoundaryConstraint.ts

@@ -24,36 +24,8 @@ class BoundaryConstraint extends Behavior<IBoundaryConstraintBehaviorParameter,
     public override category: string = "$Physics";
 
 	public override parameterOption = {
-		range: {
+		range: { type: "LR", name: "$range" },
-			type: "LR",
+		strength: { type: "number", name: "$Strength", defaultValue: 1, numberMin: 0, numberStep: .1 }
-			name: "$range"
-		},
-		strength: {
-			type: "number",
-			name: "$Strength",
-			defaultValue: 1,
-            numberMin: 0,
-            numberStep: .1
-		}
-	};
-
-    public override terms: Record<string, Record<string, string>> = {
-        "$Title": {
-            "ZH_CN": "边界约束",
-            "EN_US": "Boundary constraint"
-        },
-		"$range": {
-			"ZH_CN": "约束范围",
-			"EN_US": "Constraint range"
-		},
-		"$Strength": {
-			"ZH_CN": "约束强度系数",
-			"EN_US": "Restraint strength coefficient"
-		},
-        "$Intro": {
-            "ZH_CN": "个体越出边界后将主动返回",
-            "EN_US": "Individuals will return actively after crossing the border"
-        }
 	};
 
     public effect(individual: Individual, group: Group, model: Model, t: number): void {
@@ -99,6 +71,25 @@ class BoundaryConstraint extends Behavior<IBoundaryConstraintBehaviorParameter,
 			fz * this.parameter.strength
 		);
     }
+
+	public override terms: Record<string, Record<string, string>> = {
+        "$Title": {
+            "ZH_CN": "边界约束",
+            "EN_US": "Boundary constraint"
+        },
+		"$range": {
+			"ZH_CN": "约束范围",
+			"EN_US": "Constraint range"
+		},
+		"$Strength": {
+			"ZH_CN": "约束强度系数",
+			"EN_US": "Restraint strength coefficient"
+		},
+        "$Intro": {
+            "ZH_CN": "个体越出边界后将主动返回",
+            "EN_US": "Individuals will return actively after crossing the border"
+        }
+    };
 }
 
 export { BoundaryConstraint };

source/Behavior/Brownian.ts

@@ -25,36 +25,35 @@ class Brownian extends Behavior<IBrownianBehaviorParameter, IBrownianBehaviorEve
 	public override category: string = "$Physics";
 
 	public override parameterOption = {
-		maxFrequency: {
+		maxFrequency: { type: "number", name: "$Max.Frequency", defaultValue: 5, numberStep: .1, numberMin: 0 },
-			type: "number",
+		minFrequency: { type: "number", name: "$Min.Frequency", defaultValue: 0, numberStep: .1, numberMin: 0 },
-			name: "$Max.Frequency",
+		maxStrength: { type: "number", name: "$Max.Strength", defaultValue: 10, numberStep: .01, numberMin: 0 },
-			defaultValue: 5,
+		minStrength: { type: "number", name: "$Min.Strength", defaultValue: 0, numberStep: .01, numberMin: 0 }
-			numberStep: .1,
-			numberMin: 0
-		},
-		minFrequency: {
-			type: "number",
-			name: "$Min.Frequency",
-			defaultValue: 0,
-			numberStep: .1,
-			numberMin: 0
-		},
-		maxStrength: {
-			type: "number",
-			name: "$Max.Strength",
-			defaultValue: 10,
-			numberStep: .01,
-			numberMin: 0
-		},
-		minStrength: {
-			type: "number",
-			name: "$Min.Strength",
-			defaultValue: 0,
-			numberStep: .01,
-			numberMin: 0
-		}
 	};
 
+	public effect(individual: Individual, group: Group, model: Model, t: number): void {
+
+		const {maxFrequency, minFrequency, maxStrength, minStrength} = this.parameter;
+
+		let nextTime = individual.getData("Brownian.nextTime") ?? 
+		minFrequency +  Math.random() * (maxFrequency - minFrequency);
+		let currentTime = individual.getData("Brownian.currentTime") ?? 0;
+		
+		currentTime += t;
+		if (currentTime > nextTime) {
+			individual.applyForce(
+				minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength),
+				minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength),
+				minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength)
+			);
+			nextTime = minFrequency +  Math.random() * (maxFrequency - minFrequency);
+			currentTime = 0;
+		}
+
+		individual.setData("Brownian.nextTime", nextTime);
+		individual.setData("Brownian.currentTime", currentTime);
+	}
+
 	public override terms: Record<string, Record<string, string>> = {
         "$Title": {
             "ZH_CN": "布朗运动",
@@ -81,29 +80,6 @@ class Brownian extends Behavior<IBrownianBehaviorParameter, IBrownianBehaviorEve
             "EN_US": "Minimum strength"
         }
     };
-
-	public effect(individual: Individual, group: Group, model: Model, t: number): void {
-
-		const {maxFrequency, minFrequency, maxStrength, minStrength} = this.parameter;
-
-		let nextTime = individual.getData("Brownian.nextTime") ?? 
-		minFrequency +  Math.random() * (maxFrequency - minFrequency);
-		let currentTime = individual.getData("Brownian.currentTime") ?? 0;
-		
-		currentTime += t;
-		if (currentTime > nextTime) {
-			individual.applyForce(
-				minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength),
-				minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength),
-				minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength)
-			);
-			nextTime = minFrequency +  Math.random() * (maxFrequency - minFrequency);
-			currentTime = 0;
-		}
-
-		individual.setData("Brownian.nextTime", nextTime);
-		individual.setData("Brownian.currentTime", currentTime);
-	}
 }
 
 export { Brownian };

source/Behavior/Dynamics.ts

@@ -25,65 +25,10 @@ class Dynamics extends Behavior<IDynamicsBehaviorParameter, IDynamicsBehaviorEve
 	public override category: string = "$Physics";
 
 	public override parameterOption = {
-		mass: {
+		mass: { name: "$Mass", type: "number", defaultValue: 1, numberStep: .01, numberMin: .001 },
-			name: "$Mass",
+		maxAcceleration: { name: "$Max.Acceleration", type: "number", defaultValue: 5, numberStep: .1, numberMin: 0 },
-			type: "number",
+		maxVelocity: { name: "$Max.Velocity", type: "number", defaultValue: 10, numberStep: .1, numberMin: 0 },
-			defaultValue: 1,
+		resistance: { name: "$Resistance", type: "number", defaultValue: 0.5, numberStep: .1, numberMin: 0 }
-			numberStep: .01,
-			numberMin: .001
-		},
-		maxAcceleration: {
-			name: "$Max.Acceleration",
-			type: "number",
-			defaultValue: 5,
-			numberStep: .1,
-			numberMin: 0
-		},
-		maxVelocity: {
-			name: "$Max.Velocity",
-			type: "number",
-			defaultValue: 10,
-			numberStep: .1,
-			numberMin: 0
-		},
-		resistance: {
-			name: "$Resistance",
-			type: "number",
-			defaultValue: 0.5,
-			numberStep: .1,
-			numberMin: 0
-		}
-	};
-
-    public override terms: Record<string, Record<string, string>> = {
-        "$Title": {
-            "ZH_CN": "动力学",
-            "EN_US": "Dynamics"
-        },
-        "$Intro": {
-            "ZH_CN": "一切可以运动物体的必要行为，执行物理法则。",
-            "EN_US": "All necessary behaviors that can move objects and implement the laws of physics."
-        },
-		"$Mass": {
-			"ZH_CN": "质量 (Kg)",
-            "EN_US": "Mass (Kg)"
-		},
-		"$Max.Acceleration": {
-			"ZH_CN": "最大加速度 (m/s²)",
-            "EN_US": "Maximum acceleration (m/s²)"
-		},
-		"$Max.Velocity": {
-			"ZH_CN": "最大速度 (m/s)",
-            "EN_US": "Maximum velocity (m/s)"
-		},
-		"$Resistance": {
-			"ZH_CN": "阻力系数",
-			"EN_US": "Resistance coefficient"
-		},
-		"$Physics": {
-			"ZH_CN": "物理",
-            "EN_US": "Physics"
-		}
 	};
 
 	public override finalEffect(individual: Individual, group: Group, model: Model, t: number): void {
@@ -139,6 +84,37 @@ class Dynamics extends Behavior<IDynamicsBehaviorParameter, IDynamicsBehaviorEve
 		individual.force[1] = 0;
 		individual.force[2] = 0;
 	};
+	
+    public override terms: Record<string, Record<string, string>> = {
+        "$Title": {
+            "ZH_CN": "动力学",
+            "EN_US": "Dynamics"
+        },
+        "$Intro": {
+            "ZH_CN": "一切可以运动物体的必要行为，执行物理法则。",
+            "EN_US": "All necessary behaviors that can move objects and implement the laws of physics."
+        },
+		"$Mass": {
+			"ZH_CN": "质量 (Kg)",
+            "EN_US": "Mass (Kg)"
+		},
+		"$Max.Acceleration": {
+			"ZH_CN": "最大加速度 (m/s²)",
+            "EN_US": "Maximum acceleration (m/s²)"
+		},
+		"$Max.Velocity": {
+			"ZH_CN": "最大速度 (m/s)",
+            "EN_US": "Maximum velocity (m/s)"
+		},
+		"$Resistance": {
+			"ZH_CN": "阻力系数",
+			"EN_US": "Resistance coefficient"
+		},
+		"$Physics": {
+			"ZH_CN": "物理",
+            "EN_US": "Physics"
+		}
+    };
 }
 
 export { Dynamics };

source/Behavior/Template.ts

@@ -31,62 +31,24 @@ class Template extends Behavior<ITemplateBehaviorParameter, ITemplateBehaviorEve
     public override category: string = "$Category";
 
     public override parameterOption = {
-        testNumber: {
+        testNumber: { name: "$Test", type: "number", defaultValue: 1, numberMax: 10, numberMin: 0, numberStep: 1 },
-            name: "$Test",
+        testString: { name: "$Test", type: "string", defaultValue: "default", maxLength: 12 },
-            type: "number",
+        testColor: { name: "$Test", type: "color", defaultValue: [.5, .1, 1], colorNormal: true },
-            defaultValue: 1,
+        testOption: { name: "$Test", type: "option", defaultValue: "T", allOption: [
-            numberMax: 10,
+            { key: "P", name: "$Test"}, { key: "T", name: "$Title"}
-            numberMin: 0,
+        ]},
-            numberStep: 1
+        testBoolean: { name: "$Test", type: "boolean", defaultValue: false, iconName: "Send" },
-        },
+        testR: { name: "$Test", type: "R" },
-        testString: {
+        testG: { name: "$Test", type: "G" },
-            name: "$Test",
+        testLR: { name: "$Test", type: "LR" },
-            type: "string",
+        testLG: { name: "$Test", type: "LG" },
-            defaultValue: "default",
+        testVec: { name: "$Test", type: "vec", defaultValue: [1, 2, 3], numberMax: 10, numberMin: 0, numberStep: 1 }
-            maxLength: 12
-        },
-        testColor: {
-            name: "$Test",
-            type: "color",
-            defaultValue: [.5, .1, 1],
-            colorNormal: true
-        },
-        testOption: {
-            name: "$Test",
-            type: "option"
-        },
-        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 effect(individual: Individual, group: Group, model: Model, t: number): void {
+        
+    }
+
     public override terms: Record<string, Record<string, string>> = {
         "$Title": {
             "ZH_CN": "行为",
@@ -99,12 +61,12 @@ class Template extends Behavior<ITemplateBehaviorParameter, ITemplateBehaviorEve
         "$Test": {
             "ZH_CN": "测试参数",
             "EN_US": "Test Parameter"
+        },
+        "$Category": {
+            "ZH_CN": "测序模板",
+            "EN_US": "Test template"
         }
     };
-
-    public effect(individual: Individual, group: Group, model: Model, t: number): void {
-        
-    }
 }
 
 export { Template };

source/Input/ComboInput/ComboInput.tsx

@@ -63,7 +63,7 @@ class ComboInput extends Component<IComboInputProps, IComboInputState> {
                     {
                         this.props.value ? 
                             <Localization i18nKey={this.props.value.i18n} options={this.props.value.i18nOption}/> :
-                            null
+                            <Localization i18nKey="Input.Error.Combo"/>
                     }
                 </div>
                 <div className="list-button">

source/Input/Parameter/Parameter.tsx

@@ -4,9 +4,10 @@ import { AttrInput } from "@Input/AttrInput/AttrInput";
 import { ObjectID } from "@Model/Renderer";
 import { TogglesInput } from "@Input/TogglesInput/TogglesInput";
 import { ObjectPicker } from "@Input/ObjectPicker/ObjectPicker";
-import { AllI18nKeys } from "@Component/Localization/Localization";
+import { AllI18nKeys, I18N } from "@Component/Localization/Localization";
 import { Message } from "@Input/Message/Message";
 import { ColorInput } from "@Input/ColorInput/ColorInput";
+import { ComboInput, IDisplayItem } from "@Input/ComboInput/ComboInput";
 import {
     IParameter, IParameterOption, IParameterOptionItem,
     IParameterValue, IParamValue, isObjectType, isVectorType
@@ -18,7 +19,7 @@ interface IParameterProps<P extends IParameter = {}> {
     value: IParameterValue<P>;
     key: ObjectID;
     change: <K extends keyof P>(key: K, val: IParamValue<P[K]>) => any;
-    i18n: <K extends keyof P>(option: IParameterOptionItem<P[K]>, language: Language) => string;
+    i18n?: (key: string, language: Language) => string;
     title?: AllI18nKeys;
     titleOption?: Record<string, string>;
     isFirst?: boolean;
@@ -30,16 +31,29 @@ class Parameter<P extends IParameter> extends Component<IParameterProps<P> & IMi
     private renderParameter<K extends keyof P>
     (key: K, option: IParameterOptionItem<P[K]>, value: IParamValue<P[K]>): ReactNode {
 
+        const language = this.props.setting?.language ?? "EN_US";
         const indexKey = `${this.props.key}-${key}`;
         const type = option.type;
-        const i18nString = this.props.i18n(option, this.props.setting?.language ?? "EN_US");
+        let keyI18n: string, keyI18nOption: Record<string, string> | undefined;
+
+        // Custom I18N
+        if (this.props.i18n) {
+            keyI18n = "Panel.Info.Behavior.Details.Parameter.Key";
+            keyI18nOption = {
+                key: this.props.i18n(option.name, language)
+            };
+        }
+        
+        else {
+            keyI18n = option.name;
+        }
 
         if (type === "number") {
             return <AttrInput
                 key={indexKey}
                 id={indexKey}
-                keyI18n="Panel.Info.Behavior.Details.Parameter.Key"
+                keyI18n={keyI18n}
-                keyI18nOption={{ key: i18nString }}
+                keyI18nOption={keyI18nOption}
                 isNumber={true}
                 step={option.numberStep}
                 maxLength={option.maxLength}
@@ -56,8 +70,8 @@ class Parameter<P extends IParameter> extends Component<IParameterProps<P> & IMi
             return <AttrInput
                 key={indexKey}
                 id={indexKey}
-                keyI18n="Panel.Info.Behavior.Details.Parameter.Key"
+                keyI18n={keyI18n}
-                keyI18nOption={{ key: i18nString }}
+                keyI18nOption={keyI18nOption}
                 maxLength={option.maxLength}
                 value={value as IParamValue<"string"> ?? ""}
                 valueChange={(val) => {
@@ -69,8 +83,8 @@ class Parameter<P extends IParameter> extends Component<IParameterProps<P> & IMi
         else if (type === "boolean") {
             return <TogglesInput
                 key={indexKey}
-                keyI18n="Panel.Info.Behavior.Details.Parameter.Key"
+                keyI18n={keyI18n}
-                keyI18nOption={{ key: i18nString }}
+                keyI18nOption={keyI18nOption}
 				onIconName={option.iconName}
                 red={option.iconRed}
                 value={value as IParamValue<"boolean"> ?? false}
@@ -87,8 +101,8 @@ class Parameter<P extends IParameter> extends Component<IParameterProps<P> & IMi
 
             return <ObjectPicker
                 key={indexKey}
-                keyI18n="Panel.Info.Behavior.Details.Parameter.Key"
+                keyI18n={keyI18n}
-                keyI18nOption={{ key: i18nString }}
+                keyI18nOption={keyI18nOption}
                 type={type}
                 value={typedValue.picker}
                 valueChange={(obj) => {
@@ -106,8 +120,8 @@ class Parameter<P extends IParameter> extends Component<IParameterProps<P> & IMi
 
             return <ColorInput
                 key={indexKey}
-                keyI18n="Panel.Info.Behavior.Details.Parameter.Key"
+                keyI18n={keyI18n}
-                keyI18nOption={{ key: i18nString }}
+                keyI18nOption={keyI18nOption}
                 normal={option.colorNormal}
                 value={value as IParamValue<"color"> ?? false}
                 valueChange={(val) => {
@@ -116,10 +130,52 @@ class Parameter<P extends IParameter> extends Component<IParameterProps<P> & IMi
             />
         }
 
+        else if (type === "option") {
+
+            let allOption: IDisplayItem[] = [];
+            let focusKey: number = -1;
+
+            if (option.allOption) {
+                for (let i = 0; i < option.allOption.length; i++) {
+
+                    if (this.props.i18n) {
+                        allOption.push({
+                            i18nOption: { key: this.props.i18n(option.allOption[i].name, language) },
+                            i18n: "Panel.Info.Behavior.Details.Parameter.Key",
+                            key: option.allOption[i].key
+                        })
+                    }
+                    
+                    else {
+                        allOption.push({
+                            i18n: option.allOption[i].name,
+                            key: option.allOption[i].key
+                        })
+                    }
+
+                    if (option.allOption[i].key === value) {
+                        focusKey = i;
+                    }
+                }
+            }
+
+            return <ComboInput
+                key={indexKey}
+                keyI18n={keyI18n}
+                keyI18nOption={keyI18nOption}
+                allOption={allOption}
+                value={allOption[focusKey]}
+                valueChange={(val) => {
+                    this.props.change(key, val.key as IParamValue<P[K]>);
+                }}
+            />
+        }
+
         else if (type === "vec") {
 
             type IObjectParamValue = IParamValue<"vec">;
             const typedValue = value as IObjectParamValue;
+            const i18nVal = I18N(this.props, keyI18n, keyI18nOption);
             
             return <Fragment key={indexKey}>
                 
@@ -127,7 +183,7 @@ class Parameter<P extends IParameter> extends Component<IParameterProps<P> & IMi
                     key={`${indexKey}-X`}
                     id={indexKey}
                     keyI18n="Panel.Info.Behavior.Details.Parameter.Key.Vec.X"
-                    keyI18nOption={{ key: i18nString }}
+                    keyI18nOption={{ key: i18nVal }}
                     isNumber={true}
                     step={option.numberStep}
                     maxLength={option.maxLength}
@@ -144,7 +200,7 @@ class Parameter<P extends IParameter> extends Component<IParameterProps<P> & IMi
                     key={`${indexKey}-Y`}
                     id={indexKey}
                     keyI18n="Panel.Info.Behavior.Details.Parameter.Key.Vec.Y"
-                    keyI18nOption={{ key: i18nString }}
+                    keyI18nOption={{ key: i18nVal }}
                     isNumber={true}
                     step={option.numberStep}
                     maxLength={option.maxLength}
@@ -161,7 +217,7 @@ class Parameter<P extends IParameter> extends Component<IParameterProps<P> & IMi
                     key={`${indexKey}-Z`}
                     id={indexKey}
                     keyI18n="Panel.Info.Behavior.Details.Parameter.Key.Vec.Z"
-                    keyI18nOption={{ key: i18nString }}
+                    keyI18nOption={{ key: i18nVal }}
                     isNumber={true}
                     step={option.numberStep}
                     maxLength={option.maxLength}

source/Localization/EN-US.ts

@@ -25,6 +25,7 @@ const EN_US = {
     "Input.Error.Length": "The length of the input content must be less than {num}",
     "Input.Error.Length.Less": "The length of the input content must be greater than {num}",
     "Input.Error.Select": "Select object ...",
+    "Input.Error.Combo": "Select options ...",
     "Object.List.New.Group": "Group object {id}",
     "Object.List.New.Range": "Range object {id}",
     "Object.List.New.Label": "Label {id}",

source/Localization/ZH-CN.ts

@@ -25,6 +25,7 @@ const ZH_CN = {
     "Input.Error.Length": "输入内容长度须小于 {number}",
     "Input.Error.Length.Less": "输入内容长度须大于 {number}",
     "Input.Error.Select": "选择对象 ...",
+    "Input.Error.Combo": "选择选项 ...",
     "Object.List.New.Group": "群对象 {id}",
     "Object.List.New.Range": "范围对象 {id}",
     "Object.List.New.Label": "标签 {id}",

source/Model/Parameter.ts

@@ -116,7 +116,7 @@ interface IParameterOptionItem<T extends IParamType = IParamType> {
     /**
      * 全部选项
      */
-    allOption?: string[];
+    allOption?: Array<{key: string, name: string}>;
 }
 
 interface IParameter {

source/Panel/BehaviorDetails/BehaviorDetails.tsx

@@ -65,7 +65,7 @@ class BehaviorDetails extends Component<IBehaviorDetailsProps & IMixinStatusProp
                 key={behavior.id}
                 option={behavior.parameterOption}
                 value={behavior.parameter}
-                i18n={(option, language) => behavior.getTerms(option.name, language)}
+                i18n={(name, language) => behavior.getTerms(name, language)}
                 title={"Panel.Info.Behavior.Details.Behavior.Props"}
                 titleOption={{
                     behavior: behavior.getTerms(behavior.behaviorName, this.props.setting?.language)