source/Component/BehaviorList/BehaviorList.tsx

@@ -112,7 +112,7 @@ class BehaviorList extends Component<IBehaviorListProps & IMixinSettingProps & I
 		if (behavior instanceof Behavior) {
 			id = behavior.id;
 			name = behavior.name;
-			color = `rgb(${behavior.color.join(",")})`;
+			color = behavior.color;
 			needLocal = false;
             info = behavior.behaviorName;
 		}

source/Component/BehaviorPicker/BehaviorPicker.tsx

@@ -62,7 +62,7 @@ class BehaviorPicker extends Component<IBehaviorPickerProps & IMixinSettingProps
 
             return <>
                 <div className="behavior-picker-line-color-view">
-                    <div style={{ borderLeft: `10px solid rgb(${behavior.color.join(",")})` }}/>
+                    <div style={{ borderLeft: `10px solid ${behavior.color}` }}/>
                 </div>
                 <div
                     className="behavior-picker-line-icon-view"

source/Component/BehaviorPopup/BehaviorPopup.tsx

@@ -123,7 +123,8 @@ class BehaviorPopupComponent extends Component<
                 ) + " " + (recorder.nameIndex - 1).toString();
 
                 // 赋予一个随机颜色
-                newBehavior.color = randomColor(true);
+                let color = randomColor(true);
+                newBehavior.color = `rgb(${color[0]},${color[1]},${color[2]})`;
             }
         });
         this.props.onDismiss ? this.props.onDismiss() : undefined;

source/Context/Status.tsx

@@ -11,7 +11,7 @@ import { Setting } from "./Setting";
 import { I18N } from "@Component/Localization/Localization";
 import { superConnectWithEvent, superConnect } from "./Context";
 import { PopupController } from "./Popups";
