!356 draw命令的log区别化

Merge pull request !356 from 肖诗雅/drawLog
pull/356/MERGE
肖诗雅 5 years ago committed by ChenX
parent a65888ee51
commit e2a05dae06

@ -10,7 +10,7 @@ export class AutoCuttingReactor
{
this.Enable = userConfig.openAutoCuttingReactor;
const cuttingCommands = ["draw"];
const cuttingCommands = ["draw", "DD", "左右侧板", "立板", "层板", "背板", "DOOR"];
app.CommandReactor.OnCommandEnd((cmdName, changeObjects, createObjects) =>
{

@ -75,7 +75,7 @@ export class BoardModal extends React.Component<BoardModalProps, {}>
(e.keyCode === KeyBoard.Space &&
(el.nodeName !== "INPUT" || el.type !== "text" || !el.getAttribute('data-isNum'))))
{
store.OnOk(ModalState.Ok, this.props.type !== BoardModalType.Skt);
store.OnOk(ModalState.Ok, this.props.type !== BoardModalType.Skt, store.title);
//使用左右侧板时,该事件会使 拾取点的动态输入框响应到这个键盘事件.
//导致进入交互时,马上有个空格.
e.preventDefault();
@ -148,7 +148,7 @@ export class BoardModal extends React.Component<BoardModalProps, {}>
if (store.HasInvailValue())
AppToaster.show({ message: "存在无效数值,请修正", timeout: 1000 });
else
store.OnOk(ModalState.Ok, this.props.type != BoardModalType.Skt);
store.OnOk(ModalState.Ok, this.props.type != BoardModalType.Skt, store.title);
}} />
<Button

@ -82,7 +82,7 @@ export class BoardStore extends Singleton implements IConfigStore
this.m_BoardProcessOption[EBoardKeyList.BrMat] = br.BoardProcessOption[EBoardKeyList.BrMat];
this.m_BoardProcessOption[EBoardKeyList.Color] = br.BoardProcessOption[EBoardKeyList.Color];
}
async OnOk(state: number, isClose: boolean = true)
async OnOk(state: number, isClose: boolean = true, title?: string)
{
isClose && app.Editor.ModalManage.Clear();
if (app.Editor.ModalManage.m_PromisRes)
@ -94,7 +94,7 @@ export class BoardStore extends Singleton implements IConfigStore
{
if (state === ModalState.Ok)
{
await app.Editor.ModalManage.ExecCmd();
await app.Editor.ModalManage.ExecCmd({ cname: title });
}
else
{

Loading…
Cancel
Save