开发:修复类型问题

pull/2980/MERGE
ChenX 2 months ago
parent f0e71655ec
commit a80a2570b9

@ -7,10 +7,10 @@ import { SymbolTable } from "./SymbolTable";
export class MaterialTable extends SymbolTable
{
@observable protected _CurFloorMtl: ObjectId;//默认地板材质
@observable protected _CurWallMtl: ObjectId;//默认墙体材质
@observable protected _CurDrawMtl: ObjectId;//默认实体材质
@observable protected _CurBulkCeilingFaceMaterial: ObjectId;//吊顶底面默认材质
@observable protected _CurFloorMtl: ObjectId<PhysicalMaterialRecord>;//默认地板材质
@observable protected _CurWallMtl: ObjectId<PhysicalMaterialRecord>;//默认墙体材质
@observable protected _CurDrawMtl: ObjectId<PhysicalMaterialRecord>;//默认实体材质
@observable protected _CurBulkCeilingFaceMaterial: ObjectId<PhysicalMaterialRecord>;//吊顶底面默认材质
get CurFloorMtl() { return this._CurFloorMtl; }
get CurWallMtl() { return this._CurWallMtl; }
@ -46,7 +46,7 @@ export class MaterialTable extends SymbolTable
HostApplicationServices.DefaultMeshMaterial = (id.Object as PhysicalMaterialRecord).Material;
}
set CurBulkCeilingFaceMaterial(id)
set CurBulkCeilingFaceMaterial(id: ObjectId<PhysicalMaterialRecord>)
{
if (id === this._CurBulkCeilingFaceMaterial) return;
this.WriteAllObjectRecord();
@ -96,15 +96,15 @@ export class MaterialTable extends SymbolTable
if (this._FileVer > 2)
{
this._CurFloorMtl = file.ReadObjectId();
this._CurWallMtl = file.ReadObjectId();
this._CurFloorMtl = file.ReadObjectId() as ObjectId<PhysicalMaterialRecord>;
this._CurWallMtl = file.ReadObjectId() as ObjectId<PhysicalMaterialRecord>;
}
if (this._FileVer > 3)
this._CurDrawMtl = file.ReadObjectId();
this._CurDrawMtl = file.ReadObjectId() as ObjectId<PhysicalMaterialRecord>;
if (this._FileVer > 4)
this._CurBulkCeilingFaceMaterial = file.ReadObjectId();
this._CurBulkCeilingFaceMaterial = file.ReadObjectId() as ObjectId<PhysicalMaterialRecord>;
}
//对象将自身数据写入到文件.

@ -119,7 +119,7 @@ export class CompositeMatalPanel extends React.Component<ICompositeMatalPanelPan
//复制材质
if (e instanceof CompositeEntity)
{
let mtls: ObjectId[] = [];
let mtls: ObjectId<PhysicalMaterialRecord>[] = [];
e.Traverse(e =>
{
mtls.push(e.Material);

Loading…
Cancel
Save