Compare commits

...

2 Commits

Author SHA1 Message Date
5ff6987a4b Bind add behavior function 2022-03-29 15:14:31 +08:00
d4cd06196f Add behavior can filter by name 2022-03-29 14:32:28 +08:00
7 changed files with 138 additions and 25 deletions

View File

@ -4,7 +4,52 @@ import { Template } from "./Template";
const AllBehaviors: IAnyBehaviorRecorder[] = new Array(4).fill(0).map((_, i) => {
let behavior = new BehaviorRecorder(Template);
behavior.behaviorId = behavior.behaviorId + i;
behavior.behaviorName = behavior.behaviorName + Math.random().toString(36).slice(-6);
behavior.category = "Category" + Math.floor(Math.random() * 3).toString();
return behavior;
});
export { AllBehaviors };
/**
*
*/
type ICategory = {key: string, category: Record<string, string>, item: IAnyBehaviorRecorder[]};
const AllBehaviorsWithCategory: ICategory[] = categoryBehaviors(AllBehaviors);
/**
*
*/
function categoryBehaviors(behaviors: IAnyBehaviorRecorder[]): ICategory[] {
let res: ICategory[] = [];
for (let i = 0; i < behaviors.length; i++) {
let category: ICategory | undefined = undefined;
for (let j = 0; j < res.length; j++) {
if (res[j].key === behaviors[i].category) {
category = res[j];
}
}
if (!category) {
category = {
key: behaviors[i].category,
category: {},
item: []
}
res.push(category);
}
if (behaviors[i].category[0] === "$") {
let terms = behaviors[i].terms[behaviors[i].category];
if (terms) {
category.category = {...category.category, ...terms}
}
}
category.item.push(behaviors[i]);
}
return res;
}
export { AllBehaviors, AllBehaviorsWithCategory, ICategory as ICategoryBehavior };

View File

@ -5,7 +5,7 @@ div.behavior-popup {
height: 100%;
}
span.behavior-popup-select-counter {
span.behavior-popup-select-counter, div.behavior-popup-no-data {
opacity: .75;
}

View File

@ -1,19 +1,19 @@
import { Component, ReactNode } from "react";
import { Component, ReactNode, Fragment } from "react";
import { Popup } from "@Context/Popups";
import { Localization, I18N } from "@Component/Localization/Localization";
import { Localization } from "@Component/Localization/Localization";
import { SearchBox } from "@Component/SearchBox/SearchBox";
import { ConfirmContent } from "@Component/ConfirmPopup/ConfirmPopup";
import { BehaviorList } from "@Component/BehaviorList/BehaviorList";
import { AllBehaviors } from "@Behavior/Behavior";
import { AllBehaviorsWithCategory, ICategoryBehavior } from "@Behavior/Behavior";
import { Message } from "@Component/Message/Message";
import { IRenderBehavior } from "@Model/Behavior";
import { useStatus, IMixinStatusProps } from "@Context/Status";
import { IRenderBehavior, BehaviorRecorder } from "@Model/Behavior";
import { useStatus, IMixinStatusProps, randomColor } from "@Context/Status";
import { useSettingWithEvent, IMixinSettingProps } from "@Context/Setting";
import { ConfirmPopup } from "@Component/ConfirmPopup/ConfirmPopup";
import "./BehaviorPopup.scss";
interface IBehaviorPopupProps {
onDismiss?: () => void;
}
interface IBehaviorPopupState {
@ -21,7 +21,7 @@ interface IBehaviorPopupState {
focusBehavior: Set<IRenderBehavior>;
}
class BehaviorPopup extends Popup<IBehaviorPopupProps> {
class BehaviorPopup extends Popup {
public minWidth: number = 400;
public minHeight: number = 300;
@ -34,7 +34,9 @@ class BehaviorPopup extends Popup<IBehaviorPopupProps> {
}
public render(): ReactNode {
return <BehaviorPopupComponent {...this.props}/>
return <BehaviorPopupComponent onDismiss={() => {
this.close();
}}/>
}
}
@ -90,21 +92,28 @@ class BehaviorPopupComponent extends Component<
/>
}
public render(): ReactNode {
return <ConfirmContent
className="behavior-popup"
actions={[{
i18nKey: "Popup.Add.Behavior.Action.Add",
disable: this.state.focusBehavior.size <= 0
}]}
header={this.renderHeader}
customFooter={this.renderActionBar}
headerHeight={46}
>
<Message i18nKey="ZH_CN" isTitle first/>
private renderBehaviors = (behaviors: ICategoryBehavior, first: boolean) => {
let language = this.props.setting?.language ?? "EN_US";
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);
} else {
return true;
}
})
if (filterItem.length <= 0) return undefined;
return <Fragment key={behaviors.key}>
<Message
text={behaviors.category[language] ?? behaviors.key}
first={first} isTitle
/>
<BehaviorList
focusBehaviors={Array.from(this.state.focusBehavior)}
behaviors={AllBehaviors}
behaviors={filterItem}
action={this.showBehaviorInfo}
click={(behavior) => {
if (this.state.focusBehavior.has(behavior)) {
@ -115,6 +124,56 @@ class BehaviorPopupComponent extends Component<
this.forceUpdate();
}}
/>
</Fragment>
}
private addSelectBehavior = () => {
this.state.focusBehavior.forEach((recorder) => {
if (this.props.status && recorder instanceof BehaviorRecorder) {
let newBehavior = this.props.status.model.addBehavior(recorder);
// 初始化名字
newBehavior.name = recorder.getTerms(
recorder.behaviorName, this.props.setting?.language
) + " " + (recorder.nameIndex - 1).toString();
// 赋予一个随机颜色
let color = randomColor(true);
newBehavior.color = `rgb(${color[0]},${color[1]},${color[2]})`;
}
});
this.props.onDismiss ? this.props.onDismiss() : undefined;
}
public render(): ReactNode {
let first: boolean = true;
let behaviorNodes = AllBehaviorsWithCategory.map((behavior) => {
let renderItem = this.renderBehaviors(behavior, first);
if (renderItem) {
first = false;
}
return renderItem;
}).filter((x) => !!x);
return <ConfirmContent
className="behavior-popup"
actions={[{
i18nKey: "Popup.Add.Behavior.Action.Add",
disable: this.state.focusBehavior.size <= 0,
onClick: this.addSelectBehavior
}]}
header={this.renderHeader}
customFooter={this.renderActionBar}
headerHeight={46}
>
{
behaviorNodes.length ? behaviorNodes :
<Message
className="behavior-popup-no-data"
i18nKey="Popup.Add.Behavior.Select.Nodata" first
options={{ name: this.state.searchValue }}
/>
}
</ConfirmContent>
}
}

