diff --git a/src/Add-on/BoardFindModify.ts b/src/Add-on/BoardFindModify.ts index c6a238f34..430545687 100644 --- a/src/Add-on/BoardFindModify.ts +++ b/src/Add-on/BoardFindModify.ts @@ -21,7 +21,7 @@ import BoardFindModifyModal from "../UI/Components/Board/BoardFindModify"; import { InitRectBoardDrillOption, SetRectHighDrill } from "../UI/Components/Board/CommonBoardOption"; import { DRILL_KEYS, ECompareType, EFindType, IBoardFindOption } from "../UI/Store/BoardFindInterface"; import { BoardFindStore } from "../UI/Store/BoardFindModifyStore"; -import { LinesType } from "../UI/Store/BoardInterface"; +import { LinesType, BoardOpenDir } from "../UI/Store/BoardInterface"; export class BoardFindModify implements Command { @@ -100,9 +100,23 @@ export class BoardFindModify implements Command || ((en.Type === GangDrillType.Wood || en.Type === GangDrillType.WoodPXL) && option.condition.useWood); } else if (en instanceof Board) + { + if (option.condition.useDoor) + { + if (en.OpenDir !== BoardOpenDir.None) + return true; + } return this.FilterBr(en, option); + } else if (en instanceof HardwareTopline || en instanceof HardwareCompositeEntity) + { + if (option.condition.useDoor) + { + if (en.HardwareOption.model.includes("开门板")) + return true; + } return this.FilterHardware(en, option); + } else return true; }); diff --git a/src/Add-on/HideSelected.ts b/src/Add-on/HideSelected.ts index 2eb085d1e..7c39c388b 100644 --- a/src/Add-on/HideSelected.ts +++ b/src/Add-on/HideSelected.ts @@ -4,6 +4,9 @@ import { Light } from "../DatabaseServices/Lights/Light"; import { TemplateRecord } from "../DatabaseServices/Template/TemplateRecord"; import { Command } from "../Editor/CommandMachine"; import { SelectSetBase } from "../Editor/SelectBase"; +import { Board } from "../DatabaseServices/Entity/Board"; +import { BoardOpenDir } from "../UI/Store/BoardInterface"; +import { HardwareCompositeEntity } from "../DatabaseServices/Hardware/HardwareCompositeEntity"; export class Command_HideSelected implements Command { @@ -83,7 +86,23 @@ export class Command_SwitchDoor implements Command for (let en of app.Database.ModelSpace.Entitys) { - if (!en.Template || DoorCache.has(en.Id.Index)) continue; + if (DoorCache.has(en.Id.Index)) continue; + if (!en.Template) + { + if (en instanceof Board) + { + if (en.OpenDir !== BoardOpenDir.None) + en.Visible = this._isShow; + } + else if (en instanceof HardwareCompositeEntity) + { + if (en.HardwareOption.model.endsWith("开门板") + || en.HardwareOption.name.includes("铰链") + || en.HardwareOption.name.includes("拉手")) + en.Visible = this._isShow; + } + continue; + } let temp = en.Template.Object as TemplateRecord; diff --git a/src/Editor/DefaultConfig.ts b/src/Editor/DefaultConfig.ts index 693b8ddaf..4935af995 100644 --- a/src/Editor/DefaultConfig.ts +++ b/src/Editor/DefaultConfig.ts @@ -194,7 +194,7 @@ export const DefaultBoardFindOption: IBoardFindOption = { useWood: false, useDrill: false, useNail: false, - uerDoor: false, + useDoor: false, useDim: false, useSpecial: false, useModeling: false, diff --git a/src/UI/Components/Board/BoardFindModify.tsx b/src/UI/Components/Board/BoardFindModify.tsx index 14dfd04e0..32e4f76e6 100644 --- a/src/UI/Components/Board/BoardFindModify.tsx +++ b/src/UI/Components/Board/BoardFindModify.tsx @@ -9,10 +9,9 @@ import { EFindType, ECompareType, DRILL_KEYS } from '../../Store/BoardFindInterf import { EBoardKeyList } from '../../../Common/BoardKeyList'; import { app } from '../../../ApplicationServices/Application'; import { observable } from 'mobx'; -import { LinesType, FaceDirection, ComposingType, DrillType } from '../../Store/BoardInterface'; import { userConfig } from '../../../Editor/UserConfig'; -import { BoardDirectionIcon, Notes } from './BoardCommon'; -import { GoodsList, IGoodInfo } from '../../MaterialEditor/GoodsList'; +import { Notes } from './BoardCommon'; +import { IGoodInfo } from '../../MaterialEditor/GoodsList'; import { CommonModal } from '../Modal/ModalContainer'; import { BigFaceSelectOption, LineTypeSelectOption, ComposingFaceSelectOption } from '../../../Common/CommonSelectOption'; import { KeyCode } from '../../../Common/KeyEnum'; @@ -120,7 +119,7 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar const entPars = [ ["木削", "useWood"], ["排钻", "useDrill"], ["层板钉", "useNail"], - ["门板", "uerDoor"], ["标注", "useDim"], ["异型", "useSpecial"], + ["门板", "useDoor"], ["标注", "useDim"], ["异型", "useSpecial"], ["造型", "useModeling"], ]; @@ -185,7 +184,7 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar >
板件长宽属性
- + /> */} { optPars.map(([t, k]) => { diff --git a/src/UI/Store/BoardFindInterface.ts b/src/UI/Store/BoardFindInterface.ts index 4e988a7f9..c63934fa6 100644 --- a/src/UI/Store/BoardFindInterface.ts +++ b/src/UI/Store/BoardFindInterface.ts @@ -40,7 +40,7 @@ export interface IFindCondition useWood: boolean; useDrill: boolean; useNail: boolean; - uerDoor: boolean; + useDoor: boolean; useDim: boolean; useSpecial: boolean; useModeling: boolean; diff --git a/src/UI/Store/BoardFindModifyStore.ts b/src/UI/Store/BoardFindModifyStore.ts index a78d9a8d6..d7f0ea403 100644 --- a/src/UI/Store/BoardFindModifyStore.ts +++ b/src/UI/Store/BoardFindModifyStore.ts @@ -21,7 +21,7 @@ export class BoardFindStore extends BoardStore useWood: false, useDrill: false, useNail: false, - uerDoor: false, + useDoor: false, useDim: false, useSpecial: false, useModeling: false,