Add behavior picker component & Fix fps bug search with lower case & Remove behavior list animate #32
@ -20,20 +20,65 @@ div.behavior-list {
|
||||
width: 100%;
|
||||
|
||||
div {
|
||||
// position: relative;
|
||||
// top: 5px;
|
||||
// left: 5px;
|
||||
width: 0;
|
||||
height: 0;
|
||||
// border-left: 8px solid red;
|
||||
border-bottom: 12px solid transparent;
|
||||
// border-radius: 8px;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
}
|
||||
}
|
||||
|
||||
div.behavior-item-root {
|
||||
display: flex;
|
||||
|
||||
div.behavior-popup-menu {
|
||||
width: 0;
|
||||
max-width: 0;
|
||||
height: $behavior-item-height;
|
||||
min-height: $behavior-item-height;
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
|
||||
div.behavior-popup-layout {
|
||||
width: 0;
|
||||
opacity: 0;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
div.behavior-popup-action-view {
|
||||
height: 15px;
|
||||
min-height: 26px;
|
||||
max-height: 26px;
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
div.behavior-action-button {
|
||||
height: 100%;
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-content: center;
|
||||
align-items: center;
|
||||
padding: 0 2px;
|
||||
}
|
||||
|
||||
div.behavior-action-button.hover-red:hover i {
|
||||
color: $lt-red;
|
||||
}
|
||||
|
||||
div.behavior-action-button.hover-blue:hover i {
|
||||
color: $lt-green;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
div.behavior-icon-view {
|
||||
height: $behavior-item-height;
|
||||
min-width: $behavior-item-height;
|
||||
@ -73,38 +118,16 @@ div.behavior-list {
|
||||
opacity: .75;
|
||||
}
|
||||
}
|
||||
|
||||
div.behavior-action-view {
|
||||
height: $behavior-item-height;
|
||||
min-width: 20px;
|
||||
width: 20px;
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-content: center;
|
||||
align-items: center;
|
||||
|
||||
div.behavior-action-button {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
user-select: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
div.behavior-action-button.hover-red:hover i {
|
||||
color: $lt-red;
|
||||
}
|
||||
|
||||
div.behavior-action-button.hover-blue:hover i {
|
||||
color: $lt-blue;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
div.behavior-item:hover {
|
||||
|
||||
div.behavior-popup-menu div.behavior-popup-layout {
|
||||
width: $behavior-item-height !important;
|
||||
opacity: 1 !important;
|
||||
}
|
||||
}
|
||||
|
||||
div.add-button {
|
||||
width: 26px;
|
||||
@ -124,11 +147,19 @@ div.dark.behavior-list {
|
||||
div.behavior-item:hover {
|
||||
color: $lt-font-color-lvl2-dark;
|
||||
background-color: $lt-bg-color-lvl2-dark;
|
||||
|
||||
div.behavior-popup-menu div.behavior-popup-layout {
|
||||
background-color: $lt-bg-color-lvl2-dark;
|
||||
}
|
||||
}
|
||||
|
||||
div.behavior-item.focus {
|
||||
color: $lt-font-color-lvl1-dark;
|
||||
background-color: $lt-bg-color-lvl1-dark;
|
||||
|
||||
div.behavior-popup-menu div.behavior-popup-layout {
|
||||
background-color: $lt-bg-color-lvl1-dark;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -141,10 +172,18 @@ div.light.behavior-list {
|
||||
div.behavior-item:hover {
|
||||
color: $lt-font-color-lvl2-light;
|
||||
background-color: $lt-bg-color-lvl2-light;
|
||||
|
||||
div.behavior-popup-menu div.behavior-popup-layout {
|
||||
background-color: $lt-bg-color-lvl2-light;
|
||||
}
|
||||
}
|
||||
|
||||
div.behavior-item.focus {
|
||||
color: $lt-font-color-lvl1-light;
|
||||
background-color: $lt-bg-color-lvl1-light;
|
||||
|
||||
div.behavior-popup-menu div.behavior-popup-layout {
|
||||
background-color: $lt-bg-color-lvl1-light;
|
||||
}
|
||||
}
|
||||
}
|
@ -2,20 +2,23 @@ import { Theme } from "@Component/Theme/Theme";
|
||||
import { Component, ReactNode } from "react";
|
||||
import { IRenderBehavior, Behavior, BehaviorRecorder } from "@Model/Behavior";
|
||||
import { useSettingWithEvent, IMixinSettingProps } from "@Context/Setting";
|
||||
import { useStatus, IMixinStatusProps } from "@Context/Status";
|
||||
import { Icon } from "@fluentui/react";
|
||||
import { ConfirmPopup } from "@Component/ConfirmPopup/ConfirmPopup";
|
||||
import { Message } from "@Component/Message/Message";
|
||||
import "./BehaviorList.scss";
|
||||
|
||||
interface IBehaviorListProps {
|
||||
behaviors: IRenderBehavior[];
|
||||
focusBehaviors?: IRenderBehavior[];
|
||||
click?: (behavior: IRenderBehavior) => void;
|
||||
action?: (behavior: IRenderBehavior) => void;
|
||||
delete?: (behavior: IRenderBehavior) => void;
|
||||
onAdd?: () => void;
|
||||
actionType?: "info" | "delete";
|
||||
}
|
||||
|
||||
@useStatus
|
||||
@useSettingWithEvent("language")
|
||||
class BehaviorList extends Component<IBehaviorListProps & IMixinSettingProps> {
|
||||
class BehaviorList extends Component<IBehaviorListProps & IMixinSettingProps & IMixinStatusProps> {
|
||||
|
||||
private isFocus(behavior: IRenderBehavior): boolean {
|
||||
if (this.props.focusBehaviors) {
|
||||
@ -28,32 +31,55 @@ class BehaviorList extends Component<IBehaviorListProps & IMixinSettingProps> {
|
||||
return false;
|
||||
}
|
||||
|
||||
private renderActionButton(behavior: IRenderBehavior) {
|
||||
private renderActionButton(behavior: IRenderBehavior, actionType: "info" | "delete") {
|
||||
|
||||
const classList: string[] = ["info-button", "behavior-action-button"];
|
||||
let iconName = "Info";
|
||||
let action: () => void = () => {};
|
||||
|
||||
switch (this.props.actionType) {
|
||||
switch (actionType) {
|
||||
case "delete":
|
||||
classList.push("hover-red");
|
||||
iconName = "Delete";
|
||||
action = () => {
|
||||
this.isActionClick = true;
|
||||
if (this.props.delete) {
|
||||
this.props.delete(behavior)
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case "info":
|
||||
classList.push("hover-blue");
|
||||
iconName = "Info";
|
||||
action = () => {
|
||||
this.isActionClick = true;
|
||||
if (!this.props.status) {
|
||||
return;
|
||||
}
|
||||
const status = this.props.status;
|
||||
status.popup.showPopup(ConfirmPopup, {
|
||||
renderInfo: () => {
|
||||
return <Message
|
||||
text={behavior.getTerms(behavior.describe, this.props.setting?.language)}
|
||||
/>
|
||||
},
|
||||
titleI18N: "Popup.Behavior.Info.Title",
|
||||
yesI18n: "Popup.Behavior.Info.Confirm",
|
||||
titleI18NOption: {
|
||||
behavior: behavior.getTerms(behavior.behaviorName, this.props.setting?.language)
|
||||
}
|
||||
})
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
classList.push("hover-blue");
|
||||
}
|
||||
|
||||
return <div
|
||||
className={classList.join(" ")}
|
||||
onClick={() => {
|
||||
this.isActionClick = true;
|
||||
if (this.props.action) {
|
||||
this.props.action(behavior)
|
||||
}
|
||||
}}
|
||||
onClick={action}
|
||||
>
|
||||
<Icon iconName={iconName}/>
|
||||
</div>
|
||||
@ -116,6 +142,14 @@ class BehaviorList extends Component<IBehaviorListProps & IMixinSettingProps> {
|
||||
<div style={{ borderLeft: `12px solid ${color}` }}/>
|
||||
</div>
|
||||
<div className="behavior-item-root">
|
||||
<div className="behavior-popup-menu">
|
||||
<div className="behavior-popup-layout">
|
||||
<div className="behavior-popup-action-view">
|
||||
{this.props.delete ? this.renderActionButton(behavior, "delete") : null}
|
||||
{this.renderActionButton(behavior, "info")}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className="behavior-icon-view">
|
||||
<Icon iconName={icon}/>
|
||||
</div>
|
||||
@ -123,9 +157,6 @@ class BehaviorList extends Component<IBehaviorListProps & IMixinSettingProps> {
|
||||
{this.renderTerm(behavior, name, "title-view", needLocal)}
|
||||
{this.renderTerm(behavior, info, "info-view", true)}
|
||||
</div>
|
||||
{/* <div className="behavior-action-view">
|
||||
{this.renderActionButton(behavior)}
|
||||
</div> */}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
86
source/Component/BehaviorPicker/BehaviorPicker.scss
Normal file
86
source/Component/BehaviorPicker/BehaviorPicker.scss
Normal file
@ -0,0 +1,86 @@
|
||||
@import "../Theme/Theme.scss";
|
||||
|
||||
div.behavior-picker-list {
|
||||
width: 100%;
|
||||
max-width: 400px;
|
||||
padding: 8px 0;
|
||||
|
||||
div.behavior-picker-line {
|
||||
width: 100%;
|
||||
padding: 0 !important;
|
||||
display: flex !important;
|
||||
justify-content: flex-start !important;
|
||||
|
||||
div.behavior-picker-line-color-view {
|
||||
width: 0;
|
||||
max-width: 0;
|
||||
height: 100%;
|
||||
|
||||
div {
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-bottom: 10px solid transparent;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
}
|
||||
}
|
||||
|
||||
div.behavior-picker-line-icon-view {
|
||||
width: 30px;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
i.behavior-icon {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
i.view-icon {
|
||||
display: none;
|
||||
}
|
||||
|
||||
i.view-icon:hover {
|
||||
color: $lt-green;
|
||||
}
|
||||
}
|
||||
|
||||
div.behavior-picker-title {
|
||||
height: 100%;
|
||||
width: calc(100% - 60px);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
div {
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
}
|
||||
}
|
||||
|
||||
div.behavior-picker-line-delete-view {
|
||||
width: 30px;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
i:hover {
|
||||
color: $lt-red;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
div.behavior-picker-line:hover {
|
||||
|
||||
div.behavior-picker-line-icon-view {
|
||||
|
||||
i.behavior-icon {
|
||||
display: none;
|
||||
}
|
||||
|
||||
i.view-icon {
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
77
source/Component/BehaviorPicker/BehaviorPicker.tsx
Normal file
77
source/Component/BehaviorPicker/BehaviorPicker.tsx
Normal file
@ -0,0 +1,77 @@
|
||||
import { DetailsList } from "@Component/DetailsList/DetailsList";
|
||||
import { Component, ReactNode } from "react";
|
||||
import { Behavior } from "@Model/Behavior";
|
||||
import { Icon } from "@fluentui/react";
|
||||
import { useSettingWithEvent, IMixinSettingProps } from "@Context/Setting";
|
||||
import { Localization } from "@Component/Localization/Localization";
|
||||
import "./BehaviorPicker.scss";
|
||||
|
||||
interface IBehaviorPickerProps {
|
||||
behavior: Behavior[];
|
||||
delete?: (behavior: Behavior) => void;
|
||||
action?: (behavior: Behavior) => void;
|
||||
add?: () => void;
|
||||
}
|
||||
|
||||
@useSettingWithEvent("language")
|
||||
class BehaviorPicker extends Component<IBehaviorPickerProps & IMixinSettingProps> {
|
||||
|
||||
private getData() {
|
||||
let data: Array<{key: string, behavior: Behavior | undefined}> = [];
|
||||
for (let i = 0; i < this.props.behavior.length; i++) {
|
||||
data.push({
|
||||
key: this.props.behavior[i].id,
|
||||
behavior: this.props.behavior[i]
|
||||
})
|
||||
}
|
||||
data.push({
|
||||
key: "@@AddButton_List_Key",
|
||||
behavior: undefined
|
||||
})
|
||||
return data;
|
||||
}
|
||||
|
||||
private renderLine = (behavior?: Behavior): ReactNode => {
|
||||
if (behavior) {
|
||||
return <>
|
||||
<div className="behavior-picker-line-color-view">
|
||||
<div style={{ borderLeft: `10px solid ${behavior.color}` }}/>
|
||||
</div>
|
||||
<div className="behavior-picker-line-icon-view">
|
||||
<Icon iconName={behavior.iconName} className="behavior-icon"/>
|
||||
<Icon iconName="EditCreate" className="view-icon"/>
|
||||
</div>
|
||||
<div className={`behavior-picker-title ${this.props.setting?.language}`}>
|
||||
<div>{behavior.name}</div>
|
||||
</div>
|
||||
<div className="behavior-picker-line-delete-view">
|
||||
<Icon iconName="Delete"/>
|
||||
</div>
|
||||
</>;
|
||||
} else {
|
||||
return <>
|
||||
<div className="behavior-picker-line-icon-view">
|
||||
<Icon iconName="Add" className="add-icon"/>
|
||||
</div>
|
||||
<div className={`behavior-picker-title`}>
|
||||
<Localization i18nKey="Behavior.Picker.Add.Button"/>
|
||||
</div>
|
||||
</>;
|
||||
}
|
||||
}
|
||||
|
||||
public render(): ReactNode {
|
||||
return <DetailsList
|
||||
hideCheckBox
|
||||
className="behavior-picker-list"
|
||||
items={this.getData()}
|
||||
columns={[{
|
||||
className: "behavior-picker-line",
|
||||
key: "behavior",
|
||||
render: this.renderLine
|
||||
}]}
|
||||
/>
|
||||
}
|
||||
}
|
||||
|
||||
export { BehaviorPicker };
|
@ -64,24 +64,6 @@ class BehaviorPopupComponent extends Component<
|
||||
</div>;
|
||||
}
|
||||
|
||||
private showBehaviorInfo = (behavior: IRenderBehavior) => {
|
||||
if (this.props.status) {
|
||||
const status = this.props.status;
|
||||
status.popup.showPopup(ConfirmPopup, {
|
||||
renderInfo: () => {
|
||||
return <Message
|
||||
text={behavior.getTerms(behavior.describe, this.props.setting?.language)}
|
||||
/>
|
||||
},
|
||||
titleI18N: "Popup.Behavior.Info.Title",
|
||||
titleI18NOption: {
|
||||
behavior: behavior.getTerms(behavior.behaviorName, this.props.setting?.language)
|
||||
},
|
||||
yesI18n: "Popup.Behavior.Info.Confirm",
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
private renderActionBar = () => {
|
||||
return <Localization
|
||||
className="behavior-popup-select-counter"
|
||||
@ -95,10 +77,14 @@ class BehaviorPopupComponent extends Component<
|
||||
private renderBehaviors = (behaviors: ICategoryBehavior, first: boolean) => {
|
||||
|
||||
let language = this.props.setting?.language ?? "EN_US";
|
||||
let filterReg: RegExp | undefined = undefined;
|
||||
if (this.state.searchValue) {
|
||||
filterReg = new RegExp(this.state.searchValue, "i");
|
||||
}
|
||||
let filterItem = behaviors.item.filter((item) => {
|
||||
let name = item.getTerms(item.behaviorName, this.props.setting?.language);
|
||||
if (this.state.searchValue) {
|
||||
return name.includes(this.state.searchValue);
|
||||
if (filterReg) {
|
||||
return filterReg.test(name);
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
@ -114,7 +100,6 @@ class BehaviorPopupComponent extends Component<
|
||||
<BehaviorList
|
||||
focusBehaviors={Array.from(this.state.focusBehavior)}
|
||||
behaviors={filterItem}
|
||||
action={this.showBehaviorInfo}
|
||||
click={(behavior) => {
|
||||
if (this.state.focusBehavior.has(behavior)) {
|
||||
this.state.focusBehavior.delete(behavior);
|
||||
|
@ -40,6 +40,9 @@ class HeaderBar extends Component<
|
||||
|
||||
private createFpsCalc(type: "renderFps" | "physicsFps") {
|
||||
return (t: number) => {
|
||||
if (t === 0) {
|
||||
return;
|
||||
}
|
||||
let newState: HeaderBarState = {} as any;
|
||||
newState[type] = 1 / t;
|
||||
if (this.updateTime > 20) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
span.ZH_CN {
|
||||
span.ZH_CN, div.span.ZH_CN {
|
||||
font-family: 'Microsoft Yahei', Verdana, Simsun, 'Segoe UI', Tahoma, Arial, sans-serif;
|
||||
}
|
||||
|
||||
span.EN_US {
|
||||
span.EN_US, div.span.EN_US {
|
||||
font-family: 'Segoe UI Web Regular', 'Segoe UI', 'Segoe WP', Tahoma, Arial, sans-serif;
|
||||
}
|
@ -1,5 +1,6 @@
|
||||
@import "@fluentui/react/dist/sass/References";
|
||||
|
||||
$lt-green: rgb(50, 237, 69);
|
||||
$lt-blue: rgb(81, 79, 235);
|
||||
$lt-red: rgb(240, 94, 94);
|
||||
|
||||
|
@ -30,6 +30,7 @@ const EN_US = {
|
||||
"Object.List.New.Label": "Label {id}",
|
||||
"Object.List.No.Data": "There are no objects in the model, click the button to create it",
|
||||
"Object.Picker.List.No.Data": "There is no model in the model for this option",
|
||||
"Behavior.Picker.Add.Button": "Click here to assign behavior to this group",
|
||||
"Panel.Title.Notfound": "{id}",
|
||||
"Panel.Info.Notfound": "This panel with id {id} can not found!",
|
||||
"Panel.Title.Render.View": "Live preview",
|
||||
@ -69,6 +70,7 @@ const EN_US = {
|
||||
"Common.Attr.Title.Basic": "Basic properties",
|
||||
"Common.Attr.Title.Spatial": "Spatial property",
|
||||
"Common.Attr.Title.Individual.Generation": "Individual generation",
|
||||
"Common.Attr.Title.Behaviors": "Behaviors list",
|
||||
"Common.Attr.Title.Individual.kill": "Individual kill",
|
||||
"Common.Attr.Key.Display.Name": "Display name",
|
||||
"Common.Attr.Key.Position.X": "Position X",
|
||||
|
@ -30,6 +30,7 @@ const ZH_CN = {
|
||||
"Object.List.New.Label": "标签 {id}",
|
||||
"Object.List.No.Data": "模型中没有任何对象,点击按钮以创建",
|
||||
"Object.Picker.List.No.Data": "模型中没有合适此选项的模型",
|
||||
"Behavior.Picker.Add.Button": "点击此处以赋予行为到此群",
|
||||
"Panel.Title.Notfound": "{id}",
|
||||
"Panel.Info.Notfound": "这个编号为 {id} 的面板无法找到!",
|
||||
"Panel.Title.Render.View": "实时预览",
|
||||
@ -69,6 +70,7 @@ const ZH_CN = {
|
||||
"Common.Attr.Title.Basic": "基础属性",
|
||||
"Common.Attr.Title.Spatial": "空间属性",
|
||||
"Common.Attr.Title.Individual.Generation": "生成个体",
|
||||
"Common.Attr.Title.Behaviors": "行为列表",
|
||||
"Common.Attr.Title.Individual.kill": "消除个体",
|
||||
"Common.Attr.Key.Display.Name": "显示名称",
|
||||
"Common.Attr.Key.Position.X": "X 坐标",
|
||||
|
@ -91,6 +91,7 @@ class SimulatorWeb extends Component {
|
||||
}, {
|
||||
panels: ["GroupDetails", "RangeDetails", "LabelDetails"]
|
||||
}],
|
||||
scale: 30,
|
||||
layout: LayoutDirection.Y
|
||||
}
|
||||
],
|
||||
|
@ -36,7 +36,6 @@ class BehaviorList extends Component<IBehaviorListProps & IMixinStatusProps & IM
|
||||
<Message i18nKey="Panel.Info.Label.List.Error.Nodata"/> : null
|
||||
}
|
||||
<BehaviorListComponent
|
||||
actionType="delete"
|
||||
behaviors={behaviors}
|
||||
focusBehaviors={
|
||||
this.props.status?.focusBehavior ?
|
||||
@ -54,7 +53,7 @@ class BehaviorList extends Component<IBehaviorListProps & IMixinStatusProps & IM
|
||||
onAdd={() => {
|
||||
this.props.status?.popup.showPopup(BehaviorPopup, {});
|
||||
}}
|
||||
action={(behavior) => {
|
||||
delete={(behavior) => {
|
||||
if (this.props.status && behavior instanceof Behavior) {
|
||||
const status = this.props.status;
|
||||
status.popup.showPopup(ConfirmPopup, {
|
||||
|
@ -11,6 +11,7 @@ import { AllI18nKeys } from "@Component/Localization/Localization";
|
||||
import { ComboInput, IDisplayItem } from "@Component/ComboInput/ComboInput";
|
||||
import { ObjectPicker } from "@Component/ObjectPicker/ObjectPicker";
|
||||
import { ConfirmPopup } from "@Component/ConfirmPopup/ConfirmPopup";
|
||||
import { BehaviorPicker } from "@Component/BehaviorPicker/BehaviorPicker";
|
||||
import "./GroupDetails.scss";
|
||||
|
||||
interface IGroupDetailsProps {}
|
||||
@ -107,6 +108,12 @@ class GroupDetails extends Component<IGroupDetailsProps & IMixinStatusProps> {
|
||||
}
|
||||
}}
|
||||
/>
|
||||
|
||||
<Message i18nKey="Common.Attr.Title.Behaviors" isTitle/>
|
||||
|
||||
<BehaviorPicker
|
||||
behavior={group.behaviors}
|
||||
/>
|
||||
|
||||
<Message i18nKey="Common.Attr.Title.Individual.Generation" isTitle/>
|
||||
|
||||
|
@ -20,6 +20,10 @@ div.object-list {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
i.checkbox-icon:hover {
|
||||
color: $lt-green;
|
||||
}
|
||||
|
||||
i.type-icon {
|
||||
display: inline-block;
|
||||
opacity: 1;
|
||||
|
Loading…
Reference in New Issue
Block a user