diff --git a/src/Add-on/DrawBoard/DrawLeftRightBoard.ts b/src/Add-on/DrawBoard/DrawLeftRightBoard.ts index 7c1ae694e..c90e2a815 100644 --- a/src/Add-on/DrawBoard/DrawLeftRightBoard.ts +++ b/src/Add-on/DrawBoard/DrawLeftRightBoard.ts @@ -21,6 +21,7 @@ import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { SideBoardStore } from '../../UI/Store/BoardStore'; import { AnyObject } from "../../UI/Store/OptionInterface/IOptionInterface"; import { AutoCutting } from '../BoardCutting/AutoCuttingReactor'; +import { FaceDirection } from '../DrawDrilling/DrillType'; export class DrawLeftRight implements Command { @@ -217,6 +218,21 @@ export class DrawLeftRight implements Command rightBoard.Name = "右侧板"; rightBoard.BoardProcessOption = store.BoardProcessOption; + const BoardProcessOption = store.BoardProcessOption; + + // 朝向柜内 + if (BoardProcessOption.bigHoleDir === FaceDirection.Front) + { + leftBoard.BoardProcessOption.bigHoleDir = FaceDirection.Front; + rightBoard.BoardProcessOption.bigHoleDir = FaceDirection.Back; + } + // 朝向柜外 + else if (BoardProcessOption.bigHoleDir === FaceDirection.Back) + { + leftBoard.BoardProcessOption.bigHoleDir = FaceDirection.Back; + rightBoard.BoardProcessOption.bigHoleDir = FaceDirection.Front; + } + app.Database.ModelSpace.Append(leftBoard); app.Database.ModelSpace.Append(rightBoard); template.Objects = [leftBoard.Id, rightBoard.Id]; diff --git a/src/UI/Components/Board/BoardModal.tsx b/src/UI/Components/Board/BoardModal.tsx index efb3f032c..4db7f4528 100644 --- a/src/UI/Components/Board/BoardModal.tsx +++ b/src/UI/Components/Board/BoardModal.tsx @@ -172,7 +172,7 @@ export class BoardModal extends React.Component }} /> } - +
diff --git a/src/UI/Components/Board/BoardProcessModal.tsx b/src/UI/Components/Board/BoardProcessModal.tsx index 2a5607ba1..1364e07bd 100644 --- a/src/UI/Components/Board/BoardProcessModal.tsx +++ b/src/UI/Components/Board/BoardProcessModal.tsx @@ -31,6 +31,7 @@ import { DialogUserConfig } from './UserConfigComponent'; interface BoardProcessProps { + type?: BoardModalType; opt: BoardProcessOption; uiOpt?: IUiOption; isSpecial?: IObservableValue; @@ -322,11 +323,11 @@ export class BoardProcessModal extends React.Component{ options={ [ { - label: "正", + label: this.props.type === BoardModalType.LR ? "朝向柜内" : "正", value: FaceDirection.Front.toString() }, { - label: "反", + label: this.props.type === BoardModalType.LR ? "朝向柜外" : "反", value: FaceDirection.Back.toString() } ]