Compare commits
	
		
			No commits in common. "6b3a10070ffdb66da87123d303ebfd899d70aa57" and "6ac0b98d0f3c6162b997c12ec9280a4abfd84b7a" have entirely different histories.
		
	
	
		
			6b3a10070f
			...
			6ac0b98d0f
		
	
		
| @ -4,52 +4,7 @@ import { Template } from "./Template"; | |||||||
| const AllBehaviors: IAnyBehaviorRecorder[] = new Array(4).fill(0).map((_, i) => { | const AllBehaviors: IAnyBehaviorRecorder[] = new Array(4).fill(0).map((_, i) => { | ||||||
|     let behavior = new BehaviorRecorder(Template); |     let behavior = new BehaviorRecorder(Template); | ||||||
|     behavior.behaviorId = behavior.behaviorId + i; |     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; |     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 }; |  | ||||||
| @ -10,22 +10,11 @@ class Template extends Behavior<ITemplateBehaviorParameter, ITemplateBehaviorEve | |||||||
| 
 | 
 | ||||||
|     public override behaviorId: string = "Template"; |     public override behaviorId: string = "Template"; | ||||||
| 
 | 
 | ||||||
|     public override behaviorName: string = "$Title"; |     public override behaviorName: string = "Behavior.Template.Title"; | ||||||
| 
 | 
 | ||||||
|     public override iconName: string = "Running"; |     public override iconName: string = "Running"; | ||||||
| 
 | 
 | ||||||
|     public override describe: string = "$Intro"; |     public override describe: string = "Behavior.Template.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 }; | export { Template }; | ||||||
| @ -92,14 +92,6 @@ div.behavior-list { | |||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| 
 |  | ||||||
|     div.add-button { |  | ||||||
|         width: 45px; |  | ||||||
|         height: 45px; |  | ||||||
|         display: flex; |  | ||||||
|         justify-content: center; |  | ||||||
|         align-items: center; |  | ||||||
|     } |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| div.dark.behavior-list { | div.dark.behavior-list { | ||||||
|  | |||||||
| @ -1,8 +1,8 @@ | |||||||
| import { Theme } from "@Component/Theme/Theme"; | import { Theme } from "@Component/Theme/Theme"; | ||||||
| import { Component, ReactNode } from "react"; | import { Component, ReactNode } from "react"; | ||||||
| import { IRenderBehavior, Behavior, BehaviorRecorder } from "@Model/Behavior"; | import { IRenderBehavior, Behavior, BehaviorRecorder } from "@Model/Behavior"; | ||||||
| import { useSettingWithEvent, IMixinSettingProps } from "@Context/Setting"; |  | ||||||
| import { Icon } from "@fluentui/react"; | import { Icon } from "@fluentui/react"; | ||||||
|  | import { Localization } from "@Component/Localization/Localization"; | ||||||
| import "./BehaviorList.scss"; | import "./BehaviorList.scss"; | ||||||
| 
 | 
 | ||||||
| interface IBehaviorListProps { | interface IBehaviorListProps { | ||||||
| @ -10,12 +10,10 @@ interface IBehaviorListProps { | |||||||
| 	focusBehaviors?: IRenderBehavior[]; | 	focusBehaviors?: IRenderBehavior[]; | ||||||
| 	click?: (behavior: IRenderBehavior) => void; | 	click?: (behavior: IRenderBehavior) => void; | ||||||
| 	action?: (behavior: IRenderBehavior) => void; | 	action?: (behavior: IRenderBehavior) => void; | ||||||
|     onAdd?: () => void; |  | ||||||
| 	actionType?: "info" | "delete"; | 	actionType?: "info" | "delete"; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| @useSettingWithEvent("language") | class BehaviorList extends Component<IBehaviorListProps> { | ||||||
| class BehaviorList extends Component<IBehaviorListProps & IMixinSettingProps> { |  | ||||||
| 
 | 
 | ||||||
| 	private isFocus(behavior: IRenderBehavior): boolean { | 	private isFocus(behavior: IRenderBehavior): boolean { | ||||||
| 		if (this.props.focusBehaviors) { | 		if (this.props.focusBehaviors) { | ||||||
| @ -59,10 +57,10 @@ class BehaviorList extends Component<IBehaviorListProps & IMixinSettingProps> { | |||||||
| 		</div> | 		</div> | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	private renderTerm(behavior: IRenderBehavior, key: string, className: string, needLocal: boolean) { | 	private renderTerm(key: string, className: string, needLocal: boolean) { | ||||||
| 		if (needLocal) { | 		if (needLocal) { | ||||||
| 			return <div className={className}> | 			return <div className={className}> | ||||||
| 				{behavior.getTerms(key, this.props.setting?.language)} | 				<Localization i18nKey={key as any}/> | ||||||
| 			</div>; | 			</div>; | ||||||
| 		} else { | 		} else { | ||||||
| 			return <div className={className}> | 			return <div className={className}> | ||||||
| @ -119,8 +117,8 @@ class BehaviorList extends Component<IBehaviorListProps & IMixinSettingProps> { | |||||||
| 				<Icon iconName={icon}/> | 				<Icon iconName={icon}/> | ||||||
| 			</div> | 			</div> | ||||||
| 			<div className="behavior-content-view"> | 			<div className="behavior-content-view"> | ||||||
| 				{this.renderTerm(behavior, name, "title-view", needLocal)} | 				{this.renderTerm(name, "title-view", needLocal)} | ||||||
| 				{this.renderTerm(behavior, info, "info-view", needLocal)} | 				{this.renderTerm(info, "info-view", needLocal)} | ||||||
| 			</div> | 			</div> | ||||||
| 			<div className="behavior-action-view"> | 			<div className="behavior-action-view"> | ||||||
| 				{this.renderActionButton(behavior)} | 				{this.renderActionButton(behavior)} | ||||||
| @ -128,18 +126,11 @@ class BehaviorList extends Component<IBehaviorListProps & IMixinSettingProps> { | |||||||
| 		</div> | 		</div> | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|     private renderAddButton(add: () => void) { |  | ||||||
|         return <div className="behavior-item add-button" onClick={add}> |  | ||||||
|             <Icon iconName="Add"/> |  | ||||||
|         </div> |  | ||||||
|     } |  | ||||||
| 
 |  | ||||||
| 	public render(): ReactNode { | 	public render(): ReactNode { | ||||||
| 		return <Theme className="behavior-list"> | 		return <Theme className="behavior-list"> | ||||||
| 			{this.props.behaviors.map((behavior) => { | 			{this.props.behaviors.map((behavior) => { | ||||||
| 				return this.renderBehavior(behavior); | 				return this.renderBehavior(behavior); | ||||||
| 			})} | 			})} | ||||||
|             {this.props.onAdd ? this.renderAddButton(this.props.onAdd) : null} |  | ||||||
| 		</Theme> | 		</Theme> | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ div.behavior-popup { | |||||||
| 	height: 100%; | 	height: 100%; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| span.behavior-popup-select-counter, div.behavior-popup-no-data { | span.behavior-popup-select-counter { | ||||||
| 	opacity: .75; | 	opacity: .75; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -1,19 +1,19 @@ | |||||||
| import { Component, ReactNode, Fragment } from "react"; | import { Component, ReactNode } from "react"; | ||||||
| import { Popup } from "@Context/Popups"; | import { Popup } from "@Context/Popups"; | ||||||
| import { Localization } from "@Component/Localization/Localization"; | import { Localization, I18N } from "@Component/Localization/Localization"; | ||||||
| import { SearchBox } from "@Component/SearchBox/SearchBox"; | import { SearchBox } from "@Component/SearchBox/SearchBox"; | ||||||
| import { ConfirmContent } from "@Component/ConfirmPopup/ConfirmPopup"; | import { ConfirmContent } from "@Component/ConfirmPopup/ConfirmPopup"; | ||||||
| import { BehaviorList } from "@Component/BehaviorList/BehaviorList"; | import { BehaviorList } from "@Component/BehaviorList/BehaviorList"; | ||||||
| import { AllBehaviorsWithCategory, ICategoryBehavior } from "@Behavior/Behavior"; | import { AllBehaviors } from "@Behavior/Behavior"; | ||||||
| import { Message } from "@Component/Message/Message"; | import { Message } from "@Component/Message/Message"; | ||||||
| import { IRenderBehavior, BehaviorRecorder } from "@Model/Behavior"; | import { IRenderBehavior } from "@Model/Behavior"; | ||||||
| import { useStatus, IMixinStatusProps, randomColor } from "@Context/Status"; | import { useStatus, IMixinStatusProps } from "@Context/Status"; | ||||||
| import { useSettingWithEvent, IMixinSettingProps } from "@Context/Setting"; | import { useSettingWithEvent, IMixinSettingProps } from "@Context/Setting"; | ||||||
| import { ConfirmPopup } from "@Component/ConfirmPopup/ConfirmPopup"; | import { ConfirmPopup } from "@Component/ConfirmPopup/ConfirmPopup"; | ||||||
| import "./BehaviorPopup.scss"; | import "./BehaviorPopup.scss"; | ||||||
| 
 | 
 | ||||||
| interface IBehaviorPopupProps { | interface IBehaviorPopupProps { | ||||||
|     onDismiss?: () => void; | 
 | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| interface IBehaviorPopupState { | interface IBehaviorPopupState { | ||||||
| @ -21,7 +21,7 @@ interface IBehaviorPopupState { | |||||||
| 	focusBehavior: Set<IRenderBehavior>; | 	focusBehavior: Set<IRenderBehavior>; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| class BehaviorPopup extends Popup { | class BehaviorPopup extends Popup<IBehaviorPopupProps> { | ||||||
| 
 | 
 | ||||||
| 	public minWidth: number = 400; | 	public minWidth: number = 400; | ||||||
| 	public minHeight: number = 300; | 	public minHeight: number = 300; | ||||||
| @ -34,9 +34,7 @@ class BehaviorPopup extends Popup { | |||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	public render(): ReactNode { | 	public render(): ReactNode { | ||||||
| 		return <BehaviorPopupComponent onDismiss={() => { | 		return <BehaviorPopupComponent {...this.props}/> | ||||||
|             this.close(); |  | ||||||
|         }}/> |  | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| @ -68,14 +66,10 @@ class BehaviorPopupComponent extends Component< | |||||||
| 		if (this.props.status) { | 		if (this.props.status) { | ||||||
| 			const status = this.props.status; | 			const status = this.props.status; | ||||||
| 			status.popup.showPopup(ConfirmPopup, { | 			status.popup.showPopup(ConfirmPopup, { | ||||||
|                 renderInfo: () => { | 				infoI18n: behavior.describe as any, | ||||||
|                     return <Message |  | ||||||
|                         text={behavior.getTerms(behavior.describe, this.props.setting?.language)} |  | ||||||
|                     /> |  | ||||||
|                 }, |  | ||||||
| 				titleI18N: "Popup.Behavior.Info.Title", | 				titleI18N: "Popup.Behavior.Info.Title", | ||||||
| 				titleI18NOption: { | 				titleI18NOption: { | ||||||
| 					behavior: behavior.getTerms(behavior.behaviorName, this.props.setting?.language) | 					behavior: I18N(this.props, behavior.behaviorName as any) | ||||||
| 				}, | 				}, | ||||||
| 				yesI18n: "Popup.Behavior.Info.Confirm", | 				yesI18n: "Popup.Behavior.Info.Confirm", | ||||||
| 			}) | 			}) | ||||||
| @ -92,28 +86,21 @@ class BehaviorPopupComponent extends Component< | |||||||
| 		/> | 		/> | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|     private renderBehaviors = (behaviors: ICategoryBehavior, first: boolean) => { | 	public render(): ReactNode { | ||||||
| 
 | 		return <ConfirmContent | ||||||
|         let language = this.props.setting?.language ?? "EN_US"; | 			className="behavior-popup" | ||||||
|         let filterItem = behaviors.item.filter((item) => { | 			actions={[{ | ||||||
|             let name = item.getTerms(item.behaviorName, this.props.setting?.language); | 				i18nKey: "Popup.Add.Behavior.Action.Add", | ||||||
|             if (this.state.searchValue) { | 				disable: this.state.focusBehavior.size <= 0 | ||||||
|                 return name.includes(this.state.searchValue); | 			}]} | ||||||
|             } else { | 			header={this.renderHeader} | ||||||
|                 return true; | 			customFooter={this.renderActionBar} | ||||||
|             } | 			headerHeight={46} | ||||||
|         }) | 		> | ||||||
|          | 			<Message i18nKey="ZH_CN" isTitle first/> | ||||||
|         if (filterItem.length <= 0) return undefined; |  | ||||||
| 
 |  | ||||||
|         return <Fragment key={behaviors.key}> |  | ||||||
|             <Message |  | ||||||
|                 text={behaviors.category[language] ?? behaviors.key} |  | ||||||
|                 first={first} isTitle |  | ||||||
|             /> |  | ||||||
| 			<BehaviorList | 			<BehaviorList | ||||||
| 				focusBehaviors={Array.from(this.state.focusBehavior)} | 				focusBehaviors={Array.from(this.state.focusBehavior)} | ||||||
| 				behaviors={filterItem} | 				behaviors={AllBehaviors} | ||||||
| 				action={this.showBehaviorInfo} | 				action={this.showBehaviorInfo} | ||||||
| 				click={(behavior) => { | 				click={(behavior) => { | ||||||
| 					if (this.state.focusBehavior.has(behavior)) { | 					if (this.state.focusBehavior.has(behavior)) { | ||||||
| @ -124,56 +111,6 @@ class BehaviorPopupComponent extends Component< | |||||||
| 					this.forceUpdate(); | 					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> | 		</ConfirmContent> | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  | |||||||
| @ -11,7 +11,6 @@ interface IConfirmPopupProps { | |||||||
| 	infoI18n?: AllI18nKeys; | 	infoI18n?: AllI18nKeys; | ||||||
| 	yesI18n?: AllI18nKeys; | 	yesI18n?: AllI18nKeys; | ||||||
| 	noI18n?: AllI18nKeys; | 	noI18n?: AllI18nKeys; | ||||||
|     renderInfo?: () => ReactNode; |  | ||||||
| 	red?: "yes" | "no"; | 	red?: "yes" | "no"; | ||||||
| 	yes?: () => any; | 	yes?: () => any; | ||||||
| 	no?: () => any; | 	no?: () => any; | ||||||
| @ -60,13 +59,7 @@ class ConfirmPopup extends Popup<IConfirmPopupProps> { | |||||||
| 		return <ConfirmContent | 		return <ConfirmContent | ||||||
| 			actions={actionList} | 			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> | 		</ConfirmContent> | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  | |||||||
| @ -4,8 +4,7 @@ import { FunctionComponent } from "react"; | |||||||
| import "./Message.scss"; | import "./Message.scss"; | ||||||
| 
 | 
 | ||||||
| interface IMessageProps { | interface IMessageProps { | ||||||
|     i18nKey?: AllI18nKeys; |     i18nKey: AllI18nKeys; | ||||||
|     text?: string; |  | ||||||
|     options?: Record<string, string>; |     options?: Record<string, string>; | ||||||
|     className?: string; |     className?: string; | ||||||
|     isTitle?: boolean; |     isTitle?: boolean; | ||||||
| @ -35,15 +34,7 @@ const MessageView: FunctionComponent<IMessageProps & IMixinSettingProps> = (prop | |||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     return <div className={classList.join(" ")}> |     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> |     </div> | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -11,7 +11,6 @@ import { Setting } from "./Setting"; | |||||||
| import { I18N } from "@Component/Localization/Localization"; | import { I18N } from "@Component/Localization/Localization"; | ||||||
| import { superConnectWithEvent, superConnect } from "./Context"; | import { superConnectWithEvent, superConnect } from "./Context"; | ||||||
| import { PopupController } from "./Popups"; | import { PopupController } from "./Popups"; | ||||||
| import { Behavior } from "@Model/Behavior"; |  | ||||||
| 
 | 
 | ||||||
| function randomColor(unNormal: boolean = false) { | function randomColor(unNormal: boolean = false) { | ||||||
|     const color = [ |     const color = [ | ||||||
| @ -33,7 +32,6 @@ interface IStatusEvent { | |||||||
|     mouseModChange: void; |     mouseModChange: void; | ||||||
|     focusObjectChange: void; |     focusObjectChange: void; | ||||||
|     focusLabelChange: void; |     focusLabelChange: void; | ||||||
|     focusBehaviorChange: void; |  | ||||||
|     objectChange: void; |     objectChange: void; | ||||||
|     rangeLabelChange: void; |     rangeLabelChange: void; | ||||||
|     groupLabelChange: void; |     groupLabelChange: void; | ||||||
| @ -42,7 +40,6 @@ interface IStatusEvent { | |||||||
|     labelAttrChange: void; |     labelAttrChange: void; | ||||||
|     groupAttrChange: void; |     groupAttrChange: void; | ||||||
|     individualChange: void; |     individualChange: void; | ||||||
|     behaviorChange: void; |  | ||||||
|     popupChange: void; |     popupChange: void; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| @ -86,11 +83,6 @@ class Status extends Emitter<IStatusEvent> { | |||||||
|      */ |      */ | ||||||
|     public focusLabel?: Label; |     public focusLabel?: Label; | ||||||
| 
 | 
 | ||||||
|     /** |  | ||||||
|      * 焦点行为 |  | ||||||
|      */ |  | ||||||
|     public focusBehavior?: Behavior; |  | ||||||
| 
 |  | ||||||
|     private drawTimer?: NodeJS.Timeout; |     private drawTimer?: NodeJS.Timeout; | ||||||
| 
 | 
 | ||||||
|     private delayDraw = () => { |     private delayDraw = () => { | ||||||
| @ -110,7 +102,6 @@ class Status extends Emitter<IStatusEvent> { | |||||||
|         // 对象变化事件
 |         // 对象变化事件
 | ||||||
|         this.model.on("objectChange", () => this.emit("objectChange")); |         this.model.on("objectChange", () => this.emit("objectChange")); | ||||||
|         this.model.on("labelChange", () => this.emit("labelChange")); |         this.model.on("labelChange", () => this.emit("labelChange")); | ||||||
|         this.model.on("behaviorChange", () => this.emit("behaviorChange")); |  | ||||||
| 
 | 
 | ||||||
|         // 弹窗事件
 |         // 弹窗事件
 | ||||||
|         this.popup.on("popupChange", () => this.emit("popupChange")); |         this.popup.on("popupChange", () => this.emit("popupChange")); | ||||||
| @ -145,14 +136,6 @@ class Status extends Emitter<IStatusEvent> { | |||||||
|         this.emit("focusLabelChange"); |         this.emit("focusLabelChange"); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     /** |  | ||||||
|      * 更新焦点行为 |  | ||||||
|      */ |  | ||||||
|     public setBehaviorObject(focusBehavior?: Behavior) { |  | ||||||
|         this.focusBehavior = focusBehavior; |  | ||||||
|         this.emit("focusBehaviorChange"); |  | ||||||
|     } |  | ||||||
| 
 |  | ||||||
|     /** |     /** | ||||||
|      * 修改范围属性 |      * 修改范围属性 | ||||||
|      */ |      */ | ||||||
| @ -294,6 +277,6 @@ const useStatus = superConnect<Status>(StatusConsumer, "status"); | |||||||
| const useStatusWithEvent = superConnectWithEvent<Status, IStatusEvent>(StatusConsumer, "status"); | const useStatusWithEvent = superConnectWithEvent<Status, IStatusEvent>(StatusConsumer, "status"); | ||||||
| 
 | 
 | ||||||
| export { | export { | ||||||
|     Status, StatusContext, useStatus, useStatusWithEvent, randomColor, |     Status, StatusContext, useStatus, useStatusWithEvent, | ||||||
|     IMixinStatusProps, StatusProvider, StatusConsumer |     IMixinStatusProps, StatusProvider, StatusConsumer | ||||||
| }; | }; | ||||||
| @ -44,8 +44,6 @@ const EN_US = { | |||||||
|     "Panel.Info.Label.Details.View": "Edit view label attributes", |     "Panel.Info.Label.Details.View": "Edit view label attributes", | ||||||
|     "Panel.Title.Group.Details.View": "Group", |     "Panel.Title.Group.Details.View": "Group", | ||||||
|     "Panel.Info.Group.Details.View": "Edit view group attributes", |     "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.Unnamed": "Popup message", | ||||||
|     "Popup.Title.Confirm": "Confirm message", |     "Popup.Title.Confirm": "Confirm message", | ||||||
|     "Popup.Action.Yes": "Confirm", |     "Popup.Action.Yes": "Confirm", | ||||||
| @ -53,16 +51,16 @@ const EN_US = { | |||||||
|     "Popup.Action.Objects.Confirm.Title": "Confirm Delete", |     "Popup.Action.Objects.Confirm.Title": "Confirm Delete", | ||||||
|     "Popup.Action.Objects.Confirm.Delete": "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.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.Setting.Title": "Preferences setting", | ||||||
|     "Popup.Add.Behavior.Title": "Add behavior", |     "Popup.Add.Behavior.Title": "Add behavior", | ||||||
|     "Popup.Add.Behavior.Action.Add": "Add all select behavior", |     "Popup.Add.Behavior.Action.Add": "Add all select behavior", | ||||||
|     "Popup.Add.Behavior.Select.Counter": "Selected {count} 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.Title": "Behavior details: {behavior}", | ||||||
|     "Popup.Behavior.Info.Confirm": "OK, I know it", |     "Popup.Behavior.Info.Confirm": "OK, I know it", | ||||||
|     "Build.In.Label.Name.All.Group": "All group", |     "Build.In.Label.Name.All.Group": "All group", | ||||||
|     "Build.In.Label.Name.All.Range": "All range", |     "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.Search.Placeholder": "Search in here...", | ||||||
|     "Common.No.Data": "No Data", |     "Common.No.Data": "No Data", | ||||||
|     "Common.No.Unknown.Error": "Unknown error", |     "Common.No.Unknown.Error": "Unknown error", | ||||||
|  | |||||||
| @ -44,8 +44,6 @@ const ZH_CN = { | |||||||
|     "Panel.Info.Label.Details.View": "编辑查看标签属性", |     "Panel.Info.Label.Details.View": "编辑查看标签属性", | ||||||
|     "Panel.Title.Group.Details.View": "群", |     "Panel.Title.Group.Details.View": "群", | ||||||
|     "Panel.Info.Group.Details.View": "编辑查看群属性", |     "Panel.Info.Group.Details.View": "编辑查看群属性", | ||||||
|     "Panel.Title.Behavior.List.View": "行为列表", |  | ||||||
|     "Panel.Info.Behavior.List.View": "编辑查看行为列表", |  | ||||||
|     "Popup.Title.Unnamed": "弹窗消息", |     "Popup.Title.Unnamed": "弹窗消息", | ||||||
|     "Popup.Title.Confirm": "确认消息", |     "Popup.Title.Confirm": "确认消息", | ||||||
|     "Popup.Action.Yes": "确定", |     "Popup.Action.Yes": "确定", | ||||||
| @ -53,16 +51,16 @@ const ZH_CN = { | |||||||
|     "Popup.Action.Objects.Confirm.Title": "删除确认", |     "Popup.Action.Objects.Confirm.Title": "删除确认", | ||||||
|     "Popup.Action.Objects.Confirm.Delete": "删除", |     "Popup.Action.Objects.Confirm.Delete": "删除", | ||||||
|     "Popup.Delete.Objects.Confirm": "你确定要删除这个(些)对象吗?对象被删除将无法撤回。", |     "Popup.Delete.Objects.Confirm": "你确定要删除这个(些)对象吗?对象被删除将无法撤回。", | ||||||
|     "Popup.Delete.Behavior.Confirm": "你确定要删除这个行为吗?行为被删除将无法撤回。", |  | ||||||
|     "Popup.Setting.Title": "首选项设置", |     "Popup.Setting.Title": "首选项设置", | ||||||
|     "Popup.Add.Behavior.Title": "添加行为", |     "Popup.Add.Behavior.Title": "添加行为", | ||||||
|     "Popup.Add.Behavior.Action.Add": "添加全部选中行为", |     "Popup.Add.Behavior.Action.Add": "添加全部选中行为", | ||||||
|     "Popup.Add.Behavior.Select.Counter": "找不到名为 \"{name}\" 的行为", |     "Popup.Add.Behavior.Select.Counter": "已选择 {count} 个行为", | ||||||
|     "Popup.Add.Behavior.Select.Nodata": "Could not find behavior named \"{name}\"", |  | ||||||
|     "Popup.Behavior.Info.Title": "行为详情: {behavior}", |     "Popup.Behavior.Info.Title": "行为详情: {behavior}", | ||||||
|     "Popup.Behavior.Info.Confirm": "好的, 我知道了", |     "Popup.Behavior.Info.Confirm": "好的, 我知道了", | ||||||
|     "Build.In.Label.Name.All.Group": "全部群", |     "Build.In.Label.Name.All.Group": "全部群", | ||||||
|     "Build.In.Label.Name.All.Range": "全部范围", |     "Build.In.Label.Name.All.Range": "全部范围", | ||||||
|  |     "Behavior.Template.Title": "行为", | ||||||
|  |     "Behavior.Template.Intro": "这是一个模板行为", | ||||||
|     "Common.Search.Placeholder": "在此处搜索...", |     "Common.Search.Placeholder": "在此处搜索...", | ||||||
|     "Common.No.Data": "暂无数据", |     "Common.No.Data": "暂无数据", | ||||||
|     "Common.No.Unknown.Error": "未知错误", |     "Common.No.Unknown.Error": "未知错误", | ||||||
|  | |||||||
| @ -132,8 +132,6 @@ type IBehaviorConstructor< | |||||||
| type IAnyBehavior = Behavior<any, any>; | type IAnyBehavior = Behavior<any, any>; | ||||||
| type IAnyBehaviorRecorder = BehaviorRecorder<any, any>; | type IAnyBehaviorRecorder = BehaviorRecorder<any, any>; | ||||||
| 
 | 
 | ||||||
| type Language = "ZH_CN" | "EN_US"; |  | ||||||
| 
 |  | ||||||
| /** | /** | ||||||
|  * 行为的基础信息 |  * 行为的基础信息 | ||||||
|  */ |  */ | ||||||
| @ -158,34 +156,6 @@ class BehaviorInfo<E extends Record<EventType, any> = {}> extends Emitter<E> { | |||||||
|      * 行为描述 |      * 行为描述 | ||||||
|      */ |      */ | ||||||
|     public describe: string = ""; |     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< | class BehaviorRecorder< | ||||||
| @ -269,7 +239,6 @@ class BehaviorRecorder< | |||||||
|         this.behaviorId = this.behaviorInstance.behaviorId; |         this.behaviorId = this.behaviorInstance.behaviorId; | ||||||
|         this.behaviorName = this.behaviorInstance.behaviorName; |         this.behaviorName = this.behaviorInstance.behaviorName; | ||||||
|         this.describe = this.behaviorInstance.describe; |         this.describe = this.behaviorInstance.describe; | ||||||
|         this.terms = this.behaviorInstance.terms; |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -66,7 +66,7 @@ class SimulatorWeb extends Component { | |||||||
|                     items: [ |                     items: [ | ||||||
|                         {panels: ["RenderView", "Label Aa Bb", "Label aaa"]}, |                         {panels: ["RenderView", "Label Aa Bb", "Label aaa"]}, | ||||||
|                         { |                         { | ||||||
|                             items: [{panels: ["BehaviorList", "Label bbb"]}, {panels: ["LabelList"]}], |                             items: [{panels: ["Label b", "Label bbb"]}, {panels: ["LabelList"]}], | ||||||
|                             scale: 80, |                             scale: 80, | ||||||
|                             layout: LayoutDirection.X |                             layout: LayoutDirection.X | ||||||
|                         } |                         } | ||||||
|  | |||||||
| @ -1,8 +0,0 @@ | |||||||
| @import "../../Component/Theme/Theme.scss"; |  | ||||||
| 
 |  | ||||||
| div.behavior-list-panel-root { |  | ||||||
|     width: 100%; |  | ||||||
|     min-height: 100%; |  | ||||||
|     padding: 10px; |  | ||||||
|     box-sizing: border-box; |  | ||||||
| } |  | ||||||
| @ -1,77 +0,0 @@ | |||||||
| 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 }; |  | ||||||
| @ -8,7 +8,6 @@ import { RangeDetails } from "./RangeDetails/RangeDetails"; | |||||||
| import { LabelList } from "./LabelList/LabelList"; | import { LabelList } from "./LabelList/LabelList"; | ||||||
| import { LabelDetails } from "./LabelDetails/LabelDetails"; | import { LabelDetails } from "./LabelDetails/LabelDetails"; | ||||||
| import { GroupDetails } from "./GroupDetails/GroupDetails"; | import { GroupDetails } from "./GroupDetails/GroupDetails"; | ||||||
| import { BehaviorList } from "./BehaviorList/BehaviorList"; |  | ||||||
| 
 | 
 | ||||||
| interface IPanelInfo { | interface IPanelInfo { | ||||||
| 	nameKey: string; | 	nameKey: string; | ||||||
| @ -28,7 +27,6 @@ type PanelId = "" | |||||||
| | "LabelList" // 标签列表
 | | "LabelList" // 标签列表
 | ||||||
| | "LabelDetails" // 标签属性
 | | "LabelDetails" // 标签属性
 | ||||||
| | "GroupDetails" // 群属性
 | | "GroupDetails" // 群属性
 | ||||||
| | "BehaviorList" // 行为列表
 |  | ||||||
| ; | ; | ||||||
| 
 | 
 | ||||||
| const PanelInfoMap = new Map<PanelId, IPanelInfo>(); | const PanelInfoMap = new Map<PanelId, IPanelInfo>(); | ||||||
| @ -56,10 +54,6 @@ PanelInfoMap.set("GroupDetails", { | |||||||
|     nameKey: "Panel.Title.Group.Details.View", introKay: "Panel.Info.Group.Details.View", |     nameKey: "Panel.Title.Group.Details.View", introKay: "Panel.Info.Group.Details.View", | ||||||
|     class: GroupDetails |     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 { | function getPanelById(panelId: PanelId): ReactNode { | ||||||
| 	switch (panelId) { | 	switch (panelId) { | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user