清理

src/Add-on/Command_Option.ts

@@ -1,7 +1,6 @@
-import { Command } from "../Editor/CommandMachine";
-import { ConfigStore, ConfigDialog } from "../UI/Components/Modal/OptionModal/ConfigDialog";
 import { app } from "../ApplicationServices/Application";
-import { ModalPosition } from "../UI/Components/Modal/ModalInterface";
+import { Command } from "../Editor/CommandMachine";
+import { ConfigDialog, ConfigStore } from "../UI/Components/Modal/OptionModal/ConfigDialog";
 
 export class Command_Options implements Command
 {

src/Add-on/DrawWineRack/ConfigureWineRack.ts

@@ -1,7 +1,6 @@
-import { Command } from "../../Editor/CommandMachine";
 import { app } from "../../ApplicationServices/Application";
+import { Command } from "../../Editor/CommandMachine";
 import { WineRackModal } from "../../UI/Components/Board/WineRack";
-import { ModalPosition } from "../../UI/Components/Modal/ModalInterface";
 import { WineRackStore } from "../../UI/Store/WineRackStore";
 
 export class ConfigureWineRack implements Command

src/Add-on/DrawWineRack/EditorWineRack.ts

@@ -4,7 +4,6 @@ import { TemplateWineRackRecord } from "../../DatabaseServices/Template/ProgramT
 import { Command } from "../../Editor/CommandMachine";
 import { PromptStatus } from "../../Editor/PromptResult";
 import { WineRackModal } from "../../UI/Components/Board/WineRack";
-import { ModalPosition } from "../../UI/Components/Modal/ModalInterface";
 import { WineRackStore } from "../../UI/Store/WineRackStore";
 
 export class EditorWineRack implements Command

src/Add-on/Erp/ErpCommands.ts

@@ -1,24 +1,23 @@
+import { Intent } from "@blueprintjs/core";
 import { app } from "../../ApplicationServices/Application";
-import { Command } from "../../Editor/CommandMachine";
-import { PromptStatus } from "../../Editor/PromptResult";
-import { ModalPosition } from "../../UI/Components/Modal/ModalInterface";
-import { BoardStore } from "../../UI/Store/BoardStore";
-import { ErpView } from "./ErpView";
 import { StoreageKeys } from "../../Common/StoreageKeys";
-import { ErpParseData } from "./ParseData";
-import { ErpRouteInfo } from "./Models/ErpRouteInfo";
-import { ErpRoutes } from "./Models/ErpRoutes";
 import { Board } from "../../DatabaseServices/Entity/Board";
+import { Entity } from "../../DatabaseServices/Entity/Entity";
 import { HardwareCompositeEntity } from "../../DatabaseServices/Hardware/HardwareCompositeEntity";
 import { HardwareTopline } from "../../DatabaseServices/Hardware/HardwareTopline";
 import { ObjectId } from "../../DatabaseServices/ObjectId";
+import { Command } from "../../Editor/CommandMachine";
+import { PromptStatus } from "../../Editor/PromptResult";
+import { userConfig } from "../../Editor/UserConfig";
 import { IHardwareType } from "../../Production/Product";
 import { AppToaster } from "../../UI/Components/Toaster";
-import { Intent } from "@blueprintjs/core";
-import { Entity } from "../../DatabaseServices/Entity/Entity";
-import { OrderDataBlock, WaveType } from "./Models/CadBlock";
+import { BoardStore } from "../../UI/Store/BoardStore";
+import { ErpView } from "./ErpView";
 import { ExceedMind } from "./ExceedBlocksMind";
-import { userConfig } from "../../Editor/UserConfig";
+import { OrderDataBlock, WaveType } from "./Models/CadBlock";
+import { ErpRouteInfo } from "./Models/ErpRouteInfo";
+import { ErpRoutes } from "./Models/ErpRoutes";
+import { ErpParseData } from "./ParseData";
 export class ChaiDan implements Command
 {
     async exec()

src/Add-on/Template/ShowTemplate.ts

@@ -1,6 +1,5 @@
-import { Command } from "../../Editor/CommandMachine";
 import { app } from "../../ApplicationServices/Application";
-import { ModalPosition } from "../../UI/Components/Modal/ModalInterface";
+import { Command } from "../../Editor/CommandMachine";
 import { TemplateManage } from "../../UI/Components/Template/TemplateComponent";
 import { TempalteEditorStore } from "../../UI/Store/TemplateEditorStore";
 

src/Add-on/Template/ShowTemplateDesign.ts

@@ -3,7 +3,6 @@ import { Entity } from "../../DatabaseServices/Entity/Entity";
 import { InitTemplate } from "../../DatabaseServices/Template/TempateUtils";
 import { Command } from "../../Editor/CommandMachine";
 import { PromptStatus } from "../../Editor/PromptResult";
-import { ModalPosition } from "../../UI/Components/Modal/ModalInterface";
 import { TemplateEditor } from "../../UI/Components/Template/TemplateEditor";
 import { TempalteEditorStore } from "../../UI/Store/TemplateEditorStore";
 export class ShowTemplateDesign implements Command

src/Editor/GetPointServices.ts

@@ -4,12 +4,12 @@ import { end } from 'xaop';
 import { app } from '../ApplicationServices/Application';
 import { ColorMaterial } from '../Common/ColorPalette';
 import { DisposeThreeObj } from '../Common/Dispose';
+import { safeEval } from '../Common/eval';
 import { InputState, KeyWord, MenuDividerKWD } from '../Common/InputState';
 import { KeyBoard, KeyCode, MouseKey } from '../Common/KeyEnum';
 import { BufferGeometryUtils } from '../Geometry/BufferGeometryUtils';
 import { isParallelTo } from '../Geometry/GeUtils';
 import { CursorMode } from '../GraphicsSystem/Cursor';
-import { ModalPosition } from '../UI/Components/Modal/ModalInterface';
 import { SnapModal } from '../UI/Components/Modal/SnapModal';
 import { DynamicInputManage } from '../UI/DynamicPrompt/DynamicInputManage';
 import { GetPoint2PromptBlock, GetPointPromptBlock } from '../UI/DynamicPrompt/GetPointPromptBlock';
@@ -20,7 +20,6 @@ import { GetPointPrompt } from "./PromptOptions";
 import { PromptPointResult, PromptStatus } from './PromptResult';
 import { SnapMenuKW, SNAPMODE } from './ShowSnapMenu';
 import { SnapServices } from './SnapServices';
-import { safeEval } from '../Common/eval';
 
 /**
  * 为拾取点提供服务,提供一个类以供Editor引用.

src/Editor/ShowSnapMenu.ts

@@ -1,9 +1,8 @@
-import { KeyWord } from "../Common/InputState";
 import { app } from "../ApplicationServices/Application";
-import { PromptStatus } from "./PromptResult";
-import { ObjectSnapMode } from "./ObjectSnapMode";
+import { KeyWord } from "../Common/InputState";
 import { SnapModal } from "../UI/Components/Modal/SnapModal";
-import { ModalPosition } from "../UI/Components/Modal/ModalInterface";
+import { ObjectSnapMode } from "./ObjectSnapMode";
+import { PromptStatus } from "./PromptResult";
 
 //捕捉模式列表
 export const SNAPMODE = {

src/Editor/SnapMenuFixed.tsx

@@ -4,7 +4,6 @@ import { observer } from "mobx-react";
 import * as React from "react";
 import { app } from "../ApplicationServices/Application";
 import { KeyBoard } from "../Common/KeyEnum";
-import { ModalPosition } from "../UI/Components/Modal/ModalInterface";
 import { snapData, SnapModal } from "../UI/Components/Modal/SnapModal";
 import { SNAPMODE } from "./ShowSnapMenu";
 

src/UI/Components/RightPanel/Modeling/KnifeList.tsx

@@ -1,20 +1,20 @@
-import { Button, Card, Checkbox, Classes, Intent, Popover, Position, ContextMenu, Menu, MenuItem } from '@blueprintjs/core';
+import { Button, Card, Checkbox, Classes, ContextMenu, Intent, Menu, MenuItem, Popover, Position } from '@blueprintjs/core';
 import { IObservableValue } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
-import { TempEditor } from '../../../../Editor/TempEditor';
 import { app } from '../../../../ApplicationServices/Application';
-import { Polyline } from '../../../../DatabaseServices/Entity/Polyline';
-import { PostJson, RequestStatus } from '../../../../Common/Request';
 import { ToplineUrls } from '../../../../Common/HostUrl';
-import { inflate, toplineFileIn, getPolylineSVG, deflate } from '../../../../Common/SerializeMaterial';
+import { MouseKey } from '../../../../Common/KeyEnum';
+import { PostJson, RequestStatus } from '../../../../Common/Request';
+import { deflate, getPolylineSVG, inflate, toplineFileIn } from '../../../../Common/SerializeMaterial';
 import { CADFiler } from '../../../../DatabaseServices/CADFiler';
+import { Polyline } from '../../../../DatabaseServices/Entity/Polyline';
 import { commandMachine } from '../../../../Editor/CommandMachine';
-import { AppToaster } from '../../Toaster';
+import { TempEditor } from '../../../../Editor/TempEditor';
+import { ZoomToEntity } from '../../../Store/RightPanelStore/BoardEdgesEditor';
 import { ModalPosition } from '../../Modal/ModalInterface';
 import { IDirectoryProps } from '../../SourceManage/CommonPanel';
-import { ZoomToEntity } from '../../../Store/RightPanelStore/BoardEdgesEditor';
-import { MouseKey } from '../../../../Common/KeyEnum';
+import { AppToaster } from '../../Toaster';
 import { KnifeManage } from './KnifeManage';
 
 export interface IKnifeListProps

src/UI/Layout/ApplicationLayout.tsx

@@ -3,6 +3,7 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import ResizeObserver from 'resize-observer-polyfill';
 import { app, ApplicationService } from '../../ApplicationServices/Application';
+import { KeyBoard } from '../../Common/KeyEnum';
 import { _LogInjectFunctions } from '../../Common/Log';
 import { draw } from '../../Common/Utils';
 import { ZINDEX } from '../../Common/ZIndex';
@@ -10,7 +11,6 @@ import { registerCommand } from '../../Editor/CommandRegister';
 import { CameraControlBtn, CameraControlBtnStore } from '../Components/CameraControlButton/CameraControlBtn';
 import { MainContent } from '../Components/MainContent/MainContent';
 import { MaterialContainer, MaterialContainerProps } from '../Components/MaterialContainer';
-import { ModalPosition } from '../Components/Modal/ModalInterface';
 import { DownPanel, TopPanel } from '../Components/Panel';
 import { RightPanel } from '../Components/RightPanel/RightPanel';
 import { PropertiesPanelButton, RightPanelButton } from '../Components/RightPanel/RightPanelButton';
@@ -19,7 +19,6 @@ import { TopToolBar } from '../Components/TopToolBar/TopToolBar';
 import { DownPanelStore } from '../Store/DownPanelStore';
 import { RightPanelStore } from '../Store/RightPanelStore/RightPanelStore';
 import { TopPanelStore } from '../Store/TopPanelStore';
-import { KeyBoard } from '../../Common/KeyEnum';
 
 export let appUi: WebCAD;