fix #IHRQ0

src/DatabaseServices/Entity.ts

@@ -40,9 +40,9 @@ export class Entity extends CADObject
     //你必须重载该方法来更新绘制,在撤销重做时会自动调用该方法.
     Update()
     {
-        this.updateVisible();
+        this.UpdateVisible();
     }
-    private updateVisible()
+    UpdateVisible()
     {
         for (let [, en] of this.m_DrawEntity)
         {
@@ -71,7 +71,7 @@ export class Entity extends CADObject
     Erase(isErase: boolean = true)
     {
         super.Erase(isErase);
-        this.updateVisible();
+        this.UpdateVisible();
     }
 
     ApplyMatrix(m: Matrix4)

src/DatabaseServices/ObjectCollection.ts

@@ -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);
         }

src/GraphicsSystem/Viewer.ts

@@ -259,7 +259,8 @@ export class Viewer
             let ens = db.ModelSpace.objectCol;
             for (let en of db.ModelSpace.objectCol)
             {
-                let obj = (<Entity>en).Draw(RenderType.Wireframe);
+                let obj = en.Draw(RenderType.Wireframe);
+                en.UpdateVisible();
                 this.m_Scene.add(obj);
             }
             this.m_bNeedUpdate = true;
@@ -275,7 +276,7 @@ export class Viewer
         {
             for (let en of db.ModelSpace.objectCol)
             {
-                (<Entity>en).GoodBye();
+                en.GoodBye();
             }
         })
         xaop.end(db.ModelSpace, db.ModelSpace.ReadFile, () =>