开发:重构各种表的文件位置

src/DatabaseServices/Database.ts

@@ -1,6 +1,7 @@
 import { MirroredRepeatWrapping, Vector3 } from 'three';
 import { HostApplicationServices } from '../ApplicationServices/HostApplicationServices';
 import { DuplicateRecordCloning } from '../Common/Status';
+import { BlockTable } from '../entitys.exp';
 import { BlockTableRecord } from './BlockTableRecord';
 import { Factory } from './CADFactory';
 import { CADFiler } from './CADFiler';
@@ -17,16 +18,16 @@ import { AmbientLight } from './Lights/AmbientLight';
 import { DirectionalLight } from './Lights/DirectionalLight';
 import { HemisphereLight } from './Lights/HemisphereLight';
 import { Light } from './Lights/Light';
-import { MaterialTable } from './MaterialTable';
 import { ObjectId, RelevancyType } from './ObjectId';
 import { OwnerContainer } from './OwnerContainer';
 import { PhysicalMaterialRecord } from './PhysicalMaterialRecord';
 import { ProcessingGroupTable } from './ProcessingGroup/ProcessingGroupTable';
-import { SymbolTable } from './SymbolTable';
 import { SymbolTableRecord } from './SymbolTableRecord';
+import { MaterialTable } from './Tables/MaterialTable';
+import { SymbolTable } from './Tables/SymbolTable';
+import { TextureTable } from './Tables/TextureTable';
 import { TemplateTable } from './Template/TemplateTable';
 import { TextureTableRecord } from './Texture';
-import { TextureTable } from './TextureTable';
 import { WblockCloneFiler } from './WblockCloneFiler';
 
 @Factory
@@ -36,6 +37,7 @@ export class Database
     hm: HistoricManage;
 
     //各种表(材质 贴图 模块 编组 加工组)
+    BlockTable: BlockTable;
     MaterialTable: MaterialTable;
     TextureTable: TextureTable;
     TemplateTable: TemplateTable;

src/DatabaseServices/DimStyle/DimStyleTable.ts

@@ -1,7 +1,7 @@
 import { CADFiler } from "../CADFiler";
 import { ObjectId } from "../ObjectId";
+import { SymbolTable } from "../Tables/SymbolTable";
 import { Factory } from "./../CADFactory";
-import { SymbolTable } from "./../SymbolTable";
 
 
 @Factory

src/DatabaseServices/MaterialTableRecord.ts

@@ -1,5 +1,5 @@
-import { SymbolTableRecord } from "./SymbolTableRecord";
 import { Factory } from "./CADFactory";
+import { SymbolTableRecord } from "./SymbolTableRecord";
 
 @Factory
 export class MaterialTableRecord extends SymbolTableRecord

src/DatabaseServices/SymbolTableRecord.ts

@@ -1,7 +1,7 @@
 import { Status } from "../Common/Status";
 import { CADFiler } from "./CADFiler";
 import { CADObject } from "./CADObject";
-import { SymbolTable } from "./SymbolTable";
+import { SymbolTable } from "./Tables/SymbolTable";
 
 export abstract class SymbolTableRecord extends CADObject
 {

src/DatabaseServices/Tables/BlockTable.ts

@@ -1,4 +1,4 @@
-import { Factory } from "./CADFactory";
+import { Factory } from "../CADFactory";
 import { SymbolTable } from "./SymbolTable";
 
 @Factory

src/DatabaseServices/Tables/MaterialTable.ts

@@ -1,8 +1,8 @@
 import { observable } from "mobx";
-import { HostApplicationServices } from "../ApplicationServices/HostApplicationServices";
-import { CADFiler } from "./CADFiler";
-import { ObjectId } from "./ObjectId";
-import { PhysicalMaterialRecord } from "./PhysicalMaterialRecord";
+import { HostApplicationServices } from "../../ApplicationServices/HostApplicationServices";
+import { CADFiler } from "../CADFiler";
+import { ObjectId } from "../ObjectId";
+import { PhysicalMaterialRecord } from "../PhysicalMaterialRecord";
 import { SymbolTable } from "./SymbolTable";
 
 export class MaterialTable extends SymbolTable

src/DatabaseServices/Tables/SymbolTable.ts

@@ -1,12 +1,12 @@
 import { observable } from "mobx";
-import { Status } from "../Common/Status";
-import { Factory } from "./CADFactory";
-import { CADFiler } from "./CADFiler";
-import { CADObject } from "./CADObject";
-import { CreateObjectData } from "./CreateObjectData";
-import { HistorycRecord } from "./HistorycRecord";
-import { RemoveObjectData } from "./RemoveObjectData";
-import { SymbolTableRecord } from "./SymbolTableRecord";
+import { Status } from "../../Common/Status";
+import { Factory } from "../CADFactory";
+import { CADFiler } from "../CADFiler";
+import { CADObject } from "../CADObject";
+import { CreateObjectData } from "../CreateObjectData";
+import { HistorycRecord } from "../HistorycRecord";
+import { RemoveObjectData } from "../RemoveObjectData";
+import { SymbolTableRecord } from "../SymbolTableRecord";
 
 @Factory
 export class SymbolTable extends CADObject

src/DatabaseServices/Tables/TextureTable.ts

@@ -1,7 +1,7 @@
 import { MathUtils } from "three";
-import { Factory } from "./CADFactory";
+import { Factory } from "../CADFactory";
+import { TextureTableRecord } from "../Texture";
 import { SymbolTable } from "./SymbolTable";
-import { TextureTableRecord } from "./Texture";
 
 @Factory
 export class TextureTable extends SymbolTable

src/UI/Components/MaterialExplorer.tsx

@@ -11,9 +11,9 @@ import { GetEntity } from '../../Common/Utils';
 import { Hole } from '../../DatabaseServices/3DSolid/Hole';
 import { Board } from '../../DatabaseServices/Entity/Board';
 import { Curve } from '../../DatabaseServices/Entity/Curve';
-import { MaterialTable } from '../../DatabaseServices/MaterialTable';
 import { PhysicalMaterialRecord } from '../../DatabaseServices/PhysicalMaterialRecord';
 import { BulkheadCeiling } from '../../DatabaseServices/Room/Entity/Ceiling/BulkheadCeiling';
+import { MaterialTable } from '../../DatabaseServices/Tables/MaterialTable';
 import { Text } from '../../DatabaseServices/Text/Text';
 import { CommandWrap } from '../../Editor/CommandMachine';
 import { GenerateRaycaster, PointPick, Raycast } from '../../Editor/PointPick';