diff --git a/__test__/FeedingToolPath/qiannianzhou_lvzhijia.test.ts b/__test__/FeedingToolPath/qiannianzhou_lvzhijia.test.ts index f63d7bb0c..e87bfc864 100644 --- a/__test__/FeedingToolPath/qiannianzhou_lvzhijia.test.ts +++ b/__test__/FeedingToolPath/qiannianzhou_lvzhijia.test.ts @@ -3,7 +3,7 @@ import "../Utils/jest.util"; import { LoadBoardsFromFileData } from "../Utils/LoadEntity.util"; import { testPathCount } from "./testPathCount"; -export let feedUtil = FeedingToolPath.GetInstance() as FeedingToolPath; +export let feedUtil = FeedingToolPath.GetInstance(); test("千年舟 绿色健康之家", () => { diff --git a/__test__/FeedingToolPath/testPathCount.ts b/__test__/FeedingToolPath/testPathCount.ts index 72635923a..24b6432d2 100644 --- a/__test__/FeedingToolPath/testPathCount.ts +++ b/__test__/FeedingToolPath/testPathCount.ts @@ -1,6 +1,6 @@ import { Board } from "../../src/DatabaseServices/Entity/Board"; import { FeedingToolPath } from "../../src/GraphicsSystem/ToolPath/FeedingToolPath"; -export let feedUtil = FeedingToolPath.GetInstance() as FeedingToolPath; +export let feedUtil = FeedingToolPath.GetInstance(); export function testPathCount(br: Board, count?: number) { diff --git a/__test__/Winerack/winerack.test.ts b/__test__/Winerack/winerack.test.ts index 08748a261..b13da2c59 100644 --- a/__test__/Winerack/winerack.test.ts +++ b/__test__/Winerack/winerack.test.ts @@ -7,8 +7,8 @@ import { ISpaceParse } from "../../src/Geometry/SpaceParse/ISpaceParse"; import { EFullDir, EFullType, EWineRackStyle, EWineRackType, EWRackArrayType, IWineRackOption } from "../../src/UI/Store/WineRackInterface"; import "../Utils/jest.util"; import { LoadEntityFromFileData } from "../Utils/LoadEntity.util"; -const UprightTool = DrawUprightWineRackTool.GetInstance() as DrawUprightWineRackTool; -const ObliqueTool = DrawObliqueWineRackTool.GetInstance() as DrawObliqueWineRackTool; +const UprightTool = DrawUprightWineRackTool.GetInstance(); +const ObliqueTool = DrawObliqueWineRackTool.GetInstance(); const option: IWineRackOption = { type: EWineRackType.Oblique, diff --git a/src/Add-on/999.ts b/src/Add-on/999.ts index 6a36206e0..952637692 100644 --- a/src/Add-on/999.ts +++ b/src/Add-on/999.ts @@ -10,7 +10,7 @@ export class Command_999 implements Command { async exec() { - let fileServer = FileServer.GetInstance() as FileServer; + let fileServer = FileServer.GetInstance(); if (!fileServer.m_CurFileId) { AppToaster.show({ diff --git a/src/Add-on/ActivityLayerBoard.ts b/src/Add-on/ActivityLayerBoard.ts index 9d1a44314..e52fa7d3f 100644 --- a/src/Add-on/ActivityLayerBoard.ts +++ b/src/Add-on/ActivityLayerBoard.ts @@ -17,7 +17,7 @@ export class ActicityLayerBoard implements Command { async exec() { - const store = ActivityLayerBoardStore.GetInstance() as ActivityLayerBoardStore; + const store = ActivityLayerBoardStore.GetInstance(); app.Editor.ModalManage.RenderModal(ActivityLayerBoard, { store }); let res = await app.Editor.ModalManage.Wait(); diff --git a/src/Add-on/Batch/BatchModifySealOrDrill.ts b/src/Add-on/Batch/BatchModifySealOrDrill.ts index 28cff9bd3..529d238e9 100644 --- a/src/Add-on/Batch/BatchModifySealOrDrill.ts +++ b/src/Add-on/Batch/BatchModifySealOrDrill.ts @@ -47,7 +47,7 @@ export class BatchModify implements Command if (keyRes.Status !== PromptStatus.Keyword) return; - const store = RightPanelStore.GetInstance() as RightPanelStore; + const store = RightPanelStore.GetInstance(); store.m_IsShow = true; if (keyRes.StringResult === "S") { diff --git a/src/Add-on/BatchModifyPanel.ts b/src/Add-on/BatchModifyPanel.ts index 4e1b8a6ea..5c1138eaa 100644 --- a/src/Add-on/BatchModifyPanel.ts +++ b/src/Add-on/BatchModifyPanel.ts @@ -14,7 +14,7 @@ export class BatchModifyPanel implements Command { async exec() { - let store = BatchModifyPanelStore.GetInstance() as BatchModifyPanelStore; + let store = BatchModifyPanelStore.GetInstance(); let enRes = await app.Editor.GetSelection({ Msg: "选择需要修改的板件", diff --git a/src/Add-on/BoardBatchCurtail.ts b/src/Add-on/BoardBatchCurtail.ts index 90ead600f..b19d39e95 100644 --- a/src/Add-on/BoardBatchCurtail.ts +++ b/src/Add-on/BoardBatchCurtail.ts @@ -36,7 +36,7 @@ export class BoardBatchCurtail implements Command { async exec() { - let store = BoardBatchCurtailStore.GetInstance() as BoardBatchCurtailStore; + let store = BoardBatchCurtailStore.GetInstance(); let enRes = await app.Editor.GetSelection({ Msg: "选择需要修改的板件", diff --git a/src/Add-on/BoardCutting/CuttingUtils2.ts b/src/Add-on/BoardCutting/CuttingUtils2.ts index b24b3b986..629801dc6 100644 --- a/src/Add-on/BoardCutting/CuttingUtils2.ts +++ b/src/Add-on/BoardCutting/CuttingUtils2.ts @@ -10,7 +10,7 @@ import { Box3Ext } from "../../Geometry/Box"; export function CuttingBoardByBoard(meats: Board[], knifs: Board[], isRelevance = true) { // //进度条 - // let down = DownPanelStore.GetInstance() as DownPanelStore; + // let down = DownPanelStore.GetInstance(); // down.StartProgress("切割1:"); for (let i = 0; i < meats.length; i++) @@ -89,7 +89,7 @@ export async function CuttingBoardByHardware(meats: Board[], hardwares: Hardware } // //进度条 - // let down = DownPanelStore.GetInstance() as DownPanelStore; + // let down = DownPanelStore.GetInstance(); // down.StartProgress("切割2:"); for (let i = 0; i < meats.length; i++) diff --git a/src/Add-on/BoardCutting/ReferenceCutting.ts b/src/Add-on/BoardCutting/ReferenceCutting.ts index 1f5f92539..cfcc6b473 100644 --- a/src/Add-on/BoardCutting/ReferenceCutting.ts +++ b/src/Add-on/BoardCutting/ReferenceCutting.ts @@ -53,7 +53,7 @@ export class ReferenceCutting implements Command //偏移量 let offset: number; //对话框 设置偏移类型 - let referenceCuttingStore = ReferenceCuttingStore.GetInstance() as ReferenceCuttingStore; + let referenceCuttingStore = ReferenceCuttingStore.GetInstance(); let option = referenceCuttingStore.m_Option; option.halfThickness = brKnife.Thickness / 2; option.boardType = brKnife.BoardType; diff --git a/src/Add-on/BoardFindModify.ts b/src/Add-on/BoardFindModify.ts index 675d8de9b..ee48e3de6 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"; @@ -30,7 +30,7 @@ export class BoardFindModify implements Command private isModifyHwMatrial = false; async exec() { - const store = BoardFindStore.GetInstance() as BoardFindStore; + const store = BoardFindStore.GetInstance(); app.Editor.ModalManage.RenderModeless(BoardFindModifyModal, { store }); app.Editor.SelectCtrl.Cancel(); diff --git a/src/Add-on/CheckHoles.ts b/src/Add-on/CheckHoles.ts index 6af398eb9..e06c1a836 100644 --- a/src/Add-on/CheckHoles.ts +++ b/src/Add-on/CheckHoles.ts @@ -16,7 +16,7 @@ export class CheckHoles implements Command { async exec() { - const drillTool = DrawDrillingTool.GetInstance() as DrawDrillingTool; + const drillTool = DrawDrillingTool.GetInstance(); let brRes = await app.Editor.GetSelection({ Msg: "选择要检查排钻碰撞的板件", @@ -160,7 +160,7 @@ export class CheckHoles implements Command } private IsCollsion(boxlist: Box3Ext[][], boxlist2: Box3Ext[][]) { - const drillTool = DrawDrillingTool.GetInstance() as DrawDrillingTool; + const drillTool = DrawDrillingTool.GetInstance(); for (let boxs of boxlist) { diff --git a/src/Add-on/CheckModeling.ts b/src/Add-on/CheckModeling.ts index e23249421..ccca52800 100644 --- a/src/Add-on/CheckModeling.ts +++ b/src/Add-on/CheckModeling.ts @@ -30,7 +30,7 @@ export class CheckModeling implements Command brs.push(...en.SplitBoards); } - let feedingTool = FeedingToolPath.GetInstance() as FeedingToolPath; + let feedingTool = FeedingToolPath.GetInstance(); let errGrooves: ExtrudeSolid[] = []; let errHoles: ExtrudeHole[] = []; diff --git a/src/Add-on/Command_Option.ts b/src/Add-on/Command_Option.ts index 3815c55e6..708495b49 100644 --- a/src/Add-on/Command_Option.ts +++ b/src/Add-on/Command_Option.ts @@ -7,7 +7,7 @@ export class Command_Options implements Command constructor(private selectedTabId: EOptionTabId) { } async exec() { - let OptionStore = ConfigStore.GetInstance() as ConfigStore; + let OptionStore = ConfigStore.GetInstance(); app.Editor.ModalManage.RenderModal(ConfigDialog, { store: OptionStore, selectedTabId: this.selectedTabId }); } } diff --git a/src/Add-on/DrawBoard/DrawClosingStrip.ts b/src/Add-on/DrawBoard/DrawClosingStrip.ts index 2775b7d39..7df0ade9f 100644 --- a/src/Add-on/DrawBoard/DrawClosingStrip.ts +++ b/src/Add-on/DrawBoard/DrawClosingStrip.ts @@ -62,7 +62,7 @@ export class DrawClosingStrip implements Command }); //store初始化 - let store = ClosingStripStore.GetInstance() as ClosingStripStore; + let store = ClosingStripStore.GetInstance(); store.GetBoardProcessOption(boards[0]);//设置房名和柜名(这个是个神奇的特性 默认使用周围板的板名和柜名) store.ChangeCabinetName();//修改柜名(柜名+收口条 有的用户不喜欢这个) diff --git a/src/Add-on/DrawBoard/DrawDoor.ts b/src/Add-on/DrawBoard/DrawDoor.ts index f7c02fe63..621dba923 100644 --- a/src/Add-on/DrawBoard/DrawDoor.ts +++ b/src/Add-on/DrawBoard/DrawDoor.ts @@ -23,7 +23,7 @@ export class DrawDoor implements Command let spaceParse = selectSpace.SpaceParse; let size = spaceParse.Size; - let store = DoorStore.GetInstance() as DoorStore; + let store = DoorStore.GetInstance(); if (spaceParse.Boards.length > 0) { const surroundOption = spaceParse.Boards[0].BoardProcessOption; diff --git a/src/Add-on/DrawBoard/DrawDrawer.ts b/src/Add-on/DrawBoard/DrawDrawer.ts index d8749fdfc..723e8037e 100644 --- a/src/Add-on/DrawBoard/DrawDrawer.ts +++ b/src/Add-on/DrawBoard/DrawDrawer.ts @@ -2,10 +2,10 @@ import { toJS } from "mobx"; import { Box3 } from "three"; import { app } from "../../ApplicationServices/Application"; import { EBoardKeyList } from "../../Common/BoardKeyList"; +import { safeEval } from "../../Common/eval"; import { Log, LogType } from "../../Common/Log"; import { DuplicateRecordCloning } from "../../Common/Status"; import { FixedNotZero } from "../../Common/Utils"; -import { safeEval } from "../../Common/eval"; import { Board } from "../../DatabaseServices/Entity/Board"; import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity"; import { HardwareTopline } from "../../DatabaseServices/Hardware/HardwareTopline"; @@ -40,7 +40,7 @@ export class DrawDrawrer implements Command let spaceParse = selectSpace.SpaceParse; let size = spaceParse.Size; - let store = DrawerStore.GetInstance() as DrawerStore; + let store = DrawerStore.GetInstance(); if (spaceParse.Boards.length > 0) store.m_Option.boardName = spaceParse.Boards[0].BoardProcessOption.cabinetName; store.totalHeight = safeEval(FixedNotZero(size.z, 2)); diff --git a/src/Add-on/DrawBoard/DrawLeftRightBoard.ts b/src/Add-on/DrawBoard/DrawLeftRightBoard.ts index 9efaf09d8..ee49d07d5 100644 --- a/src/Add-on/DrawBoard/DrawLeftRightBoard.ts +++ b/src/Add-on/DrawBoard/DrawLeftRightBoard.ts @@ -13,7 +13,7 @@ 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 { ZeroVec, equalv3 } from '../../Geometry/GeUtils'; +import { equalv3, ZeroVec } from '../../Geometry/GeUtils'; import { PointSelectSpaceClamp } from '../../Geometry/SpaceParse/PointSelectSpaceClamp'; import { BoardModal } from '../../UI/Components/Board/BoardModal'; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; @@ -25,7 +25,7 @@ export class DrawLeftRight implements Command { async exec() { - let store = SideBoardStore.GetInstance() as SideBoardStore; + let store = SideBoardStore.GetInstance(); app.Editor.ModalManage.RenderModeless(BoardModal, { store, type: BoardModalType.LR, helpUrlName: CommandNames.LRBoard }); @@ -41,7 +41,7 @@ export class DrawLeftRight implements Command } private GetLRBoards() { - let store = SideBoardStore.GetInstance() as SideBoardStore; + let store = SideBoardStore.GetInstance(); let data = store.m_Option; let height = data.height; let width = data.width; @@ -60,7 +60,7 @@ export class DrawLeftRight implements Command } private InsertByPoint = async () => { - let store = SideBoardStore.GetInstance() as SideBoardStore; + let store = SideBoardStore.GetInstance(); let data = store.m_Option; let height = data.height; let width = data.width; @@ -236,7 +236,7 @@ export class DrawLeftRight implements Command Log("请选择有效板件", LogType.Error); return; } - let store = SideBoardStore.GetInstance() as SideBoardStore; + let store = SideBoardStore.GetInstance(); let data = store.m_Option; let thickness = data.thickness; diff --git a/src/Add-on/DrawBoard/DrawSingleBoard.ts b/src/Add-on/DrawBoard/DrawSingleBoard.ts index 90f10f350..5c70b2095 100644 --- a/src/Add-on/DrawBoard/DrawSingleBoard.ts +++ b/src/Add-on/DrawBoard/DrawSingleBoard.ts @@ -14,7 +14,7 @@ export class DrawSingleBoard implements Command { async exec() { - let store = SingleBoardStore.GetInstance() as SingleBoardStore; + let store = SingleBoardStore.GetInstance(); app.Editor.ModalManage.RenderModeless(BoardModal, { store, type: BoardModalType.Sg, helpUrlName: CommandNames.SingleBoard }); app.Editor.ModalManage.SetCallback(async () => diff --git a/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts b/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts index e0afd4233..da92c3986 100644 --- a/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts +++ b/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts @@ -1,8 +1,8 @@ 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 { ExtrudeSolid } from "../../DatabaseServices/Entity/Extrude"; import { Command } from "../../Editor/CommandMachine"; @@ -21,7 +21,7 @@ export class DrawSpecialShapedBoard implements Command if (useCurvesMap?.size) { - const store = SpecialShapeStore.GetInstance() as SpecialShapeStore; + const store = SpecialShapeStore.GetInstance(); store.isMore = useCurvesMap.size > 1; if (store.isMore) diff --git a/src/Add-on/DrawBoard/DrawTopBottomBoard.ts b/src/Add-on/DrawBoard/DrawTopBottomBoard.ts index 1543a8d77..a91af44a3 100644 --- a/src/Add-on/DrawBoard/DrawTopBottomBoard.ts +++ b/src/Add-on/DrawBoard/DrawTopBottomBoard.ts @@ -17,7 +17,7 @@ export class DrawTopBottomBoard implements Command { async exec() { - let store = TopBottomBoardStore.GetInstance() as TopBottomBoardStore; + let store = TopBottomBoardStore.GetInstance(); app.Editor.ModalManage.RenderModal(BoardModal, { store, type: BoardModalType.TB, helpUrlName: CommandNames.TBBoard }); let res = await app.Editor.ModalManage.Wait(); diff --git a/src/Add-on/DrawBoard/EditorBoardTempate.ts b/src/Add-on/DrawBoard/EditorBoardTempate.ts index bfc64ff7d..fbbbdc7d3 100644 --- a/src/Add-on/DrawBoard/EditorBoardTempate.ts +++ b/src/Add-on/DrawBoard/EditorBoardTempate.ts @@ -28,22 +28,22 @@ export class EditorBoardTemplate implements Command if (template instanceof TemplateLayerBoard) { - store = LayerBoardStore.GetInstance() as LayerBoardStore; + store = LayerBoardStore.GetInstance(); type = BoardModalType.Ly; } else if (template instanceof TemplateVerticalBoard) { - store = VerticalBoardStore.GetInstance() as VerticalBoardStore; + store = VerticalBoardStore.GetInstance(); type = BoardModalType.Ve; } else if (template instanceof TemplateBehindBoard) { - store = BehindBoardStore.GetInstance() as BehindBoardStore; + store = BehindBoardStore.GetInstance(); type = BoardModalType.Be; } else if (template instanceof TemplateLeftRightBoardRecord) { - store = SideBoardStore.GetInstance() as SideBoardStore; + store = SideBoardStore.GetInstance(); type = BoardModalType.LR; config = { option: { @@ -58,7 +58,7 @@ export class EditorBoardTemplate implements Command } else if (template instanceof TemplateTopBottomBoard) { - store = TopBottomBoardStore.GetInstance() as TopBottomBoardStore; + store = TopBottomBoardStore.GetInstance(); type = BoardModalType.TB; config = { topBoardData: template.TopOption, diff --git a/src/Add-on/DrawDrilling/CheckDrawHole.ts b/src/Add-on/DrawDrilling/CheckDrawHole.ts index bd457d328..571d8f499 100644 --- a/src/Add-on/DrawDrilling/CheckDrawHole.ts +++ b/src/Add-on/DrawDrilling/CheckDrawHole.ts @@ -19,7 +19,7 @@ export class CheckDrawHole implements Command let brs = ssRes.SelectSet.SelectEntityList as Board[]; - let tool = DrawDrillingTool.GetInstance() as DrawDrillingTool; + let tool = DrawDrillingTool.GetInstance(); let result = await tool.Check(brs.slice(0, 2)); ShowLinesToaster(result.length === 0 ? ["没检查出无法排钻原因"] : result, { diff --git a/src/Add-on/DrawDrilling/DeleteDrill.ts b/src/Add-on/DrawDrilling/DeleteDrill.ts index 33bb4078c..f7f12c9c6 100644 --- a/src/Add-on/DrawDrilling/DeleteDrill.ts +++ b/src/Add-on/DrawDrilling/DeleteDrill.ts @@ -1,10 +1,10 @@ -import { Command } from "../../Editor/CommandMachine"; import { app } from "../../ApplicationServices/Application"; +import { CylinderHole, GangDrillType } from "../../DatabaseServices/3DSolid/CylinderHole"; +import { Hole } from "../../DatabaseServices/3DSolid/Hole"; import { Board } from "../../DatabaseServices/Entity/Board"; +import { Command } from "../../Editor/CommandMachine"; import { PromptStatus } from "../../Editor/PromptResult"; import { DrawDrillingTool } from "./DrawDrillingTool"; -import { CylinderHole, GangDrillType } from "../../DatabaseServices/3DSolid/CylinderHole"; -import { Hole } from "../../DatabaseServices/3DSolid/Hole"; enum EDeleteDrillType { @@ -80,7 +80,7 @@ export class DeleteDrill implements Command } return; case EDeleteDrillType.Face: - (DrawDrillingTool.GetInstance() as DrawDrillingTool).ClearExitDrilling(ens as Board[]); + DrawDrillingTool.GetInstance().ClearExitDrilling(ens as Board[]); return; case EDeleteDrillType.Nail: for (let b of ens as Board[]) diff --git a/src/Add-on/DrawDrilling/DrawDrilling.ts b/src/Add-on/DrawDrilling/DrawDrilling.ts index 46b51d730..574304dce 100644 --- a/src/Add-on/DrawDrilling/DrawDrilling.ts +++ b/src/Add-on/DrawDrilling/DrawDrilling.ts @@ -20,7 +20,7 @@ export class DrawDrilling implements Command let ens = brsRes.SelectSet.SelectEntityList as Board[]; - const tool = DrawDrillingTool.GetInstance() as DrawDrillingTool; + const tool = DrawDrillingTool.GetInstance(); await tool.ClassifyAndDrilling(ens); } diff --git a/src/Add-on/DrawDrilling/DrawDrillingTool.ts b/src/Add-on/DrawDrilling/DrawDrillingTool.ts index c2f8b6a21..655cb13a9 100644 --- a/src/Add-on/DrawDrilling/DrawDrillingTool.ts +++ b/src/Add-on/DrawDrilling/DrawDrillingTool.ts @@ -1128,7 +1128,7 @@ export class DrawDrillingTool extends Singleton private async GetSpliteBoards(brs: Board[]) { //进度条 - let down = DownPanelStore.GetInstance() as DownPanelStore; + let down = DownPanelStore.GetInstance(); down.StartProgress("分裂:"); let brList: Board[] = []; diff --git a/src/Add-on/DrawDrilling/DrillConfig.ts b/src/Add-on/DrawDrilling/DrillConfig.ts index 527bee949..d2042c351 100644 --- a/src/Add-on/DrawDrilling/DrillConfig.ts +++ b/src/Add-on/DrawDrilling/DrillConfig.ts @@ -7,7 +7,7 @@ export class DrillConfig implements Command { async exec() { - let store = DrillStore.GetInstance() as DrillStore; + let store = DrillStore.GetInstance(); app.Editor.ModalManage.RenderModal(DrillModal, { store }); } } diff --git a/src/Add-on/DrawDrilling/DrillingReactor.ts b/src/Add-on/DrawDrilling/DrillingReactor.ts index cd1f3bd69..f0838ece2 100644 --- a/src/Add-on/DrawDrilling/DrillingReactor.ts +++ b/src/Add-on/DrawDrilling/DrillingReactor.ts @@ -148,7 +148,7 @@ export class DrillingReactor brs.add(br); } - const tool = DrawDrillingTool.GetInstance() as DrawDrillingTool; + const tool = DrawDrillingTool.GetInstance(); await tool.ClassifyAndDrilling(brs); for (let br of brs) diff --git a/src/Add-on/DrawText.ts b/src/Add-on/DrawText.ts index 2d6c20194..c09a9126b 100644 --- a/src/Add-on/DrawText.ts +++ b/src/Add-on/DrawText.ts @@ -42,7 +42,7 @@ export class DrawText implements Command return; angle = aRes.Distance; } - let text = TextArea.GetInstance() as TextArea; + let text = TextArea.GetInstance(); text.StartDrawText(startPoint, height, angle, ""); await text.Wait(); } diff --git a/src/Add-on/DrawViewport.ts b/src/Add-on/DrawViewport.ts index e98b3d6a2..d2e6b7086 100644 --- a/src/Add-on/DrawViewport.ts +++ b/src/Add-on/DrawViewport.ts @@ -25,7 +25,7 @@ import { HideEntityText } from "./Viewport/OneKeyLayout"; async function GetViewportInfo(): Promise<{ p1: Vector3; p2: Vector3; ens: Entity[]; }> { - const downStore = (DownPanelStore.GetInstance() as DownPanelStore); + const downStore = DownPanelStore.GetInstance(); let bak = downStore.isLayout; downStore.isLayout = false; const SelectEns = async () => diff --git a/src/Add-on/DrawWineRack/ConfigureWineRack.ts b/src/Add-on/DrawWineRack/ConfigureWineRack.ts index be595488b..3006b256c 100644 --- a/src/Add-on/DrawWineRack/ConfigureWineRack.ts +++ b/src/Add-on/DrawWineRack/ConfigureWineRack.ts @@ -7,7 +7,7 @@ export class ConfigureWineRack implements Command { async exec() { - let store = WineRackStore.GetInstance() as WineRackStore; + let store = WineRackStore.GetInstance(); app.Editor.ModalManage.RenderModal(WineRackModal, { store }); } } diff --git a/src/Add-on/DrawWineRack/EditorWineRack.ts b/src/Add-on/DrawWineRack/EditorWineRack.ts index 60aab05a3..d1aacf8df 100644 --- a/src/Add-on/DrawWineRack/EditorWineRack.ts +++ b/src/Add-on/DrawWineRack/EditorWineRack.ts @@ -12,7 +12,7 @@ export class EditorWineRack implements Command let editorTemp = await SelectTempate("选择要编辑的酒格", t => t instanceof TemplateWineRackRecord) as TemplateWineRackRecord; if (!editorTemp) return; - const store = WineRackStore.GetInstance() as WineRackStore; + const store = WineRackStore.GetInstance(); store.EditorTemplate = editorTemp; store.UpdateOption({ option: editorTemp.Option }); app.Editor.ModalManage.RenderModal(WineRackModal, { store }); diff --git a/src/Add-on/DrawWineRack/Polyline2Winerack.ts b/src/Add-on/DrawWineRack/Polyline2Winerack.ts index d85b416f7..7e41d471d 100644 --- a/src/Add-on/DrawWineRack/Polyline2Winerack.ts +++ b/src/Add-on/DrawWineRack/Polyline2Winerack.ts @@ -36,7 +36,7 @@ export class Polyline2Winerack implements Command let plss = this.Classify(pllist.filter(c => c.IsClose)); - let tool = Rect2WinerackTool.GetInstance() as Rect2WinerackTool; + let tool = Rect2WinerackTool.GetInstance(); let ucsInv = new Matrix4().getInverse(app.Editor.UCSMatrix); diff --git a/src/Add-on/Erp/ErpCommands.ts b/src/Add-on/Erp/ErpCommands.ts index 6d5478594..63009cef6 100644 --- a/src/Add-on/Erp/ErpCommands.ts +++ b/src/Add-on/Erp/ErpCommands.ts @@ -51,7 +51,7 @@ export class ShoWYouHua implements Command { async exec() { - let store = BoardStore.GetInstance() as BoardStore; + let store = BoardStore.GetInstance(); let routeInfo: ErpRouteInfo = GetRouteInfo(ErpRoutes.优化查看); app.Editor.ModalManage.RenderModal(ErpView, { erpRoute: routeInfo, @@ -198,7 +198,7 @@ async function ExecChaiDan(chaiDanRoute: ErpRoutes) }); } - let store = BoardStore.GetInstance() as BoardStore; + let store = BoardStore.GetInstance(); if (userConfig.isMaster == false && userConfig.rights.includes('377') == false) { AppToaster.show({ @@ -350,7 +350,7 @@ async function DecomposeObject() { let selction = await GetProductsEntitys(); if (!selction) return; - let store = BoardStore.GetInstance() as BoardStore; + let store = BoardStore.GetInstance(); let routeInfo: ErpRouteInfo; routeInfo = GetRouteInfo(ErpRoutes.组件拆解); let parseData = new ErpParseData().DecomposeObject(selction.metalsList); diff --git a/src/Add-on/File/OpenHistory.ts b/src/Add-on/File/OpenHistory.ts index 08f812f13..60c1d6ee0 100644 --- a/src/Add-on/File/OpenHistory.ts +++ b/src/Add-on/File/OpenHistory.ts @@ -20,7 +20,7 @@ export class Command_OpenHistory implements Command NoHistory = true; async exec() { - let fileServer = FileServer.GetInstance() as FileServer; + let fileServer = FileServer.GetInstance(); if (!fileServer.m_CurFileId) Log("无法获得当前文件的id", LogType.Warning); diff --git a/src/Add-on/File/operLog.tsx b/src/Add-on/File/operLog.tsx index 6b9e1ca28..a9ce4eaa9 100644 --- a/src/Add-on/File/operLog.tsx +++ b/src/Add-on/File/operLog.tsx @@ -27,7 +27,7 @@ export class OperLogs implements Command async exec() { - let fid = (FileServer.GetInstance() as FileServer).m_CurFileId; + let fid = FileServer.GetInstance().m_CurFileId; if (!fid) { AppToaster.show({ diff --git a/src/Add-on/Insert.ts b/src/Add-on/Insert.ts index 979dc954f..c1de172c4 100644 --- a/src/Add-on/Insert.ts +++ b/src/Add-on/Insert.ts @@ -29,7 +29,7 @@ export class Command_Insert implements Command export async function InsertDocument(fid: string) { - let fileServer = FileServer.GetInstance() as FileServer; + let fileServer = FileServer.GetInstance(); let fileData = await fileServer.GetFileInfo(fid); @@ -48,7 +48,7 @@ export async function InsertDatabase(db: Database) { if (db.ModelSpace.Entitys.length > 0 || db.Lights.Entitys.length > 0) { - const down = DownPanelStore.GetInstance() as DownPanelStore; + const down = DownPanelStore.GetInstance(); let box = new Box3; let ens = db.ModelSpace.Entitys as Entity[]; diff --git a/src/Add-on/LatticeDrawer/DrawLatticeDrawer.ts b/src/Add-on/LatticeDrawer/DrawLatticeDrawer.ts index d599b00eb..e8dd4935e 100644 --- a/src/Add-on/LatticeDrawer/DrawLatticeDrawer.ts +++ b/src/Add-on/LatticeDrawer/DrawLatticeDrawer.ts @@ -14,7 +14,7 @@ export class DrawLattice implements Command { async exec() { - const store = LatticeDrawerStore.GetInstance() as LatticeDrawerStore; + const store = LatticeDrawerStore.GetInstance(); app.Editor.ModalManage.RenderModal(LatticeDrawer, { store }); let res = await app.Editor.ModalManage.Wait(); diff --git a/src/Add-on/LatticeDrawer/EditorLattice.ts b/src/Add-on/LatticeDrawer/EditorLattice.ts index 97d096610..bbe2f61c4 100644 --- a/src/Add-on/LatticeDrawer/EditorLattice.ts +++ b/src/Add-on/LatticeDrawer/EditorLattice.ts @@ -25,7 +25,7 @@ export class EditorLattice implements Command let brs = brRes.SelectSet.SelectEntityList as Board[]; let editorTemp = brs[0].Template.Object as TemplateLatticeRecord; - const store = LatticeDrawerStore.GetInstance() as LatticeDrawerStore; + const store = LatticeDrawerStore.GetInstance(); store.EditorTemplate = editorTemp; store.UpdateOption({ option: editorTemp.Option }); app.Editor.ModalManage.RenderModal(LatticeDrawer, { store }); diff --git a/src/Add-on/Open.ts b/src/Add-on/Open.ts index 249d01ec8..1284c9946 100644 --- a/src/Add-on/Open.ts +++ b/src/Add-on/Open.ts @@ -9,6 +9,6 @@ export class Open implements Command TopPanelStore.GetInstance().m_FileManageOpen = true; // let fid = localStorage.getItem(StoreageKeys.LastOpenFileId); // if (fid) - // (FileServer.GetInstance() as FileServer).OpenFile(fid); + // (FileServer.GetInstance()).OpenFile(fid); } } diff --git a/src/Add-on/ReOpen.ts b/src/Add-on/ReOpen.ts index 05888dd22..f55293173 100644 --- a/src/Add-on/ReOpen.ts +++ b/src/Add-on/ReOpen.ts @@ -22,7 +22,7 @@ export class ReOpen implements Command return; } - let fileServer = FileServer.GetInstance() as FileServer; + let fileServer = FileServer.GetInstance(); if (fileServer.m_CurFileId) { let id = fileServer.m_CurFileId; @@ -33,7 +33,7 @@ export class ReOpen implements Command { let fid = localStorage.getItem(StoreageKeys.LastOpenFileId); if (fid) - (FileServer.GetInstance() as FileServer).OpenFile(fid); + FileServer.GetInstance().OpenFile(fid); } } } diff --git a/src/Add-on/RotateLayerBoard.ts b/src/Add-on/RotateLayerBoard.ts index 296cf20bc..70354c838 100644 --- a/src/Add-on/RotateLayerBoard.ts +++ b/src/Add-on/RotateLayerBoard.ts @@ -33,7 +33,7 @@ export class RotateLayerBoard implements Command private errBr: number = 0; async exec() { - let store = RotateLayerBoardStore.GetInstance() as RotateLayerBoardStore; + let store = RotateLayerBoardStore.GetInstance(); app.Editor.ModalManage.RenderModal(RotateLayerBoardModal, { store }); let res = await app.Editor.ModalManage.Wait(); diff --git a/src/Add-on/Save.ts b/src/Add-on/Save.ts index 93f5ce61e..cecf0d080 100644 --- a/src/Add-on/Save.ts +++ b/src/Add-on/Save.ts @@ -69,7 +69,7 @@ export class Save implements Command AppToaster.dismiss("vp"); //文件未命名和选中保存目录 - let fileServer = FileServer.GetInstance() as FileServer; + let fileServer = FileServer.GetInstance(); //如果文件从未保存过,那么让用户选一个保存位置 if (!fileServer.currentFileInfo.name || (!fileServer.m_CurFileId && !fileServer.currentFileInfo.dir?.id)) @@ -203,7 +203,7 @@ export class New implements Command NoHistory = true; async exec() { - let server = FileServer.GetInstance() as FileServer; + let server = FileServer.GetInstance(); server._CurrentFilePath = ""; await server.AddNewFile(); } @@ -224,7 +224,7 @@ export class SaveAs implements Command return; } - let fileServer = FileServer.GetInstance() as FileServer; + let fileServer = FileServer.GetInstance(); app.Editor.ModalManage.RenderModal(SaveAsModal, { currentName: fileServer.currentFileInfo.name }, { position: ModalPosition.Top }); let res = await app.Editor.ModalManage.Wait(); @@ -265,7 +265,7 @@ export class SaveToLocal implements Command NoHistory = true; async exec() { - let fileServer = FileServer.GetInstance() as FileServer; + let fileServer = FileServer.GetInstance(); let fileStr = app.FileOut().ToString(); //帮用户把文件下载下来 FS.WriteFile( @@ -356,7 +356,7 @@ export class SaveToDxf implements Command dxf.modelSpace.addEntity(dxfEntity); } - let fileServer = FileServer.GetInstance() as FileServer; + let fileServer = FileServer.GetInstance(); FS.WriteFile( `${fileServer.currentFileInfo.name || "未命名"}.dxf`, dxf.stringify() @@ -377,7 +377,7 @@ export function UploadFileHistory(fileDataStr?: string) fileDataStr = deflate(JSON.stringify(fileData)); } - let fileServer = FileServer.GetInstance() as FileServer; + let fileServer = FileServer.GetInstance(); let fileId = fileServer.m_CurFileId; let userName = localStorage.getItem(StoreageKeys.UserName); diff --git a/src/Add-on/SendCADFileOnKF.ts b/src/Add-on/SendCADFileOnKF.ts index 1ae8a9567..11e5639e5 100644 --- a/src/Add-on/SendCADFileOnKF.ts +++ b/src/Add-on/SendCADFileOnKF.ts @@ -27,7 +27,7 @@ export const SendFile = async () => { let resV = await res.json(); let fileid = resV.file_id; - let fileServer = FileServer.GetInstance() as FileServer; + let fileServer = FileServer.GetInstance(); window["easemobim"] && window["easemobim"].sendExt({ ext: { diff --git a/src/Add-on/ShareView/Command_ShareView.ts b/src/Add-on/ShareView/Command_ShareView.ts index 82594be71..09f09bf28 100644 --- a/src/Add-on/ShareView/Command_ShareView.ts +++ b/src/Add-on/ShareView/Command_ShareView.ts @@ -94,7 +94,7 @@ export class Command_ShareView implements Command const props = JSON.stringify({ showBom: store.m_Option.showBom }); const formData = new FormData(); - let fileServer = FileServer.GetInstance() as FileServer; + let fileServer = FileServer.GetInstance(); formData.append("name", fileServer.currentFileInfo.name); formData.append("logo", GetCurrentViewPreViewImage(), "cover.jpg"); formData.append("file", deflate(f.ToString())); diff --git a/src/Add-on/ShareView/ShareViewLayout.tsx b/src/Add-on/ShareView/ShareViewLayout.tsx index 4c08613ab..efae4c8fe 100644 --- a/src/Add-on/ShareView/ShareViewLayout.tsx +++ b/src/Add-on/ShareView/ShareViewLayout.tsx @@ -78,7 +78,7 @@ export class ShareViewLayout ToasterShowEntityMsgInjectFunctions.push(__AppToasterShowEntityMsg); - // let fileServer = FileServer.GetInstance() as FileServer; + // let fileServer = FileServer.GetInstance(); // ReportFunctionList.push(async (msg: string) => // { // if (!fileServer.m_CurFileId) diff --git a/src/Add-on/ShareView/ShareViewService.ts b/src/Add-on/ShareView/ShareViewService.ts index d0533a061..b1d71a28d 100644 --- a/src/Add-on/ShareView/ShareViewService.ts +++ b/src/Add-on/ShareView/ShareViewService.ts @@ -97,7 +97,7 @@ export class ShareViewService extends ApplicationService originUpdateSelectEvent.call(this.Editor.SelectCtrl); // 单选显示标注 }); - DbClickManager.GetInstance().OnDbClick = () => { }; + DbClickManager.GetInstance().OnDbClick = async () => { }; DownPanelStore.GetInstance().posEl = document.createElement("div"); // 屏蔽编辑交互 this.Editor.UcsServices.Visible = false; // 移除坐标系显示 diff --git a/src/Add-on/ShowProcessingGroupModal.ts b/src/Add-on/ShowProcessingGroupModal.ts index 86d256d01..66c99bee3 100644 --- a/src/Add-on/ShowProcessingGroupModal.ts +++ b/src/Add-on/ShowProcessingGroupModal.ts @@ -9,7 +9,7 @@ export class Command_ShowProcessingGroupModal implements Command NoHistory = true;//呼出时,我们没有任何的操作记录 async exec() { - let store = ProcessingGroupModalStore.GetInstance() as ProcessingGroupModalStore; + let store = ProcessingGroupModalStore.GetInstance(); let config = await userConfigStore.GetConfig(BoardModalType.ProcessGroupCategory); if (!config) { diff --git a/src/Add-on/Stretch.ts b/src/Add-on/Stretch.ts index aadfa429c..df5d9f71b 100644 --- a/src/Add-on/Stretch.ts +++ b/src/Add-on/Stretch.ts @@ -24,7 +24,7 @@ export class Stretch implements Command let changeRendertypeEns: Entity[]; let olducs: Matrix4; let cameraBak = new CADFiler(); - let viewBtnTitle = (CameraControlBtnStore.GetInstance() as CameraControlBtnStore).ViewBtnTitle; + let viewBtnTitle = CameraControlBtnStore.GetInstance().ViewBtnTitle; if (this.useSelectFilter) { app.Viewer.CameraCtrl.WriteFile(cameraBak); @@ -171,7 +171,7 @@ export class Stretch implements Command app.Editor.UCSMatrix = olducs; cameraBak.Reset(); app.Viewer.CameraCtrl.ReadFile(cameraBak); - (CameraControlBtnStore.GetInstance() as CameraControlBtnStore).ViewBtnTitle = viewBtnTitle; + CameraControlBtnStore.GetInstance().ViewBtnTitle = viewBtnTitle; if (changeRendertypeEns) { for (let e of changeRendertypeEns) diff --git a/src/Add-on/Template/ShowTemplate.ts b/src/Add-on/Template/ShowTemplate.ts index b33a96f05..af54a0d1b 100644 --- a/src/Add-on/Template/ShowTemplate.ts +++ b/src/Add-on/Template/ShowTemplate.ts @@ -9,7 +9,7 @@ export class ShowTemplate implements Command constructor(private type: "Administration" | "Collection", private tag?: ITempTagProps) { } async exec() { - let store = TempalteEditorStore.GetInstance() as TempalteEditorStore; + let store = TempalteEditorStore.GetInstance(); app.Editor.ModalManage.RenderModeless(TemplateManage, { store, currentTag: this.tag, type: this.type }); } } diff --git a/src/Add-on/Template/ShowTemplateDesign.ts b/src/Add-on/Template/ShowTemplateDesign.ts index 1788e2fc5..c834361f8 100644 --- a/src/Add-on/Template/ShowTemplateDesign.ts +++ b/src/Add-on/Template/ShowTemplateDesign.ts @@ -37,7 +37,7 @@ export class ShowTemplateDesign implements Command let template = await InitTemplate(ents); if (!template) return; - let store = TempalteEditorStore.GetInstance() as TempalteEditorStore; + let store = TempalteEditorStore.GetInstance(); template.Name = template.Name || "模板"; store.Template = template; store.InitParams(); diff --git a/src/Add-on/ToggleUI.ts b/src/Add-on/ToggleUI.ts index 4c12a0909..690344856 100644 --- a/src/Add-on/ToggleUI.ts +++ b/src/Add-on/ToggleUI.ts @@ -4,7 +4,7 @@ export class Command_ToggleUI { async exec() { - let store = DownPanelStore.GetInstance() as DownPanelStore; + let store = DownPanelStore.GetInstance(); if (store.isSmallScreen) store.isTopToolBarShowMin = !store.isTopToolBarShowMin; else diff --git a/src/Add-on/UpdateEntityDrawTask.ts b/src/Add-on/UpdateEntityDrawTask.ts index a22115bdd..f4e811797 100644 --- a/src/Add-on/UpdateEntityDrawTask.ts +++ b/src/Add-on/UpdateEntityDrawTask.ts @@ -18,7 +18,7 @@ export class UpdateEntityDrawTask async UpdateDraw(ens: Entity[]) { - let down = DownPanelStore.GetInstance() as DownPanelStore; + let down = DownPanelStore.GetInstance(); down.StartProgress("渲染:"); let i = 0; diff --git a/src/Add-on/ViewortConfig/EditViewport.ts b/src/Add-on/ViewortConfig/EditViewport.ts index fd757f34a..0ec67c1d5 100644 --- a/src/Add-on/ViewortConfig/EditViewport.ts +++ b/src/Add-on/ViewortConfig/EditViewport.ts @@ -48,7 +48,7 @@ export class EditViewport implements Command await userConfigStore.UpdateBoardOption(this.store.configName, BoardModalType.EditViewSetting, this.store); } - const downStore = (DownPanelStore.GetInstance() as DownPanelStore); + const downStore = DownPanelStore.GetInstance(); downStore.isLayout = true;; let ssRes = await app.Editor.GetSelection({ diff --git a/src/Add-on/Viewport/OneKeyLayout.ts b/src/Add-on/Viewport/OneKeyLayout.ts index 8725a7765..dc308aded 100644 --- a/src/Add-on/Viewport/OneKeyLayout.ts +++ b/src/Add-on/Viewport/OneKeyLayout.ts @@ -442,7 +442,7 @@ export class OneKeyLayout implements Command i++; } - const down = DownPanelStore.GetInstance() as DownPanelStore; + const down = DownPanelStore.GetInstance(); down.progress = 0.1; for (let index = 0; index < vps.length; index++) { diff --git a/src/Add-on/Wblock.ts b/src/Add-on/Wblock.ts index 1b4a4edee..65d45dfba 100644 --- a/src/Add-on/Wblock.ts +++ b/src/Add-on/Wblock.ts @@ -25,7 +25,7 @@ export class Command_Wblock implements Command for (let en of cloneEns) en.ApplyMatrix(moveM); - let fileServer = FileServer.GetInstance() as FileServer; + let fileServer = FileServer.GetInstance(); let f = newDb.FileWrite().Data; diff --git a/src/Add-on/interfere.ts b/src/Add-on/interfere.ts index 28cd002ab..1a691c85d 100644 --- a/src/Add-on/interfere.ts +++ b/src/Add-on/interfere.ts @@ -58,7 +58,7 @@ export class Interfere implements Command } //进度条 - let down = DownPanelStore.GetInstance() as DownPanelStore; + let down = DownPanelStore.GetInstance(); down.progress = 0.1; AppToaster.show({ diff --git a/src/Add-on/twoD2threeD/Command_Curve2Polyline.ts b/src/Add-on/twoD2threeD/Command_Curve2Polyline.ts index dec39f525..4dbbc8181 100644 --- a/src/Add-on/twoD2threeD/Command_Curve2Polyline.ts +++ b/src/Add-on/twoD2threeD/Command_Curve2Polyline.ts @@ -42,7 +42,7 @@ export class Command_Curve2Polyline implements Command async exec() { - let store = Curve2RecModalStore.GetInstance() as Curve2RecModalStore; + let store = Curve2RecModalStore.GetInstance(); app.Editor.ModalManage.RenderModal(Curve2RecModal, { store: store }); app.Editor.ModalManage.SetCallback(async () => { diff --git a/src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx b/src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx index 5b4442e1c..c472d263e 100644 --- a/src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx +++ b/src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx @@ -35,7 +35,7 @@ export class ParseBoardName extends Component ["knifeRadius", "刀半径"], ["grooveAddLength", "槽加长"], ["grooveAddWidth", "槽加宽"], ["grooveAddDepth", "槽加深"] ]; - rec2BrStore = Rec2BrStore.GetInstance() as Rec2BrStore; + rec2BrStore = Rec2BrStore.GetInstance(); render() { const store = this.props.store; diff --git a/src/Add-on/twoD2threeD/Polyline2Board.ts b/src/Add-on/twoD2threeD/Polyline2Board.ts index 417fb6142..5f671e5e1 100644 --- a/src/Add-on/twoD2threeD/Polyline2Board.ts +++ b/src/Add-on/twoD2threeD/Polyline2Board.ts @@ -36,7 +36,7 @@ const MaxBoardDistance = 200;//左右侧板,顶底板距离边缘的最大距离 @HotCMD export class Polyline2Board implements Command { - store = Rec2BrStore.GetInstance() as Rec2BrStore; + store = Rec2BrStore.GetInstance(); SpaceOCS: Matrix4; SpaceOCSInv: Matrix4; async exec() diff --git a/src/Add-on/twoD2threeD/R2bConfigComponent.tsx b/src/Add-on/twoD2threeD/R2bConfigComponent.tsx index f13e540f1..1af656ba0 100644 --- a/src/Add-on/twoD2threeD/R2bConfigComponent.tsx +++ b/src/Add-on/twoD2threeD/R2bConfigComponent.tsx @@ -136,7 +136,7 @@ export class R2BConfigComponent extends React.Component { let modal = app.Editor.ModalManage.CurrentModal; - let tempalteStore = TempalteEditorStore.GetInstance() as TempalteEditorStore; + let tempalteStore = TempalteEditorStore.GetInstance(); app.Editor.ModalManage.RenderModeless(TemplateManage, { tempalteStore, R2bReplace: { isR2bReplace: true } }); let state = await app.Editor.ModalManage.Wait(); diff --git a/src/ApplicationServices/Application.ts b/src/ApplicationServices/Application.ts index 8c8d5aac3..b62c45e72 100644 --- a/src/ApplicationServices/Application.ts +++ b/src/ApplicationServices/Application.ts @@ -485,7 +485,7 @@ export class ApplicationService CreateDocument(name: string = "新文件") { this.Viewer.ViewPorts.length = 0; - (DownPanelStore.GetInstance() as DownPanelStore).isLayout = false; + DownPanelStore.GetInstance().isLayout = false; this.Database.FileRead(new Database(true).FileWrite()); diff --git a/src/Common/ErrorMonitoring.ts b/src/Common/ErrorMonitoring.ts index d4432a105..9da684008 100644 --- a/src/Common/ErrorMonitoring.ts +++ b/src/Common/ErrorMonitoring.ts @@ -56,7 +56,7 @@ export async function ReportError(stack: any, msg: string = "未捕获的错误! let userName = localStorage.getItem(StoreageKeys.UserName); let userPhone = localStorage.getItem(StoreageKeys.UserPhone); - let fileServer = FileServer.GetInstance() as FileServer; + let fileServer = FileServer.GetInstance(); let lastFileKey = fileServer.m_CurFileId; await fetch("https://cf.qcad.cc:25111/logs/error", { diff --git a/src/Common/Singleton.ts b/src/Common/Singleton.ts index ce31c5cfe..73d356a61 100644 --- a/src/Common/Singleton.ts +++ b/src/Common/Singleton.ts @@ -2,6 +2,20 @@ let instanceMap = new Map(); +export interface PrototypeType extends Function +{ + prototype: T; +} + +export interface ConstructorFunctionType extends PrototypeType +{ + new(...args: any[]): T; +} + +export type ConstructorType = PrototypeType> = (ConstructorFunctionType | PrototypeType) & { + [Key in keyof Static]: Static[Key]; +}; + /** * 构造单例类的静态类. * # Example: @@ -13,8 +27,8 @@ export class Singleton { protected constructor() { } - //FIXME: https://github.com/Microsoft/TypeScript/issues/5863 - static GetInstance(): T + //ref:https://github.com/Microsoft/TypeScript/issues/5863 + static GetInstance(this: ConstructorType): T { if (instanceMap.has(this)) return instanceMap.get(this); diff --git a/src/DatabaseServices/Template/ProgramTempate/TemplateLatticeRecord.ts b/src/DatabaseServices/Template/ProgramTempate/TemplateLatticeRecord.ts index 621c04f2c..789e9bbb8 100644 --- a/src/DatabaseServices/Template/ProgramTempate/TemplateLatticeRecord.ts +++ b/src/DatabaseServices/Template/ProgramTempate/TemplateLatticeRecord.ts @@ -45,7 +45,7 @@ export class TemplateLatticeRecord extends TemplateRecord if (thickness) this.option.thickness = thickness; - let tool = DrawLatticeDrawerTool.GetInstance() as DrawLatticeDrawerTool; + let tool = DrawLatticeDrawerTool.GetInstance(); let sbrs = this.PositioningSupportBoards; let space = new ISpaceParse(sbrs, this._CacheSpaceCS); diff --git a/src/DatabaseServices/Template/ProgramTempate/TemplateWineRackRecord.ts b/src/DatabaseServices/Template/ProgramTempate/TemplateWineRackRecord.ts index 243f0c03b..71f6092c1 100644 --- a/src/DatabaseServices/Template/ProgramTempate/TemplateWineRackRecord.ts +++ b/src/DatabaseServices/Template/ProgramTempate/TemplateWineRackRecord.ts @@ -45,9 +45,9 @@ export class TemplateWineRackRecord extends TemplateRecord let wineRack: DrawWineRackTool; if (this.option.type === EWineRackType.Oblique) - wineRack = DrawObliqueWineRackTool.GetInstance() as DrawObliqueWineRackTool; + wineRack = DrawObliqueWineRackTool.GetInstance(); else - wineRack = DrawUprightWineRackTool.GetInstance() as DrawUprightWineRackTool; + wineRack = DrawUprightWineRackTool.GetInstance(); let sbrs = this.PositioningSupportBoards; let space = new ISpaceParse(sbrs, this._CacheSpaceCS); diff --git a/src/DatabaseServices/Template/TempateUtils.ts b/src/DatabaseServices/Template/TempateUtils.ts index 67fe63578..60d519651 100644 --- a/src/DatabaseServices/Template/TempateUtils.ts +++ b/src/DatabaseServices/Template/TempateUtils.ts @@ -4,15 +4,15 @@ import { ExtendsbrThick2 } from "../../Add-on/DrawBoard/BuildBoardTool"; 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 { GetEntitysLogo, TemplateIn, TemplateOut, TemplateParamsOut, deflate } from "../../Common/SerializeMaterial"; +import { deflate, GetEntitysLogo, TemplateIn, TemplateOut, TemplateParamsOut } 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,7 +21,7 @@ import { SelectPick } from "../../Editor/SelectPick"; import { AxisSnapMode } from "../../Editor/SnapServices"; import { TempEditor } from "../../Editor/TempEditor"; import { Box3Ext } from "../../Geometry/Box"; -import { AsVector3, ZAxis, ZeroVec, equaln, isParallelTo, isPerpendicularityTo } from "../../Geometry/GeUtils"; +import { AsVector3, equaln, isParallelTo, isPerpendicularityTo, ZAxis, ZeroVec } from "../../Geometry/GeUtils"; import { ClampSpaceParse } from "../../Geometry/SpaceParse/ClampSpaceParse"; import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse"; import { IGetRoomInfo } from "../../UI/Components/Template/GetRoomCabName"; @@ -1143,7 +1143,7 @@ export async function EditorOnlineTemplate(template: TemplateRecord, module_id: await CommandWrap(async () => { template = app.Database.WblockCloneObejcts([template], app.Database.TemplateTable, new Map(), DuplicateRecordCloning.Ignore)[0] as TemplateRecord; - const store = TempalteEditorStore.GetInstance() as TempalteEditorStore; + const store = TempalteEditorStore.GetInstance(); store.Template = template; store.InitParams(); app.Editor.ModalManage.DestoryAll(); diff --git a/src/DatabaseServices/Text/TextArea.ts b/src/DatabaseServices/Text/TextArea.ts index e7eb6b271..71f1b8178 100644 --- a/src/DatabaseServices/Text/TextArea.ts +++ b/src/DatabaseServices/Text/TextArea.ts @@ -50,7 +50,7 @@ export class TextArea extends Singleton if (text) { if (text instanceof Text) - (DownPanelStore.GetInstance() as DownPanelStore).fontName = text._FontName; + DownPanelStore.GetInstance().fontName = text._FontName; document.getElementById('Webgl').parentNode.appendChild(this._AreaContiner); textObj.visible = false; app.Editor.UpdateScreen(); @@ -184,7 +184,7 @@ export class TextArea extends Singleton if (this._EditoringObject) { let t = GetEntity(this._EditoringObject) as Text; - let f = FontLoader.GetLoader((DownPanelStore.GetInstance() as DownPanelStore).fontName); + let f = FontLoader.GetLoader(DownPanelStore.GetInstance().fontName); f.LoadGlyphs(el.innerText); await f.AwaitLoaded(); t.TextString = el.innerText; @@ -209,7 +209,7 @@ export class TextArea extends Singleton async EndEditor() { this.ClearEvent(); - let f = FontLoader.GetLoader((DownPanelStore.GetInstance() as DownPanelStore).fontName); + let f = FontLoader.GetLoader(DownPanelStore.GetInstance().fontName); for (let [el, pos] of this._EditorElList) { f.LoadGlyphs(el.innerText); diff --git a/src/DatabaseServices/ViewportEntity/ViewportEntityUpdateTask.ts b/src/DatabaseServices/ViewportEntity/ViewportEntityUpdateTask.ts index 864d50776..a93477470 100644 --- a/src/DatabaseServices/ViewportEntity/ViewportEntityUpdateTask.ts +++ b/src/DatabaseServices/ViewportEntity/ViewportEntityUpdateTask.ts @@ -20,7 +20,7 @@ export class ViewportEntityUpdateTask { console.time(this.timeId.toString()); - let down = DownPanelStore.GetInstance() as DownPanelStore; + let down = DownPanelStore.GetInstance(); down.StartProgress("视口:"); let i = 0; diff --git a/src/Editor/AutoSave.ts b/src/Editor/AutoSave.ts index a10530e5f..d2009e5ec 100644 --- a/src/Editor/AutoSave.ts +++ b/src/Editor/AutoSave.ts @@ -91,7 +91,7 @@ export class AutoSaveServer async SavaData(data: any[]) { const indexDbStore = await IndexedDbStore.CADStore(); - let server = FileServer.GetInstance() as FileServer; + let server = FileServer.GetInstance(); const uid = localStorage.getItem(StoreageKeys.Uid); if (uid) { diff --git a/src/Editor/DbClick/DbClick.ts b/src/Editor/DbClick/DbClick.ts index 2703d5cfe..6416af287 100644 --- a/src/Editor/DbClick/DbClick.ts +++ b/src/Editor/DbClick/DbClick.ts @@ -135,7 +135,7 @@ export class DbClickManager extends Singleton } else if (pickEnt instanceof Text || pickEnt instanceof RoomRegion) { - let textarea = TextArea.GetInstance() as TextArea; + let textarea = TextArea.GetInstance(); CommandWrap(async () => { textarea.StartEditorText(pickObj); @@ -144,7 +144,7 @@ export class DbClickManager extends Singleton } else if (pickEnt instanceof Board) { - let rightStore = RightPanelStore.GetInstance() as RightPanelStore; + let rightStore = RightPanelStore.GetInstance(); if (!(rightStore.m_TabId === RightTabId.BoardProps && rightStore.m_IsShow)) app.Editor.ModalManage.RenderModeless( BoardOptionModal, @@ -155,12 +155,12 @@ export class DbClickManager extends Singleton { CommandWrap(async () => { - await DBClickPolyline.GetInstance().HandlePolyline(pickEnt); + await DBClickPolyline.GetInstance().HandlePolyline(pickEnt as Polyline); }, "_pedit"); } else if (pickEnt instanceof AlignedDimension || pickEnt instanceof LineAngularDimension || pickEnt instanceof RadiusDimension || pickEnt instanceof ArcDimension) { - let textarea = TextArea.GetInstance() as TextArea; + let textarea = TextArea.GetInstance(); if (pickObj.children.length > 0) CommandWrap(async () => { @@ -226,7 +226,7 @@ export class DbClickManager extends Singleton }); let index = dists.indexOf(Math.min(...dists)) % 3; - let rightStore = RightPanelStore.GetInstance() as RightPanelStore; + let rightStore = RightPanelStore.GetInstance(); rightStore.m_TabId = RightTabId.TemplateParam; rightStore.m_IsShow = true; rightStore.templateParamInputFocus(description[index]); @@ -294,7 +294,7 @@ export class DbClickManager extends Singleton } else if (pickEnt instanceof RoomBase) { - let rightStore = RightPanelStore.GetInstance() as RightPanelStore; + let rightStore = RightPanelStore.GetInstance(); rightStore.m_IsShow = true; rightStore.m_TabId = RightTabId.ModuelParams; return; diff --git a/src/Editor/LightsMenu.tsx b/src/Editor/LightsMenu.tsx index 4189d71c7..6b08495c8 100644 --- a/src/Editor/LightsMenu.tsx +++ b/src/Editor/LightsMenu.tsx @@ -32,7 +32,7 @@ export class LightsMenu extends React.Component<{ GetLightType: (ent: Entity) => } RenderMenu = () => { - const downStore = DownPanelStore.GetInstance() as DownPanelStore; + const downStore = DownPanelStore.GetInstance(); return ( } RenderMenu = () => { - const downStore = DownPanelStore.GetInstance() as DownPanelStore; + const downStore = DownPanelStore.GetInstance(); return ( private close = () => { - let store = DownPanelStore.GetInstance() as DownPanelStore; + let store = DownPanelStore.GetInstance(); store.Upload(); }; } diff --git a/src/GraphicsSystem/Viewer.ts b/src/GraphicsSystem/Viewer.ts index 721b0e9a8..553f2c053 100644 --- a/src/GraphicsSystem/Viewer.ts +++ b/src/GraphicsSystem/Viewer.ts @@ -661,7 +661,7 @@ export class Viewer // console.time("开图渲染"); Entity.__ReadFileIng__ = true; - const down = DownPanelStore.GetInstance() as DownPanelStore; + const down = DownPanelStore.GetInstance(); let i = 0; down.progress = 0.1; let brs: Board[] = []; @@ -729,7 +729,7 @@ export class Viewer { UpdateWallParse(); - const down = DownPanelStore.GetInstance() as DownPanelStore; + const down = DownPanelStore.GetInstance(); Entity.__ReadFileIng__ = true; let i = 0; let space = 50; @@ -848,7 +848,7 @@ export class Viewer async UpdateRenderType(db: Database, type: RenderType) { let i = 0; - let down = DownPanelStore.GetInstance() as DownPanelStore; + let down = DownPanelStore.GetInstance(); down.progress = 0.1; for (let index = 0; index < db.ModelSpace.Entitys.length; index++) diff --git a/src/Production/Product.ts b/src/Production/Product.ts index 73867c677..9de404e0d 100644 --- a/src/Production/Product.ts +++ b/src/Production/Product.ts @@ -303,7 +303,7 @@ export namespace Production } export function GetBoardModelingData(br: Board, offsetTanslation: Vector3) { - const tool = FeedingToolPath.GetInstance() as FeedingToolPath; + const tool = FeedingToolPath.GetInstance(); const tMtx = MoveMatrix(offsetTanslation.clone().negate()); const getModelings = (ms: IModeling[], isSide: boolean): IModelingData[] => { @@ -1004,7 +1004,7 @@ export namespace Production { const { thickness, boardContour, dir, addLen, addWidth, addDepth, knifeRadius, brThickness } = data; let brContour = Data2Polyline(boardContour); - const tool = FeedingToolPath.GetInstance() as FeedingToolPath; + const tool = FeedingToolPath.GetInstance(); const outline = Contour.CreateContour(Data2Polyline(data.outline)); const holes = data.holes.map(h => Contour.CreateContour(Data2Polyline(h))); let shape = new Shape(outline, holes); diff --git a/src/Reactor/RelevanceCuttingReactor.ts b/src/Reactor/RelevanceCuttingReactor.ts index eb83c2fb7..7e2a5cb08 100644 --- a/src/Reactor/RelevanceCuttingReactor.ts +++ b/src/Reactor/RelevanceCuttingReactor.ts @@ -41,7 +41,7 @@ async function UpdateRelevanceGroove(ents: CADObject[]) } //进度条 - let down = DownPanelStore.GetInstance() as DownPanelStore; + let down = DownPanelStore.GetInstance(); down.StartProgress("更新:"); let allCount = needUpdateBoardSet.size; diff --git a/src/UI/Components/BBS/LookOverBoardInfos.tsx b/src/UI/Components/BBS/LookOverBoardInfos.tsx index 8f2f5a7dc..da4fe670a 100644 --- a/src/UI/Components/BBS/LookOverBoardInfos.tsx +++ b/src/UI/Components/BBS/LookOverBoardInfos.tsx @@ -12,11 +12,11 @@ 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"; @@ -34,7 +34,7 @@ import { SelectSetBase } from "../../../Editor/SelectBase"; import { userConfig } from "../../../Editor/UserConfig"; import { equaln } from "../../../Geometry/GeUtils"; import { IHardwareType } from "../../../Production/Product"; -import { TotalTabbarTitlesInfos, bbsEditorStore } from "../../Store/BBSEditorStore"; +import { bbsEditorStore, TotalTabbarTitlesInfos } from "../../Store/BBSEditorStore"; import { EFindType } from "../../Store/BoardFindInterface"; import { ComposingType, FaceDirection, LinesType } from "../../Store/BoardInterface"; import { userConfigStore } from "../../Store/UserConfigStore"; @@ -884,7 +884,7 @@ export class LookOverBoardInfosModal extends React.Component { this.ConvertBoardListDataToArray(); - let fileServer = FileServer.GetInstance() as FileServer; + let fileServer = FileServer.GetInstance(); let str = ""; for (let data of this.boardDataInArray) { diff --git a/src/UI/Components/Board/BoardCommon.tsx b/src/UI/Components/Board/BoardCommon.tsx index 5e64d9b29..17628223a 100644 --- a/src/UI/Components/Board/BoardCommon.tsx +++ b/src/UI/Components/Board/BoardCommon.tsx @@ -680,7 +680,7 @@ export class DrillTypeSelectCom extends React.Component{ let cu = JigUtils.Draw(br.ContourCurve.Clone().ApplyMatrix(br.OCS)); let moveCus: Curve[] = [cu]; - let store = RightPanelStore.GetInstance() as RightPanelStore; + let store = RightPanelStore.GetInstance(); //载入配置,设置配置 let config = new DialogUserConfig(store.modeling2Store, BoardModalType.ZX2); @@ -394,7 +394,7 @@ export class BoardConfigModal extends React.Component{ TempEditor.Start(); app.Database.hm.lockIndex++;//禁止初始化动作被撤销 - const store = RightPanelStore.GetInstance() as RightPanelStore; + const store = RightPanelStore.GetInstance(); //载入配置,设置配置 let config = new DialogUserConfig(store.modeling3Store, BoardModalType.ZX3); @@ -500,7 +500,7 @@ export class BoardConfigModal extends React.Component{ box.expandByVector(new Vector3(1, 1, 1)); let selectBox = new SelectBox(app.Viewer, AsVector2(box.min), AsVector2(box.max), SelectType.C); - const rightStore = RightPanelStore.GetInstance() as RightPanelStore; + const rightStore = RightPanelStore.GetInstance(); let contourMap = new Map(); @@ -589,7 +589,7 @@ export class BoardConfigModal extends React.Component{ app.Viewer.WorldToScreen(box.max); let selectBox = new SelectBox(app.Viewer, AsVector2(box.min), AsVector2(box.max), SelectType.C); - const rightStore = RightPanelStore.GetInstance() as RightPanelStore; + const rightStore = RightPanelStore.GetInstance(); let pathMap = new Map(); @@ -648,7 +648,7 @@ export class BoardConfigModal extends React.Component{ if (contourMap.size > 0) { let br = this.props.br; - const rightStore = RightPanelStore.GetInstance() as RightPanelStore; + const rightStore = RightPanelStore.GetInstance(); for (let [color, contours] of contourMap) { @@ -700,7 +700,7 @@ export class BoardConfigModal extends React.Component{ if (contourMap.size > 0) { let br = this.props.br; - const rightStore = RightPanelStore.GetInstance() as RightPanelStore; + const rightStore = RightPanelStore.GetInstance(); br.ClearModeling2DList(); let modelings: I2DModeling[] = []; for (let [color, contours] of contourMap) @@ -747,7 +747,7 @@ export class BoardConfigModal extends React.Component{ await app.Editor.ModalManage.EndExecingCmd(); - const store = (RightPanelStore.GetInstance() as RightPanelStore).modeling3Store; + const store = RightPanelStore.GetInstance().modeling3Store; let curvesMap = new Map(); for (let o of app.Viewer.Scene.children) diff --git a/src/UI/Components/Board/BoardProcessModal.tsx b/src/UI/Components/Board/BoardProcessModal.tsx index 6b0b7b863..d19dd2993 100644 --- a/src/UI/Components/Board/BoardProcessModal.tsx +++ b/src/UI/Components/Board/BoardProcessModal.tsx @@ -57,7 +57,7 @@ export class BoardProcessModal extends React.Component{ return; } app.Editor.ModalManage.Destory(); - let store = RightPanelStore.GetInstance() as RightPanelStore; + let store = RightPanelStore.GetInstance(); //提前载入封边配置 store.sealingStore.isNotUpdateStore = true;//禁止UI再次更新配置 let config = new DialogUserConfig(store.sealingStore, BoardModalType.Sealing); diff --git a/src/UI/Components/CameraControlButton/CameraControlBtn.tsx b/src/UI/Components/CameraControlButton/CameraControlBtn.tsx index 6a91c5b64..421343c75 100644 --- a/src/UI/Components/CameraControlButton/CameraControlBtn.tsx +++ b/src/UI/Components/CameraControlButton/CameraControlBtn.tsx @@ -214,7 +214,7 @@ export class CameraControlBtn extends React.Component<{}, {}> /> )} { - !(DownPanelStore.GetInstance() as DownPanelStore).isLayout && + !DownPanelStore.GetInstance().isLayout && <> {VisualStyleData2.map( (data) => @@ -252,7 +252,7 @@ export class CameraControlBtn extends React.Component<{}, {}> /> } { - (DownPanelStore.GetInstance() as DownPanelStore).isLayout && + DownPanelStore.GetInstance().isLayout &&