-import { Behavior, IBehaviorParameter, IParamValue } from "@Model/Behavior";
+import { Behavior } from "@Model/Behavior";
 import { Actuator } from "@Model/Actuator";
 
 function randomColor(unNormal: boolean = false) {
@@ -43,7 +43,6 @@ interface IStatusEvent {
     rangeAttrChange: void;
     labelAttrChange: void;
     groupAttrChange: void;
-    behaviorAttrChange: void;
     individualChange: void;
     behaviorChange: void;
     popupChange: void;
@@ -194,24 +193,6 @@ 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]>) {
-        const behavior = this.model.getBehaviorById(id);
-        if (behavior) {
-            if (key === "color") {
-                behavior.color = val as number[];
-            } else if (key === "name") {
-                behavior.name = val as string;
-            } else {
-                behavior.parameter[key] = val;
-            }
-            this.emit("behaviorAttrChange");
-        }
-    }
-
     public addGroupBehavior(id: ObjectID, val: Behavior) {
         const group = this.model.getObjectById(id);
         if (group && group instanceof Group) {

source/Model/Behavior.ts

@@ -295,7 +295,7 @@ class Behavior<
     /**
      * 颜色
      */
-    public color: number[] = [0, 0, 0];
+    public color: string = "";
 
     /**
      * 优先级
@@ -397,7 +397,7 @@ class Behavior<
 type IRenderBehavior = BehaviorInfo | Behavior;
 
 export {
-    Behavior, BehaviorRecorder, IBehaviorParameterOption, IBehaviorParameterOptionItem, IParamValue,
+    Behavior, BehaviorRecorder, IBehaviorParameterOption, IBehaviorParameterOptionItem,
-    IAnyBehavior, IAnyBehaviorRecorder, BehaviorInfo, IRenderBehavior, IBehaviorParameter
+    IAnyBehavior, IAnyBehaviorRecorder, BehaviorInfo, IRenderBehavior
 };
 export default { Behavior };

source/Page/SimulatorWeb/SimulatorWeb.tsx

@@ -56,11 +56,11 @@ class SimulatorWeb extends Component {
             this.status.newLabel().name = "New Label";
             this.status.newLabel().name = "Test Label 01";
             let dynamic = this.status.model.addBehavior(AllBehaviors[0]);
-            dynamic.name = "Dynamic"; dynamic.color = [250, 200, 80];
+            dynamic.name = "Dynamic"; dynamic.color = "rgb(250, 200, 80)";
             let brownian = this.status.model.addBehavior(AllBehaviors[1]);
-            brownian.name = "Brownian"; brownian.color = [200, 80, 250];
+            brownian.name = "Brownian"; brownian.color = "rgb(200, 80, 250)";
             let boundary = this.status.model.addBehavior(AllBehaviors[2]);
-            boundary.name = "Boundary"; boundary.color = [80, 200, 250];
+            boundary.name = "Boundary"; boundary.color = "rgb(80, 200, 250)";
             boundary.parameter.range = this.status.model.allRangeLabel;
             group.addBehavior(dynamic);
             group.addBehavior(brownian);

source/Panel/BehaviorDetails/BehaviorDetails.tsx

@@ -2,36 +2,15 @@ import { Component, ReactNode} from "react";
 import { useStatusWithEvent, IMixinStatusProps } from "@Context/Status";
 import { Behavior } from "@Model/Behavior";
 import { Message } from "@Component/Message/Message";
-import { AttrInput } from "@Component/AttrInput/AttrInput";
-import { ColorInput } from "@Component/ColorInput/ColorInput";
 import "./BehaviorDetails.scss";
 
 interface IBehaviorDetailsProps {}
 
-@useStatusWithEvent("focusBehaviorChange", "behaviorAttrChange")
+@useStatusWithEvent("focusBehaviorChange")
 class BehaviorDetails extends Component<IBehaviorDetailsProps & IMixinStatusProps> {
 
 	private renderFrom(behavior: Behavior): ReactNode {
-		return <>
+		return <></>;
-        
-            <Message i18nKey="Common.Attr.Title.Basic" isTitle first/>
-
-            <AttrInput
-                id={behavior.id} keyI18n="Common.Attr.Key.Display.Name" value={behavior.name}
-                valueChange={(val) => {
-                    this.props.status?.changeBehaviorAttrib(behavior.id, "name", val);
-                }}
-            />
-
-            <ColorInput
-                keyI18n="Common.Attr.Key.Color"
-                value={behavior.color}
-                valueChange={(color) => {
-                    this.props.status?.changeBehaviorAttrib(behavior.id, "color", color);
-                }}
-            />
-
-        </>;
 	}
 
 	public render(): ReactNode {

source/Panel/BehaviorList/BehaviorList.tsx

@@ -13,7 +13,7 @@ interface IBehaviorListProps {
 }
 
 @useSetting
-@useStatusWithEvent("behaviorChange", "focusBehaviorChange", "behaviorAttrChange")
+@useStatusWithEvent("behaviorChange", "focusBehaviorChange")
 class BehaviorList extends Component<IBehaviorListProps & IMixinStatusProps & IMixinSettingProps> {
     
     private labelInnerClick: boolean = false;
@@ -45,9 +45,9 @@ class BehaviorList extends Component<IBehaviorListProps & IMixinStatusProps & IM
                     if (this.props.status) {
                         this.props.status.setBehaviorObject(behavior as Behavior);
                     }
-                    if (this.props.setting) {
+                    // if (this.props.setting) {
-                        this.props.setting.layout.focus("BehaviorDetails");
+                    //     this.props.setting.layout.focus("LabelDetails");
-                    }
+                    // }
                     this.labelInnerClick = true;
                 }}
                 onAdd={() => {

source/Panel/GroupDetails/GroupDetails.tsx

@@ -1,7 +1,6 @@
 import { Component, ReactNode } from "react";
 import { AttrInput } from "@Component/AttrInput/AttrInput";
-import { useStatusWithEvent, IMixinStatusProps } from "@Context/Status";
+import { useStatusWithEvent, IMixinStatusProps, Status } from "@Context/Status";
-import { useSetting, IMixinSettingProps } from "@Context/Setting";
 import { Message } from "@Component/Message/Message";
 import { ObjectID } from "@Model/Renderer";
 import { ColorInput } from "@Component/ColorInput/ColorInput";
@@ -26,13 +25,11 @@ const allOption: IDisplayItem[] = [
     {nameKey: "Common.Attr.Key.Generation.Mod.Range", key: GenMod.Range}
 ];
 
-@useSetting
 @useStatusWithEvent(
     "groupAttrChange", "groupLabelChange", "focusObjectChange",
-    "focusBehaviorChange", "behaviorChange", "groupBehaviorChange",
+    "focusBehaviorChange", "behaviorChange", "groupBehaviorChange"
-    "behaviorAttrChange"
 )
-class GroupDetails extends Component<IGroupDetailsProps & IMixinStatusProps & IMixinSettingProps> {
+class GroupDetails extends Component<IGroupDetailsProps & IMixinStatusProps> {
 
 	private renderFrom(group: Group) {
 		return <>
@@ -125,9 +122,6 @@ class GroupDetails extends Component<IGroupDetailsProps & IMixinStatusProps & IM
                 }}
                 action={(behavior) => {
                     this.props.status?.setBehaviorObject(behavior);
-                    setTimeout(() => {
-                        this.props.setting?.layout.focus("BehaviorDetails");
-                    });
                 }}
                 delete={(behavior) => {
                     this.props.status?.deleteGroupBehavior(group.id, behavior);

source/Panel/ObjectList/ObjectList.scss

@@ -20,19 +20,16 @@ div.object-list {
             opacity: 0;
         }
 
+        i.checkbox-icon:hover {
+            color: $lt-green;
+        }
+
         i.type-icon {
             display: inline-block;
             opacity: 1;
         }
     }
 
-    div.object-list-checkbox:hover {
-
-        i.checkbox-icon {
-            color: $lt-green !important;
-        }
-    }
-
     div.details-list-item:hover {
 
         div.object-list-checkbox {

source/Panel/ObjectList/ObjectList.tsx

@@ -51,6 +51,9 @@ class ObjectList extends Component<IMixinStatusProps & IMixinSettingProps> {
                 }
             }}
             checkBox={(item) => {
+                if (this.props.setting) {
+                    this.props.setting.layout.focus("ObjectList");
+                }
                 if (this.props.status) {
                     if (
                         this.props.status.focusObject.has(item.key.toString()) ||