|
|
|
@ -9,12 +9,12 @@ import { CreateObjectData } from './CreateObjectData';
|
|
|
|
|
|
|
|
|
|
//对象集合.
|
|
|
|
|
@Factory
|
|
|
|
|
export class ObjectCollection<T> extends CADObject
|
|
|
|
|
export class ObjectCollection<T extends CADObject> extends CADObject
|
|
|
|
|
{
|
|
|
|
|
objectCol: CADObject[] = [];
|
|
|
|
|
objectCol: T[] = [];
|
|
|
|
|
|
|
|
|
|
//添加一个对象进入集合,这个集合存在db中,那么将自动分配id.
|
|
|
|
|
Append(obj: CADObject)
|
|
|
|
|
Append(obj: T)
|
|
|
|
|
{
|
|
|
|
|
if (obj.Id)
|
|
|
|
|
{
|
|
|
|
@ -40,11 +40,11 @@ export class ObjectCollection<T> extends CADObject
|
|
|
|
|
|
|
|
|
|
return obj.Id;
|
|
|
|
|
}
|
|
|
|
|
AppendEvent(obj: CADObject)
|
|
|
|
|
AppendEvent(obj: T)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
Remove(obj: CADObject)
|
|
|
|
|
Remove(obj: T)
|
|
|
|
|
{
|
|
|
|
|
ArrayRemove(this.objectCol, obj);
|
|
|
|
|
obj.Erase();
|
|
|
|
@ -81,7 +81,7 @@ export class ObjectCollection<T> extends CADObject
|
|
|
|
|
this.objectCol = [];
|
|
|
|
|
for (let i = 0; i < cout; i++)
|
|
|
|
|
{
|
|
|
|
|
let obj = file.ReadObject(this._db);
|
|
|
|
|
let obj = file.ReadObject(this._db) as T;
|
|
|
|
|
this.objectCol.push(obj);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -100,7 +100,7 @@ export class ObjectCollection<T> extends CADObject
|
|
|
|
|
{
|
|
|
|
|
if (undoData instanceof CreateObjectData)
|
|
|
|
|
{
|
|
|
|
|
let obj = undoData.getObject(this._db);
|
|
|
|
|
let obj = undoData.getObject(this._db) as T;
|
|
|
|
|
this.objectCol.push(obj);
|
|
|
|
|
this.AppendEvent(obj);
|
|
|
|
|
}
|
|
|
|
|