From aa9c7874c1f8372deb219e202747effffac68c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E4=B8=89?= <940119273@qq.com> Date: Tue, 18 Jul 2023 07:12:07 +0000 Subject: [PATCH] =?UTF-8?q?!2305=20option=E6=8E=A5=E5=8F=A3=E5=88=86?= =?UTF-8?q?=E7=B1=BB=20Merge=20pull=20request=20!2305=20from=20=E6=9E=97?= =?UTF-8?q?=E4=B8=89/file=5Fclassify?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __test__/Door/door.test.ts | 2 +- __test__/EdgeSealing/SmoothEdge.test.ts | 2 +- src/Add-on/ActivityLayerBoard.ts | 2 +- src/Add-on/Array.ts | 2 +- src/Add-on/AutoHoleFaceSetting.ts | 3 +- src/Add-on/BatchModifyPanel.ts | 3 +- src/Add-on/BoardBatchCurtail.ts | 3 +- src/Add-on/BoardCutting/CuttingPropsModal.tsx | 2 +- .../BoardCutting/NonAssociativeCutting.ts | 2 +- src/Add-on/BoardCutting/ReferenceCutting.ts | 4 +- .../BoardCutting/ReferenceCuttingModal.tsx | 5 +- .../BoardEditor/ChangeBoardColorByPBFace.ts | 2 +- .../BoardEditor/SelectThinBehindBoard.ts | 4 +- src/Add-on/BoardEditor/SerializeBoardData.ts | 2 +- src/Add-on/BoardEditor/SetBoardLines.ts | 2 +- src/Add-on/BoardFindModify.ts | 4 +- .../CalcBrThicknessConfigStore.ts | 2 +- src/Add-on/CommandFeeding.ts | 2 +- .../DrawBoard/ActivityLayerBoardTool.ts | 4 +- src/Add-on/DrawBoard/BuildBoardTool.ts | 4 +- src/Add-on/DrawBoard/BuildLayerNailTool.ts | 15 +- .../DrawBoard/BuildTopBottomBoardTool.ts | 3 +- src/Add-on/DrawBoard/DrawBehindBoard.ts | 3 +- src/Add-on/DrawBoard/DrawBoardTool.ts | 2 +- src/Add-on/DrawBoard/DrawClosingStrip.ts | 3 +- .../DrawBoard/DrawDoorDrawer/DrawDoorTool.ts | 4 +- .../DrawDoorDrawer/DrawLeftRightOpenDoor.ts | 2 +- .../DrawDoorDrawer/DrawUpDownOpenDoor.ts | 2 +- src/Add-on/DrawBoard/DrawDrawer.ts | 2 +- src/Add-on/DrawBoard/DrawLayerBoard.ts | 2 +- src/Add-on/DrawBoard/DrawLeftRightBoard.ts | 5 +- .../DrawBoard/DrawSpecialShapedBoard.ts | 4 +- src/Add-on/DrawBoard/DrawTemplateByImport.ts | 2 +- src/Add-on/DrawBoard/DrawVerticalBoard.ts | 3 +- src/Add-on/DrawBoard/EditorBoardTempate.ts | 2 +- src/Add-on/DrawBoard/SetHoleType.ts | 2 +- src/Add-on/DrawDim/AutoDimBrs.ts | 2 +- src/Add-on/DrawDim/AutoDimBrsStore.ts | 2 +- src/Add-on/DrawDim/DimBoards.ts | 2 +- src/Add-on/DrawDim/DimStyleStore.ts | 2 +- src/Add-on/DrawDim/OperDimStyle.tsx | 4 +- src/Add-on/DrawDrilling/DrawDrillingTool.ts | 2 +- src/Add-on/DrawDrilling/DrillType.ts | 19 + src/Add-on/DrawDrilling/HoleUtils.ts | 4 +- src/Add-on/DrawViewport.ts | 2 +- .../DrawWineRack/DrawObliqueWineRackTool.ts | 6 +- .../DrawWineRack/DrawUprightWineRackTool.ts | 2 +- src/Add-on/DrawWineRack/DrawWinRackTool.ts | 6 +- src/Add-on/Erp/ParseData.ts | 4 +- src/Add-on/FZWL.ts | 2 +- src/Add-on/Gesture/Gesture_DrawLayerBoard.ts | 2 +- src/Add-on/HideSelect/HideSelectUtils.ts | 2 +- src/Add-on/JiaJu/Import/JiaJuImport.ts | 3 +- src/Add-on/Join.ts | 2 +- src/Add-on/KJL/Import/KJLImport.ts | 4 +- src/Add-on/KJL/Import/KJLParse.ts | 6 +- .../KJLImportConfig/KJLImportConfigOption.ts | 2 +- .../KJLImportConfig/KJLImportConfigStore.ts | 2 +- src/Add-on/KJL/KjlExport.ts | 2 +- src/Add-on/LatticeDrawer/LatticeDrawerTool.ts | 4 +- .../LookOverBoardInfos/LookOverBoardInfos.ts | 8 +- .../LookOverBoardInfosTool.ts | 5 +- src/Add-on/OpenCabinet/OpenCabinet.ts | 2 +- src/Add-on/RestoreColor.ts | 4 +- src/Add-on/RotateLayerBoard.ts | 4 +- src/Add-on/SetSmoothEdge/SetSmoothEdgeFace.ts | 3 +- src/Add-on/SetSmoothEdge/SmoothEdgeStore.ts | 2 +- src/Add-on/ShareView/ShareViewRules.ts | 2 +- src/Add-on/ShareView/ShareViewStore.ts | 2 +- src/Add-on/ShareView/components/ViewAngle.tsx | 2 +- src/Add-on/Template/DrawVisualSpaceBox.tsx | 4 +- src/Add-on/TemplateSearch.tsx | 2 +- src/Add-on/ViewortConfig/Viewport2Config.tsx | 5 +- src/Add-on/ViewortConfig/Viewport3Config.tsx | 5 +- src/Add-on/ViewortConfig/Viewport4Config.tsx | 4 +- src/Add-on/ViewortConfig/ViewportConfig.tsx | 4 +- src/Add-on/Viewport/OneKeyLayout.ts | 2 +- .../twoD2threeD/Modals/Curve2RecModal.tsx | 4 +- .../twoD2threeD/Modals/Curve2RecOption.tsx | 3 +- src/Add-on/twoD2threeD/ParseBoardData.ts | 2 +- .../twoD2threeD/ParseBoardNamePanel.tsx | 2 +- src/Add-on/twoD2threeD/ParseBoardNameStore.ts | 2 +- src/Add-on/twoD2threeD/ParseBoardNameUtil.ts | 3 +- src/Add-on/twoD2threeD/Polyline2Board.ts | 2 +- src/Add-on/twoD2threeD/R2B2Store.ts | 2 +- src/Add-on/twoD2threeD/R2bInterface.ts | 3 +- src/Add-on/twoD2threeD/Rec2BrStore.ts | 2 +- src/Add-on/twoD2threeD/Rect2Board.ts | 7 +- .../HostApplicationServices.ts | 1 + src/Common/CommonSelectOption.ts | 3 +- src/Common/DataAdapter.ts | 2 +- src/DatabaseServices/BoardLinesReactor.ts | 2 +- src/DatabaseServices/Entity/Board.ts | 5 +- src/DatabaseServices/Entity/BoardInterface.ts | 45 ++ .../Wall/Hole/Window/WindowPanelStore.ts | 2 +- .../ProgramTempate/TemplateArcWindowRecord.ts | 4 +- .../ProgramTempate/TemplateBehindBoard.ts | 6 +- .../Template/ProgramTempate/TemplateBoard.ts | 3 +- .../ProgramTempate/TemplateLayerBoard.ts | 2 +- .../ProgramTempate/TemplateSizeBoard.ts | 2 +- .../ProgramTempate/TemplateTopBottomBoard.ts | 5 +- .../ProgramTempate/TemplateVerticalBoard.ts | 2 +- src/DatabaseServices/Template/TempateUtils.ts | 10 +- src/Editor/DefaultConfig.ts | 11 +- src/Editor/ICursorConfig.ts | 2 +- src/Editor/UserConfig.ts | 2 +- src/Geometry/CreateWireframe.ts | 2 +- src/Geometry/DrillParse/BoardGetFace.ts | 4 +- src/Geometry/DrillParse/CollisionDetection.ts | 2 +- .../ExtrudeEdgeGeometry2.ts | 8 +- src/Geometry/PointShapeUtils.ts | 2 +- src/Geometry/SpaceParse/ClampSpaceParse.ts | 2 +- src/Geometry/SpaceParse/ISpaceParse.ts | 4 +- src/Geometry/SpaceParse/SurroundSpaceParse.ts | 2 +- src/GraphicsSystem/CalcEdgeSealing.ts | 2 +- .../ToolPath/FeedingToolPath.ts | 2 +- src/Production/ParseBoardHoleData.ts | 2 +- src/Production/Product.ts | 4 +- src/UI/Components/AutoDimBoard.tsx | 2 +- src/UI/Components/BBS/BBSCommon.tsx | 2 +- src/UI/Components/BBS/BoardInfosList.tsx | 8 +- src/UI/Components/BBS/BoardLIst.tsx | 2 +- src/UI/Components/BBS/LookOverBoardInfos.tsx | 7 +- src/UI/Components/BatchModifyPanelModal.tsx | 3 +- src/UI/Components/Board/BehindBoardModal.tsx | 3 +- src/UI/Components/Board/BoardCommon.tsx | 5 +- src/UI/Components/Board/BoardConfigModal.tsx | 6 +- src/UI/Components/Board/BoardFindCommon.tsx | 2 +- src/UI/Components/Board/BoardModal.tsx | 5 +- src/UI/Components/Board/BoardProcessModal.tsx | 4 +- src/UI/Components/Board/ClosingStripModal.tsx | 3 +- src/UI/Components/Board/CommonBoardOption.tsx | 4 +- src/UI/Components/Board/Door/DoorCommon.tsx | 4 +- .../Components/Board/Door/DoorConfigModal.tsx | 2 +- .../Board/InvalidDrillBoardModal.tsx | 2 +- src/UI/Components/Board/LayerBoardModal.tsx | 2 +- src/UI/Components/Board/SpecialBoardModal.tsx | 2 +- .../Board/UpdateBoardInfointerface.ts | 4 +- src/UI/Components/Board/UpdateBoardInfos.tsx | 2 +- .../Components/Board/UserConfigComponent.tsx | 5 +- .../Components/Board/VerticalBoardModal.tsx | 2 +- src/UI/Components/BoardBatchCurtailModal.tsx | 2 +- src/UI/Components/Common/Datalist.tsx | 2 +- src/UI/Components/Common/DatalistStore.ts | 2 +- src/UI/Components/LatticeDrawer.tsx | 2 +- src/UI/Components/Modal/CadModal.tsx | 2 +- src/UI/Components/Modal/HideSelectModal.tsx | 6 +- src/UI/Components/Modal/ModalsManage.ts | 2 +- .../Modal/OptionModal/ChaiDanModal.tsx | 2 +- .../Modal/OptionModal/DisplayConfigPanel.tsx | 2 +- .../Modal/OptionModal/DrawConfigPanel.tsx | 2 +- .../Modal/OptionModal/FileConfigPanel.tsx | 2 +- .../Modal/OptionModal/SystemConfig.tsx | 2 +- .../Components/Modal/ProcessingGroupModal.tsx | 2 +- .../Components/RightPanel/DrillComponent.tsx | 2 +- .../RightPanel/Modeling/KnifeList.tsx | 4 +- .../Modeling/ModelingComponent2.tsx | 4 +- .../RightPanel/Modeling/knifePropsModal.tsx | 12 +- .../RightPanel/ModelingComponent.tsx | 2 +- .../RightPanel/RightPanelInterface.ts | 2 +- src/UI/Components/RotateLayerBoard.tsx | 4 +- .../SourceManage/CommonPanelStore.ts | 2 +- src/UI/Components/Template/GetRoomCabName.tsx | 2 +- .../Components/Template/TemplateComponent.tsx | 6 +- .../Template/TemplateDrawHandleTool.ts | 2 +- .../Template/TemplateDrawHingeTool.ts | 2 +- src/UI/Components/Text/TextModify.tsx | 2 +- src/UI/Store/ActivityLayerBoardStore.ts | 2 +- src/UI/Store/BBSEditorStore.ts | 7 +- src/UI/Store/BoardFindInterface.ts | 4 +- src/UI/Store/BoardInterface.ts | 621 ------------------ src/UI/Store/BoardStore.ts | 7 +- .../Store/DoorDrawerStore/DoorDrawerStore.ts | 2 +- src/UI/Store/DoorDrawerStore/DoorStore.ts | 2 +- src/UI/Store/DoorDrawerStore/DrawerStore.ts | 2 +- src/UI/Store/DoorDrawerStore/HingeStore.ts | 2 +- src/UI/Store/DoorInterface.ts | 2 +- src/UI/Store/HSInterface.ts | 2 +- src/UI/Store/KuGanStore.ts | 4 +- src/UI/Store/LatticeInterface.ts | 2 +- .../Store/OptionInterface/AutoDimBrsOption.ts | 28 + .../BoardBatchCurtailOption .ts | 18 + .../OptionInterface/BoardProcessOption.ts | 34 + .../OptionInterface/ClosingStripOption.ts | 18 + .../Store/OptionInterface/IHighSealedItem.ts | 11 + .../Store/OptionInterface/IOptionInterface.ts | 341 ++++++++++ .../OptionInterface/LightConfigOption.ts | 39 ++ src/UI/Store/OptionInterface/OptionEnum.ts | 47 ++ .../OptionInterface/ViewportConfigOption.ts | 29 + src/UI/Store/Rect2WinerackStore.ts | 2 +- src/UI/Store/RightPanelStore/DrillingStore.ts | 2 +- src/UI/Store/RightPanelStore/LightStore.ts | 7 +- .../Store/RightPanelStore/Modeling2Store.ts | 3 +- src/UI/Store/RightPanelStore/ModelingStore.ts | 3 +- .../Store/RightPanelStore/RightPanelStore.ts | 2 +- src/UI/Store/RightPanelStore/SealingStore.ts | 2 +- src/UI/Store/TemplateManageStore.ts | 2 +- src/UI/Store/UpdateBoardInfoStore.ts | 3 +- src/UI/Store/UserConfigStore.tsx | 2 +- src/UI/Store/WineRackInterface.ts | 2 +- src/UI/Store/drillInterface.ts | 2 +- 201 files changed, 968 insertions(+), 882 deletions(-) create mode 100644 src/Add-on/DrawDrilling/DrillType.ts create mode 100644 src/DatabaseServices/Entity/BoardInterface.ts delete mode 100644 src/UI/Store/BoardInterface.ts create mode 100644 src/UI/Store/OptionInterface/AutoDimBrsOption.ts create mode 100644 src/UI/Store/OptionInterface/BoardBatchCurtailOption .ts create mode 100644 src/UI/Store/OptionInterface/BoardProcessOption.ts create mode 100644 src/UI/Store/OptionInterface/ClosingStripOption.ts create mode 100644 src/UI/Store/OptionInterface/IHighSealedItem.ts create mode 100644 src/UI/Store/OptionInterface/IOptionInterface.ts create mode 100644 src/UI/Store/OptionInterface/LightConfigOption.ts create mode 100644 src/UI/Store/OptionInterface/OptionEnum.ts create mode 100644 src/UI/Store/OptionInterface/ViewportConfigOption.ts diff --git a/__test__/Door/door.test.ts b/__test__/Door/door.test.ts index 9e0daac54..f821faff6 100644 --- a/__test__/Door/door.test.ts +++ b/__test__/Door/door.test.ts @@ -2,7 +2,7 @@ import { IsDoor } from "../../src/Add-on/HideSelect/HideSelectUtils"; import { CADFiler } from "../../src/DatabaseServices/CADFiler"; import { Database } from "../../src/DatabaseServices/Database"; import { Board } from "../../src/DatabaseServices/Entity/Board"; -import { BoardOpenDir } from "../../src/UI/Store/BoardInterface"; +import { BoardOpenDir } from "../../src/DatabaseServices/Entity/BoardInterface"; import { LoadBoardsFromFileData } from "../Utils/LoadEntity.util"; LoadBoardsFromFileData; diff --git a/__test__/EdgeSealing/SmoothEdge.test.ts b/__test__/EdgeSealing/SmoothEdge.test.ts index 4b91a8750..e1d8b4355 100644 --- a/__test__/EdgeSealing/SmoothEdge.test.ts +++ b/__test__/EdgeSealing/SmoothEdge.test.ts @@ -1,6 +1,6 @@ import { SetSmoothEdges } from "../../src/Add-on/SetSmoothEdge/SetSmoothEdgeFace"; import { Board } from "../../src/DatabaseServices/Entity/Board"; -import { ISmoothEdgeOption } from "../../src/UI/Store/BoardInterface"; +import { ISmoothEdgeOption } from "../../src/UI/Store/OptionInterface/IOptionInterface"; import { LoadBoardsFromFileData } from "../Utils/LoadEntity.util"; describe("见光面封边测试", () => diff --git a/src/Add-on/ActivityLayerBoard.ts b/src/Add-on/ActivityLayerBoard.ts index e52fa7d3f..f707c85f0 100644 --- a/src/Add-on/ActivityLayerBoard.ts +++ b/src/Add-on/ActivityLayerBoard.ts @@ -2,6 +2,7 @@ import { Intent } from "@blueprintjs/core"; import { app } from "../ApplicationServices/Application"; import { Log, LogType } from "../Common/Log"; import { Board } from "../DatabaseServices/Entity/Board"; +import { BoardType } from "../DatabaseServices/Entity/BoardInterface"; import { RemoveTemplate } from "../DatabaseServices/Template/TempateUtils"; import { TemplateRecord } from "../DatabaseServices/Template/TemplateRecord"; import { Command } from "../Editor/CommandMachine"; @@ -10,7 +11,6 @@ import { ActivityLayerBoard } from "../UI/Components/Modal/ActivityLayerBoard"; import { ModalState } from "../UI/Components/Modal/ModalInterface"; import { AppToaster } from "../UI/Components/Toaster"; import { ActivityLayerBoardStore } from "../UI/Store/ActivityLayerBoardStore"; -import { BoardType } from "../UI/Store/BoardInterface"; import { activityLayerBoardTool } from "./DrawBoard/ActivityLayerBoardTool"; export class ActicityLayerBoard implements Command diff --git a/src/Add-on/Array.ts b/src/Add-on/Array.ts index 3318477ef..e33efe86b 100644 --- a/src/Add-on/Array.ts +++ b/src/Add-on/Array.ts @@ -18,7 +18,7 @@ import { AsVector2, MoveMatrix, rotatePoint } from '../Geometry/GeUtils'; import { ArrayModal } from '../UI/Components/Modal/ArrayModal'; import { ModalPosition, ModalState } from '../UI/Components/Modal/ModalInterface'; import { AppToaster } from '../UI/Components/Toaster'; -import { IBaseOption, IUiOption } from '../UI/Store/BoardInterface'; +import { IBaseOption, IUiOption } from "../UI/Store/OptionInterface/IOptionInterface"; export enum ArrayType { diff --git a/src/Add-on/AutoHoleFaceSetting.ts b/src/Add-on/AutoHoleFaceSetting.ts index 87dc60e44..61dff1b71 100644 --- a/src/Add-on/AutoHoleFaceSetting.ts +++ b/src/Add-on/AutoHoleFaceSetting.ts @@ -2,13 +2,14 @@ import { app } from "../ApplicationServices/Application"; import { EBoardKeyList } from "../Common/BoardKeyList"; import { LogType } from "../Common/Log"; import { Board } from "../DatabaseServices/Entity/Board"; +import { BoardType } from "../DatabaseServices/Entity/BoardInterface"; import { Command } from "../Editor/CommandMachine"; import { PromptStatus } from "../Editor/PromptResult"; import { BoardModalType } from "../UI/Components/Board/BoardModalType"; import { IConfigOption } from "../UI/Components/Board/UserConfigComponent"; -import { BoardType, FaceDirection } from "../UI/Store/BoardInterface"; import { IConfigStore } from "../UI/Store/BoardStore"; import { userConfigStore } from "../UI/Store/UserConfigStore"; +import { FaceDirection } from "./DrawDrilling/DrillType"; export class AutoHoleFaceSetting implements Command { diff --git a/src/Add-on/BatchModifyPanel.ts b/src/Add-on/BatchModifyPanel.ts index 5c1138eaa..7922e375b 100644 --- a/src/Add-on/BatchModifyPanel.ts +++ b/src/Add-on/BatchModifyPanel.ts @@ -3,12 +3,13 @@ import { Matrix4, Vector3 } from "three"; import { app } from "../ApplicationServices/Application"; import { safeEval } from "../Common/eval"; import { Board } from "../DatabaseServices/Entity/Board"; +import { BoardType } from "../DatabaseServices/Entity/BoardInterface"; import { Command } from "../Editor/CommandMachine"; import { PromptStatus } from "../Editor/PromptResult"; import { BatchModifyPanelModal, BatchModifyPanelStore } from "../UI/Components/BatchModifyPanelModal"; import { ModalState } from "../UI/Components/Modal/ModalInterface"; import { AppToaster } from "../UI/Components/Toaster"; -import { BoardType, RadioType } from "../UI/Store/BoardInterface"; +import { RadioType } from "../UI/Store/OptionInterface/OptionEnum"; export class BatchModifyPanel implements Command { diff --git a/src/Add-on/BoardBatchCurtail.ts b/src/Add-on/BoardBatchCurtail.ts index 68b366ba2..aa481ec5f 100644 --- a/src/Add-on/BoardBatchCurtail.ts +++ b/src/Add-on/BoardBatchCurtail.ts @@ -2,13 +2,14 @@ import { Box3, Euler, MathUtils, Vector3 } from "three"; import { app } from "../ApplicationServices/Application"; import { CylinderHole } from "../DatabaseServices/3DSolid/CylinderHole"; import { Board } from "../DatabaseServices/Entity/Board"; +import { BoardType } from "../DatabaseServices/Entity/BoardInterface"; import { Command } from "../Editor/CommandMachine"; import { PromptStatus } from "../Editor/PromptResult"; import { IntersectBox2 } from "../Geometry/Box"; import { ZeroVec, equalv3, isParallelTo } from "../Geometry/GeUtils"; import { BoardBatchCurtailModal, BoardBatchCurtailStore } from "../UI/Components/BoardBatchCurtailModal"; import { ModalState } from "../UI/Components/Modal/ModalInterface"; -import { BoardType, CurtailType } from "../UI/Store/BoardInterface"; +import { CurtailType } from "../UI/Store/OptionInterface/BoardBatchCurtailOption "; interface CurtailDataItem { diff --git a/src/Add-on/BoardCutting/CuttingPropsModal.tsx b/src/Add-on/BoardCutting/CuttingPropsModal.tsx index 9320f3c5b..49f8347d4 100644 --- a/src/Add-on/BoardCutting/CuttingPropsModal.tsx +++ b/src/Add-on/BoardCutting/CuttingPropsModal.tsx @@ -4,7 +4,7 @@ import React, { ReactElement } from 'react'; import { app } from '../../ApplicationServices/Application'; import { CheckObjectType } from '../../Common/CheckoutVaildValue'; import { ToasterInput } from '../../UI/Components/Toaster'; -import { IGrooveOption } from '../../UI/Store/BoardInterface'; +import { IGrooveOption } from "../../UI/Store/OptionInterface/IOptionInterface"; interface Props { diff --git a/src/Add-on/BoardCutting/NonAssociativeCutting.ts b/src/Add-on/BoardCutting/NonAssociativeCutting.ts index b468d64ca..11da18513 100644 --- a/src/Add-on/BoardCutting/NonAssociativeCutting.ts +++ b/src/Add-on/BoardCutting/NonAssociativeCutting.ts @@ -9,7 +9,7 @@ import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/Hardwar import { Command } from "../../Editor/CommandMachine"; import { PromptSsgetResult, PromptStatus } from "../../Editor/PromptResult"; import { ModalState } from "../../UI/Components/Modal/ModalInterface"; -import { IGrooveOption } from "../../UI/Store/BoardInterface"; +import { IGrooveOption } from "../../UI/Store/OptionInterface/IOptionInterface"; import CuttingPropsModal from "./CuttingPropsModal"; import { CuttingBoardByBoard, CuttingBoardByHardware } from "./CuttingUtils2"; diff --git a/src/Add-on/BoardCutting/ReferenceCutting.ts b/src/Add-on/BoardCutting/ReferenceCutting.ts index cfcc6b473..ef156dc0f 100644 --- a/src/Add-on/BoardCutting/ReferenceCutting.ts +++ b/src/Add-on/BoardCutting/ReferenceCutting.ts @@ -1,15 +1,15 @@ import { app } from "../../ApplicationServices/Application"; import { InteractionLog, LogType } from "../../Common/Log"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { Line } from "../../DatabaseServices/Entity/Line"; import { Polyline } from "../../DatabaseServices/Entity/Polyline"; import { Command } from "../../Editor/CommandMachine"; import { PromptStatus } from "../../Editor/PromptResult"; -import { equaln, ZeroVec } from "../../Geometry/GeUtils"; +import { ZeroVec, equaln } from "../../Geometry/GeUtils"; import { RegionParse } from "../../Geometry/RegionParse"; import { IntersectOption } from "../../GraphicsSystem/IntersectWith"; import { ModalState } from "../../UI/Components/Modal/ModalInterface"; -import { BoardType } from "../../UI/Store/BoardInterface"; import { CuttingOffset, ReferenceCuttingModal, ReferenceCuttingStore } from "./ReferenceCuttingModal"; export class ReferenceCutting implements Command diff --git a/src/Add-on/BoardCutting/ReferenceCuttingModal.tsx b/src/Add-on/BoardCutting/ReferenceCuttingModal.tsx index 84fd9bf17..cae3ac028 100644 --- a/src/Add-on/BoardCutting/ReferenceCuttingModal.tsx +++ b/src/Add-on/BoardCutting/ReferenceCuttingModal.tsx @@ -6,13 +6,14 @@ import { begin } from "xaop"; import { app } from "../../ApplicationServices/Application"; import { CheckObjectType, CheckoutValid } from "../../Common/CheckoutVaildValue"; import { DataAdapter } from "../../Common/DataAdapter"; -import { safeEval } from "../../Common/eval"; import { KeyBoard } from "../../Common/KeyEnum"; import { Singleton } from "../../Common/Singleton"; +import { safeEval } from "../../Common/eval"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { GetCompoentObjectIdString } from "../../UI/Components/ComponentObjectId"; import { ModalState } from "../../UI/Components/Modal/ModalInterface"; import { AppToaster, ToasterInput } from "../../UI/Components/Toaster"; -import { BoardType, IBaseOption } from "../../UI/Store/BoardInterface"; +import { IBaseOption } from "../../UI/Store/OptionInterface/IOptionInterface"; export enum CuttingOffset { diff --git a/src/Add-on/BoardEditor/ChangeBoardColorByPBFace.ts b/src/Add-on/BoardEditor/ChangeBoardColorByPBFace.ts index 5e4b11776..38a3977f0 100644 --- a/src/Add-on/BoardEditor/ChangeBoardColorByPBFace.ts +++ b/src/Add-on/BoardEditor/ChangeBoardColorByPBFace.ts @@ -2,10 +2,10 @@ import { Intent } from "@blueprintjs/core"; import { app } from "../../ApplicationServices/Application"; import { EBoardKeyList } from "../../Common/BoardKeyList"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { ComposingType } from "../../DatabaseServices/Entity/BoardInterface"; import { Command } from "../../Editor/CommandMachine"; import { PromptStatus } from "../../Editor/PromptResult"; import { AppToaster } from "../../UI/Components/Toaster"; -import { ComposingType } from "../../UI/Store/BoardInterface"; export class Command_ChangeBoardColorByPBFace implements Command { diff --git a/src/Add-on/BoardEditor/SelectThinBehindBoard.ts b/src/Add-on/BoardEditor/SelectThinBehindBoard.ts index 2d04fe81f..9d36f0851 100644 --- a/src/Add-on/BoardEditor/SelectThinBehindBoard.ts +++ b/src/Add-on/BoardEditor/SelectThinBehindBoard.ts @@ -2,11 +2,11 @@ import { app } from "../../ApplicationServices/Application"; import { LogType } from "../../Common/Log"; import { FixedNotZero } from "../../Common/Utils"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { Command } from "../../Editor/CommandMachine"; import { PromptStatus } from "../../Editor/PromptResult"; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent"; -import { BoardType } from "../../UI/Store/BoardInterface"; import { IConfigStore } from "../../UI/Store/BoardStore"; import { userConfigStore } from "../../UI/Store/UserConfigStore"; @@ -49,7 +49,7 @@ export class SelectThinBehindBoard implements Command { if (ret.Distance <= 0 || isNaN(ret.Distance)) { - app.Editor.Prompt("请输入为正数的厚度!", LogType.Error); + app.Editor.Prompt("请输入为正数的厚度!", LogType.Error); return; } this.store.config.option.thickness = Math.abs(ret.Distance); diff --git a/src/Add-on/BoardEditor/SerializeBoardData.ts b/src/Add-on/BoardEditor/SerializeBoardData.ts index 118a0b71f..c461d2e91 100644 --- a/src/Add-on/BoardEditor/SerializeBoardData.ts +++ b/src/Add-on/BoardEditor/SerializeBoardData.ts @@ -3,7 +3,7 @@ import { EBoardKeyList } from "../../Common/BoardKeyList"; import { CADFiler } from "../../DatabaseServices/CADFiler"; import { I2DModeling, I3DModeling, IPathItem } from "../../DatabaseServices/Entity/Board"; import { Polyline } from "../../DatabaseServices/Entity/Polyline"; -import { BoardProcessOption } from "../../UI/Store/BoardInterface"; +import { BoardProcessOption } from "../../UI/Store/OptionInterface/BoardProcessOption"; /**序列化板件数据 */ export function serializeBoardData(file: CADFiler, processData: BoardProcessOption) diff --git a/src/Add-on/BoardEditor/SetBoardLines.ts b/src/Add-on/BoardEditor/SetBoardLines.ts index 06015d532..b68bd787c 100644 --- a/src/Add-on/BoardEditor/SetBoardLines.ts +++ b/src/Add-on/BoardEditor/SetBoardLines.ts @@ -1,9 +1,9 @@ import { app } from "../../ApplicationServices/Application"; import { EBoardKeyList } from "../../Common/BoardKeyList"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { ComposingType, LinesType } from "../../DatabaseServices/Entity/BoardInterface"; import { Command } from "../../Editor/CommandMachine"; import { PromptStatus } from "../../Editor/PromptResult"; -import { ComposingType, LinesType } from "../../UI/Store/BoardInterface"; export class SetBoardLines implements Command { diff --git a/src/Add-on/BoardFindModify.ts b/src/Add-on/BoardFindModify.ts index ee48e3de6..479c7bc72 100644 --- a/src/Add-on/BoardFindModify.ts +++ b/src/Add-on/BoardFindModify.ts @@ -2,9 +2,9 @@ import { toJS } from "mobx"; import { app } from "../ApplicationServices/Application"; import { arrayLast } from "../Common/ArrayExt"; import { EBoardKeyList } from "../Common/BoardKeyList"; -import { safeEval } from "../Common/eval"; import { UpdateDraw } from "../Common/Status"; import { FixedNotZero } from "../Common/Utils"; +import { safeEval } from "../Common/eval"; import { CylinderHole, GangDrillType } from "../DatabaseServices/3DSolid/CylinderHole"; import { BoardIsLong, BoardIsShort } from "../DatabaseServices/BoardLinesReactor"; import { LineAngularDimension } from "../DatabaseServices/Dimension/2LineAngularDimension"; @@ -21,7 +21,7 @@ import { IHardwareType, Production } from "../Production/Product"; import BoardFindModifyModal from "../UI/Components/Board/BoardFindModify"; import { DRILL_KEYS, ECompareType, EFindType, IBoardFindOption, IFindCondition } from "../UI/Store/BoardFindInterface"; import { BoardFindStore } from "../UI/Store/BoardFindModifyStore"; -import { DrillType } from "../UI/Store/BoardInterface"; +import { DrillType } from "./DrawDrilling/DrillType"; import { ParseBoardRectHoleType, SetBrHighHoleTypeFromRectHoleType } from "./DrawDrilling/HoleUtils"; import { IsDoor } from "./HideSelect/HideSelectUtils"; diff --git a/src/Add-on/ChangeColorByBoard/CalcBrThicknessConfigStore.ts b/src/Add-on/ChangeColorByBoard/CalcBrThicknessConfigStore.ts index 3fd4c8b7e..8d7ac1ae3 100644 --- a/src/Add-on/ChangeColorByBoard/CalcBrThicknessConfigStore.ts +++ b/src/Add-on/ChangeColorByBoard/CalcBrThicknessConfigStore.ts @@ -1,8 +1,8 @@ import { observable, toJS } from "mobx"; import { DefaultChangeColorByBoardMaterialOption } from "../../Editor/DefaultConfig"; import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent"; -import { ChangeColorByBoardMaterialOption } from "../../UI/Store/BoardInterface"; import { IConfigStore } from "../../UI/Store/BoardStore"; +import { ChangeColorByBoardMaterialOption } from "../../UI/Store/OptionInterface/IOptionInterface"; export class ChangeColorByBoardMaterialStore implements IConfigStore { diff --git a/src/Add-on/CommandFeeding.ts b/src/Add-on/CommandFeeding.ts index 5ae3969c7..420d14838 100644 --- a/src/Add-on/CommandFeeding.ts +++ b/src/Add-on/CommandFeeding.ts @@ -12,7 +12,7 @@ import { userConfig } from "../Editor/UserConfig"; import { MoveMatrix, ZAxis, rotatePoint } from "../Geometry/GeUtils"; import { IBoardHoleInfo, IModelingData, ISpliteOrderData, Production } from "../Production/Product"; import { AppToaster } from "../UI/Components/Toaster"; -import { FaceDirection } from "../UI/Store/BoardInterface"; +import { FaceDirection } from "./DrawDrilling/DrillType"; //testm export class FeedingCommand implements Command diff --git a/src/Add-on/DrawBoard/ActivityLayerBoardTool.ts b/src/Add-on/DrawBoard/ActivityLayerBoardTool.ts index 6240256e7..db0fcf460 100644 --- a/src/Add-on/DrawBoard/ActivityLayerBoardTool.ts +++ b/src/Add-on/DrawBoard/ActivityLayerBoardTool.ts @@ -9,9 +9,9 @@ import { Shape } from "../../DatabaseServices/Shape"; import { Raycast } from "../../Editor/PointPick"; import { BoardFaceType, BoardGetFace } from "../../Geometry/DrillParse/BoardGetFace"; import { Face } from "../../Geometry/DrillParse/Face"; -import { angleTo, AsVector2, equaln, equalv3, isParallelTo, MoveMatrix } from "../../Geometry/GeUtils"; +import { AsVector2, MoveMatrix, angleTo, equaln, equalv3, isParallelTo } from "../../Geometry/GeUtils"; import { RenderType } from "../../GraphicsSystem/RenderType"; -import { INailRule, IShinkOption, LayerNailOption } from "../../UI/Store/BoardInterface"; +import { INailRule, IShinkOption, LayerNailOption } from "../../UI/Store/OptionInterface/IOptionInterface"; class ActivityLayerBoardTool { diff --git a/src/Add-on/DrawBoard/BuildBoardTool.ts b/src/Add-on/DrawBoard/BuildBoardTool.ts index 83385b010..060ca4a84 100644 --- a/src/Add-on/DrawBoard/BuildBoardTool.ts +++ b/src/Add-on/DrawBoard/BuildBoardTool.ts @@ -2,11 +2,13 @@ import { Vector3 } from "three"; import { Log, LogType } from "../../Common/Log"; import { safeEval } from "../../Common/eval"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType, BrRelativePos } from "../../DatabaseServices/Entity/BoardInterface"; import { TemplateWineRackRecord } from "../../DatabaseServices/Template/ProgramTempate/TemplateWineRackRecord"; import { TemplateRecord } from "../../DatabaseServices/Template/TemplateRecord"; import { MoveMatrix } from "../../Geometry/GeUtils"; import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse"; -import { BehindBoardOption, BehindHeightPositon, BoardType, BrRelativePos, IGrooveOption, LayerBoardOption, VerticalBoardOption } from "../../UI/Store/BoardInterface"; +import { BehindBoardOption, IGrooveOption, LayerBoardOption, VerticalBoardOption } from "../../UI/Store/OptionInterface/IOptionInterface"; +import { BehindHeightPositon } from "../../UI/Store/OptionInterface/OptionEnum"; export function BuildLayerBoards(opt: LayerBoardOption, space: ISpaceParse, grooveOption?: IGrooveOption): Board[] { diff --git a/src/Add-on/DrawBoard/BuildLayerNailTool.ts b/src/Add-on/DrawBoard/BuildLayerNailTool.ts index 680bbc10d..c1aa31e0f 100644 --- a/src/Add-on/DrawBoard/BuildLayerNailTool.ts +++ b/src/Add-on/DrawBoard/BuildLayerNailTool.ts @@ -1,14 +1,15 @@ +import { Intersection, Matrix4, Raycaster, Vector3 } from "three"; +import { app } from "../../ApplicationServices/Application"; +import { arrayLast } from "../../Common/ArrayExt"; +import { GetEntity } from "../../Common/Utils"; +import { CylinderHole, GangDrillType } from "../../DatabaseServices/3DSolid/CylinderHole"; import { Board } from "../../DatabaseServices/Entity/Board"; -import { LayerBoardOption, LayerNailOption, BoardType } from "../../UI/Store/BoardInterface"; -import { Matrix4, Vector3, Raycaster, Intersection } from "three"; -import { MoveMatrix, equalv3 } from "../../Geometry/GeUtils"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { ObjectId } from "../../DatabaseServices/ObjectId"; -import { arrayLast } from "../../Common/ArrayExt"; +import { MoveMatrix, equalv3 } from "../../Geometry/GeUtils"; import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse"; -import { app } from "../../ApplicationServices/Application"; -import { CylinderHole, GangDrillType } from "../../DatabaseServices/3DSolid/CylinderHole"; import { RenderType } from "../../GraphicsSystem/RenderType"; -import { GetEntity } from "../../Common/Utils"; +import { LayerBoardOption, LayerNailOption } from "../../UI/Store/OptionInterface/IOptionInterface"; enum NailPos { Left = 0, diff --git a/src/Add-on/DrawBoard/BuildTopBottomBoardTool.ts b/src/Add-on/DrawBoard/BuildTopBottomBoardTool.ts index a124f1d57..f14eba471 100644 --- a/src/Add-on/DrawBoard/BuildTopBottomBoardTool.ts +++ b/src/Add-on/DrawBoard/BuildTopBottomBoardTool.ts @@ -1,8 +1,9 @@ import { Vector3 } from "three"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { MoveMatrix } from "../../Geometry/GeUtils"; import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse"; -import { TBBoardOption, BoardType } from "../../UI/Store/BoardInterface"; +import { TBBoardOption } from "../../UI/Store/OptionInterface/IOptionInterface"; export function BuildTopBottomBoards(topOpt: TBBoardOption, bottomOpt: TBBoardOption, space: ISpaceParse): Board[] { diff --git a/src/Add-on/DrawBoard/DrawBehindBoard.ts b/src/Add-on/DrawBoard/DrawBehindBoard.ts index 89bbb0428..ab44e3730 100644 --- a/src/Add-on/DrawBoard/DrawBehindBoard.ts +++ b/src/Add-on/DrawBoard/DrawBehindBoard.ts @@ -1,9 +1,10 @@ import { app } from '../../ApplicationServices/Application'; +import { BoardType } from '../../DatabaseServices/Entity/BoardInterface'; import { TemplateBehindBoard } from '../../DatabaseServices/Template/ProgramTempate/TemplateBehindBoard'; import { SetTemplatePositionAndSetParent } from '../../DatabaseServices/Template/TempateUtils'; import { JigUtils } from '../../Editor/JigUtils'; -import { BehindBoardOption, BoardType } from '../../UI/Store/BoardInterface'; import { BehindBoardStore } from '../../UI/Store/BoardStore'; +import { BehindBoardOption } from "../../UI/Store/OptionInterface/IOptionInterface"; import { BuildBehindBoards } from './BuildBoardTool'; import { DrawBoardTool } from './DrawBoardTool'; diff --git a/src/Add-on/DrawBoard/DrawBoardTool.ts b/src/Add-on/DrawBoard/DrawBoardTool.ts index d17712286..621b00fd2 100644 --- a/src/Add-on/DrawBoard/DrawBoardTool.ts +++ b/src/Add-on/DrawBoard/DrawBoardTool.ts @@ -1,5 +1,6 @@ import { app } from '../../ApplicationServices/Application'; import { CommandNames } from '../../Common/CommandNames'; +import { BoardType } from '../../DatabaseServices/Entity/BoardInterface'; import { Command } from '../../Editor/CommandMachine'; import { PromptStatus } from '../../Editor/PromptResult'; import { ISpaceParse } from '../../Geometry/SpaceParse/ISpaceParse'; @@ -7,7 +8,6 @@ import { PointSelectSpaceClamp } from '../../Geometry/SpaceParse/PointSelectSpac import { BoardModal } from '../../UI/Components/Board/BoardModal'; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { ModalPosition } from '../../UI/Components/Modal/ModalInterface'; -import { BoardType } from '../../UI/Store/BoardInterface'; import { BehindBoardStore, LayerBoardStore, VerticalBoardStore } from '../../UI/Store/BoardStore'; import { AutoCutting } from '../BoardCutting/AutoCuttingReactor'; diff --git a/src/Add-on/DrawBoard/DrawClosingStrip.ts b/src/Add-on/DrawBoard/DrawClosingStrip.ts index 88ac43228..8ea1d0aad 100644 --- a/src/Add-on/DrawBoard/DrawClosingStrip.ts +++ b/src/Add-on/DrawBoard/DrawClosingStrip.ts @@ -6,6 +6,7 @@ import { app } from '../../ApplicationServices/Application'; import { EBoardKeyList } from '../../Common/BoardKeyList'; import { CommandNames } from '../../Common/CommandNames'; import { Board } from '../../DatabaseServices/Entity/Board'; +import { BoardType, BrRelativePos, LinesType } from '../../DatabaseServices/Entity/BoardInterface'; import { Command } from '../../Editor/CommandMachine'; import { PromptStatus } from '../../Editor/PromptResult'; import { Box3Ext } from '../../Geometry/Box'; @@ -15,8 +16,8 @@ import { BoardModal } from '../../UI/Components/Board/BoardModal'; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { ModalState } from '../../UI/Components/Modal/ModalInterface'; import { AppToaster } from '../../UI/Components/Toaster'; -import { BoardType, BrRelativePos, LinesType, StripType } from '../../UI/Store/BoardInterface'; import { ClosingStripStore } from '../../UI/Store/BoardStore'; +import { StripType } from "../../UI/Store/OptionInterface/ClosingStripOption"; import { AutoCutting } from '../BoardCutting/AutoCuttingReactor'; //补收口条默认宽度 diff --git a/src/Add-on/DrawBoard/DrawDoorDrawer/DrawDoorTool.ts b/src/Add-on/DrawBoard/DrawDoorDrawer/DrawDoorTool.ts index 00375d772..11abe6597 100644 --- a/src/Add-on/DrawBoard/DrawDoorDrawer/DrawDoorTool.ts +++ b/src/Add-on/DrawBoard/DrawDoorDrawer/DrawDoorTool.ts @@ -6,6 +6,7 @@ import { EBoardKeyList } from "../../../Common/BoardKeyList"; import { DuplicateRecordCloning } from "../../../Common/Status"; import { CADObject } from "../../../DatabaseServices/CADObject"; import { Board } from "../../../DatabaseServices/Entity/Board"; +import { BoardOpenDir, BoardType } from "../../../DatabaseServices/Entity/BoardInterface"; import { Entity } from '../../../DatabaseServices/Entity/Entity'; import { ExtrudeContourCurve } from "../../../DatabaseServices/Entity/Extrude"; import { HardwareCompositeEntity } from "../../../DatabaseServices/Hardware/HardwareCompositeEntity"; @@ -19,10 +20,11 @@ import { Box3Ext } from "../../../Geometry/Box"; import { equaln, isParallelTo } from "../../../Geometry/GeUtils"; import { ISpaceParse } from "../../../Geometry/SpaceParse/ISpaceParse"; import { AppToaster } from "../../../UI/Components/Toaster"; -import { BoardOpenDir, BoardProcessOption, BoardType, DrillType } from "../../../UI/Store/BoardInterface"; import { DoorStore, IHingeRule, openDirTitle } from "../../../UI/Store/DoorDrawerStore/DoorStore"; import { DisableChangeParName, DoorOpenDir, HandleHorPos, HandleVePos, IDoorConfigOption, IDoorInfo } from "../../../UI/Store/DoorInterface"; +import { BoardProcessOption } from "../../../UI/Store/OptionInterface/BoardProcessOption"; import { ITemplateParam } from "../../../UI/Store/RightPanelStore/ITemplateParam"; +import { DrillType } from "../../DrawDrilling/DrillType"; import { IsDoor, IsHandle, IsHinge } from "../../HideSelect/HideSelectUtils"; const MoveNum = 8; diff --git a/src/Add-on/DrawBoard/DrawDoorDrawer/DrawLeftRightOpenDoor.ts b/src/Add-on/DrawBoard/DrawDoorDrawer/DrawLeftRightOpenDoor.ts index ea892c0fb..bc8a4eeae 100644 --- a/src/Add-on/DrawBoard/DrawDoorDrawer/DrawLeftRightOpenDoor.ts +++ b/src/Add-on/DrawBoard/DrawDoorDrawer/DrawLeftRightOpenDoor.ts @@ -2,13 +2,13 @@ import { Intent } from "@blueprintjs/core"; import { app } from "../../../ApplicationServices/Application"; import { EBoardKeyList } from "../../../Common/BoardKeyList"; import { Board } from "../../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../../DatabaseServices/Entity/BoardInterface"; import { ObjectId } from "../../../DatabaseServices/ObjectId"; import { TemplateSizeBoard } from "../../../DatabaseServices/Template/ProgramTempate/TemplateSizeBoard"; import { SetTemplatePositionAndSetParent } from "../../../DatabaseServices/Template/TempateUtils"; import { TemplateRecord } from "../../../DatabaseServices/Template/TemplateRecord"; import { TemplateSplitType } from "../../../DatabaseServices/Template/TemplateType"; import { AppToaster } from "../../../UI/Components/Toaster"; -import { BoardType } from "../../../UI/Store/BoardInterface"; import { DoorOpenDir, IDoorInfo } from "../../../UI/Store/DoorInterface"; import { DrawDoorTool } from "./DrawDoorTool"; diff --git a/src/Add-on/DrawBoard/DrawDoorDrawer/DrawUpDownOpenDoor.ts b/src/Add-on/DrawBoard/DrawDoorDrawer/DrawUpDownOpenDoor.ts index 797a9f492..bc639eb59 100644 --- a/src/Add-on/DrawBoard/DrawDoorDrawer/DrawUpDownOpenDoor.ts +++ b/src/Add-on/DrawBoard/DrawDoorDrawer/DrawUpDownOpenDoor.ts @@ -2,13 +2,13 @@ import { Intent } from "@blueprintjs/core"; import { app } from "../../../ApplicationServices/Application"; import { EBoardKeyList } from "../../../Common/BoardKeyList"; import { Board } from "../../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../../DatabaseServices/Entity/BoardInterface"; import { ObjectId } from "../../../DatabaseServices/ObjectId"; import { TemplateSizeBoard } from "../../../DatabaseServices/Template/ProgramTempate/TemplateSizeBoard"; import { SetTemplatePositionAndSetParent } from "../../../DatabaseServices/Template/TempateUtils"; import { TemplateRecord } from "../../../DatabaseServices/Template/TemplateRecord"; import { TemplateSplitType } from "../../../DatabaseServices/Template/TemplateType"; import { AppToaster } from "../../../UI/Components/Toaster"; -import { BoardType } from "../../../UI/Store/BoardInterface"; import { DoorOpenDir, IDoorInfo } from "../../../UI/Store/DoorInterface"; import { DrawDoorTool } from "./DrawDoorTool"; diff --git a/src/Add-on/DrawBoard/DrawDrawer.ts b/src/Add-on/DrawBoard/DrawDrawer.ts index 666f68302..cb8cab428 100644 --- a/src/Add-on/DrawBoard/DrawDrawer.ts +++ b/src/Add-on/DrawBoard/DrawDrawer.ts @@ -7,6 +7,7 @@ import { DuplicateRecordCloning } from "../../Common/Status"; import { FixedNotZero } from "../../Common/Utils"; import { safeEval } from "../../Common/eval"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity"; import { HardwareTopline } from "../../DatabaseServices/Hardware/HardwareTopline"; import { ObjectId } from "../../DatabaseServices/ObjectId"; @@ -22,7 +23,6 @@ import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse"; import { PointSelectSpaceClamp } from "../../Geometry/SpaceParse/PointSelectSpaceClamp"; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { DoorModal } from "../../UI/Components/Board/Door/DoorModal"; -import { BoardType } from "../../UI/Store/BoardInterface"; import { DrawerStore } from "../../UI/Store/DoorDrawerStore/DrawerStore"; import { DisableChangeParName, HandleHorPos, HandleVePos, IDrawerConfigOption, IDrawerInfo } from "../../UI/Store/DoorInterface"; import { ITemplateParam } from "../../UI/Store/RightPanelStore/ITemplateParam"; diff --git a/src/Add-on/DrawBoard/DrawLayerBoard.ts b/src/Add-on/DrawBoard/DrawLayerBoard.ts index 6b1714caa..057eaf9eb 100644 --- a/src/Add-on/DrawBoard/DrawLayerBoard.ts +++ b/src/Add-on/DrawBoard/DrawLayerBoard.ts @@ -2,8 +2,8 @@ import { app } from '../../ApplicationServices/Application'; import { TemplateLayerBoard } from '../../DatabaseServices/Template/ProgramTempate/TemplateLayerBoard'; import { SetTemplatePositionAndSetParent } from '../../DatabaseServices/Template/TempateUtils'; import { JigUtils } from '../../Editor/JigUtils'; -import { LayerBoardOption } from '../../UI/Store/BoardInterface'; import { LayerBoardStore } from '../../UI/Store/BoardStore'; +import { LayerBoardOption } from "../../UI/Store/OptionInterface/IOptionInterface"; import { BuildLayerBoards } from './BuildBoardTool'; import { DrawBoardTool } from './DrawBoardTool'; diff --git a/src/Add-on/DrawBoard/DrawLeftRightBoard.ts b/src/Add-on/DrawBoard/DrawLeftRightBoard.ts index ee49d07d5..7c1ae694e 100644 --- a/src/Add-on/DrawBoard/DrawLeftRightBoard.ts +++ b/src/Add-on/DrawBoard/DrawLeftRightBoard.ts @@ -5,6 +5,7 @@ import { Log, LogType } from '../../Common/Log'; import { TransformVector } from '../../Common/Matrix4Utils'; import { GetEntity } from '../../Common/Utils'; import { Board } from '../../DatabaseServices/Entity/Board'; +import { BoardType } from '../../DatabaseServices/Entity/BoardInterface'; import { RoomBase } from '../../DatabaseServices/Room/Entity/RoomBase'; import { TemplateLeftRightBoardRecord } from '../../DatabaseServices/Template/ProgramTempate/TemplateLeftRightBoardRecord'; import { SetTemplatePositionAndSetParent } from '../../DatabaseServices/Template/TempateUtils'; @@ -13,12 +14,12 @@ import { JigUtils } from '../../Editor/JigUtils'; import { PromptPointResult, PromptStatus } from '../../Editor/PromptResult'; import { ParsePlaceEntitys } from '../../Editor/TranstrolControl/ParsePlaceEntitys'; import { ParsePlacePos, ParsePlacePosWithTemplate, ParsePlacePosWithTemplate2 } from '../../Editor/TranstrolControl/ParsePlacePos'; -import { equalv3, ZeroVec } from '../../Geometry/GeUtils'; +import { ZeroVec, equalv3 } from '../../Geometry/GeUtils'; import { PointSelectSpaceClamp } from '../../Geometry/SpaceParse/PointSelectSpaceClamp'; import { BoardModal } from '../../UI/Components/Board/BoardModal'; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; -import { AnyObject, BoardType } from '../../UI/Store/BoardInterface'; import { SideBoardStore } from '../../UI/Store/BoardStore'; +import { AnyObject } from "../../UI/Store/OptionInterface/IOptionInterface"; import { AutoCutting } from '../BoardCutting/AutoCuttingReactor'; export class DrawLeftRight implements Command diff --git a/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts b/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts index da92c3986..516c633e5 100644 --- a/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts +++ b/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts @@ -1,14 +1,14 @@ import { Matrix4 } from "three"; import { app } from "../../ApplicationServices/Application"; -import { safeEval } from "../../Common/eval"; import { LogType } from "../../Common/Log"; import { FixedNotZero } from "../../Common/Utils"; +import { safeEval } from "../../Common/eval"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { ExtrudeSolid } from "../../DatabaseServices/Entity/Extrude"; import { Command } from "../../Editor/CommandMachine"; import { SpecialShapeBoardModal } from "../../UI/Components/Board/SpecialBoardModal"; import { ModalState } from "../../UI/Components/Modal/ModalInterface"; -import { BoardType } from "../../UI/Store/BoardInterface"; import { SpecialShapeStore } from "../../UI/Store/BoardStore"; import { ExtrudeApplyContour, SelectExtrudeContours } from "./DrawSpecialShapeBoardTool"; diff --git a/src/Add-on/DrawBoard/DrawTemplateByImport.ts b/src/Add-on/DrawBoard/DrawTemplateByImport.ts index f5f18d7e7..dd5d34e56 100644 --- a/src/Add-on/DrawBoard/DrawTemplateByImport.ts +++ b/src/Add-on/DrawBoard/DrawTemplateByImport.ts @@ -8,6 +8,7 @@ import { PostJson, RequestStatus } from "../../Common/Request"; import { DuplicateRecordCloning } from "../../Common/Status"; import { AlignedDimension } from "../../DatabaseServices/Dimension/AlignedDimension"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { Entity } from "../../DatabaseServices/Entity/Entity"; import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity"; import { GetOnlineTemplate } from "../../DatabaseServices/Template/TempateUtils"; @@ -16,7 +17,6 @@ import { Text } from "../../DatabaseServices/Text/Text"; import { Command, CommandWrap } from "../../Editor/CommandMachine"; import { PromptResult } from "../../Editor/PromptResult"; import { AppToaster } from "../../UI/Components/Toaster"; -import { BoardType } from "../../UI/Store/BoardInterface"; interface IList diff --git a/src/Add-on/DrawBoard/DrawVerticalBoard.ts b/src/Add-on/DrawBoard/DrawVerticalBoard.ts index 9d2fa2a06..afedbe154 100644 --- a/src/Add-on/DrawBoard/DrawVerticalBoard.ts +++ b/src/Add-on/DrawBoard/DrawVerticalBoard.ts @@ -1,8 +1,9 @@ import { app } from '../../ApplicationServices/Application'; +import { BoardType } from '../../DatabaseServices/Entity/BoardInterface'; import { TemplateVerticalBoard } from '../../DatabaseServices/Template/ProgramTempate/TemplateVerticalBoard'; import { SetTemplatePositionAndSetParent } from '../../DatabaseServices/Template/TempateUtils'; import { JigUtils } from '../../Editor/JigUtils'; -import { BoardType, VerticalBoardOption } from '../../UI/Store/BoardInterface'; +import { VerticalBoardOption } from "../../UI/Store/OptionInterface/IOptionInterface"; import { BuildVerticalBoards } from './BuildBoardTool'; import { DrawBoardTool } from './DrawBoardTool'; diff --git a/src/Add-on/DrawBoard/EditorBoardTempate.ts b/src/Add-on/DrawBoard/EditorBoardTempate.ts index fbbbdc7d3..346ce6ce4 100644 --- a/src/Add-on/DrawBoard/EditorBoardTempate.ts +++ b/src/Add-on/DrawBoard/EditorBoardTempate.ts @@ -12,8 +12,8 @@ import { Command } from "../../Editor/CommandMachine"; import { BoardModal } from "../../UI/Components/Board/BoardModal"; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent"; -import { BoardConfigOption, SideBoardOption } from "../../UI/Store/BoardInterface"; import { BehindBoardStore, BoardStore, LayerBoardStore, SideBoardStore, TopBottomBoardStore, VerticalBoardStore } from "../../UI/Store/BoardStore"; +import { BoardConfigOption, SideBoardOption } from "../../UI/Store/OptionInterface/IOptionInterface"; export class EditorBoardTemplate implements Command { diff --git a/src/Add-on/DrawBoard/SetHoleType.ts b/src/Add-on/DrawBoard/SetHoleType.ts index 2982a6102..b46bd06e0 100644 --- a/src/Add-on/DrawBoard/SetHoleType.ts +++ b/src/Add-on/DrawBoard/SetHoleType.ts @@ -3,7 +3,7 @@ import { EBoardKeyList } from "../../Common/BoardKeyList"; import { Board } from "../../DatabaseServices/Entity/Board"; import { Command } from "../../Editor/CommandMachine"; import { PromptStatus } from "../../Editor/PromptResult"; -import { DrillType } from "../../UI/Store/BoardInterface"; +import { DrillType } from "../DrawDrilling/DrillType"; export class SetHoleNoneType implements Command { diff --git a/src/Add-on/DrawDim/AutoDimBrs.ts b/src/Add-on/DrawDim/AutoDimBrs.ts index 6c6536e2b..ca28e1af7 100644 --- a/src/Add-on/DrawDim/AutoDimBrs.ts +++ b/src/Add-on/DrawDim/AutoDimBrs.ts @@ -1,6 +1,7 @@ import { Matrix4, Vector3 } from "three"; import { app } from "../../ApplicationServices/Application"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { Entity } from "../../DatabaseServices/Entity/Entity"; import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity"; import { TemplateRecord } from "../../DatabaseServices/Template/TemplateRecord"; @@ -9,7 +10,6 @@ import { PromptStatus } from "../../Editor/PromptResult"; import { MoveMatrix, ZeroVec, equalv3 } from "../../Geometry/GeUtils"; import { AutoDimBoardPanel } from "../../UI/Components/AutoDimBoard"; import { ModalState } from "../../UI/Components/Modal/ModalInterface"; -import { BoardType } from "../../UI/Store/BoardInterface"; import { IsDoor, IsHandle, IsHinge } from "../HideSelect/HideSelectUtils"; import { autoDimBrsStore } from "./AutoDimBrsStore"; import { DimBoards } from "./DimBoards"; diff --git a/src/Add-on/DrawDim/AutoDimBrsStore.ts b/src/Add-on/DrawDim/AutoDimBrsStore.ts index 3585ca6a2..c388f8e05 100644 --- a/src/Add-on/DrawDim/AutoDimBrsStore.ts +++ b/src/Add-on/DrawDim/AutoDimBrsStore.ts @@ -2,8 +2,8 @@ import { observable, toJS } from "mobx"; import { DefaultAutoDimBrsOption } from "../../Editor/DefaultConfig"; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent"; -import { IAutoDimBrsOption } from "../../UI/Store/BoardInterface"; import { IConfigStore } from "../../UI/Store/BoardStore"; +import { IAutoDimBrsOption } from "../../UI/Store/OptionInterface/AutoDimBrsOption"; import { userConfigStore } from "../../UI/Store/UserConfigStore"; export class AutoDimBrsStore implements IConfigStore diff --git a/src/Add-on/DrawDim/DimBoards.ts b/src/Add-on/DrawDim/DimBoards.ts index 6e779b4b6..5abb54b79 100644 --- a/src/Add-on/DrawDim/DimBoards.ts +++ b/src/Add-on/DrawDim/DimBoards.ts @@ -13,7 +13,7 @@ import { TemplateRecord } from "../../DatabaseServices/Template/TemplateRecord"; import { AsVector2, ZAxis, equaln, equalnn, isParallelTo, isPerpendicularityTo, midPoint } from "../../Geometry/GeUtils"; import { GetObbFromOcsSize } from "../../Geometry/OBB/obb"; import { BoolOpeartionType } from "../../GraphicsSystem/BoolOperateUtils"; -import { ForBoardNameType } from "../../UI/Store/BoardInterface"; +import { ForBoardNameType } from "../../UI/Store/OptionInterface/AutoDimBrsOption"; import { TestDraw } from "../test/TestUtil"; const TEST_DRAW_CURVE = false; diff --git a/src/Add-on/DrawDim/DimStyleStore.ts b/src/Add-on/DrawDim/DimStyleStore.ts index defbeea9d..fd0be1768 100644 --- a/src/Add-on/DrawDim/DimStyleStore.ts +++ b/src/Add-on/DrawDim/DimStyleStore.ts @@ -2,8 +2,8 @@ import { action, observable } from "mobx"; import { CADFiler } from "../../DatabaseServices/CADFiler"; import { ISerialize } from "../../DatabaseServices/ISerialize"; import { DefaultDimStyleOption } from "../../Editor/DefaultConfig"; -import { IDimStyleOption } from "../../UI/Store/BoardInterface"; import { IConfigStore } from "../../UI/Store/BoardStore"; +import { IDimStyleOption } from "../../UI/Store/OptionInterface/IOptionInterface"; export class DimStyleStore implements IConfigStore, ISerialize { diff --git a/src/Add-on/DrawDim/OperDimStyle.tsx b/src/Add-on/DrawDim/OperDimStyle.tsx index 41a732952..20550f222 100644 --- a/src/Add-on/DrawDim/OperDimStyle.tsx +++ b/src/Add-on/DrawDim/OperDimStyle.tsx @@ -4,13 +4,13 @@ import React, { Component } from "react"; import { begin } from "xaop"; import { app } from "../../ApplicationServices/Application"; import { KeyBoard } from "../../Common/KeyEnum"; -import { Dimension } from "../../DatabaseServices/Dimension/Dimension"; import { DimStyleRecord } from "../../DatabaseServices/DimStyle/DimStyleRecord"; +import { Dimension } from "../../DatabaseServices/Dimension/Dimension"; import { CommandWrap } from "../../Editor/CommandMachine"; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { UserConfigComponent } from "../../UI/Components/Board/UserConfigComponent"; import { AppConfirm } from "../../UI/Components/Common/Confirm"; -import { IDimStyleOption } from "../../UI/Store/BoardInterface"; +import { IDimStyleOption } from "../../UI/Store/OptionInterface/IOptionInterface"; import { DEFAULT_STYLE_NAME, DimStylePanel } from "./DimStylePanel"; import { DimStyleParam } from "./DimStyleParam"; import { DimStyleStore, dimStyleStore } from "./DimStyleStore"; diff --git a/src/Add-on/DrawDrilling/DrawDrillingTool.ts b/src/Add-on/DrawDrilling/DrawDrillingTool.ts index 02778064d..b9f8b06e2 100644 --- a/src/Add-on/DrawDrilling/DrawDrillingTool.ts +++ b/src/Add-on/DrawDrilling/DrawDrillingTool.ts @@ -32,9 +32,9 @@ import { CollisionDetection } from "../../Geometry/DrillParse/CollisionDetection import { Face } from "../../Geometry/DrillParse/Face"; import { MoveMatrix, YAxis, ZAxis, equaln, isIntersect, isParallelTo } from "../../Geometry/GeUtils"; import { AppToaster } from "../../UI/Components/Toaster"; -import { FaceDirection } from "../../UI/Store/BoardInterface"; import { DownPanelStore } from "../../UI/Store/DownPanelStore"; import { DrillingOption, SpacingType } from "../../UI/Store/drillInterface"; +import { FaceDirection } from "./DrillType"; import { CyHoleInBoard } from "./HoleUtils"; export class DrawDrillingTool extends Singleton diff --git a/src/Add-on/DrawDrilling/DrillType.ts b/src/Add-on/DrawDrilling/DrillType.ts new file mode 100644 index 000000000..ae6a3cb41 --- /dev/null +++ b/src/Add-on/DrawDrilling/DrillType.ts @@ -0,0 +1,19 @@ +/** + *勿随意更改属性名,若更改,需更改对应UI模态框的属性和检验方法的key + * + */ +//排钻类型 +export enum DrillType +{ + Yes = "排", + None = "不排", + More = "**多种**", + Invail = "无效配置" +} + +//偏心轮类型 +export enum FaceDirection +{ + Front = 0, + Back = 1 +} diff --git a/src/Add-on/DrawDrilling/HoleUtils.ts b/src/Add-on/DrawDrilling/HoleUtils.ts index fbd458ea2..1570b011c 100644 --- a/src/Add-on/DrawDrilling/HoleUtils.ts +++ b/src/Add-on/DrawDrilling/HoleUtils.ts @@ -9,8 +9,8 @@ import { Circle } from "../../DatabaseServices/Entity/Circle"; import { Curve } from "../../DatabaseServices/Entity/Curve"; import { Line } from "../../DatabaseServices/Entity/Line"; import { Polyline } from "../../DatabaseServices/Entity/Polyline"; -import { isParallelTo, rotatePoint, ZAxis } from "../../Geometry/GeUtils"; -import { DrillType } from "../../UI/Store/BoardInterface"; +import { ZAxis, isParallelTo, rotatePoint } from "../../Geometry/GeUtils"; +import { DrillType } from "./DrillType"; export const SCALAR = 0.1; diff --git a/src/Add-on/DrawViewport.ts b/src/Add-on/DrawViewport.ts index 57d523f19..0c5610937 100644 --- a/src/Add-on/DrawViewport.ts +++ b/src/Add-on/DrawViewport.ts @@ -14,8 +14,8 @@ import { Box3Ext } from "../Geometry/Box"; import { RenderType } from "../GraphicsSystem/RenderType"; import { ModalState } from "../UI/Components/Modal/ModalInterface"; import { AppToaster } from "../UI/Components/Toaster"; -import { ViewDirection, ViewportPosition } from "../UI/Store/BoardInterface"; import { DownPanelStore } from "../UI/Store/DownPanelStore"; +import { ViewDirection, ViewportPosition } from "../UI/Store/OptionInterface/OptionEnum"; import { IsDoor, IsDrawer, IsHandle, IsHinge, IsLattice } from "./HideSelect/HideSelectUtils"; import { Viewport2ConfigModal, Viewport2ConfigStore } from "./ViewortConfig/Viewport2Config"; import { Viewport3ConfigModal, Viewport3ConfigStore } from "./ViewortConfig/Viewport3Config"; diff --git a/src/Add-on/DrawWineRack/DrawObliqueWineRackTool.ts b/src/Add-on/DrawWineRack/DrawObliqueWineRackTool.ts index a0ecc6007..0411af088 100644 --- a/src/Add-on/DrawWineRack/DrawObliqueWineRackTool.ts +++ b/src/Add-on/DrawWineRack/DrawObliqueWineRackTool.ts @@ -2,13 +2,13 @@ import { Matrix4, Vector2, Vector3 } from "three"; import { arrayLast, arrayRemoveDuplicateBySort, arraySortByNumber } from "../../Common/ArrayExt"; import { MakeMirrorMtx } from "../../Common/Matrix4Utils"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { Line } from "../../DatabaseServices/Entity/Line"; import { Polyline } from "../../DatabaseServices/Entity/Polyline"; -import { AsVector2, equaln, equalv3, isParallelTo, MoveMatrix, polar, XAxis, YAxis, ZAxis } from "../../Geometry/GeUtils"; +import { AsVector2, MoveMatrix, XAxis, YAxis, ZAxis, equaln, equalv3, isParallelTo, polar } from "../../Geometry/GeUtils"; import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse"; import { IntersectOption } from "../../GraphicsSystem/IntersectWith"; -import { BoardType } from "../../UI/Store/BoardInterface"; -import { EFullDir, EFullType, EWineRackStyle, EWRackArrayType, IR2WROption, IWineRackOption } from "../../UI/Store/WineRackInterface"; +import { EFullDir, EFullType, EWRackArrayType, EWineRackStyle, IR2WROption, IWineRackOption } from "../../UI/Store/WineRackInterface"; import { DrawWineRackTool, SIN45 } from "./DrawWinRackTool"; export interface IWineRackData diff --git a/src/Add-on/DrawWineRack/DrawUprightWineRackTool.ts b/src/Add-on/DrawWineRack/DrawUprightWineRackTool.ts index c0edc988e..1d9979aa4 100644 --- a/src/Add-on/DrawWineRack/DrawUprightWineRackTool.ts +++ b/src/Add-on/DrawWineRack/DrawUprightWineRackTool.ts @@ -1,9 +1,9 @@ import { Vector3 } from "three"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { Polyline } from "../../DatabaseServices/Entity/Polyline"; import { AsVector2, MoveMatrix } from "../../Geometry/GeUtils"; import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse"; -import { BoardType } from "../../UI/Store/BoardInterface"; import { EWRackArrayType, IWineRackOption } from "../../UI/Store/WineRackInterface"; import { DrawWineRackTool } from "./DrawWinRackTool"; diff --git a/src/Add-on/DrawWineRack/DrawWinRackTool.ts b/src/Add-on/DrawWineRack/DrawWinRackTool.ts index f5d189b42..dc3c8abb3 100644 --- a/src/Add-on/DrawWineRack/DrawWinRackTool.ts +++ b/src/Add-on/DrawWineRack/DrawWinRackTool.ts @@ -1,11 +1,13 @@ import { Vector3 } from "three"; import { EBoardKeyList } from "../../Common/BoardKeyList"; -import { safeEval } from "../../Common/eval"; import { Singleton } from "../../Common/Singleton"; +import { safeEval } from "../../Common/eval"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse"; -import { BoardType, DrillType, FaceDirection, IHighSealedItem } from "../../UI/Store/BoardInterface"; +import { IHighSealedItem } from "../../UI/Store/OptionInterface/IHighSealedItem"; import { EFullDir, EFullType, EWRackArrayType, IWineRackOption } from "../../UI/Store/WineRackInterface"; +import { DrillType, FaceDirection } from "../DrawDrilling/DrillType"; export const SIN45 = Math.sin(Math.PI / 4); diff --git a/src/Add-on/Erp/ParseData.ts b/src/Add-on/Erp/ParseData.ts index 8eb0a7f5c..5431bde7d 100644 --- a/src/Add-on/Erp/ParseData.ts +++ b/src/Add-on/Erp/ParseData.ts @@ -4,6 +4,7 @@ import { EBoardKeyList } from "../../Common/BoardKeyList"; import { ConverCircleToPolyline } from "../../Common/CurveUtils"; import { CylinderHole, GangDrillType } from "../../DatabaseServices/3DSolid/CylinderHole"; import { Board, I2DModeingItem } from "../../DatabaseServices/Entity/Board"; +import { BoardOpenDir, LinesType } from "../../DatabaseServices/Entity/BoardInterface"; import { Circle } from "../../DatabaseServices/Entity/Circle"; import { ExtrudeSolid } from "../../DatabaseServices/Entity/Extrude"; import { HardwareTopline } from "../../DatabaseServices/Hardware/HardwareTopline"; @@ -14,7 +15,8 @@ import { AsVector2, GetBoxArr, ZeroVec, equalv3 } from "../../Geometry/GeUtils"; import { IContourData } from "../../Production/Convert2PtsBul"; import { I2DModeling, I3DContourData, I3DModeling, IDrillingOption, IHardwareType, IModelingData, ISpliteHardwareData, ISpliteOrderData, Production } from '../../Production/Product'; import { EMetalsType } from "../../UI/Components/RightPanel/RightPanelInterface"; -import { BoardOpenDir, FaceDirection, ISealingData, LinesType } from "../../UI/Store/BoardInterface"; +import { ISealingData } from "../../UI/Store/OptionInterface/IHighSealedItem"; +import { FaceDirection } from "../DrawDrilling/DrillType"; // import { DownPanelStore } from "../../UI/Store/DownPanelStore"; import { InteractionLog, LogType } from "../../Common/Log"; import { Intent, Toaster } from "../../Common/Toaster"; diff --git a/src/Add-on/FZWL.ts b/src/Add-on/FZWL.ts index 37c622bb9..c634d2775 100644 --- a/src/Add-on/FZWL.ts +++ b/src/Add-on/FZWL.ts @@ -3,9 +3,9 @@ import { app } from "../ApplicationServices/Application"; import { EBoardKeyList } from "../Common/BoardKeyList"; import { Board } from "../DatabaseServices/Entity/Board"; +import { LinesType } from "../DatabaseServices/Entity/BoardInterface"; import { Command } from "../Editor/CommandMachine"; import { PromptStatus } from "../Editor/PromptResult"; -import { LinesType } from "../UI/Store/BoardInterface"; export class Command_FZWL implements Command { diff --git a/src/Add-on/Gesture/Gesture_DrawLayerBoard.ts b/src/Add-on/Gesture/Gesture_DrawLayerBoard.ts index c38ae72a6..4ac04506c 100644 --- a/src/Add-on/Gesture/Gesture_DrawLayerBoard.ts +++ b/src/Add-on/Gesture/Gesture_DrawLayerBoard.ts @@ -2,13 +2,13 @@ import { Vector2, Vector3 } from "three"; import { app } from "../../ApplicationServices/Application"; import { LogType } from "../../Common/Log"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { CommandWrap } from "../../Editor/CommandMachine"; import { CommandState } from "../../Editor/CommandState"; import { GestureDir, GestureDirEqual } from "../../Editor/Gesture"; import { AsVector3, MoveMatrix } from "../../Geometry/GeUtils"; import { ClampSpaceParseRay } from "../../Geometry/SpaceParse/ClampSpaceParseRay"; import { PointSelectBoards } from "../../Geometry/SpaceParse/PointSelectBoards"; -import { BoardType } from "../../UI/Store/BoardInterface"; export async function Gesture_DrawLayerBoard(dirs: GestureDir[], path: Vector2[]) { diff --git a/src/Add-on/HideSelect/HideSelectUtils.ts b/src/Add-on/HideSelect/HideSelectUtils.ts index 765211abf..e8db211f2 100644 --- a/src/Add-on/HideSelect/HideSelectUtils.ts +++ b/src/Add-on/HideSelect/HideSelectUtils.ts @@ -1,4 +1,5 @@ import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardOpenDir, BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { Entity } from "../../DatabaseServices/Entity/Entity"; import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity"; import { ProcessingGroupRecord } from "../../DatabaseServices/ProcessingGroup/ProcessingGroupRecord"; @@ -6,7 +7,6 @@ import { TemplateLatticeRecord } from "../../DatabaseServices/Template/ProgramTe import { TemplateTopBottomBoard } from "../../DatabaseServices/Template/ProgramTempate/TemplateTopBottomBoard"; import { TemplateWineRackRecord } from "../../DatabaseServices/Template/ProgramTempate/TemplateWineRackRecord"; import { TemplateRecord } from "../../DatabaseServices/Template/TemplateRecord"; -import { BoardOpenDir, BoardType } from "../../UI/Store/BoardInterface"; export function IsDoor(en: Entity) { diff --git a/src/Add-on/JiaJu/Import/JiaJuImport.ts b/src/Add-on/JiaJu/Import/JiaJuImport.ts index 6b9e4c5bb..3aea94684 100644 --- a/src/Add-on/JiaJu/Import/JiaJuImport.ts +++ b/src/Add-on/JiaJu/Import/JiaJuImport.ts @@ -10,6 +10,7 @@ import { Contour } from "../../../DatabaseServices/Contour"; import { Database } from "../../../DatabaseServices/Database"; import { Arc } from "../../../DatabaseServices/Entity/Arc"; import { Board } from "../../../DatabaseServices/Entity/Board"; +import { BoardType, LinesType } from "../../../DatabaseServices/Entity/BoardInterface"; import { Entity } from "../../../DatabaseServices/Entity/Entity"; import { Line } from "../../../DatabaseServices/Entity/Line"; import { Polyline } from "../../../DatabaseServices/Entity/Polyline"; @@ -21,8 +22,8 @@ import { Command, CommandWrap } from "../../../Editor/CommandMachine"; import { XAxis, YAxis, ZAxis, ZeroVec, equaln } from "../../../Geometry/GeUtils"; import { GetSealedBoardContour } from "../../../GraphicsSystem/CalcEdgeSealing"; import { AppToaster } from "../../../UI/Components/Toaster"; -import { BoardType, FaceDirection, LinesType } from "../../../UI/Store/BoardInterface"; import { CuttingBoardByBoard } from "../../BoardCutting/CuttingUtils2"; +import { FaceDirection } from "../../DrawDrilling/DrillType"; import { IBoardRectHoleType, SetBrHighHoleTypeFromRectHoleType } from "../../DrawDrilling/HoleUtils"; diff --git a/src/Add-on/Join.ts b/src/Add-on/Join.ts index d50899e0e..d210be624 100644 --- a/src/Add-on/Join.ts +++ b/src/Add-on/Join.ts @@ -4,6 +4,7 @@ import { ComputerCurvesNormalOCS, curveLinkGroup } from "../Common/CurveUtils"; import { Status } from "../Common/Status"; import { Arc } from "../DatabaseServices/Entity/Arc"; import { Board } from "../DatabaseServices/Entity/Board"; +import { BoardType } from "../DatabaseServices/Entity/BoardInterface"; import { Circle } from "../DatabaseServices/Entity/Circle"; import { Curve } from '../DatabaseServices/Entity/Curve'; import { ExtrudeSolid } from "../DatabaseServices/Entity/Extrude"; @@ -15,7 +16,6 @@ import { PromptStatus } from "../Editor/PromptResult"; import { FuzzDirection } from "../Geometry/FuzzVector"; import { ComparePointFnGenerate, ptToString } from "../Geometry/GeUtils"; import { PlaneExt } from "../Geometry/Plane"; -import { BoardType } from "../UI/Store/BoardInterface"; export class Command_Join implements Command { diff --git a/src/Add-on/KJL/Import/KJLImport.ts b/src/Add-on/KJL/Import/KJLImport.ts index ddb4e7dde..964983186 100644 --- a/src/Add-on/KJL/Import/KJLImport.ts +++ b/src/Add-on/KJL/Import/KJLImport.ts @@ -10,6 +10,7 @@ import { DuplicateRecordCloning } from "../../../Common/Status"; import { Intent, ToasterShowEntityMsg } from "../../../Common/Toaster"; import { safeEval } from "../../../Common/eval"; import { Board } from "../../../DatabaseServices/Entity/Board"; +import { BoardType, LinesType } from "../../../DatabaseServices/Entity/BoardInterface"; import { Entity } from "../../../DatabaseServices/Entity/Entity"; import { ExtrudeSolid } from "../../../DatabaseServices/Entity/Extrude"; import { HardwareCompositeEntity } from "../../../DatabaseServices/Hardware/HardwareCompositeEntity"; @@ -25,10 +26,11 @@ import { ConverEachSeal2HightSealData, SetBoardTopDownLeftRightSealData } from " import { BoardModalType } from "../../../UI/Components/Board/BoardModalType"; import { AppConfirm } from "../../../UI/Components/Common/Confirm"; import { AppToaster } from "../../../UI/Components/Toaster"; -import { BoardType, DrillType, FaceDirection, IHighSealedItem, LinesType } from "../../../UI/Store/BoardInterface"; +import { IHighSealedItem } from "../../../UI/Store/OptionInterface/IHighSealedItem"; import { TopPanelStore } from "../../../UI/Store/TopPanelStore"; import { EZengZhiBaoId, userConfigStore } from "../../../UI/Store/UserConfigStore"; import { CuttingBoardByBoard } from "../../BoardCutting/CuttingUtils2"; +import { DrillType, FaceDirection } from "../../DrawDrilling/DrillType"; import { KJLUseName } from "../KJLImportConfig/KJLConfig"; import { DefaultKJImportOption, KJLImportConfigOption } from "../KJLImportConfig/KJLImportConfigOption"; import { KJLEdgeAndDrillParse } from "./KJLEdgeAndDrillParse"; diff --git a/src/Add-on/KJL/Import/KJLParse.ts b/src/Add-on/KJL/Import/KJLParse.ts index 4f8164268..ff34ddad5 100644 --- a/src/Add-on/KJL/Import/KJLParse.ts +++ b/src/Add-on/KJL/Import/KJLParse.ts @@ -1,12 +1,12 @@ import { Vec2, Vector2 } from "three"; -import { arrayLast, ArrayRemoveDupSavePre } from "../../../Common/ArrayExt"; +import { ArrayRemoveDupSavePre, arrayLast } from "../../../Common/ArrayExt"; import { EBoardKeyList } from "../../../Common/BoardKeyList"; import { FixIndex, ToFixed } from "../../../Common/Utils"; +import { BoardOpenDir } from "../../../DatabaseServices/Entity/BoardInterface"; import { Polyline, PolylineProps } from "../../../DatabaseServices/Entity/Polyline"; import { HardwareTopline } from "../../../DatabaseServices/Hardware/HardwareTopline"; import { AsVector2, equalv2 } from "../../../Geometry/GeUtils"; -import { BoardOpenDir } from "../../../UI/Store/BoardInterface"; -import { KJL_AssemblyModel, KJL_DesignData, KJL_DrillData, KJL_LineType, KJL_Parameter, KJL_ParamModel, KJL_Path, KJL_Topline } from "./KJLInterface"; +import { KJL_AssemblyModel, KJL_DesignData, KJL_DrillData, KJL_LineType, KJL_ParamModel, KJL_Parameter, KJL_Path, KJL_Topline } from "./KJLInterface"; import { KJLMaterialLoader } from "./KJLMaterialLoader"; import { ApplyMaterial } from "./KJLUtils"; diff --git a/src/Add-on/KJL/KJLImportConfig/KJLImportConfigOption.ts b/src/Add-on/KJL/KJLImportConfig/KJLImportConfigOption.ts index ab647ee1e..6fb394e25 100644 --- a/src/Add-on/KJL/KJLImportConfig/KJLImportConfigOption.ts +++ b/src/Add-on/KJL/KJLImportConfig/KJLImportConfigOption.ts @@ -1,4 +1,4 @@ -import { IBaseOption, MaterialMapOption } from "../../../UI/Store/BoardInterface"; +import { IBaseOption, MaterialMapOption } from "../../../UI/Store/OptionInterface/IOptionInterface"; import { KJLUseName } from "./KJLConfig"; diff --git a/src/Add-on/KJL/KJLImportConfig/KJLImportConfigStore.ts b/src/Add-on/KJL/KJLImportConfig/KJLImportConfigStore.ts index 80499b119..65bddee43 100644 --- a/src/Add-on/KJL/KJLImportConfig/KJLImportConfigStore.ts +++ b/src/Add-on/KJL/KJLImportConfig/KJLImportConfigStore.ts @@ -7,8 +7,8 @@ import { Singleton } from "../../../Common/Singleton"; import { CADFiler } from "../../../DatabaseServices/CADFiler"; import { IConfigOption } from "../../../UI/Components/Board/UserConfigComponent"; import { AppToaster } from "../../../UI/Components/Toaster"; -import { AnyObject, IUiOption } from "../../../UI/Store/BoardInterface"; import { IConfigStore } from "../../../UI/Store/BoardStore"; +import { AnyObject, IUiOption } from "../../../UI/Store/OptionInterface/IOptionInterface"; import { KJLUseName } from "./KJLConfig"; import { DefaultKJImportOption, KJLImportConfigOption } from "./KJLImportConfigOption"; import { deserializeKJLConfigData, serializeKJLConfigData } from "./SerializeKJLConfigData"; diff --git a/src/Add-on/KJL/KjlExport.ts b/src/Add-on/KJL/KjlExport.ts index c77fd9fee..cca5e9e5f 100644 --- a/src/Add-on/KJL/KjlExport.ts +++ b/src/Add-on/KJL/KjlExport.ts @@ -11,6 +11,7 @@ import { ExtrudeHole } from "../../DatabaseServices/3DSolid/ExtrudeHole"; import { SweepSolid } from "../../DatabaseServices/3DSolid/SweepSolid"; import { Arc } from "../../DatabaseServices/Entity/Arc"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType, LinesType } from "../../DatabaseServices/Entity/BoardInterface"; import { Circle } from "../../DatabaseServices/Entity/Circle"; import { CompositeEntity } from "../../DatabaseServices/Entity/CompositeEntity"; import { Curve } from "../../DatabaseServices/Entity/Curve"; @@ -23,7 +24,6 @@ import { PromptStatus } from "../../Editor/PromptResult"; import { GetEulerAngle, equalv3 } from "../../Geometry/GeUtils"; import { AppConfirm } from '../../UI/Components/Common/Confirm'; import { AppToaster } from "../../UI/Components/Toaster"; -import { BoardType, LinesType } from "../../UI/Store/BoardInterface"; import { TopPanelStore } from '../../UI/Store/TopPanelStore'; import { EZengZhiBaoId } from '../../UI/Store/UserConfigStore'; import { HotCMD } from './../../Hot/HotCommand'; diff --git a/src/Add-on/LatticeDrawer/LatticeDrawerTool.ts b/src/Add-on/LatticeDrawer/LatticeDrawerTool.ts index 1be67f0ee..6c187de40 100644 --- a/src/Add-on/LatticeDrawer/LatticeDrawerTool.ts +++ b/src/Add-on/LatticeDrawer/LatticeDrawerTool.ts @@ -5,11 +5,13 @@ import { Log, LogType } from "../../Common/Log"; import { Singleton } from "../../Common/Singleton"; import { Arc } from "../../DatabaseServices/Entity/Arc"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { Polyline } from "../../DatabaseServices/Entity/Polyline"; import { AsVector2, XAxis, YAxis, equalv3, isParallelTo } from "../../Geometry/GeUtils"; import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse"; -import { BoardType, DrillType, IHighSealedItem } from "../../UI/Store/BoardInterface"; import { ELatticeArrayType, ILatticeOption } from "../../UI/Store/LatticeInterface"; +import { IHighSealedItem } from "../../UI/Store/OptionInterface/IHighSealedItem"; +import { DrillType } from "../DrawDrilling/DrillType"; export class DrawLatticeDrawerTool extends Singleton { diff --git a/src/Add-on/LookOverBoardInfos/LookOverBoardInfos.ts b/src/Add-on/LookOverBoardInfos/LookOverBoardInfos.ts index e85ab387f..7c7e4560b 100644 --- a/src/Add-on/LookOverBoardInfos/LookOverBoardInfos.ts +++ b/src/Add-on/LookOverBoardInfos/LookOverBoardInfos.ts @@ -1,4 +1,5 @@ import { app } from "../../ApplicationServices/Application"; +import { HostApplicationServices } from "../../ApplicationServices/HostApplicationServices"; import { LogType } from "../../Common/Log"; import { Board } from "../../DatabaseServices/Entity/Board"; import { Command } from "../../Editor/CommandMachine"; @@ -19,12 +20,13 @@ export class LookOverBoardInfos implements Command let switchDivisionChaiDan: null | boolean = null; while (true) { + let sealReserve = HostApplicationServices.sealReserve; enRes = await app.Editor.GetSelection({ KeyWordList: [ { msg: `${switchDivisionChaiDan ? "包括非拆单板" : "不包括非拆单板"}`, key: "S" }, { msg: `修改封边统计留头量`, key: "L" } ], - Msg: `当前设置封边统计留头量 : ${bbsEditorStore.sealReserve},\n选择板件或者五金${switchDivisionChaiDan ? "(不包括非拆单板)" : "(包括非拆单板)"}`, + Msg: `当前设置封边统计留头量 : ${sealReserve},\n选择板件或者五金${switchDivisionChaiDan ? "(不包括非拆单板)" : "(包括非拆单板)"}`, UseSelect: true, Filter: { filterFunction: (o, e) => e && e.Id && @@ -40,14 +42,14 @@ export class LookOverBoardInfos implements Command switchDivisionChaiDan = !switchDivisionChaiDan; else if (enRes.StringResult === "L") { - let ret = await app.Editor.GetDistance({ Msg: "当前设置封边统计留头量为:", Default: bbsEditorStore.sealReserve }); + let ret = await app.Editor.GetDistance({ Msg: "当前设置封边统计留头量为:", Default: sealReserve }); if (ret.Status === PromptStatus.OK) { if (ret.Distance <= 0 || isNaN(ret.Distance)) { app.Editor.Prompt("请输入为正数的留头量!", LogType.Warning); } - bbsEditorStore.sealReserve = Math.abs(ret.Distance); + HostApplicationServices.sealReserve = Math.abs(ret.Distance); userConfigStore.SaveConfig(BoardModalType.BBSEditor, bbsEditorStore, { toaster: false }); } } diff --git a/src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts b/src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts index 84054e941..e440cbcbe 100644 --- a/src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts +++ b/src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts @@ -17,8 +17,7 @@ import { ProcessingGroupRecord } from '../../DatabaseServices/ProcessingGroup/Pr import { equaln } from "../../Geometry/GeUtils"; import { GetSealedBoardContour } from "../../GraphicsSystem/CalcEdgeSealing"; import { IHardwareType, Production } from "../../Production/Product"; -import { bbsEditorStore } from "../../UI/Store/BBSEditorStore"; -import { ISealingData } from "../../UI/Store/BoardInterface"; +import { ISealingData } from "../../UI/Store/OptionInterface/IHighSealedItem"; import { HoleInBoard } from "../DrawDrilling/HoleUtils"; export interface ICountType @@ -249,7 +248,7 @@ class LookOverBoardInfosTool let color = br.BoardProcessOption[EBoardKeyList.Color]; //封边留头量 - let sealReserve = bbsEditorStore.sealReserve * 2; + let sealReserve = HostApplicationServices.sealReserve * 2; for (let data of sealData) { diff --git a/src/Add-on/OpenCabinet/OpenCabinet.ts b/src/Add-on/OpenCabinet/OpenCabinet.ts index c3f057c9e..ea1471cdc 100644 --- a/src/Add-on/OpenCabinet/OpenCabinet.ts +++ b/src/Add-on/OpenCabinet/OpenCabinet.ts @@ -6,6 +6,7 @@ import { Log, LogType } from "../../Common/Log"; import { Hole } from "../../DatabaseServices/3DSolid/Hole"; import { Dimension } from "../../DatabaseServices/Dimension/Dimension"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardOpenDir } from "../../DatabaseServices/Entity/BoardInterface"; import { Curve } from "../../DatabaseServices/Entity/Curve"; import { Entity } from "../../DatabaseServices/Entity/Entity"; import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity"; @@ -18,7 +19,6 @@ import { Box3Ext } from "../../Geometry/Box"; import { XAxis, ZAxis } from "../../Geometry/GeUtils"; import { RenderType } from "../../GraphicsSystem/RenderType"; import { AppToaster } from "../../UI/Components/Toaster"; -import { BoardOpenDir } from "../../UI/Store/BoardInterface"; import { IsDoor, IsDrawer, IsHandle, IsHinge, IsLattice } from "../HideSelect/HideSelectUtils"; const MOVECOUNT = 150; diff --git a/src/Add-on/RestoreColor.ts b/src/Add-on/RestoreColor.ts index cd3371d15..fb8443f02 100644 --- a/src/Add-on/RestoreColor.ts +++ b/src/Add-on/RestoreColor.ts @@ -1,8 +1,8 @@ -import { Command } from "../Editor/CommandMachine"; import { app } from "../ApplicationServices/Application"; import { Board } from "../DatabaseServices/Entity/Board"; +import { BoardOpenDir, BoardType } from "../DatabaseServices/Entity/BoardInterface"; +import { Command } from "../Editor/CommandMachine"; import { PromptStatus } from "../Editor/PromptResult"; -import { BoardType, BoardOpenDir } from "../UI/Store/BoardInterface"; export class Command_RestoreColor implements Command { diff --git a/src/Add-on/RotateLayerBoard.ts b/src/Add-on/RotateLayerBoard.ts index 70354c838..6d164f6d6 100644 --- a/src/Add-on/RotateLayerBoard.ts +++ b/src/Add-on/RotateLayerBoard.ts @@ -2,14 +2,14 @@ import { MathUtils, Matrix4, Vector3 } from "three"; import { app } from "../ApplicationServices/Application"; import { CylinderHole } from "../DatabaseServices/3DSolid/CylinderHole"; import { Board } from "../DatabaseServices/Entity/Board"; +import { BoardType } from "../DatabaseServices/Entity/BoardInterface"; import { Command } from "../Editor/CommandMachine"; import { PromptStatus } from "../Editor/PromptResult"; import { IntersectBox2 } from "../Geometry/Box"; -import { equalv3, isParallelTo, MoveMatrix } from "../Geometry/GeUtils"; +import { MoveMatrix, equalv3, isParallelTo } from "../Geometry/GeUtils"; import { ModalState } from "../UI/Components/Modal/ModalInterface"; import { ERotateType, RotateLayerBoardModal, RotateLayerBoardStore } from "../UI/Components/RotateLayerBoard"; import { AppToaster } from "../UI/Components/Toaster"; -import { BoardType } from "../UI/Store/BoardInterface"; /** 计算前的板件相关数据接口 */ interface IOldBrData diff --git a/src/Add-on/SetSmoothEdge/SetSmoothEdgeFace.ts b/src/Add-on/SetSmoothEdge/SetSmoothEdgeFace.ts index 76b4376d2..93bdf11bd 100644 --- a/src/Add-on/SetSmoothEdge/SetSmoothEdgeFace.ts +++ b/src/Add-on/SetSmoothEdge/SetSmoothEdgeFace.ts @@ -8,7 +8,8 @@ import { BoardFaceType, BoardGetFace, GetSideFaceMtx } from "../../Geometry/Dril import { Face } from "../../Geometry/DrillParse/Face"; import { equaln, equalv3 } from "../../Geometry/GeUtils"; import { GetBoardHighSeal, GetBoardSealingCurves, SetBoardTopDownLeftRightSealData } from "../../GraphicsSystem/CalcEdgeSealing"; -import { IHighSealedItem, ISmoothEdgeOption } from "../../UI/Store/BoardInterface"; +import { IHighSealedItem } from "../../UI/Store/OptionInterface/IHighSealedItem"; +import { ISmoothEdgeOption } from "../../UI/Store/OptionInterface/IOptionInterface"; class SetSmoothEdgeFaces extends BoardGetFace { diff --git a/src/Add-on/SetSmoothEdge/SmoothEdgeStore.ts b/src/Add-on/SetSmoothEdge/SmoothEdgeStore.ts index 56528df29..9b7d42029 100644 --- a/src/Add-on/SetSmoothEdge/SmoothEdgeStore.ts +++ b/src/Add-on/SetSmoothEdge/SmoothEdgeStore.ts @@ -1,8 +1,8 @@ import { observable, toJS } from "mobx"; import { DataAdapter } from "../../Common/DataAdapter"; import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent"; -import { ISmoothEdgeOption, IUiOption } from "../../UI/Store/BoardInterface"; import { IConfigStore } from "../../UI/Store/BoardStore"; +import { ISmoothEdgeOption, IUiOption } from "../../UI/Store/OptionInterface/IOptionInterface"; export class SmoothEdgeStore implements IConfigStore { diff --git a/src/Add-on/ShareView/ShareViewRules.ts b/src/Add-on/ShareView/ShareViewRules.ts index cd1af4147..42e6b8a4b 100644 --- a/src/Add-on/ShareView/ShareViewRules.ts +++ b/src/Add-on/ShareView/ShareViewRules.ts @@ -1,6 +1,6 @@ import { CommandNames } from "../../Common/CommandNames"; import { RenderType } from "../../GraphicsSystem/RenderType"; -import { ViewDirection } from "../../UI/Store/BoardInterface"; +import { ViewDirection } from "../../UI/Store/OptionInterface/OptionEnum"; //仅在分享图纸shareView使用 export const ViewAngleTypes = [ diff --git a/src/Add-on/ShareView/ShareViewStore.ts b/src/Add-on/ShareView/ShareViewStore.ts index 0081815d8..415d281a2 100644 --- a/src/Add-on/ShareView/ShareViewStore.ts +++ b/src/Add-on/ShareView/ShareViewStore.ts @@ -4,8 +4,8 @@ import { Singleton } from "../../Common/Singleton"; import { Board } from "../../DatabaseServices/Entity/Board"; import { DefaultShareBoardInfConfigurationOption } from "../../Editor/DefaultConfig"; import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent"; -import { ShareBoardInfConfigurationOption } from "../../UI/Store/BoardInterface"; import { IConfigStore } from '../../UI/Store/BoardStore'; +import { ShareBoardInfConfigurationOption } from "../../UI/Store/OptionInterface/IOptionInterface"; interface IProps { diff --git a/src/Add-on/ShareView/components/ViewAngle.tsx b/src/Add-on/ShareView/components/ViewAngle.tsx index 7ea6835eb..282a705cc 100644 --- a/src/Add-on/ShareView/components/ViewAngle.tsx +++ b/src/Add-on/ShareView/components/ViewAngle.tsx @@ -1,6 +1,6 @@ import React, { forwardRef, useEffect, useRef, useState } from "react"; import { commandMachine } from "../../../Editor/CommandMachine"; -import { ViewDirection } from "../../../UI/Store/BoardInterface"; +import { ViewDirection } from "../../../UI/Store/OptionInterface/OptionEnum"; import { ViewAngleTypes } from "../ShareViewRules"; import { shareViewApp } from "../ShareViewService"; import { ForbiddenToaster, resetBoxView } from "../ShareViewUtil"; diff --git a/src/Add-on/Template/DrawVisualSpaceBox.tsx b/src/Add-on/Template/DrawVisualSpaceBox.tsx index 74753c6e6..5f5e45239 100644 --- a/src/Add-on/Template/DrawVisualSpaceBox.tsx +++ b/src/Add-on/Template/DrawVisualSpaceBox.tsx @@ -16,13 +16,13 @@ import { JigUtils } from '../../Editor/JigUtils'; import { PromptPointResult, PromptStatus } from "../../Editor/PromptResult"; import { ParsePlacePos, ParsePlacePosWithTemplate, ParsePlacePosWithTemplate2 } from '../../Editor/TranstrolControl/ParsePlacePos'; import { VisualSpaceBox } from '../../Editor/VisualSpaceBox'; -import { equalv3, ZeroVec } from '../../Geometry/GeUtils'; +import { ZeroVec, equalv3 } from '../../Geometry/GeUtils'; import { GetCompoentObjectIdString } from '../../UI/Components/ComponentObjectId'; import { ModalState } from '../../UI/Components/Modal/ModalInterface'; import { ToasterInput } from '../../UI/Components/Toaster'; +import { IBaseOption, IUiOption } from "../../UI/Store/OptionInterface/IOptionInterface"; import { DataAdapter } from './../../Common/DataAdapter'; import { AppToaster } from './../../UI/Components/Toaster'; -import { IBaseOption, IUiOption } from './../../UI/Store/BoardInterface'; const VS_BOX_KEY = "vsBoxKey"; diff --git a/src/Add-on/TemplateSearch.tsx b/src/Add-on/TemplateSearch.tsx index a448300e4..422db6c12 100644 --- a/src/Add-on/TemplateSearch.tsx +++ b/src/Add-on/TemplateSearch.tsx @@ -15,7 +15,7 @@ import { AutoCutCheckbox } from '../UI/Components/Board/BoardCommon'; import { ModalFooter } from '../UI/Components/Modal/ModalContainer'; import { IGetRoomInfo } from '../UI/Components/Template/GetRoomCabName'; import { InsertTemplateByBasePoint } from '../UI/Components/Template/InsertTemplateByBasePoint'; -import { IDrawBoardAutoCutOption } from '../UI/Store/BoardInterface'; +import { IDrawBoardAutoCutOption } from "../UI/Store/OptionInterface/IOptionInterface"; import { CommonIframe } from './../UI/Components/Common/CommonIframe'; import { AutoCutting } from './BoardCutting/AutoCuttingReactor'; diff --git a/src/Add-on/ViewortConfig/Viewport2Config.tsx b/src/Add-on/ViewortConfig/Viewport2Config.tsx index 9a41a88a8..01ba53a6a 100644 --- a/src/Add-on/ViewortConfig/Viewport2Config.tsx +++ b/src/Add-on/ViewortConfig/Viewport2Config.tsx @@ -9,9 +9,10 @@ import { DefaultViewport2ConfigOption } from "../../Editor/DefaultConfig"; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { Config_ModalType, IConfigOption, UserConfigComponent } from "../../UI/Components/Board/UserConfigComponent"; import { ModalState } from "../../UI/Components/Modal/ModalInterface"; -import { Viewport2ConfigOption, ViewportPosition } from "../../UI/Store/BoardInterface"; import { IConfigStore } from "../../UI/Store/BoardStore"; -import { viewportOptions, ViewportRenderTypeOptions } from "./ViewportOptions"; +import { ViewportPosition } from "../../UI/Store/OptionInterface/OptionEnum"; +import { Viewport2ConfigOption } from "../../UI/Store/OptionInterface/ViewportConfigOption"; +import { ViewportRenderTypeOptions, viewportOptions } from "./ViewportOptions"; export class Viewport2ConfigStore implements IConfigStore { diff --git a/src/Add-on/ViewortConfig/Viewport3Config.tsx b/src/Add-on/ViewortConfig/Viewport3Config.tsx index 067d9cee5..69170ef5b 100644 --- a/src/Add-on/ViewortConfig/Viewport3Config.tsx +++ b/src/Add-on/ViewortConfig/Viewport3Config.tsx @@ -9,9 +9,10 @@ import { DefaultViewport3ConfigOption } from "../../Editor/DefaultConfig"; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { Config_ModalType, IConfigOption, UserConfigComponent } from "../../UI/Components/Board/UserConfigComponent"; import { ModalState } from "../../UI/Components/Modal/ModalInterface"; -import { Viewport3ConfigOption, ViewportPosition } from "../../UI/Store/BoardInterface"; import { IConfigStore } from "../../UI/Store/BoardStore"; -import { viewportOptions, ViewportRenderTypeOptions } from "./ViewportOptions"; +import { ViewportPosition } from "../../UI/Store/OptionInterface/OptionEnum"; +import { Viewport3ConfigOption } from "../../UI/Store/OptionInterface/ViewportConfigOption"; +import { ViewportRenderTypeOptions, viewportOptions } from "./ViewportOptions"; export class Viewport3ConfigStore implements IConfigStore { diff --git a/src/Add-on/ViewortConfig/Viewport4Config.tsx b/src/Add-on/ViewortConfig/Viewport4Config.tsx index 2cbf4fa27..8071419ed 100644 --- a/src/Add-on/ViewortConfig/Viewport4Config.tsx +++ b/src/Add-on/ViewortConfig/Viewport4Config.tsx @@ -9,9 +9,9 @@ import { DefaultViewport4ConfigOption } from "../../Editor/DefaultConfig"; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { Config_ModalType, IConfigOption, UserConfigComponent } from "../../UI/Components/Board/UserConfigComponent"; import { ModalState } from "../../UI/Components/Modal/ModalInterface"; -import { Viewport4ConfigOption } from "../../UI/Store/BoardInterface"; import { IConfigStore } from "../../UI/Store/BoardStore"; -import { viewportOptions, ViewportRenderTypeOptions } from "./ViewportOptions"; +import { Viewport4ConfigOption } from "../../UI/Store/OptionInterface/ViewportConfigOption"; +import { ViewportRenderTypeOptions, viewportOptions } from "./ViewportOptions"; export class Viewport4ConfigStore implements IConfigStore { diff --git a/src/Add-on/ViewortConfig/ViewportConfig.tsx b/src/Add-on/ViewortConfig/ViewportConfig.tsx index 9116c8958..21885dd9f 100644 --- a/src/Add-on/ViewortConfig/ViewportConfig.tsx +++ b/src/Add-on/ViewortConfig/ViewportConfig.tsx @@ -9,9 +9,9 @@ import { DefaultViewportConfigOption } from "../../Editor/DefaultConfig"; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { Config_ModalType, IConfigOption, UserConfigComponent } from "../../UI/Components/Board/UserConfigComponent"; import { ModalState } from "../../UI/Components/Modal/ModalInterface"; -import { ViewportConfigOption } from "../../UI/Store/BoardInterface"; import { IConfigStore } from "../../UI/Store/BoardStore"; -import { viewportOptions, ViewportRenderTypeOptions } from "./ViewportOptions"; +import { ViewportConfigOption } from "../../UI/Store/OptionInterface/ViewportConfigOption"; +import { ViewportRenderTypeOptions, viewportOptions } from "./ViewportOptions"; export class ViewportConfigStore implements IConfigStore { diff --git a/src/Add-on/Viewport/OneKeyLayout.ts b/src/Add-on/Viewport/OneKeyLayout.ts index 71009c9a5..521164fab 100644 --- a/src/Add-on/Viewport/OneKeyLayout.ts +++ b/src/Add-on/Viewport/OneKeyLayout.ts @@ -32,8 +32,8 @@ import { RenderType } from "../../GraphicsSystem/RenderType"; import { FrameManage } from "../../UI/Components/Modal/FrameManager"; import { ModalState } from "../../UI/Components/Modal/ModalInterface"; import { AppToaster } from "../../UI/Components/Toaster"; -import { ViewDirection } from "../../UI/Store/BoardInterface"; import { DownPanelStore } from "../../UI/Store/DownPanelStore"; +import { ViewDirection } from "../../UI/Store/OptionInterface/OptionEnum"; import { TopPanelStore } from "../../UI/Store/TopPanelStore"; import { DrawCustomViewports, Get4Viewport, ICustomViewportInfo } from "../DrawViewport"; import { OneKeyLayoutStore } from "./OneKeyLayoutStore"; diff --git a/src/Add-on/twoD2threeD/Modals/Curve2RecModal.tsx b/src/Add-on/twoD2threeD/Modals/Curve2RecModal.tsx index 2196f9701..c75a19775 100644 --- a/src/Add-on/twoD2threeD/Modals/Curve2RecModal.tsx +++ b/src/Add-on/twoD2threeD/Modals/Curve2RecModal.tsx @@ -7,9 +7,9 @@ import { app } from "../../../ApplicationServices/Application"; import { CheckObjectType } from "../../../Common/CheckoutVaildValue"; import { CommandNames } from "../../../Common/CommandNames"; import { DataAdapter } from "../../../Common/DataAdapter"; -import { safeEval } from "../../../Common/eval"; import { KeyBoard } from "../../../Common/KeyEnum"; import { Singleton } from "../../../Common/Singleton"; +import { safeEval } from "../../../Common/eval"; import { DefaultCurve2RecOption } from "../../../Editor/DefaultConfig"; import { BoardModalType } from "../../../UI/Components/Board/BoardModalType"; import { Config_ModalType, IConfigOption, UserConfigComponent } from "../../../UI/Components/Board/UserConfigComponent"; @@ -17,8 +17,8 @@ import { GetCompoentObjectIdString } from "../../../UI/Components/ComponentObjec import { ModalFooter, ModalHeader } from "../../../UI/Components/Modal/ModalContainer"; import { ModalState } from "../../../UI/Components/Modal/ModalInterface"; import { ToasterInput, ToasterValueError } from "../../../UI/Components/Toaster"; -import { IUiOption } from "../../../UI/Store/BoardInterface"; import { IConfigStore } from "../../../UI/Store/BoardStore"; +import { IUiOption } from "../../../UI/Store/OptionInterface/IOptionInterface"; import '../Modals/Curve2Rec.less'; import { Curve2RecOption } from "./Curve2RecOption"; diff --git a/src/Add-on/twoD2threeD/Modals/Curve2RecOption.tsx b/src/Add-on/twoD2threeD/Modals/Curve2RecOption.tsx index 891471eee..e371a07a5 100644 --- a/src/Add-on/twoD2threeD/Modals/Curve2RecOption.tsx +++ b/src/Add-on/twoD2threeD/Modals/Curve2RecOption.tsx @@ -1,5 +1,4 @@ -import { IBaseOption } from "../../../UI/Store/BoardInterface"; - +import { IBaseOption } from "../../../UI/Store/OptionInterface/IOptionInterface"; export interface Curve2RecOption extends IBaseOption { diff --git a/src/Add-on/twoD2threeD/ParseBoardData.ts b/src/Add-on/twoD2threeD/ParseBoardData.ts index 25a53a638..035159573 100644 --- a/src/Add-on/twoD2threeD/ParseBoardData.ts +++ b/src/Add-on/twoD2threeD/ParseBoardData.ts @@ -1,8 +1,8 @@ import { Box3, Matrix4, Vector3 } from "three"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { Polyline } from "../../DatabaseServices/Entity/Polyline"; import { BoardGetFace } from "../../Geometry/DrillParse/BoardGetFace"; -import { BoardType } from "../../UI/Store/BoardInterface"; export class ParseBoardData { diff --git a/src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx b/src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx index c472d263e..ae5a2e462 100644 --- a/src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx +++ b/src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx @@ -12,7 +12,7 @@ import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { Config_ModalType } from "../../UI/Components/Board/UserConfigComponent"; import { CommonModal } from '../../UI/Components/Modal/ModalContainer'; import { AppToaster, ToasterInput } from "../../UI/Components/Toaster"; -import { IUiOption } from '../../UI/Store/BoardInterface'; +import { IUiOption } from "../../UI/Store/OptionInterface/IOptionInterface"; import { ParseBoardNameStore } from './ParseBoardNameStore'; import { GetOptionState } from "./R2bConfigComponent"; import { IParseBoardNameOption } from './R2bInterface'; diff --git a/src/Add-on/twoD2threeD/ParseBoardNameStore.ts b/src/Add-on/twoD2threeD/ParseBoardNameStore.ts index 357e63f90..92189bfc0 100644 --- a/src/Add-on/twoD2threeD/ParseBoardNameStore.ts +++ b/src/Add-on/twoD2threeD/ParseBoardNameStore.ts @@ -3,8 +3,8 @@ import { CheckObjectType, CheckoutValid } from "../../Common/CheckoutVaildValue" import { DataAdapter } from "../../Common/DataAdapter"; import { DefaultParseBoardNameOPtion } from "../../Editor/DefaultConfig"; import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent"; -import { IUiOption } from "../../UI/Store/BoardInterface"; import { BoardStore } from "../../UI/Store/BoardStore"; +import { IUiOption } from "../../UI/Store/OptionInterface/IOptionInterface"; import { IParseBoardNameOption } from "./R2bInterface"; export class ParseBoardNameStore extends BoardStore diff --git a/src/Add-on/twoD2threeD/ParseBoardNameUtil.ts b/src/Add-on/twoD2threeD/ParseBoardNameUtil.ts index ea9f02370..79d1072c3 100644 --- a/src/Add-on/twoD2threeD/ParseBoardNameUtil.ts +++ b/src/Add-on/twoD2threeD/ParseBoardNameUtil.ts @@ -4,8 +4,9 @@ import { arrayRemoveIf } from "../../Common/ArrayExt"; import { EBoardKeyList } from "../../Common/BoardKeyList"; import { LogType } from "../../Common/Log"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType, LinesType } from "../../DatabaseServices/Entity/BoardInterface"; import { ComparePointFnGenerate, equaln, isParallelTo } from "../../Geometry/GeUtils"; -import { BoardType, DrillType, FaceDirection, LinesType } from "../../UI/Store/BoardInterface"; +import { DrillType, FaceDirection } from "../DrawDrilling/DrillType"; import { IParseBoardNameOption } from "./R2bInterface"; /*解析板件名称 根据板件的位置. diff --git a/src/Add-on/twoD2threeD/Polyline2Board.ts b/src/Add-on/twoD2threeD/Polyline2Board.ts index a248afd1f..3c1c57c3d 100644 --- a/src/Add-on/twoD2threeD/Polyline2Board.ts +++ b/src/Add-on/twoD2threeD/Polyline2Board.ts @@ -8,6 +8,7 @@ import { DuplicateRecordCloning } from "../../Common/Status"; import { FixDigits } from "../../Common/Utils"; import { safeEval } from "../../Common/eval"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { Polyline } from "../../DatabaseServices/Entity/Polyline"; import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity"; import { PositioningBoardSpace } from "../../DatabaseServices/Template/Positioning/PositioningBoardSpace"; @@ -21,7 +22,6 @@ import { HotCMD } from "../../Hot/HotCommand"; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { IUpdateBoardInfosOption } from "../../UI/Components/Board/UpdateBoardInfointerface"; import { AppConfirm } from "../../UI/Components/Common/Confirm"; -import { BoardType } from "../../UI/Store/BoardInterface"; import { TopPanelStore } from "../../UI/Store/TopPanelStore"; import { updateBoardInfoStore } from "../../UI/Store/UpdateBoardInfoStore"; import { userConfigStore } from "../../UI/Store/UserConfigStore"; diff --git a/src/Add-on/twoD2threeD/R2B2Store.ts b/src/Add-on/twoD2threeD/R2B2Store.ts index 565da28ae..255806493 100644 --- a/src/Add-on/twoD2threeD/R2B2Store.ts +++ b/src/Add-on/twoD2threeD/R2B2Store.ts @@ -5,8 +5,8 @@ import { DataAdapter } from "../../Common/DataAdapter"; import { DefaultR2b2Option } from "../../Editor/DefaultConfig"; import { userConfig } from "../../Editor/UserConfig"; import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent"; -import { IUiOption } from "../../UI/Store/BoardInterface"; import { IConfigStore } from "../../UI/Store/BoardStore"; +import { IUiOption } from "../../UI/Store/OptionInterface/IOptionInterface"; import { IRect2Br2Option } from "./R2bInterface"; export class R2B2Store implements IConfigStore diff --git a/src/Add-on/twoD2threeD/R2bInterface.ts b/src/Add-on/twoD2threeD/R2bInterface.ts index eedf2bb28..9fd5d9c7f 100644 --- a/src/Add-on/twoD2threeD/R2bInterface.ts +++ b/src/Add-on/twoD2threeD/R2bInterface.ts @@ -1,6 +1,7 @@ import { EBoardKeyList } from "../../Common/BoardKeyList"; import { TemplateRecord } from "../../DatabaseServices/Template/TemplateRecord"; -import { DrillType, IBaseOption, IGrooveOption } from "../../UI/Store/BoardInterface"; +import { IBaseOption, IGrooveOption } from "../../UI/Store/OptionInterface/IOptionInterface"; +import { DrillType } from "../DrawDrilling/DrillType"; export interface IParseBoardNameOption extends IBaseOption { diff --git a/src/Add-on/twoD2threeD/Rec2BrStore.ts b/src/Add-on/twoD2threeD/Rec2BrStore.ts index 5939bf298..afdd78d92 100644 --- a/src/Add-on/twoD2threeD/Rec2BrStore.ts +++ b/src/Add-on/twoD2threeD/Rec2BrStore.ts @@ -3,8 +3,8 @@ import { CheckObjectType, CheckoutValid } from "../../Common/CheckoutVaildValue" import { DataAdapter } from "../../Common/DataAdapter"; import { DefaultR2bOption } from "../../Editor/DefaultConfig"; import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent"; -import { IGrooveOption, IUiOption } from "../../UI/Store/BoardInterface"; import { BoardStore } from "../../UI/Store/BoardStore"; +import { IGrooveOption, IUiOption } from "../../UI/Store/OptionInterface/IOptionInterface"; import { updateBoardInfoStore } from "../../UI/Store/UpdateBoardInfoStore"; import { IRec2BrOption } from "./R2bInterface"; diff --git a/src/Add-on/twoD2threeD/Rect2Board.ts b/src/Add-on/twoD2threeD/Rect2Board.ts index 2dd099235..e22780f3e 100644 --- a/src/Add-on/twoD2threeD/Rect2Board.ts +++ b/src/Add-on/twoD2threeD/Rect2Board.ts @@ -3,22 +3,23 @@ import { Box3, Matrix4, Object3D, Vector3 } from "three"; import { app } from "../../ApplicationServices/Application"; import { EBoardKeyList } from "../../Common/BoardKeyList"; import { IsRect } from "../../Common/CurveUtils"; -import { safeEval } from "../../Common/eval"; import { Buy2To3 } from "../../Common/HostUrl"; import { Log, LogType } from "../../Common/Log"; import { FixDigits } from "../../Common/Utils"; +import { safeEval } from "../../Common/eval"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { Polyline } from "../../DatabaseServices/Entity/Polyline"; import { Command } from "../../Editor/CommandMachine"; import { PromptStatus } from "../../Editor/PromptResult"; -import { isParallelTo, XAxis, YAxis, ZAxis } from "../../Geometry/GeUtils"; +import { XAxis, YAxis, ZAxis, isParallelTo } from "../../Geometry/GeUtils"; import { ClampSpaceParseRay } from "../../Geometry/SpaceParse/ClampSpaceParseRay"; import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse"; import { PointSelectBoards } from "../../Geometry/SpaceParse/PointSelectBoards"; import { RenderType } from "../../GraphicsSystem/RenderType"; import { AppConfirm } from "../../UI/Components/Common/Confirm"; -import { BoardType, FaceDirection } from "../../UI/Store/BoardInterface"; import { TopPanelStore } from "../../UI/Store/TopPanelStore"; +import { FaceDirection } from "../DrawDrilling/DrillType"; import { R2b2Panel } from "./Modals/R2b2"; import { r2b2Store } from "./R2B2Store"; import { IRect2Br2Option } from "./R2bInterface"; diff --git a/src/ApplicationServices/HostApplicationServices.ts b/src/ApplicationServices/HostApplicationServices.ts index fcf2cc520..2aafc39b4 100644 --- a/src/ApplicationServices/HostApplicationServices.ts +++ b/src/ApplicationServices/HostApplicationServices.ts @@ -23,6 +23,7 @@ export class IHostApplicationServices @ProxyValue ConceptualOpacity = 1;//概念透明的透明度 DrawWallBottomFace = false;//绘制底面 + sealReserve = 0; //封边统计留头量 private __ProxyObject__: any;//代理对象,当代理对象存在时,获取内部的值指向代理对象 static __ProxyKeys__: string[] = [];//代理对象,当代理对象存在时,获取内部的值指向代理对象 diff --git a/src/Common/CommonSelectOption.ts b/src/Common/CommonSelectOption.ts index 1caf6af76..3c59df7e0 100644 --- a/src/Common/CommonSelectOption.ts +++ b/src/Common/CommonSelectOption.ts @@ -1,4 +1,5 @@ -import { ComposingType, LinesType, FaceDirection } from "../UI/Store/BoardInterface"; +import { FaceDirection } from "../Add-on/DrawDrilling/DrillType"; +import { ComposingType, LinesType } from "../DatabaseServices/Entity/BoardInterface"; /**排版面选择项 */ export const ComposingFaceSelectOption = [ diff --git a/src/Common/DataAdapter.ts b/src/Common/DataAdapter.ts index 3e9db05d8..d0634318c 100644 --- a/src/Common/DataAdapter.ts +++ b/src/Common/DataAdapter.ts @@ -1,5 +1,5 @@ import { observable } from "mobx"; -import { IUiOption } from "../UI/Store/BoardInterface"; +import { IUiOption } from "../UI/Store/OptionInterface/IOptionInterface"; export class DataAdapter { diff --git a/src/DatabaseServices/BoardLinesReactor.ts b/src/DatabaseServices/BoardLinesReactor.ts index aa9c4e7cd..92021fc7e 100644 --- a/src/DatabaseServices/BoardLinesReactor.ts +++ b/src/DatabaseServices/BoardLinesReactor.ts @@ -6,9 +6,9 @@ import { userConfig } from "../Editor/UserConfig"; import { Production } from "../Production/Product"; import { AppConfirm } from "../UI/Components/Common/Confirm"; import { AppToaster } from "../UI/Components/Toaster"; -import { LinesType } from "../UI/Store/BoardInterface"; import { CADObject } from "./CADObject"; import { Board } from "./Entity/Board"; +import { LinesType } from "./Entity/BoardInterface"; //禁止触发反应的命令 const ForbidReactorCmd = new Set([ diff --git a/src/DatabaseServices/Entity/Board.ts b/src/DatabaseServices/Entity/Board.ts index efecea251..9f8fe8999 100644 --- a/src/DatabaseServices/Entity/Board.ts +++ b/src/DatabaseServices/Entity/Board.ts @@ -1,6 +1,7 @@ import { Euler, FrontSide, Geometry, LineSegments, Matrix3, Matrix4, Mesh, Object3D, ShapeGeometry, Line as TLine, UVGenerator, Vector3 } from 'three'; import { Board2Regions } from '../../Add-on/BoardEditor/Board2Regions'; import { DeserializationBoard2DModeingData, DeserializationBoard3DModeingData, SerializeBoard2DModeingData, SerializeBoard3DModeingData, deserializationBoardData, serializeBoardData } from '../../Add-on/BoardEditor/SerializeBoardData'; +import { DrillType, FaceDirection } from "../../Add-on/DrawDrilling/DrillType"; import { CyHoleInBoard, ParseBoardRectHoleType, SetBrHighHoleTypeFromRectHoleType, TempRectHoleOption } from '../../Add-on/DrawDrilling/HoleUtils'; import { HostApplicationServices } from '../../ApplicationServices/HostApplicationServices'; import { AddEntityDrawObject } from '../../Common/AddEntityDrawObject'; @@ -17,7 +18,7 @@ import { PointShapeUtils } from '../../Geometry/PointShapeUtils'; import { GetBoardHighSeal, GetBoardSealingCurves, SetBoardTopDownLeftRightSealData } from '../../GraphicsSystem/CalcEdgeSealing'; import { RenderType } from '../../GraphicsSystem/RenderType'; import { VData2Curve, VKnifToolPath } from '../../GraphicsSystem/ToolPath/VKnifToolPath'; -import { BoardOpenDir, BoardProcessOption, BoardType, ComposingType, DrillType, FaceDirection, LinesType } from '../../UI/Store/BoardInterface'; +import { BoardProcessOption } from "../../UI/Store/OptionInterface/BoardProcessOption"; import { CylinderHole } from '../3DSolid/CylinderHole'; import { ExtrudeHole } from '../3DSolid/ExtrudeHole'; import { AutoRecord } from '../AutoRecord'; @@ -29,13 +30,13 @@ import { ObjectId } from '../ObjectId'; import { Shape } from '../Shape'; import { Text as DbText, TextAligen } from "../Text/Text"; import { Arc } from './Arc'; +import { BoardOpenDir, BoardType, ComposingType, LinesType } from './BoardInterface'; import { Circle } from './Circle'; import { DragPointType } from './DragPointType'; import { Entity } from './Entity'; import { ExtrudeContourCurve, ExtrudeSolid } from './Extrude'; import { Polyline } from './Polyline'; - //排钻配置名是合法的 可用的 function IsValidDriName(name: string): boolean { diff --git a/src/DatabaseServices/Entity/BoardInterface.ts b/src/DatabaseServices/Entity/BoardInterface.ts new file mode 100644 index 000000000..d580d3e90 --- /dev/null +++ b/src/DatabaseServices/Entity/BoardInterface.ts @@ -0,0 +1,45 @@ +export enum BoardType +{ + Layer = 0, //层板 + Vertical = 1, //立板 + Behind = 2 //背板 +} + +//纹路类型 +export enum LinesType +{ + /** 正纹 */ + Positive = 0, + /** 反纹 */ + Reverse = 1, + /** 可翻转 */ + CanReversal = 2, +} + +// 排版面 +export enum ComposingType +{ + Positive = 0, //正面 + Reverse = 1, //反面 + Arbitrary = 2 //任意 +} + +export enum BoardOpenDir +{ + Left = 1, + Right = 2, + Up = 3, + Down = 4, + None = 0, +} + +export enum BrRelativePos +{ + Front = "front", + Back = "back", + Top = "top", + Bottom = "bottom", + Left = "left", + Right = "right", + Div = "div" +} diff --git a/src/DatabaseServices/Room/Entity/Wall/Hole/Window/WindowPanelStore.ts b/src/DatabaseServices/Room/Entity/Wall/Hole/Window/WindowPanelStore.ts index f2468f504..be941dc15 100644 --- a/src/DatabaseServices/Room/Entity/Wall/Hole/Window/WindowPanelStore.ts +++ b/src/DatabaseServices/Room/Entity/Wall/Hole/Window/WindowPanelStore.ts @@ -1,9 +1,9 @@ import { observable, toJS } from "mobx"; import { DefaultWindowPanelOption as DefaultDoorWindowPanelOption } from "../../../../../../Editor/DefaultConfig"; import { IConfigOption } from "../../../../../../UI/Components/Board/UserConfigComponent"; -import { WindowPanelConfigOption as DoorWindowPanelConfigOption } from "../../../../../../UI/Store/BoardInterface"; import { IConfigStore } from "../../../../../../UI/Store/BoardStore"; import { ISelectTempInfo } from "../../../../../../UI/Store/DoorInterface"; +import { WindowPanelConfigOption as DoorWindowPanelConfigOption } from "../../../../../../UI/Store/OptionInterface/IOptionInterface"; import { TemplateWindowRecord } from "../../../../../Template/ProgramTempate/TemplateWindowRecord"; export enum DoorWindowParamsNames diff --git a/src/DatabaseServices/Template/ProgramTempate/TemplateArcWindowRecord.ts b/src/DatabaseServices/Template/ProgramTempate/TemplateArcWindowRecord.ts index f3067f10e..ed5ea2478 100644 --- a/src/DatabaseServices/Template/ProgramTempate/TemplateArcWindowRecord.ts +++ b/src/DatabaseServices/Template/ProgramTempate/TemplateArcWindowRecord.ts @@ -1,12 +1,12 @@ import { MathUtils, Matrix4, Vector3 } from "three"; -import { equaln, ZAxis } from "../../../Geometry/GeUtils"; -import { BoardType } from "../../../UI/Store/BoardInterface"; +import { ZAxis, equaln } from "../../../Geometry/GeUtils"; import { AutoRecord } from "../../AutoRecord"; import { Factory } from "../../CADFactory"; import { CADFiler } from "../../CADFiler"; import { CADObject } from "../../CADObject"; import { Arc } from "../../Entity/Arc"; import { Board } from "../../Entity/Board"; +import { BoardType } from "../../Entity/BoardInterface"; import { Line } from "../../Entity/Line"; import { Polyline } from "../../Entity/Polyline"; import { HardwareCompositeEntity } from "../../Hardware/HardwareCompositeEntity"; diff --git a/src/DatabaseServices/Template/ProgramTempate/TemplateBehindBoard.ts b/src/DatabaseServices/Template/ProgramTempate/TemplateBehindBoard.ts index 91125fa4a..455753475 100644 --- a/src/DatabaseServices/Template/ProgramTempate/TemplateBehindBoard.ts +++ b/src/DatabaseServices/Template/ProgramTempate/TemplateBehindBoard.ts @@ -1,10 +1,10 @@ import { BuildBehindBoards } from "../../../Add-on/DrawBoard/BuildBoardTool"; +import { DefaultBehindBoardConfig } from "../../../Editor/DefaultConfig"; import { ISpaceParse } from "../../../Geometry/SpaceParse/ISpaceParse"; -import { BehindBoardOption, IGrooveOption } from "../../../UI/Store/BoardInterface"; +import { BehindBoardOption, IGrooveOption } from "../../../UI/Store/OptionInterface/IOptionInterface"; import { Factory } from "../../CADFactory"; -import { TemplateBoardRecord } from "./TemplateBoard"; -import { DefaultBehindBoardConfig } from "../../../Editor/DefaultConfig"; import { CADFiler } from "../../CADFiler"; +import { TemplateBoardRecord } from "./TemplateBoard"; /** * 背板模板 diff --git a/src/DatabaseServices/Template/ProgramTempate/TemplateBoard.ts b/src/DatabaseServices/Template/ProgramTempate/TemplateBoard.ts index e92975851..12724c2bb 100644 --- a/src/DatabaseServices/Template/ProgramTempate/TemplateBoard.ts +++ b/src/DatabaseServices/Template/ProgramTempate/TemplateBoard.ts @@ -1,7 +1,8 @@ import { ExtendsBoardThickness } from "../../../Add-on/DrawBoard/BuildBoardTool"; import { EBoardKeyList } from "../../../Common/BoardKeyList"; import { ISpaceParse } from "../../../Geometry/SpaceParse/ISpaceParse"; -import { BoardConfigOption, BoardProcessOption } from "../../../UI/Store/BoardInterface"; +import { BoardProcessOption } from "../../../UI/Store/OptionInterface/BoardProcessOption"; +import { BoardConfigOption } from "../../../UI/Store/OptionInterface/IOptionInterface"; import { AutoRecord } from "../../AutoRecord"; import { Factory } from "../../CADFactory"; import { CADFiler } from "../../CADFiler"; diff --git a/src/DatabaseServices/Template/ProgramTempate/TemplateLayerBoard.ts b/src/DatabaseServices/Template/ProgramTempate/TemplateLayerBoard.ts index ff9a99dc1..488e67738 100644 --- a/src/DatabaseServices/Template/ProgramTempate/TemplateLayerBoard.ts +++ b/src/DatabaseServices/Template/ProgramTempate/TemplateLayerBoard.ts @@ -2,7 +2,7 @@ import { activityLayerBoardTool } from "../../../Add-on/DrawBoard/ActivityLayerB import { BuildLayerBoards } from "../../../Add-on/DrawBoard/BuildBoardTool"; import { DefaultLayerBoardConfig, DefaultNailOption } from "../../../Editor/DefaultConfig"; import { ISpaceParse } from "../../../Geometry/SpaceParse/ISpaceParse"; -import { IGrooveOption, LayerBoardOption, LayerNailOption } from "../../../UI/Store/BoardInterface"; +import { IGrooveOption, LayerBoardOption, LayerNailOption } from "../../../UI/Store/OptionInterface/IOptionInterface"; import { Factory } from "../../CADFactory"; import { CADFiler } from "../../CADFiler"; import { Board } from "../../Entity/Board"; diff --git a/src/DatabaseServices/Template/ProgramTempate/TemplateSizeBoard.ts b/src/DatabaseServices/Template/ProgramTempate/TemplateSizeBoard.ts index ada656f42..37a566468 100644 --- a/src/DatabaseServices/Template/ProgramTempate/TemplateSizeBoard.ts +++ b/src/DatabaseServices/Template/ProgramTempate/TemplateSizeBoard.ts @@ -1,7 +1,7 @@ import { Factory } from "../../CADFactory"; import { Board } from "../../Entity/Board"; +import { BoardType } from "../../Entity/BoardInterface"; import { TemplateRecord } from "../TemplateRecord"; -import { BoardType } from "../../../UI/Store/BoardInterface"; @Factory export class TemplateSizeBoard extends TemplateRecord diff --git a/src/DatabaseServices/Template/ProgramTempate/TemplateTopBottomBoard.ts b/src/DatabaseServices/Template/ProgramTempate/TemplateTopBottomBoard.ts index 5bd9bdc99..9117bb18a 100644 --- a/src/DatabaseServices/Template/ProgramTempate/TemplateTopBottomBoard.ts +++ b/src/DatabaseServices/Template/ProgramTempate/TemplateTopBottomBoard.ts @@ -1,12 +1,15 @@ import { ExtendsBoardThickness } from "../../../Add-on/DrawBoard/BuildBoardTool"; import { BuildTopBottomBoards } from "../../../Add-on/DrawBoard/BuildTopBottomBoardTool"; +import { FaceDirection } from "../../../Add-on/DrawDrilling/DrillType"; import { EBoardKeyList } from "../../../Common/BoardKeyList"; import { DefaultBottomBoardOption, DefaultTopBoardOption } from "../../../Editor/DefaultConfig"; -import { BoardProcessOption, FaceDirection, LinesType, TBBoardOption } from "../../../UI/Store/BoardInterface"; +import { BoardProcessOption } from "../../../UI/Store/OptionInterface/BoardProcessOption"; +import { TBBoardOption } from "../../../UI/Store/OptionInterface/IOptionInterface"; import { AutoRecord } from "../../AutoRecord"; import { Factory } from "../../CADFactory"; import { CADFiler } from "../../CADFiler"; import { Board } from "../../Entity/Board"; +import { LinesType } from "../../Entity/BoardInterface"; import { Entity } from "../../Entity/Entity"; import { TemplateRecord } from "../TemplateRecord"; diff --git a/src/DatabaseServices/Template/ProgramTempate/TemplateVerticalBoard.ts b/src/DatabaseServices/Template/ProgramTempate/TemplateVerticalBoard.ts index ccf87c08f..c74cacb3d 100644 --- a/src/DatabaseServices/Template/ProgramTempate/TemplateVerticalBoard.ts +++ b/src/DatabaseServices/Template/ProgramTempate/TemplateVerticalBoard.ts @@ -1,7 +1,7 @@ import { BuildVerticalBoards } from "../../../Add-on/DrawBoard/BuildBoardTool"; import { DefaultVerticalBoardConfig } from "../../../Editor/DefaultConfig"; import { ISpaceParse } from "../../../Geometry/SpaceParse/ISpaceParse"; -import { IGrooveOption, VerticalBoardOption } from "../../../UI/Store/BoardInterface"; +import { IGrooveOption, VerticalBoardOption } from "../../../UI/Store/OptionInterface/IOptionInterface"; import { Factory } from "../../CADFactory"; import { CADFiler } from "../../CADFiler"; import { TemplateBoardRecord } from "./TemplateBoard"; diff --git a/src/DatabaseServices/Template/TempateUtils.ts b/src/DatabaseServices/Template/TempateUtils.ts index 60d519651..de748141b 100644 --- a/src/DatabaseServices/Template/TempateUtils.ts +++ b/src/DatabaseServices/Template/TempateUtils.ts @@ -1,18 +1,19 @@ import { Intent } from "@blueprintjs/core"; import { Box3, Matrix4, Vector3 } from "three"; import { ExtendsbrThick2 } from "../../Add-on/DrawBoard/BuildBoardTool"; +import { FaceDirection } from "../../Add-on/DrawDrilling/DrillType"; import { IsHinge } from "../../Add-on/HideSelect/HideSelectUtils"; import { app } from "../../ApplicationServices/Application"; import { arrayRemoveOnce } from "../../Common/ArrayExt"; -import { CheckExpr, safeEval } from "../../Common/eval"; import { TemplateUrls } from "../../Common/HostUrl"; -import { inflateBase64 } from "../../Common/inflate"; import { Log, LogType } from "../../Common/Log"; import { PostJson, RequestStatus } from "../../Common/Request"; -import { deflate, GetEntitysLogo, TemplateIn, TemplateOut, TemplateParamsOut } from "../../Common/SerializeMaterial"; +import { GetEntitysLogo, TemplateIn, TemplateOut, TemplateParamsOut, deflate } from "../../Common/SerializeMaterial"; import { DuplicateRecordCloning } from "../../Common/Status"; import { StretchParse } from "../../Common/StretchParse"; import { FixedNotZero } from "../../Common/Utils"; +import { CheckExpr, safeEval } from "../../Common/eval"; +import { inflateBase64 } from "../../Common/inflate"; import { CommandWrap } from "../../Editor/CommandMachine"; import { Jig } from "../../Editor/Jig"; import { PromptStatus } from "../../Editor/PromptResult"; @@ -21,14 +22,13 @@ import { SelectPick } from "../../Editor/SelectPick"; import { AxisSnapMode } from "../../Editor/SnapServices"; import { TempEditor } from "../../Editor/TempEditor"; import { Box3Ext } from "../../Geometry/Box"; -import { AsVector3, equaln, isParallelTo, isPerpendicularityTo, ZAxis, ZeroVec } from "../../Geometry/GeUtils"; +import { AsVector3, ZAxis, ZeroVec, equaln, isParallelTo, isPerpendicularityTo } from "../../Geometry/GeUtils"; import { ClampSpaceParse } from "../../Geometry/SpaceParse/ClampSpaceParse"; import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse"; import { IGetRoomInfo } from "../../UI/Components/Template/GetRoomCabName"; import { followAttribute } from "../../UI/Components/Template/TemplateComponent"; import { TemplateEditor } from "../../UI/Components/Template/TemplateEditor"; import { AppToaster } from "../../UI/Components/Toaster"; -import { FaceDirection } from "../../UI/Store/BoardInterface"; import { ITemplateParam } from "../../UI/Store/RightPanelStore/ITemplateParam"; import { TempalteEditorStore } from "../../UI/Store/TemplateEditorStore"; import { Database } from "../Database"; diff --git a/src/Editor/DefaultConfig.ts b/src/Editor/DefaultConfig.ts index 15c021011..7ac0d1c16 100644 --- a/src/Editor/DefaultConfig.ts +++ b/src/Editor/DefaultConfig.ts @@ -1,15 +1,24 @@ +import { FaceDirection } from "../Add-on/DrawDrilling/DrillType"; import { Curve2RecOption } from "../Add-on/twoD2threeD/Modals/Curve2RecOption"; import { IParseBoardNameOption, IRec2BrOption, IRect2Br2Option } from "../Add-on/twoD2threeD/R2bInterface"; import { EBoardKeyList } from "../Common/BoardKeyList"; +import { BoardType, BrRelativePos, ComposingType, LinesType } from "../DatabaseServices/Entity/BoardInterface"; import { RenderType } from "../GraphicsSystem/RenderType"; import { IUpdateBoardInfosOption } from "../UI/Components/Board/UpdateBoardInfointerface"; import { EMetalsType, ICompHardwareOption, ICylMetalsOption, IExtMetalsOption, IToplineOption } from "../UI/Components/RightPanel/RightPanelInterface"; import { IKuGangDrawOption } from "../UI/Components/Template/TemplateInterface"; import { ECompareType, IBoardFindOption } from "../UI/Store/BoardFindInterface"; -import { BehindBoardOption, BehindHeightPositon, BoardProcessOption, BoardType, BrRelativePos, ChangeColorByBoardMaterialOption, ClosingStripOption, CommonPanelConfigOption, ComposingType, CurtailType, DatalistConfigOption, FaceDirection, ForBoardNameType, IAutoDimBrsOption, IBatchModifyPanelOption, IBoardBatchCurtailOption, IDimStyleOption, LayerBoardOption, LayerNailOption, LinesType, ModifyTextsConfigOption, PointLightOption, RadioType, RectAreaLightOption, RightPlaneLightOption, ShareBoardInfConfigurationOption, SideBoardOption, SingleBoardOption, SpotLightOption, StripType, TBBoardOption, VerticalBoardOption, ViewDirection, Viewport2ConfigOption, Viewport3ConfigOption, Viewport4ConfigOption, ViewportConfigOption, ViewportPosition, WindowPanelConfigOption } from "../UI/Store/BoardInterface"; import { DoorPosType, HandleHorPos, HandleVePos, IDoorConfigOption, IDrawerConfigOption, IHingeConfigOption } from "../UI/Store/DoorInterface"; import { IHSOption } from "../UI/Store/HSInterface"; import { ELatticeArrayType, ILatticeOption } from "../UI/Store/LatticeInterface"; +import { ForBoardNameType, IAutoDimBrsOption } from "../UI/Store/OptionInterface/AutoDimBrsOption"; +import { CurtailType, IBoardBatchCurtailOption } from "../UI/Store/OptionInterface/BoardBatchCurtailOption "; +import { BoardProcessOption } from "../UI/Store/OptionInterface/BoardProcessOption"; +import { ClosingStripOption, StripType } from "../UI/Store/OptionInterface/ClosingStripOption"; +import { BehindBoardOption, ChangeColorByBoardMaterialOption, CommonPanelConfigOption, DatalistConfigOption, IBatchModifyPanelOption, IDimStyleOption, LayerBoardOption, LayerNailOption, ModifyTextsConfigOption, RightPlaneLightOption, ShareBoardInfConfigurationOption, SideBoardOption, SingleBoardOption, TBBoardOption, VerticalBoardOption, WindowPanelConfigOption } from "../UI/Store/OptionInterface/IOptionInterface"; +import { PointLightOption, RectAreaLightOption, SpotLightOption } from "../UI/Store/OptionInterface/LightConfigOption"; +import { BehindHeightPositon, RadioType, ViewDirection, ViewportPosition } from "../UI/Store/OptionInterface/OptionEnum"; +import { Viewport2ConfigOption, Viewport3ConfigOption, Viewport4ConfigOption, ViewportConfigOption } from "../UI/Store/OptionInterface/ViewportConfigOption"; import { EFullDir, EFullType, EWRackArrayType, EWineRackStyle, EWineRackType, IWineRackOption } from "../UI/Store/WineRackInterface"; import { EOrderType } from "./OrderType"; diff --git a/src/Editor/ICursorConfig.ts b/src/Editor/ICursorConfig.ts index 3048c4098..6df37d46e 100644 --- a/src/Editor/ICursorConfig.ts +++ b/src/Editor/ICursorConfig.ts @@ -1,4 +1,4 @@ -import { IBaseOption } from "../UI/Store/BoardInterface"; +import { IBaseOption } from "../UI/Store/OptionInterface/IOptionInterface"; export interface ICursorConfig extends IBaseOption diff --git a/src/Editor/UserConfig.ts b/src/Editor/UserConfig.ts index afa03ff6c..77912770d 100644 --- a/src/Editor/UserConfig.ts +++ b/src/Editor/UserConfig.ts @@ -3,8 +3,8 @@ import { StoreageKeys } from "../Common/StoreageKeys"; import { AAType, FractionDigitsType, ViewDirType } from "../Common/SystemEnum"; import { RenderType } from "../GraphicsSystem/RenderType"; import { IConfigOption } from "../UI/Components/Board/UserConfigComponent"; -import { IBaseOption, IGrooveOption } from "../UI/Store/BoardInterface"; import { IConfigStore } from "../UI/Store/BoardStore"; +import { IBaseOption, IGrooveOption } from "../UI/Store/OptionInterface/IOptionInterface"; import { IWineRackOption } from "../UI/Store/WineRackInterface"; import { DrillingOption } from "../UI/Store/drillInterface"; import { ICursorConfig } from "./ICursorConfig"; diff --git a/src/Geometry/CreateWireframe.ts b/src/Geometry/CreateWireframe.ts index ceb033116..01302b4a9 100644 --- a/src/Geometry/CreateWireframe.ts +++ b/src/Geometry/CreateWireframe.ts @@ -1,4 +1,5 @@ import { BufferGeometry, Float32BufferAttribute, Geometry, Line, LineBasicMaterial, LineSegments, Matrix4, Object3D, Vector3 } from "three"; +import { FaceDirection } from "../Add-on/DrawDrilling/DrillType"; import { ColorMaterial } from "../Common/ColorPalette"; import { FixIndex } from "../Common/Utils"; import { ExtrudeHole } from "../DatabaseServices/3DSolid/ExtrudeHole"; @@ -8,7 +9,6 @@ import { Curve } from "../DatabaseServices/Entity/Curve"; import { ExtrudeSolid } from "../DatabaseServices/Entity/Extrude"; import { Shape } from "../DatabaseServices/Shape"; import { Shape2 } from "../DatabaseServices/Shape2"; -import { FaceDirection } from "../UI/Store/BoardInterface"; import { MatrixIsIdentityCS, MoveMatrix } from "./GeUtils"; //FIXME: #IWBPB 性能缺陷和BUG. 等待废弃或者改进 diff --git a/src/Geometry/DrillParse/BoardGetFace.ts b/src/Geometry/DrillParse/BoardGetFace.ts index ef6fa71fe..c651156f9 100644 --- a/src/Geometry/DrillParse/BoardGetFace.ts +++ b/src/Geometry/DrillParse/BoardGetFace.ts @@ -1,12 +1,12 @@ import { Matrix4, Vector3 } from "three"; +import { DrillType } from "../../Add-on/DrawDrilling/DrillType"; import { MergeCurvelist } from "../../Common/CurveUtils"; import { MakeMirrorMtx } from "../../Common/Matrix4Utils"; import { Arc } from "../../DatabaseServices/Entity/Arc"; import { Board } from "../../DatabaseServices/Entity/Board"; import { Curve } from "../../DatabaseServices/Entity/Curve"; import { Region } from "../../DatabaseServices/Entity/Region"; -import { DrillType } from "../../UI/Store/BoardInterface"; -import { equaln, equalv3, ZAxis } from "../GeUtils"; +import { ZAxis, equaln, equalv3 } from "../GeUtils"; import { Face } from "./Face"; diff --git a/src/Geometry/DrillParse/CollisionDetection.ts b/src/Geometry/DrillParse/CollisionDetection.ts index 40484e1dd..7dca7e2f4 100644 --- a/src/Geometry/DrillParse/CollisionDetection.ts +++ b/src/Geometry/DrillParse/CollisionDetection.ts @@ -1,5 +1,5 @@ +import { DrillType } from "../../Add-on/DrawDrilling/DrillType"; import { Board } from "../../DatabaseServices/Entity/Board"; -import { DrillType } from "../../UI/Store/BoardInterface"; import { Box3Ext } from "../Box"; import { BoardGetFace, CanDrawHoleFuzz } from "./BoardGetFace"; import { Face } from "./Face"; diff --git a/src/Geometry/ExtrudeMeshGeomBuilder/ExtrudeEdgeGeometry2.ts b/src/Geometry/ExtrudeMeshGeomBuilder/ExtrudeEdgeGeometry2.ts index e2333aa9c..9a8cb31bb 100644 --- a/src/Geometry/ExtrudeMeshGeomBuilder/ExtrudeEdgeGeometry2.ts +++ b/src/Geometry/ExtrudeMeshGeomBuilder/ExtrudeEdgeGeometry2.ts @@ -1,23 +1,23 @@ import Flatbush from 'flatbush'; -import { Box3, BufferGeometry, Float32BufferAttribute, MathUtils, Matrix4, Shape as TShape, ShapeUtils, Vector3 } from "three"; +import { Box3, BufferGeometry, Float32BufferAttribute, MathUtils, Matrix4, ShapeUtils, Shape as TShape, Vector3 } from "three"; import { arrayPushArray, arrayRemoveDuplicateBySort, arraySortByNumber } from "../../Common/ArrayExt"; import { ComputerCurvesNormalOCS, curveLinkGroup } from "../../Common/CurveUtils"; import { Status } from '../../Common/Status'; import { FixIndex } from "../../Common/Utils"; -import { FuzzyFactory } from '../../csg/core/FuzzyFactory'; import { Contour, fastCurveInCurve2 } from "../../DatabaseServices/Contour"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { LinesType } from "../../DatabaseServices/Entity/BoardInterface"; import { Circle } from "../../DatabaseServices/Entity/Circle"; import { Curve } from "../../DatabaseServices/Entity/Curve"; import { ExtrudeContourCurve, ExtrudeSolid, MaxDrawGrooveCount } from "../../DatabaseServices/Entity/Extrude"; import { Line } from "../../DatabaseServices/Entity/Line"; import { Polyline, PolylineProps } from "../../DatabaseServices/Entity/Polyline"; import { IntersectOption, IntersectResult } from "../../GraphicsSystem/IntersectWith"; -import { LinesType } from "../../UI/Store/BoardInterface"; +import { FuzzyFactory } from '../../csg/core/FuzzyFactory'; import { IntersectsBox } from "../Box"; import { CreateContour2 } from "../CreateContour2"; import { FastOffset } from "../FastOffset"; -import { AsVector2, equaln, equalv2, equalv3, IdentityMtx4 } from "../GeUtils"; +import { AsVector2, IdentityMtx4, equaln, equalv2, equalv3 } from "../GeUtils"; import { RegionParse } from "../RegionParse"; import { SplitCurveParams } from './SplitCurveParams'; diff --git a/src/Geometry/PointShapeUtils.ts b/src/Geometry/PointShapeUtils.ts index a2ec9bf2e..3654255c5 100644 --- a/src/Geometry/PointShapeUtils.ts +++ b/src/Geometry/PointShapeUtils.ts @@ -1,5 +1,5 @@ import { Vector3 } from "three"; -import { BoardOpenDir, LinesType } from "../UI/Store/BoardInterface"; +import { BoardOpenDir, LinesType } from "../DatabaseServices/Entity/BoardInterface"; export class PointShapeUtils { diff --git a/src/Geometry/SpaceParse/ClampSpaceParse.ts b/src/Geometry/SpaceParse/ClampSpaceParse.ts index 1d4fd5522..07035ecdb 100644 --- a/src/Geometry/SpaceParse/ClampSpaceParse.ts +++ b/src/Geometry/SpaceParse/ClampSpaceParse.ts @@ -1,7 +1,7 @@ import { Ray, Vector3 } from "three"; import { arrayLast } from "../../Common/ArrayExt"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { PromptDistendResult, PromptStatus } from "../../Editor/PromptResult"; -import { BoardType } from "../../UI/Store/BoardInterface"; import { Box3Ext, SplitType } from "../Box"; import { ISpaceParse } from "./ISpaceParse"; diff --git a/src/Geometry/SpaceParse/ISpaceParse.ts b/src/Geometry/SpaceParse/ISpaceParse.ts index e01d813d5..8b24294d0 100644 --- a/src/Geometry/SpaceParse/ISpaceParse.ts +++ b/src/Geometry/SpaceParse/ISpaceParse.ts @@ -1,9 +1,9 @@ import { Matrix4, Vector3 } from "three"; import { arrayRemoveDuplicateBySort } from "../../Common/ArrayExt"; import { Board } from "../../DatabaseServices/Entity/Board"; -import { BoardType } from "../../UI/Store/BoardInterface"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { Box3Ext, SplitType } from "../Box"; -import { equaln, isParallelTo, XAxis, YAxis, ZAxis } from "../GeUtils"; +import { XAxis, YAxis, ZAxis, equaln, isParallelTo } from "../GeUtils"; import { VisualSpaceBox } from './../../Editor/VisualSpaceBox'; export class ISpaceParse diff --git a/src/Geometry/SpaceParse/SurroundSpaceParse.ts b/src/Geometry/SpaceParse/SurroundSpaceParse.ts index 5f8366b39..74730aaf7 100644 --- a/src/Geometry/SpaceParse/SurroundSpaceParse.ts +++ b/src/Geometry/SpaceParse/SurroundSpaceParse.ts @@ -1,11 +1,11 @@ import { Matrix4, Vector3 } from "three"; import { app } from "../../ApplicationServices/Application"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { BoardType } from "../../DatabaseServices/Entity/BoardInterface"; import { PromptStatus } from "../../Editor/PromptResult"; import { equaln, isParallelTo } from "../GeUtils"; import { ClampSpaceParseKey } from "./ClampSpaceParseKey"; import { ISpaceParse } from "./ISpaceParse"; -import { BoardType } from "../../UI/Store/BoardInterface"; /** * (弃用)绘制顶底板所需要的空间 diff --git a/src/GraphicsSystem/CalcEdgeSealing.ts b/src/GraphicsSystem/CalcEdgeSealing.ts index f0f44f94f..ac2060e0e 100644 --- a/src/GraphicsSystem/CalcEdgeSealing.ts +++ b/src/GraphicsSystem/CalcEdgeSealing.ts @@ -16,7 +16,7 @@ import { CreateContour2 } from "../Geometry/CreateContour2"; import { IdentityMtx4, XAxis, equaln, equalv3, isParallelTo } from "../Geometry/GeUtils"; import { Max } from "../Nest/Common/Util"; import { Production } from "../Production/Product"; -import { IHighSealedItem } from "../UI/Store/BoardInterface"; +import { IHighSealedItem } from "../UI/Store/OptionInterface/IHighSealedItem"; import { OffsetPolyline } from "./OffsetPolyline"; import { ParseEdgeSealDir } from "./ParseEdgeSealDir"; diff --git a/src/GraphicsSystem/ToolPath/FeedingToolPath.ts b/src/GraphicsSystem/ToolPath/FeedingToolPath.ts index 24e554673..7c4231b36 100644 --- a/src/GraphicsSystem/ToolPath/FeedingToolPath.ts +++ b/src/GraphicsSystem/ToolPath/FeedingToolPath.ts @@ -1,4 +1,5 @@ import { Matrix4, Vector3 } from "three"; +import { FaceDirection } from "../../Add-on/DrawDrilling/DrillType"; import { HostApplicationServices } from "../../ApplicationServices/HostApplicationServices"; import { arrayRemoveIf } from "../../Common/ArrayExt"; import { ConverCircleToPolyline, IsRect, MergeCurvelist, equalCurve } from "../../Common/CurveUtils"; @@ -20,7 +21,6 @@ import { CanDrawHoleFuzz, GetSideFaceMtx } from "../../Geometry/DrillParse/Board import { AsVector2, equaln, isParallelTo } from "../../Geometry/GeUtils"; import { RegionParse } from "../../Geometry/RegionParse"; import { FixIndex } from "../../Nest/Common/Util"; -import { FaceDirection } from "../../UI/Store/BoardInterface"; import { BoolOpeartionType, isTargetCurInOrOnSourceCur } from "../BoolOperateUtils"; import { GetBoardContour } from "../CalcEdgeSealing"; import { GetCurveToInDir, GetOffsetCurves, OptimizeToolPath } from "./OptimizeToolPath"; diff --git a/src/Production/ParseBoardHoleData.ts b/src/Production/ParseBoardHoleData.ts index 8c3c5a348..bdd0adca7 100644 --- a/src/Production/ParseBoardHoleData.ts +++ b/src/Production/ParseBoardHoleData.ts @@ -1,4 +1,5 @@ import { Vector3 } from "three"; +import { FaceDirection } from "../Add-on/DrawDrilling/DrillType"; import { EBoardKeyList } from "../Common/BoardKeyList"; import { CylinderHole, GangDrillType } from "../DatabaseServices/3DSolid/CylinderHole"; import { ExtrudeHole } from "../DatabaseServices/3DSolid/ExtrudeHole"; @@ -7,7 +8,6 @@ import { Circle } from "../DatabaseServices/Entity/Circle"; import { ExtrudeContourCurve } from "../DatabaseServices/Entity/Extrude"; import { Line } from "../DatabaseServices/Entity/Line"; import { XAxis, angleTo, equaln, equalv3, isParallelTo } from "../Geometry/GeUtils"; -import { FaceDirection } from "../UI/Store/BoardInterface"; import { IBoardHoleInfo, IDrillingOption, Production } from "./Product"; /** diff --git a/src/Production/Product.ts b/src/Production/Product.ts index 1abf0bd88..b57b7dc39 100644 --- a/src/Production/Product.ts +++ b/src/Production/Product.ts @@ -1,4 +1,5 @@ import { Box3, Matrix4, Vector2, Vector3 } from "three"; +import { FaceDirection } from "../Add-on/DrawDrilling/DrillType"; import { SCALAR } from "../Add-on/DrawDrilling/HoleUtils"; import { lookOverBoardInfosTool } from "../Add-on/LookOverBoardInfos/LookOverBoardInfosTool"; import { HostApplicationServices } from "../ApplicationServices/HostApplicationServices"; @@ -13,6 +14,7 @@ import { Hole } from "../DatabaseServices/3DSolid/Hole"; import { Contour } from "../DatabaseServices/Contour"; import { Arc } from "../DatabaseServices/Entity/Arc"; import { Board, I2DModeingItem, IKnifeInfo, IModeling } from "../DatabaseServices/Entity/Board"; +import { BoardOpenDir } from "../DatabaseServices/Entity/BoardInterface"; import { Circle } from "../DatabaseServices/Entity/Circle"; import { ExtrudeContourCurve } from "../DatabaseServices/Entity/Extrude"; import { Line } from "../DatabaseServices/Entity/Line"; @@ -26,7 +28,7 @@ import { IsBetweenA2B, MoveMatrix, XAxis, angleTo, equaln, equalv2, equalv3, isI import { BrSealedData, GetSealedBoardContour } from "../GraphicsSystem/CalcEdgeSealing"; import { FeedingToolPath, GetModelingFromCustomDrill } from "../GraphicsSystem/ToolPath/FeedingToolPath"; import { EMetalsType, IHardwareOption, IToplineOption } from "../UI/Components/RightPanel/RightPanelInterface"; -import { BoardOpenDir, FaceDirection, ISealingData } from "../UI/Store/BoardInterface"; +import { ISealingData } from "../UI/Store/OptionInterface/IHighSealedItem"; import { Entity } from './../DatabaseServices/Entity/Entity'; import { ICompHardwareOption } from './../UI/Components/RightPanel/RightPanelInterface'; import { ConverArcToPtsBul, ConverToPtsBul, IContourData } from "./Convert2PtsBul"; diff --git a/src/UI/Components/AutoDimBoard.tsx b/src/UI/Components/AutoDimBoard.tsx index d932a9279..5d77cb3d5 100644 --- a/src/UI/Components/AutoDimBoard.tsx +++ b/src/UI/Components/AutoDimBoard.tsx @@ -8,7 +8,7 @@ import { EDimType } from '../../Add-on/DrawDim/AutoDimBrsTool'; import { app } from '../../ApplicationServices/Application'; import { KeyBoard } from '../../Common/KeyEnum'; import { safeEval } from '../../Common/eval'; -import { ForBoardNameType } from '../Store/BoardInterface'; +import { ForBoardNameType } from "../Store/OptionInterface/AutoDimBrsOption"; import { BoardModalType } from './Board/BoardModalType'; import { UserConfigComponent } from './Board/UserConfigComponent'; import { ModalHeader } from './Modal/ModalContainer'; diff --git a/src/UI/Components/BBS/BBSCommon.tsx b/src/UI/Components/BBS/BBSCommon.tsx index b5ea0b16d..6a3431a7d 100644 --- a/src/UI/Components/BBS/BBSCommon.tsx +++ b/src/UI/Components/BBS/BBSCommon.tsx @@ -8,6 +8,7 @@ import { CheckObjectType } from '../../../Common/CheckoutVaildValue'; import { safeEval } from '../../../Common/eval'; import { FixedNotZero } from '../../../Common/Utils'; import { Board } from '../../../DatabaseServices/Entity/Board'; +import { LinesType } from '../../../DatabaseServices/Entity/BoardInterface'; import { ObjectId } from '../../../DatabaseServices/ObjectId'; import { ProcessingGroupRecord } from '../../../DatabaseServices/ProcessingGroup/ProcessingGroupRecord'; import { TemplateLatticeRecord } from '../../../DatabaseServices/Template/ProgramTempate/TemplateLatticeRecord'; @@ -16,7 +17,6 @@ import { TemplateRecord } from '../../../DatabaseServices/Template/TemplateRecor import { userConfig } from '../../../Editor/UserConfig'; import { IHardwareType } from '../../../Production/Product'; import { bbsEditorStore, TotalTabbarTitlesInfos } from '../../Store/BBSEditorStore'; -import { LinesType } from '../../Store/BoardInterface'; import { ToasterInput } from '../Toaster'; import { IBoardInfoOptions } from './BoardInfosList'; import { BBSBoardData } from './LookOverBoardInfos'; diff --git a/src/UI/Components/BBS/BoardInfosList.tsx b/src/UI/Components/BBS/BoardInfosList.tsx index ddc4dd31e..61bdff73d 100644 --- a/src/UI/Components/BBS/BoardInfosList.tsx +++ b/src/UI/Components/BBS/BoardInfosList.tsx @@ -3,18 +3,20 @@ import { observable } from "mobx"; import { observer } from "mobx-react"; import * as React from 'react'; import { end } from "xaop"; +import { DrillType } from "../../../Add-on/DrawDrilling/DrillType"; import { ParseBoardRectHoleType } from "../../../Add-on/DrawDrilling/HoleUtils"; import { EBoardKeyList } from "../../../Common/BoardKeyList"; import { CheckObjectType } from "../../../Common/CheckoutVaildValue"; import { BigFaceSelectOption, ComposingFaceSelectOption, LineTypeSelectOption } from "../../../Common/CommonSelectOption"; -import { safeEval } from "../../../Common/eval"; import { FixedNotZero } from "../../../Common/Utils"; +import { safeEval } from "../../../Common/eval"; import { Board } from "../../../DatabaseServices/Entity/Board"; +import { LinesType } from "../../../DatabaseServices/Entity/BoardInterface"; import { ObjectId } from "../../../DatabaseServices/ObjectId"; import { ProcessingGroupRecord } from "../../../DatabaseServices/ProcessingGroup/ProcessingGroupRecord"; import { userConfig } from "../../../Editor/UserConfig"; -import { bbsEditorStore, TotalTabbarTitlesInfos } from "../../Store/BBSEditorStore"; -import { BoardProcessOption, DrillType, LinesType } from "../../Store/BoardInterface"; +import { TotalTabbarTitlesInfos, bbsEditorStore } from "../../Store/BBSEditorStore"; +import { BoardProcessOption } from "../../Store/OptionInterface/BoardProcessOption"; import { TopPanelStore } from "../../Store/TopPanelStore"; import { ToasterInput } from "../Toaster"; import { BBSHighDrillingComponent, BBSProcessGroupItem, BBSRemarksComponent, BBSSealingComponent, BBSSelectComponent } from "./BBSCommon"; diff --git a/src/UI/Components/BBS/BoardLIst.tsx b/src/UI/Components/BBS/BoardLIst.tsx index 4efa7b943..007948017 100644 --- a/src/UI/Components/BBS/BoardLIst.tsx +++ b/src/UI/Components/BBS/BoardLIst.tsx @@ -5,10 +5,10 @@ import AutoSizer from 'react-virtualized-auto-sizer'; import { VariableSizeList as List } from 'react-window'; import { EBoardKeyList } from '../../../Common/BoardKeyList'; import { Board } from '../../../DatabaseServices/Entity/Board'; +import { LinesType } from '../../../DatabaseServices/Entity/BoardInterface'; import { ObjectId } from '../../../DatabaseServices/ObjectId'; import { ProcessingGroupRecord } from '../../../DatabaseServices/ProcessingGroup/ProcessingGroupRecord'; import { CommandWrap } from '../../../Editor/CommandMachine'; -import { LinesType } from '../../Store/BoardInterface'; import { SortBtnData, TitleBanner } from './BBSCommon'; import { BoardInfoList, IBoardInfoOptions } from './BoardInfosList'; import { BBSBoardData } from './LookOverBoardInfos'; diff --git a/src/UI/Components/BBS/LookOverBoardInfos.tsx b/src/UI/Components/BBS/LookOverBoardInfos.tsx index 29e87d79a..9752e6365 100644 --- a/src/UI/Components/BBS/LookOverBoardInfos.tsx +++ b/src/UI/Components/BBS/LookOverBoardInfos.tsx @@ -6,21 +6,23 @@ import * as React from 'react'; import { Rnd } from "react-rnd"; import AutoSizer from 'react-virtualized-auto-sizer'; import { begin, end } from "xaop"; +import { FaceDirection } from "../../../Add-on/DrawDrilling/DrillType"; import { IBoardRectHoleType, ParseBoardRectHoleType, SetBrHighHoleTypeFromRectHoleType } from "../../../Add-on/DrawDrilling/HoleUtils"; import { ICountType, lookOverBoardInfosTool } from "../../../Add-on/LookOverBoardInfos/LookOverBoardInfosTool"; import { app } from "../../../ApplicationServices/Application"; import { arrayRemove } from "../../../Common/ArrayExt"; import { EBoardKeyList } from "../../../Common/BoardKeyList"; import { CheckObjectType, CheckoutValid } from "../../../Common/CheckoutVaildValue"; -import { safeEval } from "../../../Common/eval"; import { FS } from "../../../Common/FileSystem"; import { KeyBoard } from "../../../Common/KeyEnum"; import { Log, LogType } from "../../../Common/Log"; import { FixedNotZero } from "../../../Common/Utils"; +import { safeEval } from "../../../Common/eval"; import { CylinderHole } from "../../../DatabaseServices/3DSolid/CylinderHole"; import { CommandHistoryRecord } from "../../../DatabaseServices/CommandHistoryRecord"; import { CreateObjectData } from "../../../DatabaseServices/CreateObjectData"; import { Board } from "../../../DatabaseServices/Entity/Board"; +import { ComposingType, LinesType } from "../../../DatabaseServices/Entity/BoardInterface"; import { FileServer } from "../../../DatabaseServices/FileServer"; import { HardwareCompositeEntity } from '../../../DatabaseServices/Hardware/HardwareCompositeEntity'; import { HardwareTopline } from '../../../DatabaseServices/Hardware/HardwareTopline'; @@ -34,9 +36,8 @@ import { SelectSetBase } from "../../../Editor/SelectBase"; import { userConfig } from "../../../Editor/UserConfig"; import { equaln } from "../../../Geometry/GeUtils"; import { IHardwareType } from "../../../Production/Product"; -import { bbsEditorStore, TotalTabbarTitlesInfos } from "../../Store/BBSEditorStore"; +import { TotalTabbarTitlesInfos, bbsEditorStore } from "../../Store/BBSEditorStore"; import { EFindType } from "../../Store/BoardFindInterface"; -import { ComposingType, FaceDirection, LinesType } from "../../Store/BoardInterface"; import { userConfigStore } from "../../Store/UserConfigStore"; import { BoardModalType } from "../Board/BoardModalType"; import { GetCompoentObjectIdString } from "../ComponentObjectId"; diff --git a/src/UI/Components/BatchModifyPanelModal.tsx b/src/UI/Components/BatchModifyPanelModal.tsx index 0dc545b13..ef31069a4 100644 --- a/src/UI/Components/BatchModifyPanelModal.tsx +++ b/src/UI/Components/BatchModifyPanelModal.tsx @@ -12,8 +12,9 @@ import { Board } from "../../DatabaseServices/Entity/Board"; import { DefaultBatchModifyPanelOption } from "../../Editor/DefaultConfig"; import { PromptStatus } from "../../Editor/PromptResult"; import "../Css/batchModifyModal.less"; -import { IBatchModifyPanelOption, RadioType } from "../Store/BoardInterface"; import { BoardStore } from "../Store/BoardStore"; +import { IBatchModifyPanelOption } from "../Store/OptionInterface/IOptionInterface"; +import { RadioType } from "../Store/OptionInterface/OptionEnum"; import { SetBoardDataItem } from "./Board/BoardCommon"; import { BoardModalType } from "./Board/BoardModalType"; import { Config_ModalType, IConfigOption } from "./Board/UserConfigComponent"; diff --git a/src/UI/Components/Board/BehindBoardModal.tsx b/src/UI/Components/Board/BehindBoardModal.tsx index 43aaf98e2..501479b0f 100644 --- a/src/UI/Components/Board/BehindBoardModal.tsx +++ b/src/UI/Components/Board/BehindBoardModal.tsx @@ -5,9 +5,10 @@ import * as React from 'react'; import { app } from '../../../ApplicationServices/Application'; import { CheckObjectType } from '../../../Common/CheckoutVaildValue'; import { FixedNotZero } from '../../../Common/Utils'; +import { BrRelativePos } from '../../../DatabaseServices/Entity/BoardInterface'; import { PromptStatus } from '../../../Editor/PromptResult'; -import { BehindHeightPositon, BrRelativePos } from '../../Store/BoardInterface'; import { BehindBoardStore } from '../../Store/BoardStore'; +import { BehindHeightPositon } from "../../Store/OptionInterface/OptionEnum"; import { BoardDirectionIcon, BoardRePosBlock, ItemName, SetBoardDataBlock, SetBoardDataItem } from './BoardCommon'; @observer diff --git a/src/UI/Components/Board/BoardCommon.tsx b/src/UI/Components/Board/BoardCommon.tsx index 6e027cb56..b94b13a89 100644 --- a/src/UI/Components/Board/BoardCommon.tsx +++ b/src/UI/Components/Board/BoardCommon.tsx @@ -2,6 +2,7 @@ import { Button, Checkbox, Classes, HTMLSelect, Label, Radio, RadioGroup } from import { observable } from 'mobx'; import { observer } from 'mobx-react'; import * as React from 'react'; +import { DrillType } from "../../../Add-on/DrawDrilling/DrillType"; import { app } from '../../../ApplicationServices/Application'; import { EBoardKeyList } from '../../../Common/BoardKeyList'; import { CheckObjectType } from '../../../Common/CheckoutVaildValue'; @@ -9,10 +10,12 @@ import { Intent } from '../../../Common/Toaster'; import { FixedNotZero } from '../../../Common/Utils'; import { safeEval } from '../../../Common/eval'; import { Board } from '../../../DatabaseServices/Entity/Board'; +import { BoardOpenDir, BoardType, BrRelativePos } from '../../../DatabaseServices/Entity/BoardInterface'; import { PromptStatus } from '../../../Editor/PromptResult'; import { TempEditor } from '../../../Editor/TempEditor'; import { userConfig } from '../../../Editor/UserConfig'; -import { AnyObject, BoardConfigOption, BoardOpenDir, BoardProcessOption, BoardType, BrRelativePos, DrillType, IBaseOption, IDrawBoardAutoCutOption, IHightDrillOption, IUiOption, TBBoardOption } from '../../Store/BoardInterface'; +import { BoardProcessOption } from "../../Store/OptionInterface/BoardProcessOption"; +import { AnyObject, BoardConfigOption, IBaseOption, IDrawBoardAutoCutOption, IHightDrillOption, IUiOption, TBBoardOption } from "../../Store/OptionInterface/IOptionInterface"; import { RightPanelStore } from '../../Store/RightPanelStore/RightPanelStore'; import { ModalState } from '../Modal/ModalInterface'; import { RightTabId } from '../RightPanel/RightPanel'; diff --git a/src/UI/Components/Board/BoardConfigModal.tsx b/src/UI/Components/Board/BoardConfigModal.tsx index d6009d4ed..8fa903671 100644 --- a/src/UI/Components/Board/BoardConfigModal.tsx +++ b/src/UI/Components/Board/BoardConfigModal.tsx @@ -4,6 +4,7 @@ import { observer } from "mobx-react"; import * as React from 'react'; import { MathUtils, Matrix4, Vector3 } from "three"; import { ExtrudeApplyContour, SelectExtrudeContour, selectOutlinePosition } from "../../../Add-on/DrawBoard/DrawSpecialShapeBoardTool"; +import { FaceDirection } from "../../../Add-on/DrawDrilling/DrillType"; import { app } from "../../../ApplicationServices/Application"; import { CheckObjectType } from "../../../Common/CheckoutVaildValue"; import { ConverCircleToPolyline, curveLinkGroup } from "../../../Common/CurveUtils"; @@ -25,8 +26,9 @@ import { PromptStatus } from "../../../Editor/PromptResult"; import { SelectBox, SelectType } from "../../../Editor/SelectBox"; import { CreateContours } from "../../../Geometry/CreateContour2"; import { ContourTreeNode } from "../../../Geometry/ExtrudeMeshGeomBuilder/ExtrudeEdgeGeometry2"; -import { AsVector2, equaln, isParallelTo, MoveMatrix } from "../../../Geometry/GeUtils"; -import { BoardConfigOption, BoardProcessOption, FaceDirection, IGrooveOption, IUiOption } from '../../Store/BoardInterface'; +import { AsVector2, MoveMatrix, equaln, isParallelTo } from "../../../Geometry/GeUtils"; +import { BoardProcessOption } from "../../Store/OptionInterface/BoardProcessOption"; +import { BoardConfigOption, IGrooveOption, IUiOption } from "../../Store/OptionInterface/IOptionInterface"; import { RightPanelStore } from "../../Store/RightPanelStore/RightPanelStore"; import { RightTabId } from "../RightPanel/RightPanel"; import { AppToaster } from "../Toaster"; diff --git a/src/UI/Components/Board/BoardFindCommon.tsx b/src/UI/Components/Board/BoardFindCommon.tsx index 23c0d2e40..1da22c262 100644 --- a/src/UI/Components/Board/BoardFindCommon.tsx +++ b/src/UI/Components/Board/BoardFindCommon.tsx @@ -8,7 +8,7 @@ import { safeEval } from '../../../Common/eval'; import { GoodsList, IGoodInfo } from '../../MaterialEditor/GoodsList'; import { DRILL_KEYS, ECompareType, IBoardFindOption } from '../../Store/BoardFindInterface'; import { BoardFindStore } from '../../Store/BoardFindModifyStore'; -import { AnyObject, IUiOption } from '../../Store/BoardInterface'; +import { AnyObject, IUiOption } from "../../Store/OptionInterface/IOptionInterface"; import { UpdateBoardInfosStore } from '../../Store/UpdateBoardInfoStore'; import { ToasterInput } from '../Toaster'; import { BoardDirectionIcon } from './BoardCommon'; diff --git a/src/UI/Components/Board/BoardModal.tsx b/src/UI/Components/Board/BoardModal.tsx index cdcec36d5..e69bdc197 100644 --- a/src/UI/Components/Board/BoardModal.tsx +++ b/src/UI/Components/Board/BoardModal.tsx @@ -2,11 +2,12 @@ import { Button, Checkbox, Classes } from '@blueprintjs/core'; import { observer } from 'mobx-react'; import * as React from 'react'; import * as xaop from 'xaop'; +import { DrillType } from "../../../Add-on/DrawDrilling/DrillType"; import { app } from '../../../ApplicationServices/Application'; import { KeyBoard } from '../../../Common/KeyEnum'; import { userConfig } from '../../../Editor/UserConfig'; -import { AnyObject, DrillType } from '../../Store/BoardInterface'; import { BehindBoardStore, BoardStore, ClosingStripStore, LayerBoardStore, SideBoardStore, SingleBoardStore, TopBottomBoardStore, VerticalBoardStore } from '../../Store/BoardStore'; +import { AnyObject } from "../../Store/OptionInterface/IOptionInterface"; import { ModalState } from '../Modal/ModalInterface'; import { CommonModal } from './../Modal/ModalContainer'; import { BehindBoardModal } from './BehindBoardModal'; @@ -15,11 +16,11 @@ import { BoardModalType } from './BoardModalType'; import { BoardProcessModal } from './BoardProcessModal'; import { ClosingStripModal } from './ClosingStripModal'; import { LayerBoardModal } from './LayerBoardModal'; -import { LeftRightBoardModal } from './leftRightBoardModal'; import { SingleBoardModal } from './SingleBoardModal'; import { TopBottomBoardModal } from './TopBottomBoardModal'; import { Config_ModalType } from './UserConfigComponent'; import { VerticalBoardModal } from './VerticalBoardModal'; +import { LeftRightBoardModal } from './leftRightBoardModal'; export interface BoardModalProps { diff --git a/src/UI/Components/Board/BoardProcessModal.tsx b/src/UI/Components/Board/BoardProcessModal.tsx index d19dd2993..2a5607ba1 100644 --- a/src/UI/Components/Board/BoardProcessModal.tsx +++ b/src/UI/Components/Board/BoardProcessModal.tsx @@ -2,6 +2,7 @@ import { Alert, Button, Checkbox, Classes, HTMLSelect, Intent, Tag } from '@blue import { IObservableValue, observable } from 'mobx'; import { observer } from 'mobx-react'; import * as React from 'react'; +import { FaceDirection } from "../../../Add-on/DrawDrilling/DrillType"; import { app } from '../../../ApplicationServices/Application'; import { arrayRemove } from '../../../Common/ArrayExt'; import { EBoardKeyList } from '../../../Common/BoardKeyList'; @@ -18,7 +19,8 @@ import { CommandWrap } from '../../../Editor/CommandMachine'; import { PromptStatus } from '../../../Editor/PromptResult'; import { TempEditor } from '../../../Editor/TempEditor'; import { GoodsList, IGoodInfo } from '../../MaterialEditor/GoodsList'; -import { BoardProcessOption, FaceDirection, IHightDrillOption, IUiOption } from '../../Store/BoardInterface'; +import { BoardProcessOption } from "../../Store/OptionInterface/BoardProcessOption"; +import { IHightDrillOption, IUiOption } from "../../Store/OptionInterface/IOptionInterface"; import { RightPanelStore } from '../../Store/RightPanelStore/RightPanelStore'; import "../Modal/ModalStyle/BoardProcessModal.less"; import { RightTabId } from '../RightPanel/RightPanel'; diff --git a/src/UI/Components/Board/ClosingStripModal.tsx b/src/UI/Components/Board/ClosingStripModal.tsx index 78bdf5e17..57cb5a030 100644 --- a/src/UI/Components/Board/ClosingStripModal.tsx +++ b/src/UI/Components/Board/ClosingStripModal.tsx @@ -5,9 +5,10 @@ import { app } from '../../../ApplicationServices/Application'; import { EBoardKeyList } from '../../../Common/BoardKeyList'; import { CheckObjectType } from '../../../Common/CheckoutVaildValue'; import { ClosingStripReg, FixedNotZero } from '../../../Common/Utils'; +import { BrRelativePos } from '../../../DatabaseServices/Entity/BoardInterface'; import { PromptStatus } from '../../../Editor/PromptResult'; -import { BrRelativePos, StripType } from '../../Store/BoardInterface'; import { ClosingStripStore } from '../../Store/BoardStore'; +import { StripType } from "../../Store/OptionInterface/ClosingStripOption"; import { SetBoardDataItem } from './BoardCommon'; diff --git a/src/UI/Components/Board/CommonBoardOption.tsx b/src/UI/Components/Board/CommonBoardOption.tsx index e51714734..394047dc6 100644 --- a/src/UI/Components/Board/CommonBoardOption.tsx +++ b/src/UI/Components/Board/CommonBoardOption.tsx @@ -9,11 +9,13 @@ import { DataAdapter } from '../../../Common/DataAdapter'; import { safeEval } from '../../../Common/eval'; import { FixedNotZero } from '../../../Common/Utils'; import { Board } from '../../../DatabaseServices/Entity/Board'; +import { BoardOpenDir } from '../../../DatabaseServices/Entity/BoardInterface'; import { CommandWrap } from '../../../Editor/CommandMachine'; import { DefaultBoardProcessOption } from '../../../Editor/DefaultConfig'; import { userConfig } from '../../../Editor/UserConfig'; import { equaln } from '../../../Geometry/GeUtils'; -import { BoardOpenDir, BoardProcessOption, IGrooveOption, IUiOption, SingleBoardOption } from '../../Store/BoardInterface'; +import { BoardProcessOption } from "../../Store/OptionInterface/BoardProcessOption"; +import { IGrooveOption, IUiOption, SingleBoardOption } from "../../Store/OptionInterface/IOptionInterface"; import { AppToaster, ToasterValueError } from '../Toaster'; export interface ICommonOptionProps diff --git a/src/UI/Components/Board/Door/DoorCommon.tsx b/src/UI/Components/Board/Door/DoorCommon.tsx index 83c2c5ed0..fa3085907 100644 --- a/src/UI/Components/Board/Door/DoorCommon.tsx +++ b/src/UI/Components/Board/Door/DoorCommon.tsx @@ -3,11 +3,11 @@ import { action, observable } from 'mobx'; import { observer } from 'mobx-react'; import * as React from 'react'; import { CheckObjectType } from '../../../../Common/CheckoutVaildValue'; -import { safeEval } from '../../../../Common/eval'; import { FixedNotZero } from '../../../../Common/Utils'; -import { IUiOption } from '../../../Store/BoardInterface'; +import { safeEval } from '../../../../Common/eval'; import { DoorDrawerStore } from '../../../Store/DoorDrawerStore/DoorDrawerStore'; import { DoorPosType, IDoorConfigOption, IDrawerConfigOption } from '../../../Store/DoorInterface'; +import { IUiOption } from "../../../Store/OptionInterface/IOptionInterface"; import { AppToaster, ToasterInput } from '../../Toaster'; import { Input5Or4Component, SetBoardDataItem } from '../BoardCommon'; diff --git a/src/UI/Components/Board/Door/DoorConfigModal.tsx b/src/UI/Components/Board/Door/DoorConfigModal.tsx index 36160aba0..6fd3a4b33 100644 --- a/src/UI/Components/Board/Door/DoorConfigModal.tsx +++ b/src/UI/Components/Board/Door/DoorConfigModal.tsx @@ -3,11 +3,11 @@ import { observer } from 'mobx-react'; import * as React from 'react'; import { CheckObjectType } from '../../../../Common/CheckoutVaildValue'; import { safeEval } from '../../../../Common/eval'; -import { IUiOption } from '../../../Store/BoardInterface'; import { DoorDrawerStore } from '../../../Store/DoorDrawerStore/DoorDrawerStore'; import { DoorStore } from '../../../Store/DoorDrawerStore/DoorStore'; import { DrawerStore } from '../../../Store/DoorDrawerStore/DrawerStore'; import { DoorPosType, HandleHorPos, HandleVePos, IDoorConfigOption, IDrawerConfigOption } from '../../../Store/DoorInterface'; +import { IUiOption } from "../../../Store/OptionInterface/IOptionInterface"; import { ToasterInput } from '../../Toaster'; import { Input5Or4Component, SetBoardDataItem } from '../BoardCommon'; import { ChangeDoorOrDrawerPosition, DoorDrawerRowCol, UpDownSpaceComponent } from './DoorCommon'; diff --git a/src/UI/Components/Board/InvalidDrillBoardModal.tsx b/src/UI/Components/Board/InvalidDrillBoardModal.tsx index 0b0fd297f..f59cc5759 100644 --- a/src/UI/Components/Board/InvalidDrillBoardModal.tsx +++ b/src/UI/Components/Board/InvalidDrillBoardModal.tsx @@ -1,12 +1,12 @@ import { Button, Classes, HTMLSelect, Tooltip } from "@blueprintjs/core"; import { observer } from "mobx-react"; import React from "react"; +import { DrillType } from "../../../Add-on/DrawDrilling/DrillType"; import { app } from "../../../ApplicationServices/Application"; import { HostApplicationServices } from "../../../ApplicationServices/HostApplicationServices"; import { Board } from "../../../DatabaseServices/Entity/Board"; import { CommandWrap } from "../../../Editor/CommandMachine"; import { userConfig } from "../../../Editor/UserConfig"; -import { DrillType } from "../../Store/BoardInterface"; import { CommonModal } from "../Modal/ModalContainer"; import { ModalState } from "../Modal/ModalInterface"; diff --git a/src/UI/Components/Board/LayerBoardModal.tsx b/src/UI/Components/Board/LayerBoardModal.tsx index baebe87f1..380322220 100644 --- a/src/UI/Components/Board/LayerBoardModal.tsx +++ b/src/UI/Components/Board/LayerBoardModal.tsx @@ -2,7 +2,7 @@ import { Checkbox, Classes } from '@blueprintjs/core'; import { observer } from 'mobx-react'; import * as React from 'react'; import { CheckObjectType } from '../../../Common/CheckoutVaildValue'; -import { BrRelativePos } from '../../Store/BoardInterface'; +import { BrRelativePos } from '../../../DatabaseServices/Entity/BoardInterface'; import { LayerBoardStore } from '../../Store/BoardStore'; import { BoardRePosBlock, ItemName, SetBoardDataBlock, SetBoardDataItem } from './BoardCommon'; diff --git a/src/UI/Components/Board/SpecialBoardModal.tsx b/src/UI/Components/Board/SpecialBoardModal.tsx index c9aa826fd..dd0fcefe1 100644 --- a/src/UI/Components/Board/SpecialBoardModal.tsx +++ b/src/UI/Components/Board/SpecialBoardModal.tsx @@ -6,8 +6,8 @@ import { app } from '../../../ApplicationServices/Application'; import { CheckObjectType } from '../../../Common/CheckoutVaildValue'; import { CommandNames } from '../../../Common/CommandNames'; import { KeyBoard } from '../../../Common/KeyEnum'; -import { BoardConfigOption } from '../../Store/BoardInterface'; import { SpecialShapeStore } from '../../Store/BoardStore'; +import { BoardConfigOption } from "../../Store/OptionInterface/IOptionInterface"; import { GetCompoentObjectIdString } from '../ComponentObjectId'; import { CommonModal } from '../Modal/ModalContainer'; import { ToasterValueError } from '../Toaster'; diff --git a/src/UI/Components/Board/UpdateBoardInfointerface.ts b/src/UI/Components/Board/UpdateBoardInfointerface.ts index 0cb962980..b49d2bb45 100644 --- a/src/UI/Components/Board/UpdateBoardInfointerface.ts +++ b/src/UI/Components/Board/UpdateBoardInfointerface.ts @@ -1,5 +1,7 @@ +import { FaceDirection } from "../../../Add-on/DrawDrilling/DrillType"; import { EBoardKeyList } from "../../../Common/BoardKeyList"; -import { ComposingType, FaceDirection, IBaseOption, IDrawBoardAutoCutOption, LinesType } from "../../Store/BoardInterface"; +import { ComposingType, LinesType } from "../../../DatabaseServices/Entity/BoardInterface"; +import { IBaseOption, IDrawBoardAutoCutOption } from "../../Store/OptionInterface/IOptionInterface"; export interface IUpdateBoardInfosOption extends IBaseOption { diff --git a/src/UI/Components/Board/UpdateBoardInfos.tsx b/src/UI/Components/Board/UpdateBoardInfos.tsx index 07459b170..dfaf9e7f7 100644 --- a/src/UI/Components/Board/UpdateBoardInfos.tsx +++ b/src/UI/Components/Board/UpdateBoardInfos.tsx @@ -3,6 +3,7 @@ import { toJS } from 'mobx'; import { observer } from 'mobx-react'; import * as React from 'react'; import * as xaop from 'xaop'; +import { DrillType } from "../../../Add-on/DrawDrilling/DrillType"; import { ParseBoardRectHoleType } from '../../../Add-on/DrawDrilling/HoleUtils'; import { app } from '../../../ApplicationServices/Application'; import { EBoardKeyList } from '../../../Common/BoardKeyList'; @@ -14,7 +15,6 @@ import { Board } from '../../../DatabaseServices/Entity/Board'; import { CommandWrap } from '../../../Editor/CommandMachine'; import { PromptStatus } from '../../../Editor/PromptResult'; import { userConfig } from '../../../Editor/UserConfig'; -import { DrillType } from '../../Store/BoardInterface'; import { UpdateBoardInfosStore } from '../../Store/UpdateBoardInfoStore'; import { InputSelect } from '../Common'; import { PopoverButton } from '../Common/PopoverButton'; diff --git a/src/UI/Components/Board/UserConfigComponent.tsx b/src/UI/Components/Board/UserConfigComponent.tsx index 0d737ab7a..41b038c14 100644 --- a/src/UI/Components/Board/UserConfigComponent.tsx +++ b/src/UI/Components/Board/UserConfigComponent.tsx @@ -5,12 +5,13 @@ import { ImportConfig } from '../../../Add-on/LoadConfig'; import { arrayLast } from '../../../Common/ArrayExt'; import { FS } from '../../../Common/FileSystem'; import { userConfig } from '../../../Editor/UserConfig'; -import { AnyObject, BoardProcessOption, IDrawBoardAutoCutOption, IGrooveOption, LayerNailOption, TBBoardOption } from '../../Store/BoardInterface'; import { IConfigStore } from '../../Store/BoardStore'; import { IDoorInfo, IDrawerInfo } from '../../Store/DoorInterface'; -import { DrillingOption } from '../../Store/drillInterface'; import { DrillConfigSortType } from '../../Store/DrillStore'; +import { BoardProcessOption } from "../../Store/OptionInterface/BoardProcessOption"; +import { AnyObject, IDrawBoardAutoCutOption, IGrooveOption, LayerNailOption, TBBoardOption } from "../../Store/OptionInterface/IOptionInterface"; import { userConfigStore } from '../../Store/UserConfigStore'; +import { DrillingOption } from '../../Store/drillInterface'; import { PopoverCheckBoxes } from '../Common/PopoverCheckBoxes'; import { PopoverInput } from '../Common/PopoverInput'; import { BoardModalType } from "./BoardModalType"; diff --git a/src/UI/Components/Board/VerticalBoardModal.tsx b/src/UI/Components/Board/VerticalBoardModal.tsx index 4b456b96d..6edec52d6 100644 --- a/src/UI/Components/Board/VerticalBoardModal.tsx +++ b/src/UI/Components/Board/VerticalBoardModal.tsx @@ -2,7 +2,7 @@ import { Checkbox, Classes } from '@blueprintjs/core'; import { observer } from 'mobx-react'; import * as React from 'react'; import { CheckObjectType } from '../../../Common/CheckoutVaildValue'; -import { BrRelativePos } from '../../Store/BoardInterface'; +import { BrRelativePos } from '../../../DatabaseServices/Entity/BoardInterface'; import { VerticalBoardStore } from '../../Store/BoardStore'; import { BoardRePosBlock, ItemName, SetBoardDataBlock, SetBoardDataItem } from './BoardCommon'; diff --git a/src/UI/Components/BoardBatchCurtailModal.tsx b/src/UI/Components/BoardBatchCurtailModal.tsx index 3b17bef83..f04e8617a 100644 --- a/src/UI/Components/BoardBatchCurtailModal.tsx +++ b/src/UI/Components/BoardBatchCurtailModal.tsx @@ -10,8 +10,8 @@ import { KeyBoard } from "../../Common/KeyEnum"; import { safeEval } from "../../Common/eval"; import { DefaultBoardBatchCurtailOption } from "../../Editor/DefaultConfig"; import '../Css/batchCurtailModal.less'; -import { CurtailType, IBoardBatchCurtailOption } from "../Store/BoardInterface"; import { BoardStore } from "../Store/BoardStore"; +import { CurtailType, IBoardBatchCurtailOption } from "../Store/OptionInterface/BoardBatchCurtailOption "; import { BoardModalType } from "./Board/BoardModalType"; import { Config_ModalType, IConfigOption } from "./Board/UserConfigComponent"; import { GetCompoentObjectIdString } from "./ComponentObjectId"; diff --git a/src/UI/Components/Common/Datalist.tsx b/src/UI/Components/Common/Datalist.tsx index 5d8ad5477..5f55b66ea 100644 --- a/src/UI/Components/Common/Datalist.tsx +++ b/src/UI/Components/Common/Datalist.tsx @@ -6,7 +6,7 @@ import { CURRENT_HOST } from '../../../Common/HostUrl'; import { MouseKey } from '../../../Common/KeyEnum'; import { getFileSize } from '../../../Common/Utils'; import '../../Css/dataList.less'; -import { AnyObject, DatalistColumnWidthOption } from '../../Store/BoardInterface'; +import { AnyObject, DatalistColumnWidthOption } from "../../Store/OptionInterface/IOptionInterface"; import { userConfigStore } from '../../Store/UserConfigStore'; import { BoardModalType } from '../Board/BoardModalType'; import { ScaleImages } from '../Template/ScaleImages'; diff --git a/src/UI/Components/Common/DatalistStore.ts b/src/UI/Components/Common/DatalistStore.ts index 4601c1fad..414217577 100644 --- a/src/UI/Components/Common/DatalistStore.ts +++ b/src/UI/Components/Common/DatalistStore.ts @@ -1,8 +1,8 @@ import { observable, toJS } from "mobx"; import { Singleton } from "../../../Common/Singleton"; import { DefaultCommonPanelOption, DefaultDatalistOption } from "../../../Editor/DefaultConfig"; -import { DatalistConfigOption } from "../../Store/BoardInterface"; import { IConfigStore } from "../../Store/BoardStore"; +import { DatalistConfigOption } from "../../Store/OptionInterface/IOptionInterface"; import { IConfigOption } from "../Board/UserConfigComponent"; export class DatalistStore extends Singleton implements IConfigStore diff --git a/src/UI/Components/LatticeDrawer.tsx b/src/UI/Components/LatticeDrawer.tsx index 845ac4057..f1289a3b8 100644 --- a/src/UI/Components/LatticeDrawer.tsx +++ b/src/UI/Components/LatticeDrawer.tsx @@ -7,7 +7,7 @@ import { app } from '../../ApplicationServices/Application'; import { CheckObjectType } from '../../Common/CheckoutVaildValue'; import { CommandNames } from '../../Common/CommandNames'; import { KeyBoard } from '../../Common/KeyEnum'; -import { LinesType } from '../Store/BoardInterface'; +import { LinesType } from '../../DatabaseServices/Entity/BoardInterface'; import { LatticeDrawerStore } from '../Store/LatticeDrawerStore'; import { ELatticeArrayType } from '../Store/LatticeInterface'; import { Input5Or4Component, SetBoardDataBlock, SetBoardDataItem } from './Board/BoardCommon'; diff --git a/src/UI/Components/Modal/CadModal.tsx b/src/UI/Components/Modal/CadModal.tsx index 8b78c72dc..457d2eb06 100644 --- a/src/UI/Components/Modal/CadModal.tsx +++ b/src/UI/Components/Modal/CadModal.tsx @@ -5,7 +5,7 @@ import { app } from "../../../ApplicationServices/Application"; import { ZINDEX } from "../../../Common/ZIndex"; import { CommandWrap } from "../../../Editor/CommandMachine"; import { equaln } from '../../../Geometry/GeUtils'; -import { AnyObject } from '../../Store/BoardInterface'; +import { AnyObject } from "../../Store/OptionInterface/IOptionInterface"; import { LightStore } from "../../Store/RightPanelStore/LightStore"; import { GetCompoentObjectIdString } from '../ComponentObjectId'; import { CommandState } from './../../../Editor/CommandState'; diff --git a/src/UI/Components/Modal/HideSelectModal.tsx b/src/UI/Components/Modal/HideSelectModal.tsx index e464ac727..42e86f821 100644 --- a/src/UI/Components/Modal/HideSelectModal.tsx +++ b/src/UI/Components/Modal/HideSelectModal.tsx @@ -2,7 +2,7 @@ import { Button, Card, Checkbox, H5, HTMLSelect, Intent, Radio, RadioGroup, Tool import { observer } from 'mobx-react'; import React from 'react'; import { CompareIsEqual } from '../../../Add-on/BoardFindModify'; -import { isDingDiBan, IsDoor, IsDrawer, IsHandle, IsHinge, IsLattice, IsWinerack } from '../../../Add-on/HideSelect/HideSelectUtils'; +import { IsDoor, IsDrawer, IsHandle, IsHinge, IsLattice, IsWinerack, isDingDiBan } from '../../../Add-on/HideSelect/HideSelectUtils'; import { app } from '../../../ApplicationServices/Application'; import { arrayRemoveIf } from '../../../Common/ArrayExt'; import { CommandNames } from '../../../Common/CommandNames'; @@ -11,6 +11,7 @@ import { Hole } from '../../../DatabaseServices/3DSolid/Hole'; import { Dimension } from '../../../DatabaseServices/Dimension/Dimension'; import { Arc } from '../../../DatabaseServices/Entity/Arc'; import { Board } from '../../../DatabaseServices/Entity/Board'; +import { BoardType } from '../../../DatabaseServices/Entity/BoardInterface'; import { Circle } from '../../../DatabaseServices/Entity/Circle'; import { CompositeEntity } from '../../../DatabaseServices/Entity/CompositeEntity'; import { Curve } from '../../../DatabaseServices/Entity/Curve'; @@ -26,9 +27,8 @@ import { CommandWrap } from '../../../Editor/CommandMachine'; import { PromptStatus } from '../../../Editor/PromptResult'; import { SelectSetBase } from '../../../Editor/SelectBase'; import { ECompareType } from '../../Store/BoardFindInterface'; -import { BoardType } from '../../Store/BoardInterface'; -import { HideSelectStore } from '../../Store/HideSelectStore'; import { IHSOption } from '../../Store/HSInterface'; +import { HideSelectStore } from '../../Store/HideSelectStore'; import { BoardModalType } from "../Board/BoardModalType"; import { Config_ModalType } from '../Board/UserConfigComponent'; import './HideSelectModal.less'; diff --git a/src/UI/Components/Modal/ModalsManage.ts b/src/UI/Components/Modal/ModalsManage.ts index 0f278f62b..26b5ab0f7 100644 --- a/src/UI/Components/Modal/ModalsManage.ts +++ b/src/UI/Components/Modal/ModalsManage.ts @@ -7,7 +7,7 @@ import { ZINDEX } from '../../../Common/ZIndex'; import { CommandWrap } from '../../../Editor/CommandMachine'; import { CommandState } from '../../../Editor/CommandState'; import { Editor } from '../../../Editor/Editor'; -import { AnyObject } from '../../Store/BoardInterface'; +import { AnyObject } from "../../Store/OptionInterface/IOptionInterface"; import { GetCompoentObjectIdString } from '../ComponentObjectId'; import { CADModal, DATA_KEY } from './CadModal'; import { ModalPosition, ModalState } from './ModalInterface'; diff --git a/src/UI/Components/Modal/OptionModal/ChaiDanModal.tsx b/src/UI/Components/Modal/OptionModal/ChaiDanModal.tsx index bec3ddc18..e6e85fa99 100644 --- a/src/UI/Components/Modal/OptionModal/ChaiDanModal.tsx +++ b/src/UI/Components/Modal/OptionModal/ChaiDanModal.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import { CheckObjectType } from '../../../../Common/CheckoutVaildValue'; import { DataAdapter } from '../../../../Common/DataAdapter'; import { userConfig } from "../../../../Editor/UserConfig"; -import { IUiOption } from '../../../Store/BoardInterface'; +import { IUiOption } from "../../../Store/OptionInterface/IOptionInterface"; import { ToasterInput } from '../../Toaster'; @observer diff --git a/src/UI/Components/Modal/OptionModal/DisplayConfigPanel.tsx b/src/UI/Components/Modal/OptionModal/DisplayConfigPanel.tsx index 973d9d528..0dc7eee5e 100644 --- a/src/UI/Components/Modal/OptionModal/DisplayConfigPanel.tsx +++ b/src/UI/Components/Modal/OptionModal/DisplayConfigPanel.tsx @@ -14,7 +14,7 @@ import { FixedNotZero } from "../../../../Common/Utils"; import { safeEval } from "../../../../Common/eval"; import { ICursorConfig } from "../../../../Editor/ICursorConfig"; import { userConfig } from "../../../../Editor/UserConfig"; -import { IUiOption } from "../../../Store/BoardInterface"; +import { IUiOption } from "../../../Store/OptionInterface/IOptionInterface"; import { ToasterInput } from "../../Toaster"; import { ConfigColorList } from "./ConfigColorList"; import { ConfigStore } from "./ConfigDialog"; diff --git a/src/UI/Components/Modal/OptionModal/DrawConfigPanel.tsx b/src/UI/Components/Modal/OptionModal/DrawConfigPanel.tsx index 070d471c2..a91437678 100644 --- a/src/UI/Components/Modal/OptionModal/DrawConfigPanel.tsx +++ b/src/UI/Components/Modal/OptionModal/DrawConfigPanel.tsx @@ -9,7 +9,7 @@ import { ColorMaterial } from '../../../../Common/ColorPalette'; import { Board } from '../../../../DatabaseServices/Entity/Board'; import { CompositeEntity } from '../../../../DatabaseServices/Entity/CompositeEntity'; import { IMaxSizeProps, userConfig } from '../../../../Editor/UserConfig'; -import { IUiOption } from '../../../Store/BoardInterface'; +import { IUiOption } from "../../../Store/OptionInterface/IOptionInterface"; import { ToasterInput } from '../../Toaster'; import { DataAdapter } from './../../../../Common/DataAdapter'; import { ConfigStore } from './ConfigDialog'; diff --git a/src/UI/Components/Modal/OptionModal/FileConfigPanel.tsx b/src/UI/Components/Modal/OptionModal/FileConfigPanel.tsx index 83084dc59..03b3ab6ed 100644 --- a/src/UI/Components/Modal/OptionModal/FileConfigPanel.tsx +++ b/src/UI/Components/Modal/OptionModal/FileConfigPanel.tsx @@ -4,7 +4,7 @@ import React from "react"; import { CheckObjectType } from "../../../../Common/CheckoutVaildValue"; import { DataAdapter } from "../../../../Common/DataAdapter"; import { userConfig } from "../../../../Editor/UserConfig"; -import { IUiOption } from "../../../Store/BoardInterface"; +import { IUiOption } from "../../../Store/OptionInterface/IOptionInterface"; import { ToasterInput } from "../../Toaster"; @observer diff --git a/src/UI/Components/Modal/OptionModal/SystemConfig.tsx b/src/UI/Components/Modal/OptionModal/SystemConfig.tsx index 82dc87036..fec8332fe 100644 --- a/src/UI/Components/Modal/OptionModal/SystemConfig.tsx +++ b/src/UI/Components/Modal/OptionModal/SystemConfig.tsx @@ -5,7 +5,7 @@ import { CheckObjectType } from '../../../../Common/CheckoutVaildValue'; import { DataAdapter } from '../../../../Common/DataAdapter'; import { safeEval } from '../../../../Common/eval'; import { ISystemConfig, userConfig } from "../../../../Editor/UserConfig"; -import { IUiOption } from '../../../Store/BoardInterface'; +import { IUiOption } from "../../../Store/OptionInterface/IOptionInterface"; import { ToasterInput } from '../../Toaster'; @observer diff --git a/src/UI/Components/Modal/ProcessingGroupModal.tsx b/src/UI/Components/Modal/ProcessingGroupModal.tsx index 5079e54f0..157842f04 100644 --- a/src/UI/Components/Modal/ProcessingGroupModal.tsx +++ b/src/UI/Components/Modal/ProcessingGroupModal.tsx @@ -24,8 +24,8 @@ import { PromptStatus } from "../../../Editor/PromptResult"; import { SelectSetBase } from "../../../Editor/SelectBase"; import '../../Css/ProcessingGroupModal.less'; import { ECompareType } from "../../Store/BoardFindInterface"; -import { ProcessingGroupOption } from "../../Store/BoardInterface"; import { IConfigStore } from "../../Store/BoardStore"; +import { ProcessingGroupOption } from "../../Store/OptionInterface/IOptionInterface"; import { userConfigStore } from "../../Store/UserConfigStore"; import { BoardModalType } from "../Board/BoardModalType"; import { GetCompoentObjectIdString } from "../ComponentObjectId"; diff --git a/src/UI/Components/RightPanel/DrillComponent.tsx b/src/UI/Components/RightPanel/DrillComponent.tsx index c6f0b1936..357d76c26 100644 --- a/src/UI/Components/RightPanel/DrillComponent.tsx +++ b/src/UI/Components/RightPanel/DrillComponent.tsx @@ -1,9 +1,9 @@ import { Button, Classes, HTMLSelect, Intent, Label } from '@blueprintjs/core'; import { inject, observer } from 'mobx-react'; import * as React from 'react'; +import { DrillType } from "../../../Add-on/DrawDrilling/DrillType"; import { ColorMaterial } from '../../../Common/ColorPalette'; import { userConfig } from '../../../Editor/UserConfig'; -import { DrillType } from '../../Store/BoardInterface'; import { Board_Editor_Key } from '../../Store/RightPanelStore/BoardEdgesEditor'; import { RightPanelStore } from '../../Store/RightPanelStore/RightPanelStore'; import { AppToaster } from '../Toaster'; diff --git a/src/UI/Components/RightPanel/Modeling/KnifeList.tsx b/src/UI/Components/RightPanel/Modeling/KnifeList.tsx index 2da36dd15..6e06a3f8a 100644 --- a/src/UI/Components/RightPanel/Modeling/KnifeList.tsx +++ b/src/UI/Components/RightPanel/Modeling/KnifeList.tsx @@ -5,15 +5,15 @@ import * as React from 'react'; import { app } from '../../../../ApplicationServices/Application'; import { DataAdapter } from '../../../../Common/DataAdapter'; import { ToplineUrls } from '../../../../Common/HostUrl'; -import { inflateBase64 } from "../../../../Common/inflate"; import { MouseKey } from '../../../../Common/KeyEnum'; import { PostJson, RequestStatus } from '../../../../Common/Request'; import { deflate, getPolylineSVG, toplineFileIn } from '../../../../Common/SerializeMaterial'; +import { inflateBase64 } from "../../../../Common/inflate"; import { CADFiler } from '../../../../DatabaseServices/CADFiler'; import { Polyline } from '../../../../DatabaseServices/Entity/Polyline'; import { CommandState } from '../../../../Editor/CommandState'; import { TempEditor } from '../../../../Editor/TempEditor'; -import { IKnifeProps, IUiOption } from '../../../Store/BoardInterface'; +import { IKnifeProps, IUiOption } from "../../../Store/OptionInterface/IOptionInterface"; import { ZoomToEntity } from '../../../Store/RightPanelStore/BoardEdgesEditor'; import { DataList } from '../../Common/Datalist'; import { ModalPosition } from '../../Modal/ModalInterface'; diff --git a/src/UI/Components/RightPanel/Modeling/ModelingComponent2.tsx b/src/UI/Components/RightPanel/Modeling/ModelingComponent2.tsx index bd89ec9ab..249b9a8ba 100644 --- a/src/UI/Components/RightPanel/Modeling/ModelingComponent2.tsx +++ b/src/UI/Components/RightPanel/Modeling/ModelingComponent2.tsx @@ -1,12 +1,12 @@ import { Button, Classes, Intent, Label } from '@blueprintjs/core'; import { observer } from 'mobx-react'; import * as React from 'react'; +import { FaceDirection } from "../../../../Add-on/DrawDrilling/DrillType"; import { app } from '../../../../ApplicationServices/Application'; import { CheckObjectType } from '../../../../Common/CheckoutVaildValue'; import { ColorMaterial } from '../../../../Common/ColorPalette'; -import { safeEval } from '../../../../Common/eval'; import { FixedNotZero } from '../../../../Common/Utils'; -import { FaceDirection } from '../../../Store/BoardInterface'; +import { safeEval } from '../../../../Common/eval'; import { IKnifeInfo2, IUiVModeing, IVModelingInfo, Modeling2Store } from '../../../Store/RightPanelStore/Modeling2Store'; import { BoardModalType } from "../../Board/BoardModalType"; import { Config_ModalType, UserConfigComponent } from '../../Board/UserConfigComponent'; diff --git a/src/UI/Components/RightPanel/Modeling/knifePropsModal.tsx b/src/UI/Components/RightPanel/Modeling/knifePropsModal.tsx index 1cdcd95a9..7af5fc083 100644 --- a/src/UI/Components/RightPanel/Modeling/knifePropsModal.tsx +++ b/src/UI/Components/RightPanel/Modeling/knifePropsModal.tsx @@ -1,13 +1,13 @@ -import * as React from 'react'; -import { Label, Classes, Button, Intent } from '@blueprintjs/core'; +import { Button, Classes, Intent, Label } from '@blueprintjs/core'; +import { toJS } from 'mobx'; import { observer } from 'mobx-react'; -import { IKnifeProps, IUiOption } from '../../../Store/BoardInterface'; -import { ToasterInput, AppToaster } from '../../Toaster'; +import * as React from 'react'; import { CheckObjectType } from '../../../../Common/CheckoutVaildValue'; -import { PostJson, RequestStatus } from '../../../../Common/Request'; import { ToplineUrls } from '../../../../Common/HostUrl'; -import { toJS } from 'mobx'; +import { PostJson, RequestStatus } from '../../../../Common/Request'; import { safeEval } from '../../../../Common/eval'; +import { IKnifeProps, IUiOption } from "../../../Store/OptionInterface/IOptionInterface"; +import { AppToaster, ToasterInput } from '../../Toaster'; interface IKnifeModalProps { diff --git a/src/UI/Components/RightPanel/ModelingComponent.tsx b/src/UI/Components/RightPanel/ModelingComponent.tsx index eff8dff6a..bc39e11bc 100644 --- a/src/UI/Components/RightPanel/ModelingComponent.tsx +++ b/src/UI/Components/RightPanel/ModelingComponent.tsx @@ -1,9 +1,9 @@ import { Classes, Label } from '@blueprintjs/core'; import { inject, observer } from 'mobx-react'; import * as React from 'react'; +import { FaceDirection } from "../../../Add-on/DrawDrilling/DrillType"; import { ColorMaterial } from '../../../Common/ColorPalette'; import { safeEval } from '../../../Common/eval'; -import { FaceDirection } from '../../Store/BoardInterface'; import { RightPanelStore } from '../../Store/RightPanelStore/RightPanelStore'; import { BoardModalType } from "../Board/BoardModalType"; import { Config_ModalType, UserConfigComponent } from '../Board/UserConfigComponent'; diff --git a/src/UI/Components/RightPanel/RightPanelInterface.ts b/src/UI/Components/RightPanel/RightPanelInterface.ts index a1033b080..b82bb3592 100644 --- a/src/UI/Components/RightPanel/RightPanelInterface.ts +++ b/src/UI/Components/RightPanel/RightPanelInterface.ts @@ -1,5 +1,5 @@ import { EBoardKeyList } from "../../../Common/BoardKeyList"; -import { IBaseOption } from "../../Store/BoardInterface"; +import { IBaseOption } from "../../Store/OptionInterface/IOptionInterface"; export interface IHardwareOption extends IBaseOption { diff --git a/src/UI/Components/RotateLayerBoard.tsx b/src/UI/Components/RotateLayerBoard.tsx index 86307acd8..f6829b838 100644 --- a/src/UI/Components/RotateLayerBoard.tsx +++ b/src/UI/Components/RotateLayerBoard.tsx @@ -4,12 +4,12 @@ import * as React from 'react'; import { begin } from 'xaop'; import { app } from '../../ApplicationServices/Application'; import { CheckObjectType, CheckoutValid } from '../../Common/CheckoutVaildValue'; -import { safeEval } from '../../Common/eval'; import { KeyBoard } from '../../Common/KeyEnum'; +import { safeEval } from '../../Common/eval'; import { IndexedDbStore, StoreName } from '../../IndexedDb/IndexedDbStore'; import '../Css/rotateLyModal.less'; -import { IBaseOption } from '../Store/BoardInterface'; import { BoardStore } from '../Store/BoardStore'; +import { IBaseOption } from '../Store/OptionInterface/IOptionInterface'; import { SetBoardDataItem } from './Board/BoardCommon'; import { GetCompoentObjectIdString } from './ComponentObjectId'; import { ModalState } from './Modal/ModalInterface'; diff --git a/src/UI/Components/SourceManage/CommonPanelStore.ts b/src/UI/Components/SourceManage/CommonPanelStore.ts index 92af07584..4b64daf00 100644 --- a/src/UI/Components/SourceManage/CommonPanelStore.ts +++ b/src/UI/Components/SourceManage/CommonPanelStore.ts @@ -1,7 +1,7 @@ import { observable, toJS } from "mobx"; import { DefaultCommonPanelOption } from "../../../Editor/DefaultConfig"; -import { CommonPanelConfigOption } from "../../Store/BoardInterface"; import { IConfigStore } from "../../Store/BoardStore"; +import { CommonPanelConfigOption } from "../../Store/OptionInterface/IOptionInterface"; import { IConfigOption } from "../Board/UserConfigComponent"; export class CommonPanelStore implements IConfigStore diff --git a/src/UI/Components/Template/GetRoomCabName.tsx b/src/UI/Components/Template/GetRoomCabName.tsx index 2d46b7a58..f5395a624 100644 --- a/src/UI/Components/Template/GetRoomCabName.tsx +++ b/src/UI/Components/Template/GetRoomCabName.tsx @@ -4,8 +4,8 @@ import * as React from 'react'; import { app } from '../../../ApplicationServices/Application'; import { EBoardKeyList } from '../../../Common/BoardKeyList'; import { Board } from '../../../DatabaseServices/Entity/Board'; +import { BoardOpenDir } from '../../../DatabaseServices/Entity/BoardInterface'; import { PromptStatus } from '../../../Editor/PromptResult'; -import { BoardOpenDir } from '../../Store/BoardInterface'; export interface IGetRoomInfo { diff --git a/src/UI/Components/Template/TemplateComponent.tsx b/src/UI/Components/Template/TemplateComponent.tsx index f4acbbabe..abeb57f63 100644 --- a/src/UI/Components/Template/TemplateComponent.tsx +++ b/src/UI/Components/Template/TemplateComponent.tsx @@ -3,19 +3,21 @@ import { observable } from 'mobx'; import { observer } from 'mobx-react'; import * as React from 'react'; import { AutoCutting } from '../../../Add-on/BoardCutting/AutoCuttingReactor'; +import { DrillType } from "../../../Add-on/DrawDrilling/DrillType"; import { IsDoor, IsHandle, IsHinge } from '../../../Add-on/HideSelect/HideSelectUtils'; import { ITempTagProps, templateTagCommand } from '../../../Add-on/Template/TemplateTagCommand'; import { R2bReplaceProps } from '../../../Add-on/twoD2threeD/R2bConfigComponent'; import { app } from '../../../ApplicationServices/Application'; import { EBoardKeyList } from '../../../Common/BoardKeyList'; -import { safeEval } from '../../../Common/eval'; import { TemplateUrls } from '../../../Common/HostUrl'; import { LogType } from '../../../Common/Log'; import { DirectoryId, PostJson, RequestStatus } from '../../../Common/Request'; import { DuplicateRecordCloning } from '../../../Common/Status'; import { StoreageKeys } from '../../../Common/StoreageKeys'; +import { safeEval } from '../../../Common/eval'; import { CADObject } from '../../../DatabaseServices/CADObject'; import { Board } from '../../../DatabaseServices/Entity/Board'; +import { BoardOpenDir } from '../../../DatabaseServices/Entity/BoardInterface'; import { Entity } from '../../../DatabaseServices/Entity/Entity'; import { FileServer } from '../../../DatabaseServices/FileServer'; import { HardwareCompositeEntity } from '../../../DatabaseServices/Hardware/HardwareCompositeEntity'; @@ -35,9 +37,9 @@ import { ISpaceParse } from '../../../Geometry/SpaceParse/ISpaceParse'; import { Point2SpaceParse } from '../../../Geometry/SpaceParse/Point2SpaceParse'; import { PointSelectSpaceClamp } from '../../../Geometry/SpaceParse/PointSelectSpaceClamp'; import { arrayRemoveOnce } from '../../../Nest/Common/ArrayExt'; -import { BoardOpenDir, DrillType, IBaseOption, IDrawBoardAutoCutOption } from '../../Store/BoardInterface'; import { IDrawerDoorTempInfo } from '../../Store/DoorInterface'; import { kuGanStore } from '../../Store/KuGanStore'; +import { IBaseOption, IDrawBoardAutoCutOption } from "../../Store/OptionInterface/IOptionInterface"; import { ITemplateParam } from "../../Store/RightPanelStore/ITemplateParam"; import { TempalteEditorStore } from '../../Store/TemplateEditorStore'; import { tempalteManageStore } from '../../Store/TemplateManageStore'; diff --git a/src/UI/Components/Template/TemplateDrawHandleTool.ts b/src/UI/Components/Template/TemplateDrawHandleTool.ts index 5fe6ae8fb..74b17f55c 100644 --- a/src/UI/Components/Template/TemplateDrawHandleTool.ts +++ b/src/UI/Components/Template/TemplateDrawHandleTool.ts @@ -2,10 +2,10 @@ import { app } from "../../../ApplicationServices/Application"; import { EBoardKeyList } from "../../../Common/BoardKeyList"; import { DuplicateRecordCloning } from "../../../Common/Status"; import { Board } from "../../../DatabaseServices/Entity/Board"; +import { BoardOpenDir } from "../../../DatabaseServices/Entity/BoardInterface"; import { HardwareCompositeEntity } from "../../../DatabaseServices/Hardware/HardwareCompositeEntity"; import { PositioningHandleSpace } from "../../../DatabaseServices/Template/Positioning/PositioningHandleSpace"; import { TemplateRecord } from "../../../DatabaseServices/Template/TemplateRecord"; -import { BoardOpenDir } from "../../Store/BoardInterface"; import { DoorStore } from "../../Store/DoorDrawerStore/DoorStore"; import { HandleHorPos, HandleVePos } from "../../Store/DoorInterface"; diff --git a/src/UI/Components/Template/TemplateDrawHingeTool.ts b/src/UI/Components/Template/TemplateDrawHingeTool.ts index 3802c526a..c057aae74 100644 --- a/src/UI/Components/Template/TemplateDrawHingeTool.ts +++ b/src/UI/Components/Template/TemplateDrawHingeTool.ts @@ -6,6 +6,7 @@ import { EBoardKeyList } from "../../../Common/BoardKeyList"; import { DuplicateRecordCloning } from "../../../Common/Status"; import { Intent } from "../../../Common/Toaster"; import { Board } from "../../../DatabaseServices/Entity/Board"; +import { BoardOpenDir, BoardType } from "../../../DatabaseServices/Entity/BoardInterface"; import { Entity } from "../../../DatabaseServices/Entity/Entity"; import { ExtrudeContourCurve } from "../../../DatabaseServices/Entity/Extrude"; import { HardwareCompositeEntity } from "../../../DatabaseServices/Hardware/HardwareCompositeEntity"; @@ -14,7 +15,6 @@ import { TemplateParam } from "../../../DatabaseServices/Template/Param/Template import { TemplateRecord } from "../../../DatabaseServices/Template/TemplateRecord"; import { Box3Ext } from "../../../Geometry/Box"; import { equaln, isParallelTo } from "../../../Geometry/GeUtils"; -import { BoardOpenDir, BoardType } from "../../Store/BoardInterface"; import { IHingeRule } from "../../Store/DoorDrawerStore/DoorStore"; import { HingeStore } from "../../Store/DoorDrawerStore/HingeStore"; import { AppToaster } from "../Toaster"; diff --git a/src/UI/Components/Text/TextModify.tsx b/src/UI/Components/Text/TextModify.tsx index 4a8ba21d9..a249d49c0 100644 --- a/src/UI/Components/Text/TextModify.tsx +++ b/src/UI/Components/Text/TextModify.tsx @@ -4,8 +4,8 @@ import { observer } from "mobx-react"; import React, { useEffect, useRef } from "react"; import { app } from "../../../ApplicationServices/Application"; import { DefaultModifyTextsOption } from "../../../Editor/DefaultConfig"; -import { ModifyTextsConfigOption } from "../../Store/BoardInterface"; import { IConfigStore } from "../../Store/BoardStore"; +import { ModifyTextsConfigOption } from "../../Store/OptionInterface/IOptionInterface"; import { BoardModalType } from "../Board/BoardModalType"; import { Config_ModalType, IConfigOption, UserConfigComponent } from "../Board/UserConfigComponent"; import { ModalState } from "../Modal/ModalInterface"; diff --git a/src/UI/Store/ActivityLayerBoardStore.ts b/src/UI/Store/ActivityLayerBoardStore.ts index ec8e8c992..f9864a163 100644 --- a/src/UI/Store/ActivityLayerBoardStore.ts +++ b/src/UI/Store/ActivityLayerBoardStore.ts @@ -4,8 +4,8 @@ import { DataAdapter } from "../../Common/DataAdapter"; import { DefaultNailOption } from "../../Editor/DefaultConfig"; import { IConfigOption } from "../Components/Board/UserConfigComponent"; import { AppConfirm } from "../Components/Common/Confirm"; -import { INailRule, IShinkOption, IUiOption, LayerNailOption } from "./BoardInterface"; import { BoardStore } from "./BoardStore"; +import { INailRule, IShinkOption, IUiOption, LayerNailOption } from "./OptionInterface/IOptionInterface"; export class ActivityLayerBoardStore extends BoardStore { diff --git a/src/UI/Store/BBSEditorStore.ts b/src/UI/Store/BBSEditorStore.ts index 4671bad29..f18a3b310 100644 --- a/src/UI/Store/BBSEditorStore.ts +++ b/src/UI/Store/BBSEditorStore.ts @@ -1,4 +1,5 @@ import { observable, toJS } from "mobx"; +import { HostApplicationServices } from "../../ApplicationServices/HostApplicationServices"; import { EBoardKeyList } from "../../Common/BoardKeyList"; import { IConfigOption } from "../Components/Board/UserConfigComponent"; import { IConfigStore } from "./BoardStore"; @@ -24,7 +25,6 @@ export class BBSEditorStore implements IConfigStore private readonly _version = 3; @observable configName = "默认"; @observable configsNames = []; - sealReserve = 0; //封边统计留头量 noResize = [6, 7, 8, 19, 20, 22, 23, 24, 25, 26, 27, 28]; //用于字段列宽度调整，但是有一些特殊框就不做调整了 @observable tabbarIndexs = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 19, 20]; @@ -35,7 +35,6 @@ export class BBSEditorStore implements IConfigStore this.tabbarIndexs.length = 0; this.tabbarIndexs.push(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 19, 20); this.IsBbsCountChaidan = true; - this.sealReserve = 0; } SaveConfig() { @@ -44,7 +43,7 @@ export class BBSEditorStore implements IConfigStore version: this._version, tabbarIndexs: toJS(this.tabbarIndexs), IsBbsCountChaidan: this.IsBbsCountChaidan, - sealReserve: this.sealReserve + sealReserve: HostApplicationServices.sealReserve } }; } @@ -60,7 +59,7 @@ export class BBSEditorStore implements IConfigStore this.IsBbsCountChaidan = config.option.IsBbsCountChaidan; } if (config.option.version > 2) - this.sealReserve = config.option.sealReserve; + HostApplicationServices.sealReserve = config.option.sealReserve; } } diff --git a/src/UI/Store/BoardFindInterface.ts b/src/UI/Store/BoardFindInterface.ts index 46e863eeb..cff7ba8fc 100644 --- a/src/UI/Store/BoardFindInterface.ts +++ b/src/UI/Store/BoardFindInterface.ts @@ -1,5 +1,7 @@ +import { FaceDirection } from "../../Add-on/DrawDrilling/DrillType"; import { EBoardKeyList } from "../../Common/BoardKeyList"; -import { ComposingType, FaceDirection, IBaseOption, LinesType } from "./BoardInterface"; +import { ComposingType, LinesType } from "../../DatabaseServices/Entity/BoardInterface"; +import { IBaseOption } from "./OptionInterface/IOptionInterface"; export const DRILL_KEYS = ["downDrill", "rightDrill", "upDrill", "leftDrill"]; diff --git a/src/UI/Store/BoardInterface.ts b/src/UI/Store/BoardInterface.ts deleted file mode 100644 index f9bf7746b..000000000 --- a/src/UI/Store/BoardInterface.ts +++ /dev/null @@ -1,621 +0,0 @@ -import { EBoardKeyList } from "../../Common/BoardKeyList"; -import { ObjectId } from "../../DatabaseServices/ObjectId"; -import { RenderType } from "../../GraphicsSystem/RenderType"; - -export enum BoardType -{ - Layer = 0, //层板 - Vertical = 1, //立板 - Behind = 2 //背板 -} - -/** - *勿随意更改属性名,若更改,需更改对应UI模态框的属性和检验方法的key - * - */ -export interface IBaseOption -{ - version?: number; -} - -//板件数据,配置信息+加工信息 -export interface BoardData -{ - boardConfig: BoardConfigOption; - boardProcess: BoardProcessOption; -} -//排钻类型 -export enum DrillType -{ - Yes = "排", - None = "不排", - More = "**多种**", - Invail = "无效配置", -} -//偏心轮类型 -export enum FaceDirection -{ - Front = 0, - Back = 1, -} - -//纹路类型 -export enum LinesType -{ - /** 正纹 */ - Positive = 0, - /** 反纹 */ - Reverse = 1, - /** 可翻转 */ - CanReversal = 2, -} - -// 排版面 -export enum ComposingType -{ - Positive = 0, //正面 - Reverse = 1, //反面 - Arbitrary = 2 //任意 -} -/** - *背板靠上还是靠下 - * - * @export - * @enum {number} - */ -export enum BehindHeightPositon -{ - ForTop = "top", //靠上 - ForBottom = "bottom",//靠下 - AllHeight = "all" //总高 -} - -/** - *板件相对位置 - * - * @export - * @enum {number} - */ -export enum BrRelativePos -{ - Front = "front", - Back = "back", - Top = "top", - Bottom = "bottom", - Left = "left", - Right = "right", - Div = "div" -} - -export enum ViewDirection -{ - Left = 1, - Right = 2, - Up = 3, - Front = 4, - Bottom = 5, - Back = 6, - Southwest = 7 -} - -export enum ViewportPosition -{ - Vertical = "vertical", - Horizontal = "horizontal", - Left = "left", - Right = "right", - Bottom = "bottom", - Top = "top" -} - -export interface IHighSealedItem -{ - size: number; -} - -export interface ISealingData extends IHighSealedItem -{ - length: number; - type?: string; - shop?: string; -} - -export interface BoardProcessOption extends IBaseOption -{ - [EBoardKeyList.RoomName]?: string; - [EBoardKeyList.CabinetName]?: string;//柜名 - [EBoardKeyList.BrMat]?: string;//板材名 - [EBoardKeyList.Mat]?: string;//材料 - [EBoardKeyList.Color]?: string; - [EBoardKeyList.Lines]?: LinesType;//纹路 - [EBoardKeyList.ProcessGroup]?: ObjectId[];//纹路 - [EBoardKeyList.BigHole]?: FaceDirection;//大孔面 - [EBoardKeyList.DrillType]?: string;//排钻类型 - [EBoardKeyList.ComposingFace]?: ComposingType;//排版面 - [EBoardKeyList.HighSealed]?: IHighSealedItem[];//封边数据 - [EBoardKeyList.UpSealed]?: string;//封边上下左右 - [EBoardKeyList.DownSealed]?: string; - [EBoardKeyList.LeftSealed]?: string; - [EBoardKeyList.RightSealed]?: string; - [EBoardKeyList.SpliteHeight]?: string;//拆单高/宽/厚 - [EBoardKeyList.SpliteWidth]?: string; - [EBoardKeyList.SpliteThickness]?: string; - - highDrill?: string[]; - frontDrill: boolean; - backDrill: boolean; - remarks: [string, string][]; - useBoardProcessOption?: boolean;//使用周围板 -} - -/** - *板件参数 - */ -export interface BoardConfigOption extends IBaseOption -{ - type: BoardType; - name: string; - thickness?: number; - height?: number; - width?: number; - openDir?: BoardOpenDir; -} - -export interface LightConfigOption extends IBaseOption -{ - Intensity: number; - lightColor: string; - temperature: number; - IndirectLightingIntensity: number; - SpecularScale: number; - CaseShadow: boolean; -} - -export interface PointLightOption extends LightConfigOption -{ - SourceRadius: number; - SoftSourceRadius: number; - SourceLength: number; -} - -export interface SpotLightOption extends LightConfigOption -{ - Angle: number; - InnerConeAngle: number; - SourceRadius: number; - SoftSourceRadius: number; - SourceLength: number; - AttenuationRadius: number; - ShowHelper: boolean; -} - -export interface RectAreaLightOption extends LightConfigOption -{ - Width: number; - Height: number; - BarnDoorAngle: number; - BarnDoorLength: number; - AttenuationRadius: number; - ShowHelper: boolean; -} - -export interface RightPlaneLightOption -{ - version: number; - ShowHemiLight: boolean; - SkyLightColor: string; - SkyLightIntensity: number; - SkyLightIndirectLightingIntensity: number; - ShowSunLight: boolean; - SunLightIntensity: number; - SunLightIndirectLightingIntensity: number; - SunLightColor: string; - SunLightTemperature: number; - SunLightElevationDeg: number; - SunLightRotateDeg: number; - ShowExposure: boolean; - AutoExposure: boolean; - ExposureCompensation: number; - SunTime: string; -} - -export interface ModifyTextsConfigOption -{ - changeTexts: [string, string][]; -} - -export interface MaterialMapOption -{ - id: string; //引用材质ID - kjlName: string; //酷家乐基础材质名称 -} - -export interface ViewportConfigOption -{ - view: ViewDirection; - renderType: RenderType; -} - -export interface Viewport2ConfigOption -{ - viewportPosition: ViewportPosition; - view1: ViewDirection, - view2: ViewDirection, - renderType: RenderType[], -} -export interface Viewport3ConfigOption -{ - viewportPosition: ViewportPosition; - view: ViewDirection[], - renderType: RenderType[], -} - -export interface Viewport4ConfigOption -{ - view: ViewDirection[], - renderType: RenderType[], -} - -export interface SideBoardOption extends BoardConfigOption -{ - spaceSize?: number; //空间宽度 - leftShrink: number; //左侧板内缩 - rightShrink: number; -} - -/** - *背板参数 - * - * @export - * @interface BehindBoardOption - * @extends {BoardConfigOption} - */ -export interface BehindBoardOption extends BoardConfigOption -{ - //上下左右延伸 - leftExt: number; - rightExt: number; - topExt: number; - bottomExt: number; - //板件位置 - boardPosition: BehindHeightPositon; - moveDist: number; - - spaceSize?: number; - count?: number; - //板件相对位置 - boardRelative?: BrRelativePos; - calcHeight: string;//高度表达式 - calcSpaceSize: string; - calcMoveDist: string; -} - -/** - *层板参数 - * - * @export - * @interface LayerBoardOption - * @extends {BoardConfigOption} - */ -export interface LayerBoardOption extends BoardConfigOption -{ - calcHeight: string; - frontShrink: number; - leftShrink: number; - rightShrink: number; - isTotalLength: boolean; - isActive: boolean; - spaceSize?: number; - count?: number; - boardRelative?: BrRelativePos; - calcSpaceSize: string; - calcFrontShrink: string; - calcLeftShrink: string; - calcRightShrink: string; -} - -/** - *层板钉参数 - * - * @export - * @interface LayerNailOption - */ -export interface LayerNailOption extends IBaseOption -{ - isDraw: boolean; //是否绘制 - addCount: number;//增 - dist: number; - isGroup: boolean; - isInBack: boolean; //是否在背板绘制 - front: number; - behind: number; - count: number; - rad: number; - length: number; - depth: number; -} - -/** - *立板参数 - */ -export interface VerticalBoardOption extends BoardConfigOption -{ - frontShrink: number; //前缩 - bottomShrink: number;//底缩 - isTotalLength: boolean; //是否取总高 - isTotalWidth: boolean;//是否取总宽 - count?: number; - spaceSize?: number; - boardRelative?: BrRelativePos; - calcWidth: string; //板深表达式 - calcHeight: string; - calcSpaceSize: string; - calcFrontShrink: string; - calcBottomShrink: string; -} -export interface TBBoardOption extends BoardConfigOption -{ - isDraw: boolean; - frontDist: number; //前距 - behindDistance: number; //后距 - isWrapSide: boolean; //顶包侧 - useLFData: boolean; - leftExt: number; - rightExt: number; - offset: number;//上留或者下留 - isDrawFooter?: boolean; - footThickness?: number; //地脚厚 - footBehindShrink?: number;//内缩 - isDrawBackFooter?: boolean; - footerOffset?: number; - isDrawStrengthenStrip?: boolean; - divCount?: number; -} - -export interface SingleBoardOption extends BoardConfigOption -{ - rotateX: number; - rotateY: number; - rotateZ: number; - drawNumber?: number; -} - -export enum StripType -{ - H = "h", - V = "v", -} -export interface ClosingStripOption extends BoardConfigOption -{ - boardRelative: BrRelativePos; - striptype: StripType;//收口条类型 - frontShrink: number; //前缩 - isDrawFuZhu: boolean; //是否绘制辅助条 - fzWidth: number; - fzThickness: number; -} - -export interface IGrooveOption extends IBaseOption -{ - grooveAddLength: string;//槽加长/宽/高 - grooveAddWidth: string; - grooveAddDepth: string; - knifeRadius?: string; -} - -export interface IShinkOption extends IBaseOption -{ - name: string; - left: number; - right: number; - front: number; - back: number; - isLREqual: boolean; - isFBEqual: boolean; -} - -export type IUiOption = { - [P in (keyof T)]: T[P] extends number ? string : T[P] -}; - -export interface INailRule extends IBaseOption -{ - startDist: number; - endDist: number; - count: number; -} - -export interface IHightDrillOption -{ - up: string; - down: string; - left: string; - right: string; -} -export enum CurtailType -{ - PerBr = "0", - Total = "1", - OCS = "2", //按板坐标系内缩 -} - -export interface IBoardBatchCurtailOption extends IBaseOption -{ - type: CurtailType; - front: number; - back: number; - left: number; - right: number; - moveBrs: boolean; -} - -export enum RadioType -{ - lefttop = "1", - leftbottom = "2", - righttop = "3", - rightbottom = "4", -} - -export interface IBatchModifyPanelOption extends IBaseOption -{ - length: string; - width: string; - thick: string; - position: RadioType; -} - -export enum BoardOpenDir -{ - Left = 1, - Right = 2, - Up = 3, - Down = 4, - None = 0, -} - -export type AnyObject = { [key: string]: any; }; - -//见光面封边设置 -export interface ISmoothEdgeOption extends IBaseOption -{ - smoothEdge: number;//见光面 - edge: number;//非见光面 - scale: number;//见光比例 - filterArr: string[];// -} - -export interface IDrawBoardAutoCutOption -{ - isAutoCut: boolean;//是否自动切割 - isRelevance: boolean;//是否关联切割 -} - -export interface IKnifeProps -{ - radius: number; - angle: number; -} - -export interface CommonPanelConfigOption extends IBaseOption -{ - orderType: string; -} -export interface DatalistColumnWidthOption -{ - name: number, - date: number, - size: number, - operate: number, -} - -export interface DatalistConfigOption extends IBaseOption -{ - resizeUI: { - [key: string]: DatalistColumnWidthOption; - }; -} - -export interface TemplateManageOption extends IBaseOption -{ - isAutoCut: boolean, - isRelevance: boolean; - roomName: string; - cabName: string; - useCabName: boolean; - cabIndex?: number; - originCabName: string; - boardName?: string; - useBoardName?: boolean; - material?: string; - color?: string; - brMat?: string; - useMaterial?: boolean; - openDir?: BoardOpenDir | string; - navigationWidth: string; - showTag: boolean; - perPageCount: number; -} - -export enum ForBoardNameType -{ - Same = "same", - NoSame = "nosame", - Include = "include", - NoInclude = "noinclude" -} - -export interface IAutoDimBrsOption extends IBaseOption -{ - total: boolean;//整体标注 - out: boolean;//柜外标注(前视图标注) - inW: boolean;//柜内宽标注 - inH: boolean;//柜内高标注 - noRepeat: boolean;//删除重复 - noSmSize: boolean;//过滤小尺寸 - noAppointSize: boolean;//过滤指定尺寸 - noInSize: boolean;//空间小于该数值时 不标注内空 - noShowMinSize: number; - noShowMinInSize: number; - noShowAppointSizes: string; - useParseGroups: string; - forBoardName: boolean; - forBoardNameStr: string; - forBoardNameType: ForBoardNameType; -} - -export interface WindowPanelConfigOption -{ - Length: number; //窗宽 - Height: number; //窗高 - Thick: number; //窗厚 - WindowOffGround: number; //离地 - IsBayWindow: boolean; //窗户外飘 - BayLeftIsWall?: boolean;//飘窗左侧是墙 - BayRightIsWall?: boolean;//飘窗右侧是墙 - BayDist?: number;//外飘距离 - BayLeftDist?: number;//左外飘距离 - BayMiddleDist?: number;//中外飘距离 - BayRightDist?: number;//右外飘距离 - HasWindowStone: boolean; //是否有窗台石 - StoneThick?: number; //窗台石厚度 - StoneBulge?: number; //窗台石凸出 - StoneLeftRightBulge?: number; //窗台石左右凸出 -} - -export interface IDimStyleOption extends IBaseOption -{ - dimFXLON: boolean; - dimFXL: number; - dimASZ: number; - dimGAP: number; - dimEXE: number; - dimTXT: number; - dimTAD: number; - dimALTD: number; - dimADEC: number; -} - -export interface ChangeColorByBoardMaterialOption -{ - accordThickness: boolean; - accordMaterial: boolean; - accordMaterialName: boolean; - accordMaterialColor: boolean; -} - -export interface ShareBoardInfConfigurationOption -{ - Physical2EdgeColor: number; //真实带线框颜色 - VisualStyle: RenderType; //视觉样式 - Viewport: ViewDirection; //视觉角度 - IsExportBoard: boolean; //是否导出板件 - IsExportHardware: boolean; //是否导出五金 - showBom: boolean; //是否展示物料明细 -} - -export interface ProcessingGroupOption -{ - processGroupCategory: string[]; - addAlone: boolean; -} diff --git a/src/UI/Store/BoardStore.ts b/src/UI/Store/BoardStore.ts index 410b94e41..a7b4a82ca 100644 --- a/src/UI/Store/BoardStore.ts +++ b/src/UI/Store/BoardStore.ts @@ -1,6 +1,7 @@ import { action, observable, toJS } from 'mobx'; import { begin } from 'xaop'; +import { DrillType, FaceDirection } from "../../Add-on/DrawDrilling/DrillType"; import { app } from '../../ApplicationServices/Application'; import { EBoardKeyList } from '../../Common/BoardKeyList'; import { CheckObjectType, CheckoutValid } from '../../Common/CheckoutVaildValue'; @@ -8,6 +9,7 @@ import { DataAdapter } from '../../Common/DataAdapter'; import { Singleton } from '../../Common/Singleton'; import { ClosingStripReg } from '../../Common/Utils'; import { Board } from '../../DatabaseServices/Entity/Board'; +import { BoardType, BrRelativePos, LinesType } from '../../DatabaseServices/Entity/BoardInterface'; import { TemplateRecord } from '../../DatabaseServices/Template/TemplateRecord'; import { DefaultBehindBoardConfig, DefaultBoardProcessOption, DefaultBottomBoardOption, DefaultClosingStripOption, DefaultLayerBoardConfig, DefaultNailOption, DefaultSideBoardOption, DefaultSingleBoardOption, DefaultTopBoardOption, DefaultVerticalBoardConfig } from '../../Editor/DefaultConfig'; import { userConfig } from '../../Editor/UserConfig'; @@ -15,7 +17,10 @@ import { IConfigOption } from '../Components/Board/UserConfigComponent'; import { ModalState } from '../Components/Modal/ModalInterface'; import { IModalResult } from '../Components/Modal/ModalsManage'; import { ToasterValueError } from '../Components/Toaster'; -import { AnyObject, BehindBoardOption, BehindHeightPositon, BoardConfigOption, BoardProcessOption, BoardType, BrRelativePos, ClosingStripOption, DrillType, FaceDirection, IBaseOption, IDrawBoardAutoCutOption, IGrooveOption, IHightDrillOption, IUiOption, LayerBoardOption, LayerNailOption, LinesType, SideBoardOption, SingleBoardOption, TBBoardOption, VerticalBoardOption } from './BoardInterface'; +import { BoardProcessOption } from "./OptionInterface/BoardProcessOption"; +import { ClosingStripOption } from "./OptionInterface/ClosingStripOption"; +import { AnyObject, BehindBoardOption, BoardConfigOption, IBaseOption, IDrawBoardAutoCutOption, IGrooveOption, IHightDrillOption, IUiOption, LayerBoardOption, LayerNailOption, SideBoardOption, SingleBoardOption, TBBoardOption, VerticalBoardOption } from "./OptionInterface/IOptionInterface"; +import { BehindHeightPositon } from "./OptionInterface/OptionEnum"; export interface IConfigStore diff --git a/src/UI/Store/DoorDrawerStore/DoorDrawerStore.ts b/src/UI/Store/DoorDrawerStore/DoorDrawerStore.ts index 905df0dee..f1bbac44a 100644 --- a/src/UI/Store/DoorDrawerStore/DoorDrawerStore.ts +++ b/src/UI/Store/DoorDrawerStore/DoorDrawerStore.ts @@ -6,9 +6,9 @@ import { FixedNotZero } from "../../../Common/Utils"; import { safeEval } from "../../../Common/eval"; import { IConfigOption } from "../../Components/Board/UserConfigComponent"; import { AppToaster } from "../../Components/Toaster"; -import { IUiOption } from "../BoardInterface"; import { BoardStore } from "../BoardStore"; import { IDoorAndDrawerConfigOption, IDoorInfo, IDrawerInfo, ISelectTempInfo } from "../DoorInterface"; +import { IUiOption } from "../OptionInterface/IOptionInterface"; import { ITemplateParam } from "../RightPanelStore/ITemplateParam"; diff --git a/src/UI/Store/DoorDrawerStore/DoorStore.ts b/src/UI/Store/DoorDrawerStore/DoorStore.ts index 68315778a..2825c3eb1 100644 --- a/src/UI/Store/DoorDrawerStore/DoorStore.ts +++ b/src/UI/Store/DoorDrawerStore/DoorStore.ts @@ -6,9 +6,9 @@ import { DefaultDoorOption } from "../../../Editor/DefaultConfig"; import { IConfigOption } from "../../Components/Board/UserConfigComponent"; import { AppConfirm } from "../../Components/Common/Confirm"; import { AppToaster } from "../../Components/Toaster"; -import { IUiOption } from "../BoardInterface"; import { FixErrorDataConfig } from "../BoardStore"; import { DoorOpenDir, IDoorConfigOption, IDoorInfo } from "../DoorInterface"; +import { IUiOption } from "../OptionInterface/IOptionInterface"; import { DoorDrawerStore } from "./DoorDrawerStore"; export const openDirTitle = {}; //门板开门类型对应 diff --git a/src/UI/Store/DoorDrawerStore/DrawerStore.ts b/src/UI/Store/DoorDrawerStore/DrawerStore.ts index 4a0c5a473..c8fba6d6d 100644 --- a/src/UI/Store/DoorDrawerStore/DrawerStore.ts +++ b/src/UI/Store/DoorDrawerStore/DrawerStore.ts @@ -2,9 +2,9 @@ import { observable } from "mobx"; import { safeEval } from "../../../Common/eval"; import { DefaultDrawerOption } from "../../../Editor/DefaultConfig"; import { IConfigOption } from "../../Components/Board/UserConfigComponent"; -import { IUiOption } from "../BoardInterface"; import { FixErrorDataConfig } from "../BoardStore"; import { IDrawerConfigOption } from "../DoorInterface"; +import { IUiOption } from "../OptionInterface/IOptionInterface"; import { DoorDrawerStore } from "./DoorDrawerStore"; export class DrawerStore extends DoorDrawerStore { diff --git a/src/UI/Store/DoorDrawerStore/HingeStore.ts b/src/UI/Store/DoorDrawerStore/HingeStore.ts index 26428f687..6d2e3f937 100644 --- a/src/UI/Store/DoorDrawerStore/HingeStore.ts +++ b/src/UI/Store/DoorDrawerStore/HingeStore.ts @@ -6,9 +6,9 @@ import { DefaultHingeOption } from "../../../Editor/DefaultConfig"; import { IConfigOption } from "../../Components/Board/UserConfigComponent"; import { AppConfirm } from "../../Components/Common/Confirm"; import { AppToaster } from "../../Components/Toaster"; -import { IUiOption } from "../BoardInterface"; import { BoardStore } from "../BoardStore"; import { IHingeConfigOption } from "../DoorInterface"; +import { IUiOption } from "../OptionInterface/IOptionInterface"; import { IHingeRule } from "./DoorStore"; export class HingeStore extends BoardStore diff --git a/src/UI/Store/DoorInterface.ts b/src/UI/Store/DoorInterface.ts index 8f81a385d..507b4aac6 100644 --- a/src/UI/Store/DoorInterface.ts +++ b/src/UI/Store/DoorInterface.ts @@ -1,4 +1,4 @@ -import { IBaseOption } from "./BoardInterface"; +import { IBaseOption } from "./OptionInterface/IOptionInterface"; import { ITemplateParam } from "./RightPanelStore/ITemplateParam"; export interface IDoorAndDrawerConfigOption extends IBaseOption diff --git a/src/UI/Store/HSInterface.ts b/src/UI/Store/HSInterface.ts index 5e3e32f02..a047f80a6 100644 --- a/src/UI/Store/HSInterface.ts +++ b/src/UI/Store/HSInterface.ts @@ -1,5 +1,5 @@ import { ECompareType } from "./BoardFindInterface"; -import { IBaseOption } from "./BoardInterface"; +import { IBaseOption } from "./OptionInterface/IOptionInterface"; export interface IHSOption extends IBaseOption { diff --git a/src/UI/Store/KuGanStore.ts b/src/UI/Store/KuGanStore.ts index 0a01ce5ed..7c082c27d 100644 --- a/src/UI/Store/KuGanStore.ts +++ b/src/UI/Store/KuGanStore.ts @@ -1,12 +1,12 @@ import { action, observable, reaction, toJS } from "mobx"; import { appCache } from "../../Common/AppCache"; import { DataAdapter } from "../../Common/DataAdapter"; -import { safeEval } from "../../Common/eval"; import { ConfigUrls } from "../../Common/HostUrl"; import { PostJson, RequestStatus } from "../../Common/Request"; +import { safeEval } from "../../Common/eval"; import { DefaultKuGanOption } from "../../Editor/DefaultConfig"; import { IKuGangDrawOption } from "../Components/Template/TemplateInterface"; -import { IUiOption } from "./BoardInterface"; +import { IUiOption } from "./OptionInterface/IOptionInterface"; export class KuGanStore { diff --git a/src/UI/Store/LatticeInterface.ts b/src/UI/Store/LatticeInterface.ts index 0e0d7bf04..bde5b02aa 100644 --- a/src/UI/Store/LatticeInterface.ts +++ b/src/UI/Store/LatticeInterface.ts @@ -1,4 +1,4 @@ -import { IBaseOption } from "./BoardInterface"; +import { IBaseOption } from "./OptionInterface/IOptionInterface"; export enum ELatticeArrayType { diff --git a/src/UI/Store/OptionInterface/AutoDimBrsOption.ts b/src/UI/Store/OptionInterface/AutoDimBrsOption.ts new file mode 100644 index 000000000..256b63ac1 --- /dev/null +++ b/src/UI/Store/OptionInterface/AutoDimBrsOption.ts @@ -0,0 +1,28 @@ +import { IBaseOption } from "./IOptionInterface"; + +export enum ForBoardNameType +{ + Same = "same", + NoSame = "nosame", + Include = "include", + NoInclude = "noinclude" +} + +export interface IAutoDimBrsOption extends IBaseOption +{ + total: boolean; //整体标注 + out: boolean; //柜外标注(前视图标注) + inW: boolean; //柜内宽标注 + inH: boolean; //柜内高标注 + noRepeat: boolean; //删除重复 + noSmSize: boolean; //过滤小尺寸 + noAppointSize: boolean; //过滤指定尺寸 + noInSize: boolean; //空间小于该数值时 不标注内空 + noShowMinSize: number; + noShowMinInSize: number; + noShowAppointSizes: string; + useParseGroups: string; + forBoardName: boolean; + forBoardNameStr: string; + forBoardNameType: ForBoardNameType; +} diff --git a/src/UI/Store/OptionInterface/BoardBatchCurtailOption .ts b/src/UI/Store/OptionInterface/BoardBatchCurtailOption .ts new file mode 100644 index 000000000..16de35420 --- /dev/null +++ b/src/UI/Store/OptionInterface/BoardBatchCurtailOption .ts @@ -0,0 +1,18 @@ +import { IBaseOption } from "./IOptionInterface"; + +export enum CurtailType +{ + PerBr = "0", + Total = "1", + OCS = "2" +} + +export interface IBoardBatchCurtailOption extends IBaseOption +{ + type: CurtailType; + front: number; + back: number; + left: number; + right: number; + moveBrs: boolean; +} diff --git a/src/UI/Store/OptionInterface/BoardProcessOption.ts b/src/UI/Store/OptionInterface/BoardProcessOption.ts new file mode 100644 index 000000000..fd9eeed38 --- /dev/null +++ b/src/UI/Store/OptionInterface/BoardProcessOption.ts @@ -0,0 +1,34 @@ +import { FaceDirection } from "../../../Add-on/DrawDrilling/DrillType"; +import { EBoardKeyList } from "../../../Common/BoardKeyList"; +import { ComposingType, LinesType } from "../../../DatabaseServices/Entity/BoardInterface"; +import { ObjectId } from "../../../DatabaseServices/ObjectId"; +import { IHighSealedItem } from "./IHighSealedItem"; +import { IBaseOption } from "./IOptionInterface"; + +export interface BoardProcessOption extends IBaseOption +{ + [EBoardKeyList.RoomName]?: string; + [EBoardKeyList.CabinetName]?: string; //柜名 + [EBoardKeyList.BrMat]?: string; //板材名 + [EBoardKeyList.Mat]?: string; //材料 + [EBoardKeyList.Color]?: string; + [EBoardKeyList.Lines]?: LinesType; //纹路 + [EBoardKeyList.ProcessGroup]?: ObjectId[]; //纹路 + [EBoardKeyList.BigHole]?: FaceDirection; //大孔面 + [EBoardKeyList.DrillType]?: string; //排钻类型 + [EBoardKeyList.ComposingFace]?: ComposingType; //排版面 + [EBoardKeyList.HighSealed]?: IHighSealedItem[]; //封边数据 + [EBoardKeyList.UpSealed]?: string; //封边上下左右 + [EBoardKeyList.DownSealed]?: string; + [EBoardKeyList.LeftSealed]?: string; + [EBoardKeyList.RightSealed]?: string; + [EBoardKeyList.SpliteHeight]?: string; //拆单高/宽/厚 + [EBoardKeyList.SpliteWidth]?: string; + [EBoardKeyList.SpliteThickness]?: string; + + highDrill?: string[]; + frontDrill: boolean; + backDrill: boolean; + remarks: [string, string][]; + useBoardProcessOption?: boolean; //使用周围板 +} diff --git a/src/UI/Store/OptionInterface/ClosingStripOption.ts b/src/UI/Store/OptionInterface/ClosingStripOption.ts new file mode 100644 index 000000000..5d7ecd310 --- /dev/null +++ b/src/UI/Store/OptionInterface/ClosingStripOption.ts @@ -0,0 +1,18 @@ +import { BrRelativePos } from "../../../DatabaseServices/Entity/BoardInterface"; +import { BoardConfigOption } from "./IOptionInterface"; + +export enum StripType +{ + H = "h", + V = "v" +} + +export interface ClosingStripOption extends BoardConfigOption +{ + boardRelative: BrRelativePos; + striptype: StripType; //收口条类型 + frontShrink: number; //前缩 + isDrawFuZhu: boolean; //是否绘制辅助条 + fzWidth: number; + fzThickness: number; +} diff --git a/src/UI/Store/OptionInterface/IHighSealedItem.ts b/src/UI/Store/OptionInterface/IHighSealedItem.ts new file mode 100644 index 000000000..b1ed85b57 --- /dev/null +++ b/src/UI/Store/OptionInterface/IHighSealedItem.ts @@ -0,0 +1,11 @@ +export interface IHighSealedItem +{ + size: number; +} + +export interface ISealingData extends IHighSealedItem +{ + length: number; + type?: string; + shop?: string; +} diff --git a/src/UI/Store/OptionInterface/IOptionInterface.ts b/src/UI/Store/OptionInterface/IOptionInterface.ts new file mode 100644 index 000000000..803421c72 --- /dev/null +++ b/src/UI/Store/OptionInterface/IOptionInterface.ts @@ -0,0 +1,341 @@ +import { BoardOpenDir, BoardType, BrRelativePos } from "../../../DatabaseServices/Entity/BoardInterface"; +import { RenderType } from "../../../GraphicsSystem/RenderType"; +import { BehindHeightPositon, RadioType, ViewDirection } from "./OptionEnum"; + +export interface IBaseOption +{ + version?: number; +} + +/** + *板件参数 + */ +export interface BoardConfigOption extends IBaseOption +{ + type: BoardType; + name: string; + thickness?: number; + height?: number; + width?: number; + openDir?: BoardOpenDir; +} + +export interface RightPlaneLightOption +{ + version: number; + ShowHemiLight: boolean; + SkyLightColor: string; + SkyLightIntensity: number; + SkyLightIndirectLightingIntensity: number; + ShowSunLight: boolean; + SunLightIntensity: number; + SunLightIndirectLightingIntensity: number; + SunLightColor: string; + SunLightTemperature: number; + SunLightElevationDeg: number; + SunLightRotateDeg: number; + ShowExposure: boolean; + AutoExposure: boolean; + ExposureCompensation: number; + SunTime: string; +} + +export interface ModifyTextsConfigOption +{ + changeTexts: [string, string][]; +} + +export interface MaterialMapOption +{ + id: string; //引用材质ID + kjlName: string; //酷家乐基础材质名称 +} + +export interface SideBoardOption extends BoardConfigOption +{ + spaceSize?: number; //空间宽度 + leftShrink: number; //左侧板内缩 + rightShrink: number; +} +/** + *背板参数 + * + * @export + * @interface BehindBoardOption + * @extends {BoardConfigOption} + */ + +export interface BehindBoardOption extends BoardConfigOption +{ + //上下左右延伸 + leftExt: number; + rightExt: number; + topExt: number; + bottomExt: number; + //板件位置 + boardPosition: BehindHeightPositon; + moveDist: number; + + spaceSize?: number; + count?: number; + //板件相对位置 + boardRelative?: BrRelativePos; + calcHeight: string; //高度表达式 + calcSpaceSize: string; + calcMoveDist: string; +} +/** + *层板参数 + * + * @export + * @interface LayerBoardOption + * @extends {BoardConfigOption} + */ + +export interface LayerBoardOption extends BoardConfigOption +{ + calcHeight: string; + frontShrink: number; + leftShrink: number; + rightShrink: number; + isTotalLength: boolean; + isActive: boolean; + spaceSize?: number; + count?: number; + boardRelative?: BrRelativePos; + calcSpaceSize: string; + calcFrontShrink: string; + calcLeftShrink: string; + calcRightShrink: string; +} +/** + *层板钉参数 + * + * @export + * @interface LayerNailOption + */ + +export interface LayerNailOption extends IBaseOption +{ + isDraw: boolean; //是否绘制 + addCount: number; //增 + dist: number; + isGroup: boolean; + isInBack: boolean; //是否在背板绘制 + front: number; + behind: number; + count: number; + rad: number; + length: number; + depth: number; +} +/** + *立板参数 + */ + +export interface VerticalBoardOption extends BoardConfigOption +{ + frontShrink: number; //前缩 + bottomShrink: number; //底缩 + isTotalLength: boolean; //是否取总高 + isTotalWidth: boolean; //是否取总宽 + count?: number; + spaceSize?: number; + boardRelative?: BrRelativePos; + calcWidth: string; //板深表达式 + calcHeight: string; + calcSpaceSize: string; + calcFrontShrink: string; + calcBottomShrink: string; +} +export interface TBBoardOption extends BoardConfigOption +{ + isDraw: boolean; + frontDist: number; //前距 + behindDistance: number; //后距 + isWrapSide: boolean; //顶包侧 + useLFData: boolean; + leftExt: number; + rightExt: number; + offset: number; //上留或者下留 + isDrawFooter?: boolean; + footThickness?: number; //地脚厚 + footBehindShrink?: number; //内缩 + isDrawBackFooter?: boolean; + footerOffset?: number; + isDrawStrengthenStrip?: boolean; + divCount?: number; +} + +export interface SingleBoardOption extends BoardConfigOption +{ + rotateX: number; + rotateY: number; + rotateZ: number; + drawNumber?: number; +} + +export interface IGrooveOption extends IBaseOption +{ + grooveAddLength: string; //槽加长/宽/高 + grooveAddWidth: string; + grooveAddDepth: string; + knifeRadius?: string; +} + +export interface IShinkOption extends IBaseOption +{ + name: string; + left: number; + right: number; + front: number; + back: number; + isLREqual: boolean; + isFBEqual: boolean; +} + +export type IUiOption = { + [P in (keyof T)]: T[P] extends number ? string : T[P]; +}; + +export interface INailRule extends IBaseOption +{ + startDist: number; + endDist: number; + count: number; +} + +export interface IHightDrillOption +{ + up: string; + down: string; + left: string; + right: string; +} + +export interface IBatchModifyPanelOption extends IBaseOption +{ + length: string; + width: string; + thick: string; + position: RadioType; +} + +export type AnyObject = { [key: string]: any; }; +//见光面封边设置 + +export interface ISmoothEdgeOption extends IBaseOption +{ + smoothEdge: number; //见光面 + edge: number; //非见光面 + scale: number; //见光比例 + filterArr: string[]; // +} + +export interface IDrawBoardAutoCutOption +{ + isAutoCut: boolean; //是否自动切割 + isRelevance: boolean; //是否关联切割 +} + +export interface IKnifeProps +{ + radius: number; + angle: number; +} + +export interface CommonPanelConfigOption extends IBaseOption +{ + orderType: string; +} +export interface DatalistColumnWidthOption +{ + name: number; + date: number; + size: number; + operate: number; +} + +export interface DatalistConfigOption extends IBaseOption +{ + resizeUI: { + [key: string]: DatalistColumnWidthOption; + }; +} + +export interface TemplateManageOption extends IBaseOption +{ + isAutoCut: boolean; + isRelevance: boolean; + roomName: string; + cabName: string; + useCabName: boolean; + cabIndex?: number; + originCabName: string; + boardName?: string; + useBoardName?: boolean; + material?: string; + color?: string; + brMat?: string; + useMaterial?: boolean; + openDir?: BoardOpenDir | string; + navigationWidth: string; + showTag: boolean; + perPageCount: number; +} + +export interface WindowPanelConfigOption +{ + Length: number; //窗宽 + Height: number; //窗高 + Thick: number; //窗厚 + WindowOffGround: number; //离地 + IsBayWindow: boolean; //窗户外飘 + BayLeftIsWall?: boolean; //飘窗左侧是墙 + BayRightIsWall?: boolean; //飘窗右侧是墙 + BayDist?: number; //外飘距离 + BayLeftDist?: number; //左外飘距离 + BayMiddleDist?: number; //中外飘距离 + BayRightDist?: number; //右外飘距离 + HasWindowStone: boolean; //是否有窗台石 + StoneThick?: number; //窗台石厚度 + StoneBulge?: number; //窗台石凸出 + StoneLeftRightBulge?: number; //窗台石左右凸出 +} + +export interface IDimStyleOption extends IBaseOption +{ + dimFXLON: boolean; + dimFXL: number; + dimASZ: number; + dimGAP: number; + dimEXE: number; + dimTXT: number; + dimTAD: number; + dimALTD: number; + dimADEC: number; +} + +export interface ChangeColorByBoardMaterialOption +{ + accordThickness: boolean; + accordMaterial: boolean; + accordMaterialName: boolean; + accordMaterialColor: boolean; +} + +export interface ShareBoardInfConfigurationOption +{ + Physical2EdgeColor: number; //真实带线框颜色 + VisualStyle: RenderType; //视觉样式 + Viewport: ViewDirection; //视觉角度 + IsExportBoard: boolean; //是否导出板件 + IsExportHardware: boolean; //是否导出五金 + showBom: boolean; //是否展示物料明细 +} + +export interface ProcessingGroupOption +{ + processGroupCategory: string[]; + addAlone: boolean; +} diff --git a/src/UI/Store/OptionInterface/LightConfigOption.ts b/src/UI/Store/OptionInterface/LightConfigOption.ts new file mode 100644 index 000000000..3c7f1c70c --- /dev/null +++ b/src/UI/Store/OptionInterface/LightConfigOption.ts @@ -0,0 +1,39 @@ +import { IBaseOption } from "./IOptionInterface"; + +export interface LightConfigOption extends IBaseOption +{ + Intensity: number; + lightColor: string; + temperature: number; + IndirectLightingIntensity: number; + SpecularScale: number; + CaseShadow: boolean; +} + +export interface PointLightOption extends LightConfigOption +{ + SourceRadius: number; + SoftSourceRadius: number; + SourceLength: number; +} + +export interface SpotLightOption extends LightConfigOption +{ + Angle: number; + InnerConeAngle: number; + SourceRadius: number; + SoftSourceRadius: number; + SourceLength: number; + AttenuationRadius: number; + ShowHelper: boolean; +} + +export interface RectAreaLightOption extends LightConfigOption +{ + Width: number; + Height: number; + BarnDoorAngle: number; + BarnDoorLength: number; + AttenuationRadius: number; + ShowHelper: boolean; +} diff --git a/src/UI/Store/OptionInterface/OptionEnum.ts b/src/UI/Store/OptionInterface/OptionEnum.ts new file mode 100644 index 000000000..2bd35caf0 --- /dev/null +++ b/src/UI/Store/OptionInterface/OptionEnum.ts @@ -0,0 +1,47 @@ +/** + *背板靠上还是靠下 + * + * @export + * @enum {number} + */ +export enum BehindHeightPositon +{ + ForTop = "top", + ForBottom = "bottom", + AllHeight = "all" //总高 +} +/** + *板件相对位置 + * + * @export + * @enum {number} + */ + +export enum ViewDirection +{ + Left = 1, + Right = 2, + Up = 3, + Front = 4, + Bottom = 5, + Back = 6, + Southwest = 7 +} + +export enum ViewportPosition +{ + Vertical = "vertical", + Horizontal = "horizontal", + Left = "left", + Right = "right", + Bottom = "bottom", + Top = "top" +} + +export enum RadioType +{ + lefttop = "1", + leftbottom = "2", + righttop = "3", + rightbottom = "4" +} diff --git a/src/UI/Store/OptionInterface/ViewportConfigOption.ts b/src/UI/Store/OptionInterface/ViewportConfigOption.ts new file mode 100644 index 000000000..495dd47fd --- /dev/null +++ b/src/UI/Store/OptionInterface/ViewportConfigOption.ts @@ -0,0 +1,29 @@ +import { RenderType } from "../../../GraphicsSystem/RenderType"; +import { ViewDirection, ViewportPosition } from "./OptionEnum"; + +export interface ViewportConfigOption +{ + view: ViewDirection; + renderType: RenderType; +} + +export interface Viewport2ConfigOption +{ + viewportPosition: ViewportPosition; + view1: ViewDirection; + view2: ViewDirection; + renderType: RenderType[]; +} + +export interface Viewport3ConfigOption +{ + viewportPosition: ViewportPosition; + view: ViewDirection[]; + renderType: RenderType[]; +} + +export interface Viewport4ConfigOption +{ + view: ViewDirection[]; + renderType: RenderType[]; +} diff --git a/src/UI/Store/Rect2WinerackStore.ts b/src/UI/Store/Rect2WinerackStore.ts index 0a66cea8d..73e35356f 100644 --- a/src/UI/Store/Rect2WinerackStore.ts +++ b/src/UI/Store/Rect2WinerackStore.ts @@ -3,8 +3,8 @@ import { EBoardKeyList } from "../../Common/BoardKeyList"; import { CheckObjectType, CheckoutValid } from "../../Common/CheckoutVaildValue"; import { DataAdapter } from "../../Common/DataAdapter"; import { IConfigOption } from "../Components/Board/UserConfigComponent"; -import { IUiOption } from "./BoardInterface"; import { IConfigStore } from "./BoardStore"; +import { IUiOption } from "./OptionInterface/IOptionInterface"; import { IR2WROption } from "./WineRackInterface"; export class Rect2WinerackStore implements IConfigStore diff --git a/src/UI/Store/RightPanelStore/DrillingStore.ts b/src/UI/Store/RightPanelStore/DrillingStore.ts index 94df45eb6..98e7d908a 100644 --- a/src/UI/Store/RightPanelStore/DrillingStore.ts +++ b/src/UI/Store/RightPanelStore/DrillingStore.ts @@ -1,5 +1,6 @@ import { Intent } from "@blueprintjs/core"; import { observable } from "mobx"; +import { DrillType } from "../../../Add-on/DrawDrilling/DrillType"; import { CommandNames } from "../../../Common/CommandNames"; import { Log, LogType } from "../../../Common/Log"; import { Board } from "../../../DatabaseServices/Entity/Board"; @@ -8,7 +9,6 @@ import { CommandWrap } from "../../../Editor/CommandMachine"; import { userConfig } from "../../../Editor/UserConfig"; import { OffsetOutlineSpNotChange } from "../../../GraphicsSystem/CalcEdgeSealing"; import { ShowLinesToaster } from "../../Components/Toaster"; -import { DrillType } from "../BoardInterface"; import { BoardEdgesEditor, Board_Editor_Key } from "./BoardEdgesEditor"; export class DrillingStore extends BoardEdgesEditor diff --git a/src/UI/Store/RightPanelStore/LightStore.ts b/src/UI/Store/RightPanelStore/LightStore.ts index 601a29f7e..db0790b57 100644 --- a/src/UI/Store/RightPanelStore/LightStore.ts +++ b/src/UI/Store/RightPanelStore/LightStore.ts @@ -4,9 +4,9 @@ import { end } from "xaop"; import { Entitys2Data } from "../../../Add-on/ExportData"; import { app } from "../../../ApplicationServices/Application"; import { EntityUpdateWrap } from "../../../Common/EntityUpdateWrap"; -import { safeEval } from "../../../Common/eval"; import { CalcSunShadowCameraExtents } from "../../../Common/LightUtils"; import { FixedNotZero } from "../../../Common/Utils"; +import { safeEval } from "../../../Common/eval"; import { CommandHistoryRecord } from "../../../DatabaseServices/CommandHistoryRecord"; import { HistorycRecord } from "../../../DatabaseServices/HistorycRecord"; import { AmbientLight } from "../../../DatabaseServices/Lights/AmbientLight"; @@ -21,12 +21,13 @@ import { TemplateRecord } from "../../../DatabaseServices/Template/TemplateRecor import { CommandWrap } from "../../../Editor/CommandMachine"; import { DefaultPointLightOption, DefaultRectAreaLightOption, DefaultRightPlaneLightOption, DefaultSpotLightOption } from "../../../Editor/DefaultConfig"; import { userConfig } from "../../../Editor/UserConfig"; -import { angle, equalv3, ZeroVec } from "../../../Geometry/GeUtils"; +import { ZeroVec, angle, equalv3 } from "../../../Geometry/GeUtils"; import { IConfigOption } from "../../Components/Board/UserConfigComponent"; import { DefaultDist } from "../../Components/RightPanel/ScenePanel"; import { SunLightStore } from "../../Components/RightPanel/SunLightStore"; -import { AnyObject, PointLightOption, RectAreaLightOption, RightPlaneLightOption, SpotLightOption } from "../BoardInterface"; import { IConfigStore } from "../BoardStore"; +import { AnyObject, RightPlaneLightOption } from "../OptionInterface/IOptionInterface"; +import { PointLightOption, RectAreaLightOption, SpotLightOption } from "../OptionInterface/LightConfigOption"; export interface LightModalState { diff --git a/src/UI/Store/RightPanelStore/Modeling2Store.ts b/src/UI/Store/RightPanelStore/Modeling2Store.ts index 51f63843e..23b3a4177 100644 --- a/src/UI/Store/RightPanelStore/Modeling2Store.ts +++ b/src/UI/Store/RightPanelStore/Modeling2Store.ts @@ -1,9 +1,10 @@ import { action, observable, toJS } from "mobx"; import { MathUtils } from "three"; +import { FaceDirection } from "../../../Add-on/DrawDrilling/DrillType"; import { I2DModeling, IKnifeInfo } from "../../../DatabaseServices/Entity/Board"; import { IConfigOption } from "../../Components/Board/UserConfigComponent"; -import { FaceDirection, IKnifeProps, IUiOption } from "../BoardInterface"; import { IConfigStore } from "../BoardStore"; +import { IKnifeProps, IUiOption } from "../OptionInterface/IOptionInterface"; export interface IKnifeInfo2 diff --git a/src/UI/Store/RightPanelStore/ModelingStore.ts b/src/UI/Store/RightPanelStore/ModelingStore.ts index 371c23262..7b73a0e9c 100644 --- a/src/UI/Store/RightPanelStore/ModelingStore.ts +++ b/src/UI/Store/RightPanelStore/ModelingStore.ts @@ -1,10 +1,11 @@ import { action, observable, toJS } from "mobx"; +import { FaceDirection } from "../../../Add-on/DrawDrilling/DrillType"; import { FixedNotZero } from "../../../Common/Utils"; import { IModeling } from "../../../DatabaseServices/Entity/Board"; import { IConfigOption } from "../../Components/Board/UserConfigComponent"; import { IModelingItem } from "../../Components/RightPanel/ModelingComponent"; -import { FaceDirection, IUiOption } from "../BoardInterface"; import { IConfigStore } from "../BoardStore"; +import { IUiOption } from "../OptionInterface/IOptionInterface"; export class ModelingStore implements IConfigStore { diff --git a/src/UI/Store/RightPanelStore/RightPanelStore.ts b/src/UI/Store/RightPanelStore/RightPanelStore.ts index bebcea444..3caf568df 100644 --- a/src/UI/Store/RightPanelStore/RightPanelStore.ts +++ b/src/UI/Store/RightPanelStore/RightPanelStore.ts @@ -5,7 +5,7 @@ import { app } from "../../../ApplicationServices/Application"; import { Board } from "../../../DatabaseServices/Entity/Board"; import { SelectSetBase } from "../../../Editor/SelectBase"; import { RightTabId } from "../../Components/RightPanel/RightPanel"; -import { IKnifeProps } from "../BoardInterface"; +import { IKnifeProps } from "../OptionInterface/IOptionInterface"; import { DrillingStore } from "./DrillingStore"; import { LightStore } from "./LightStore"; import { Modeling2Store } from "./Modeling2Store"; diff --git a/src/UI/Store/RightPanelStore/SealingStore.ts b/src/UI/Store/RightPanelStore/SealingStore.ts index a08a7df6d..1337e8b5b 100644 --- a/src/UI/Store/RightPanelStore/SealingStore.ts +++ b/src/UI/Store/RightPanelStore/SealingStore.ts @@ -9,8 +9,8 @@ import { CommandWrap } from "../../../Editor/CommandMachine"; import { GetBoardHighSeal, GetBoardSealingCurves, GetSealedBoardContour, SetBoardTopDownLeftRightSealData } from "../../../GraphicsSystem/CalcEdgeSealing"; import { IConfigOption } from "../../Components/Board/UserConfigComponent"; import { AppToaster, ShowLinesToaster } from "../../Components/Toaster"; -import { IHighSealedItem } from "../BoardInterface"; import { IConfigStore } from "../BoardStore"; +import { IHighSealedItem } from "../OptionInterface/IHighSealedItem"; import { BoardEdgesEditor, Board_Editor_Key } from "./BoardEdgesEditor"; export class SealingStore extends BoardEdgesEditor implements IConfigStore diff --git a/src/UI/Store/TemplateManageStore.ts b/src/UI/Store/TemplateManageStore.ts index 165e52fa6..30e33eed8 100644 --- a/src/UI/Store/TemplateManageStore.ts +++ b/src/UI/Store/TemplateManageStore.ts @@ -7,7 +7,7 @@ import { GetIndexDBID } from "../../Common/Utils"; import { IndexedDbStore, StoreName } from "../../IndexedDb/IndexedDbStore"; import { BoardModalType } from "../Components/Board/BoardModalType"; import { ITemplateManageOption } from "../Components/Template/TemplateComponent"; -import { TemplateManageOption } from "./BoardInterface"; +import { TemplateManageOption } from "./OptionInterface/IOptionInterface"; import { userConfigStore } from "./UserConfigStore"; export class TempalteManageStore extends Singleton diff --git a/src/UI/Store/UpdateBoardInfoStore.ts b/src/UI/Store/UpdateBoardInfoStore.ts index ca4eae0e7..1079c6c9b 100644 --- a/src/UI/Store/UpdateBoardInfoStore.ts +++ b/src/UI/Store/UpdateBoardInfoStore.ts @@ -1,12 +1,13 @@ import { action, observable, toJS } from "mobx"; +import { DrillType, FaceDirection } from "../../Add-on/DrawDrilling/DrillType"; import { EBoardKeyList } from "../../Common/BoardKeyList"; import { CheckObjectType, CheckoutValid } from "../../Common/CheckoutVaildValue"; +import { LinesType } from "../../DatabaseServices/Entity/BoardInterface"; import { DefaultUpdateInfoOption } from "../../Editor/DefaultConfig"; import { userConfig } from "../../Editor/UserConfig"; import { IUpdateBoardInfosOption } from "../Components/Board/UpdateBoardInfointerface"; import { IConfigOption } from "../Components/Board/UserConfigComponent"; import { DRILL_KEYS } from "./BoardFindInterface"; -import { DrillType, FaceDirection, LinesType } from "./BoardInterface"; import { BoardStore } from "./BoardStore"; export class UpdateBoardInfosStore extends BoardStore diff --git a/src/UI/Store/UserConfigStore.tsx b/src/UI/Store/UserConfigStore.tsx index 6c81544c8..e5b8c8a9e 100644 --- a/src/UI/Store/UserConfigStore.tsx +++ b/src/UI/Store/UserConfigStore.tsx @@ -31,12 +31,12 @@ import { AppToaster, ToasterValueError } from "../Components/Toaster"; import RoomBaseParamsStore from "../Components/ToolBar/ModifyModel/RoomBaseParamsStore"; import ResourceStore from "../Components/ToolBar/ResourceLibrary/RsourceStore"; import { bbsEditorStore } from "./BBSEditorStore"; -import { AnyObject, CommonPanelConfigOption, DatalistConfigOption } from "./BoardInterface"; import { IConfigStore } from "./BoardStore"; import { DoorStore } from "./DoorDrawerStore/DoorStore"; import { DrawerStore } from "./DoorDrawerStore/DrawerStore"; import { DownPanelStore } from "./DownPanelStore"; import { DrillConfigSortType, DrillStore } from "./DrillStore"; +import { AnyObject, CommonPanelConfigOption, DatalistConfigOption } from "./OptionInterface/IOptionInterface"; import { RightPanelStore } from "./RightPanelStore/RightPanelStore"; import { TopPanelStore } from "./TopPanelStore"; import { updateBoardInfoStore } from "./UpdateBoardInfoStore"; diff --git a/src/UI/Store/WineRackInterface.ts b/src/UI/Store/WineRackInterface.ts index c77e287fd..3258bd33b 100644 --- a/src/UI/Store/WineRackInterface.ts +++ b/src/UI/Store/WineRackInterface.ts @@ -1,5 +1,5 @@ import { EBoardKeyList } from "../../Common/BoardKeyList"; -import { IBaseOption } from "./BoardInterface"; +import { IBaseOption } from "./OptionInterface/IOptionInterface"; export enum EWineRackType { diff --git a/src/UI/Store/drillInterface.ts b/src/UI/Store/drillInterface.ts index b07c6431e..d1c95e9b3 100644 --- a/src/UI/Store/drillInterface.ts +++ b/src/UI/Store/drillInterface.ts @@ -1,4 +1,4 @@ -import { IBaseOption } from "./BoardInterface"; +import { IBaseOption } from "./OptionInterface/IOptionInterface"; export enum SpacingType {