View File

@ -40,6 +40,7 @@ interface IStatusEvent {
labelAttrChange: void;
groupAttrChange: void;
individualChange: void;
behaviorChange: void;
popupChange: void;
}
@ -102,6 +103,7 @@ class Status extends Emitter<IStatusEvent> {
// 对象变化事件
this.model.on("objectChange", () => this.emit("objectChange"));
this.model.on("labelChange", () => this.emit("labelChange"));
this.model.on("behaviorChange", () => this.emit("behaviorChange"));
// 弹窗事件
this.popup.on("popupChange", () => this.emit("popupChange"));
@ -277,6 +279,6 @@ const useStatus = superConnect<Status>(StatusConsumer, "status");
const useStatusWithEvent = superConnectWithEvent<Status, IStatusEvent>(StatusConsumer, "status");
export {
Status, StatusContext, useStatus, useStatusWithEvent,
Status, StatusContext, useStatus, useStatusWithEvent, randomColor,
IMixinStatusProps, StatusProvider, StatusConsumer
};

View File

@ -55,6 +55,7 @@ const EN_US = {
"Popup.Add.Behavior.Title": "Add behavior",
"Popup.Add.Behavior.Action.Add": "Add all select behavior",
"Popup.Add.Behavior.Select.Counter": "Selected {count} behavior",
"Popup.Add.Behavior.Select.Nodata": "Could not find behavior named \"{name}\"",
"Popup.Behavior.Info.Title": "Behavior details: {behavior}",
"Popup.Behavior.Info.Confirm": "OK, I know it",
"Build.In.Label.Name.All.Group": "All group",

View File

@ -54,7 +54,8 @@ const ZH_CN = {
"Popup.Setting.Title": "首选项设置",
"Popup.Add.Behavior.Title": "添加行为",
"Popup.Add.Behavior.Action.Add": "添加全部选中行为",
"Popup.Add.Behavior.Select.Counter": "已选择 {count} 个行为",
"Popup.Add.Behavior.Select.Counter": "找不到名为 \"{name}\" 的行为",
"Popup.Add.Behavior.Select.Nodata": "Could not find behavior named \"{name}\"",
"Popup.Behavior.Info.Title": "行为详情: {behavior}",
"Popup.Behavior.Info.Confirm": "好的, 我知道了",
"Build.In.Label.Name.All.Group": "全部群",

View File

@ -159,6 +159,11 @@ class BehaviorInfo<E extends Record<EventType, any> = {}> extends Emitter<E> {
*/
public describe: string = "";
/**
*
*/
public category: string = "";
/**
*
*/