Merge pull request 'Add behavior i18n & behavior can filter by name & behavior list panel' (#29) from dev-mrkbear into master
Some checks reported errors
continuous-integration/drone/push Build was killed
continuous-integration/drone Build is passing

Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/29
This commit is contained in:
MrKBear 2022-03-29 20:14:23 +08:00
commit 6b3a10070f
16 changed files with 338 additions and 43 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

@ -10,11 +10,22 @@ class Template extends Behavior<ITemplateBehaviorParameter, ITemplateBehaviorEve
public override behaviorId: string = "Template";
public override behaviorName: string = "Behavior.Template.Title";
public override behaviorName: string = "$Title";
public override iconName: string = "Running";
public override describe: string = "Behavior.Template.Intro";
public override describe: string = "$Intro";
terms: Record<string, Record<string, string>> = {
"$Title": {
"ZH_CN": "行为",
"EN_US": "Behavior"
},
"$Intro": {
"ZH_CN": "这是一个模板行为",
"EN_US": "This is a template behavior"
}
};
}
export { Template };

View File

@ -92,6 +92,14 @@ div.behavior-list {
}
}
}
div.add-button {
width: 45px;
height: 45px;
display: flex;
justify-content: center;
align-items: center;
}
}
div.dark.behavior-list {

View File

@ -1,8 +1,8 @@
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 { Icon } from "@fluentui/react";
import { Localization } from "@Component/Localization/Localization";
import "./BehaviorList.scss";
interface IBehaviorListProps {
@ -10,10 +10,12 @@ interface IBehaviorListProps {
focusBehaviors?: IRenderBehavior[];
click?: (behavior: IRenderBehavior) => void;
action?: (behavior: IRenderBehavior) => void;
onAdd?: () => void;
actionType?: "info" | "delete";
}
class BehaviorList extends Component<IBehaviorListProps> {
@useSettingWithEvent("language")
class BehaviorList extends Component<IBehaviorListProps & IMixinSettingProps> {
private isFocus(behavior: IRenderBehavior): boolean {
if (this.props.focusBehaviors) {
@ -57,10 +59,10 @@ class BehaviorList extends Component<IBehaviorListProps> {
</div>
}
private renderTerm(key: string, className: string, needLocal: boolean) {
private renderTerm(behavior: IRenderBehavior, key: string, className: string, needLocal: boolean) {
if (needLocal) {
return <div className={className}>
<Localization i18nKey={key as any}/>
{behavior.getTerms(key, this.props.setting?.language)}
</div>;
} else {
return <div className={className}>
@ -117,8 +119,8 @@ class BehaviorList extends Component<IBehaviorListProps> {
<Icon iconName={icon}/>
</div>
<div className="behavior-content-view">
{this.renderTerm(name, "title-view", needLocal)}
{this.renderTerm(info, "info-view", needLocal)}
{this.renderTerm(behavior, name, "title-view", needLocal)}
{this.renderTerm(behavior, info, "info-view", needLocal)}
</div>
<div className="behavior-action-view">
{this.renderActionButton(behavior)}
@ -126,11 +128,18 @@ class BehaviorList extends Component<IBehaviorListProps> {
</div>
}
private renderAddButton(add: () => void) {
return <div className="behavior-item add-button" onClick={add}>
<Icon iconName="Add"/>
</div>
}
public render(): ReactNode {
return <Theme className="behavior-list">
{this.props.behaviors.map((behavior) => {
return this.renderBehavior(behavior);
})}
{this.props.onAdd ? this.renderAddButton(this.props.onAdd) : null}
</Theme>
}
}

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();
}}/>
}
}
@ -66,10 +68,14 @@ class BehaviorPopupComponent extends Component<
if (this.props.status) {
const status = this.props.status;
status.popup.showPopup(ConfirmPopup, {
infoI18n: behavior.describe as any,
renderInfo: () => {
return <Message
text={behavior.getTerms(behavior.describe, this.props.setting?.language)}
/>
},
titleI18N: "Popup.Behavior.Info.Title",
titleI18NOption: {
behavior: I18N(this.props, behavior.behaviorName as any)
behavior: behavior.getTerms(behavior.behaviorName, this.props.setting?.language)
},
yesI18n: "Popup.Behavior.Info.Confirm",
})
@ -86,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)) {
@ -111,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

@ -11,6 +11,7 @@ interface IConfirmPopupProps {
infoI18n?: AllI18nKeys;
yesI18n?: AllI18nKeys;
noI18n?: AllI18nKeys;
renderInfo?: () => ReactNode;
red?: "yes" | "no";
yes?: () => any;
no?: () => any;
@ -59,7 +60,13 @@ class ConfirmPopup extends Popup<IConfirmPopupProps> {
return <ConfirmContent
actions={actionList}
>
{this.props.infoI18n ? <Message i18nKey={this.props.infoI18n}/> : null}
{
this.props.renderInfo ?
this.props.renderInfo() :
this.props.infoI18n ?
<Message i18nKey={this.props.infoI18n}/> :
null
}
</ConfirmContent>
}
}

View File

@ -4,7 +4,8 @@ import { FunctionComponent } from "react";
import "./Message.scss";
interface IMessageProps {
i18nKey: AllI18nKeys;
i18nKey?: AllI18nKeys;
text?: string;
options?: Record<string, string>;
className?: string;
isTitle?: boolean;
@ -34,7 +35,15 @@ const MessageView: FunctionComponent<IMessageProps & IMixinSettingProps> = (prop
}
return <div className={classList.join(" ")}>
<span className={language}>{I18N(language, props.i18nKey, props.options)}</span>
{
props.text ?
<span className={language}>{props.text}</span> :
props.i18nKey ?
<span className={language}>{
I18N(language, props.i18nKey, props.options)
}</span> :
null
}
</div>
}

View File

@ -11,6 +11,7 @@ import { Setting } from "./Setting";
import { I18N } from "@Component/Localization/Localization";
import { superConnectWithEvent, superConnect } from "./Context";
import { PopupController } from "./Popups";
import { Behavior } from "@Model/Behavior";
function randomColor(unNormal: boolean = false) {
const color = [
@ -32,6 +33,7 @@ interface IStatusEvent {
mouseModChange: void;
focusObjectChange: void;
focusLabelChange: void;
focusBehaviorChange: void;
objectChange: void;
rangeLabelChange: void;
groupLabelChange: void;
@ -40,6 +42,7 @@ interface IStatusEvent {
labelAttrChange: void;
groupAttrChange: void;
individualChange: void;
behaviorChange: void;
popupChange: void;
}
@ -83,6 +86,11 @@ class Status extends Emitter<IStatusEvent> {
*/
public focusLabel?: Label;
/**
*
*/
public focusBehavior?: Behavior;
private drawTimer?: NodeJS.Timeout;
private delayDraw = () => {
@ -102,6 +110,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"));
@ -136,6 +145,14 @@ class Status extends Emitter<IStatusEvent> {
this.emit("focusLabelChange");
}
/**
*
*/
public setBehaviorObject(focusBehavior?: Behavior) {
this.focusBehavior = focusBehavior;
this.emit("focusBehaviorChange");
}
/**
*
*/
@ -277,6 +294,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

@ -44,6 +44,8 @@ const EN_US = {
"Panel.Info.Label.Details.View": "Edit view label attributes",
"Panel.Title.Group.Details.View": "Group",
"Panel.Info.Group.Details.View": "Edit view group attributes",
"Panel.Title.Behavior.List.View": "Behavior list",
"Panel.Info.Behavior.List.View": "Edit view behavior list",
"Popup.Title.Unnamed": "Popup message",
"Popup.Title.Confirm": "Confirm message",
"Popup.Action.Yes": "Confirm",
@ -51,16 +53,16 @@ const EN_US = {
"Popup.Action.Objects.Confirm.Title": "Confirm Delete",
"Popup.Action.Objects.Confirm.Delete": "Delete",
"Popup.Delete.Objects.Confirm": "Are you sure you want to delete this object(s)? The object is deleted and cannot be recalled.",
"Popup.Delete.Behavior.Confirm": "Are you sure you want to delete this behavior? The behavior is deleted and cannot be recalled.",
"Popup.Setting.Title": "Preferences setting",
"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",
"Build.In.Label.Name.All.Range": "All range",
"Behavior.Template.Title": "Behavior",
"Behavior.Template.Intro": "This is a template behavior",
"Common.Search.Placeholder": "Search in here...",
"Common.No.Data": "No Data",
"Common.No.Unknown.Error": "Unknown error",

View File

@ -44,6 +44,8 @@ const ZH_CN = {
"Panel.Info.Label.Details.View": "编辑查看标签属性",
"Panel.Title.Group.Details.View": "群",
"Panel.Info.Group.Details.View": "编辑查看群属性",
"Panel.Title.Behavior.List.View": "行为列表",
"Panel.Info.Behavior.List.View": "编辑查看行为列表",
"Popup.Title.Unnamed": "弹窗消息",
"Popup.Title.Confirm": "确认消息",
"Popup.Action.Yes": "确定",
@ -51,16 +53,16 @@ const ZH_CN = {
"Popup.Action.Objects.Confirm.Title": "删除确认",
"Popup.Action.Objects.Confirm.Delete": "删除",
"Popup.Delete.Objects.Confirm": "你确定要删除这个(些)对象吗?对象被删除将无法撤回。",
"Popup.Delete.Behavior.Confirm": "你确定要删除这个行为吗?行为被删除将无法撤回。",
"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": "全部群",
"Build.In.Label.Name.All.Range": "全部范围",
"Behavior.Template.Title": "行为",
"Behavior.Template.Intro": "这是一个模板行为",
"Common.Search.Placeholder": "在此处搜索...",
"Common.No.Data": "暂无数据",
"Common.No.Unknown.Error": "未知错误",

View File

@ -132,6 +132,8 @@ type IBehaviorConstructor<
type IAnyBehavior = Behavior<any, any>;
type IAnyBehaviorRecorder = BehaviorRecorder<any, any>;
type Language = "ZH_CN" | "EN_US";
/**
*
*/
@ -156,6 +158,34 @@ class BehaviorInfo<E extends Record<EventType, any> = {}> extends Emitter<E> {
*
*/
public describe: string = "";
/**
*
*/
public category: string = "";
/**
*
*/
public terms: Record<string, Record<Language | string, string>> = {};
/**
*
*/
public getTerms(key: string, language?: Language | string): string {
if (key[0] === "$" && this.terms[key]) {
let res: string = "";
if (language) {
res = this.terms[key][language];
} else {
res = this.terms[key]["EN_US"];
}
if (res) {
return res;
}
}
return key;
}
}
class BehaviorRecorder<
@ -239,6 +269,7 @@ class BehaviorRecorder<
this.behaviorId = this.behaviorInstance.behaviorId;
this.behaviorName = this.behaviorInstance.behaviorName;
this.describe = this.behaviorInstance.describe;
this.terms = this.behaviorInstance.terms;
}
}

View File

@ -66,7 +66,7 @@ class SimulatorWeb extends Component {
items: [
{panels: ["RenderView", "Label Aa Bb", "Label aaa"]},
{
items: [{panels: ["Label b", "Label bbb"]}, {panels: ["LabelList"]}],
items: [{panels: ["BehaviorList", "Label bbb"]}, {panels: ["LabelList"]}],
scale: 80,
layout: LayoutDirection.X
}

View File

@ -0,0 +1,8 @@
@import "../../Component/Theme/Theme.scss";
div.behavior-list-panel-root {
width: 100%;
min-height: 100%;
padding: 10px;
box-sizing: border-box;
}

View File

@ -0,0 +1,77 @@
import { BehaviorList as BehaviorListComponent } from "@Component/BehaviorList/BehaviorList";
import { Component } from "react";
import { useStatusWithEvent, IMixinStatusProps } from "@Context/Status";
import { useSetting, IMixinSettingProps } from "@Context/Setting";
import { Behavior } from "@Model/Behavior";
import { Message } from "@Component/Message/Message";
import { ConfirmPopup } from "@Component/ConfirmPopup/ConfirmPopup";
import { BehaviorPopup } from "@Component/BehaviorPopup/BehaviorPopup";
import "./BehaviorList.scss";
interface IBehaviorListProps {
}
@useSetting
@useStatusWithEvent("behaviorChange", "focusBehaviorChange")
class BehaviorList extends Component<IBehaviorListProps & IMixinStatusProps & IMixinSettingProps> {
private labelInnerClick: boolean = false;
public render() {
let behaviors: Behavior[] = [];
if (this.props.status) {
behaviors = this.props.status.model.behaviorPool.concat([]);
}
return <div
className="behavior-list-panel-root"
onClick={() => {
if (this.props.status && !this.labelInnerClick) {
this.props.status.setBehaviorObject();
}
this.labelInnerClick = false;
}}
>
{behaviors.length <=0 ?
<Message i18nKey="Panel.Info.Label.List.Error.Nodata"/> : null
}
<BehaviorListComponent
actionType="delete"
behaviors={behaviors}
focusBehaviors={
this.props.status?.focusBehavior ?
[this.props.status?.focusBehavior] : undefined
}
click={(behavior) => {
if (this.props.status) {
this.props.status.setBehaviorObject(behavior as Behavior);
}
// if (this.props.setting) {
// this.props.setting.layout.focus("LabelDetails");
// }
this.labelInnerClick = true;
}}
onAdd={() => {
this.props.status?.popup.showPopup(BehaviorPopup, {});
}}
action={(behavior) => {
if (this.props.status && behavior instanceof Behavior) {
const status = this.props.status;
status.popup.showPopup(ConfirmPopup, {
infoI18n: "Popup.Delete.Behavior.Confirm",
titleI18N: "Popup.Action.Objects.Confirm.Title",
yesI18n: "Popup.Action.Objects.Confirm.Delete",
red: "yes",
yes: () => {
status.model.deleteBehavior(behavior);
}
})
}
this.labelInnerClick = true;
}}
/>
</div>;
}
}
export { BehaviorList };

View File

@ -8,6 +8,7 @@ import { RangeDetails } from "./RangeDetails/RangeDetails";
import { LabelList } from "./LabelList/LabelList";
import { LabelDetails } from "./LabelDetails/LabelDetails";
import { GroupDetails } from "./GroupDetails/GroupDetails";
import { BehaviorList } from "./BehaviorList/BehaviorList";
interface IPanelInfo {
nameKey: string;
@ -27,6 +28,7 @@ type PanelId = ""
| "LabelList" // 标签列表
| "LabelDetails" // 标签属性
| "GroupDetails" // 群属性
| "BehaviorList" // 行为列表
;
const PanelInfoMap = new Map<PanelId, IPanelInfo>();
@ -54,6 +56,10 @@ PanelInfoMap.set("GroupDetails", {
nameKey: "Panel.Title.Group.Details.View", introKay: "Panel.Info.Group.Details.View",
class: GroupDetails
});
PanelInfoMap.set("BehaviorList", {
nameKey: "Panel.Title.Behavior.List.View", introKay: "Panel.Info.Behavior.List.View",
class: BehaviorList, hidePadding: true
});
function getPanelById(panelId: PanelId): ReactNode {
switch (panelId) {