diff --git a/__test__/FileSystem/__snapshots__/file.test.ts.snap b/__test__/FileSystem/__snapshots__/file.test.ts.snap
index dfb139e5c..9a78afe00 100644
--- a/__test__/FileSystem/__snapshots__/file.test.ts.snap
+++ b/__test__/FileSystem/__snapshots__/file.test.ts.snap
@@ -1,14 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`changev 1`] = `"[1,5,\\"BlockTableRecord\\",1,1,false,1,\\"Line\\",1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[2,3,4],[0,0,0],\\"MaerialTableRecord\\",1,2,false,0,\\"ObjectCollection\\",1,3,false,0,1,0,1,\\"CommandHistoryRecord\\",1,\\"\\",2,1,1,\\"HistorycRecord\\",1,\\"RemoveObjectData\\",1,0,\\"CreateObjectData\\",1,[\\"Line\\",1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[0,0,0],[0,0,0]],\\"\\",4,1,\\"ObjectAllDataHistoryRecord\\",1,1,\\"AllObjectData\\",1,[1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[0,0,0],[0,0,0]],\\"\\",\\"\\",4]"`;
+exports[`changev 1`] = `"[1,5,1,0,false,1,\\"\\",1,2,false,1,3,false,1,0,1,\\"CommandHistoryRecord\\",1,\\"\\",2,1,1,\\"HistorycRecord\\",1,\\"RemoveObjectData\\",1,0,\\"CreateObjectData\\",1,[\\"Line\\",1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[0,0,0],[0,0,0]],\\"\\",4,1,\\"ObjectAllDataHistoryRecord\\",1,1,\\"AllObjectData\\",1,[1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[0,0,0],[0,0,0]],\\"\\",\\"\\",4]"`;
 
-exports[`创建 修改 撤销撤销  重做重做  撤销  重做 1`] = `"[1,5,\\"BlockTableRecord\\",1,1,false,1,\\"Line\\",1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[1,2,3],[0,0,0],\\"MaerialTableRecord\\",1,2,false,0,\\"ObjectCollection\\",1,3,false,0,1,0,1,\\"CommandHistoryRecord\\",1,\\"\\",2,1,1,\\"HistorycRecord\\",1,\\"RemoveObjectData\\",1,0,\\"CreateObjectData\\",1,[\\"Line\\",1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[0,0,0],[0,0,0]],\\"\\",4,1,\\"ObjectAllDataHistoryRecord\\",1,1,\\"AllObjectData\\",1,[1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[0,0,0],[0,0,0]],\\"AllObjectData\\",1,[1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[1,2,3],[0,0,0]],\\"\\",4]"`;
+exports[`创建 修改 撤销撤销  重做重做  撤销  重做 1`] = `"[1,5,1,0,false,1,\\"\\",1,2,false,1,3,false,1,0,1,\\"CommandHistoryRecord\\",1,\\"\\",2,1,1,\\"HistorycRecord\\",1,\\"RemoveObjectData\\",1,0,\\"CreateObjectData\\",1,[\\"Line\\",1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[0,0,0],[0,0,0]],\\"\\",4,1,\\"ObjectAllDataHistoryRecord\\",1,1,\\"AllObjectData\\",1,[1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[0,0,0],[0,0,0]],\\"AllObjectData\\",1,[1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[1,2,3],[0,0,0]],\\"\\",4]"`;
 
 exports[`创建 修改 撤销撤销  重做重做  撤销  重做 2`] = `"[\\"HistoricManage\\",1,0,1,\\"CommandHistoryRecord\\",1,\\"\\",2,1,1,\\"HistorycRecord\\",1,\\"RemoveObjectData\\",1,0,\\"CreateObjectData\\",1,[\\"Line\\",1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[0,0,0],[0,0,0]],\\"\\",4,1,\\"ObjectAllDataHistoryRecord\\",1,1,\\"AllObjectData\\",1,[1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[0,0,0],[0,0,0]],\\"AllObjectData\\",1,[1,1,4,false,7,0,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],1,[1,2,3],[0,0,0]],\\"\\",4]"`;
 
 exports[`测试创建 1`] = `"[\\"AllObjectData\\",1,[]]"`;
 
-exports[`测试创建 2`] = `"[\\"BlockTableRecord\\",1,0,false,0]"`;
+exports[`测试创建 2`] = `"[\\"BlockTableRecord\\",1,0,false,1,\\"\\"]"`;
 
 exports[`测试创建 3`] = `"[\\"CommandHistoryRecord\\",1,null,0]"`;
 
diff --git a/__test__/FileSystem/file.test.ts b/__test__/FileSystem/file.test.ts
index 3388e1190..323294593 100644
--- a/__test__/FileSystem/file.test.ts
+++ b/__test__/FileSystem/file.test.ts
@@ -58,7 +58,8 @@ test('id分配', () =>
     let line = new Line();
 
     //对象添加到模型空间 分配id
-    let id = db.ModelSpace.Append(line);
+    db.ModelSpace.Append(line);
+    let id = line.Id;
 
     expect(id != undefined).toBeTruthy();//对象已经被创建,所以id被分配
     expect(id.Object === line).toBeTruthy();//对象id指向对象
@@ -67,12 +68,12 @@ test('id分配', () =>
     db.hm.Undo();
 
     expect(id.IsErase).toBeTruthy();  //对象已经被删除
-    expect(db.ModelSpace.Cout()).toBe(0);  //个数应该为0
+    expect(db.ModelSpace.Entitys.length).toBe(0);  //个数应该为0
 
     //还原对象
     db.hm.Redo();
 
-    expect(db.ModelSpace.Cout()).toBe(1);  //对象还原
+    expect(db.ModelSpace.Entitys.length).toBe(1);  //对象还原
     expect(!id.IsErase).toBeTruthy();  //id指向的对象不被删除
 });
 
@@ -99,7 +100,8 @@ test('changev', () =>
     let db = new Database();
     let l1 = new Line();
 
-    let id = db.ModelSpace.Append(l1);
+    db.ModelSpace.Append(l1);
+    let id = l1.Id;
 
     db.hm.Undo();
     db.hm.Redo();
@@ -118,8 +120,9 @@ test('xxx', () =>
     db.hm.StartCmd("");
     let l1 = new Line();
     let l2 = new Line();
-    let id1 = db.ModelSpace.Append(l1);
-    let in2 = db.ModelSpace.Append(l2);
+    db.ModelSpace.Append(l1);
+    let id1 = l1.Id;
+    db.ModelSpace.Append(l2);
 
     db.hm.Undo(); //?
     db.hm.Redo(); //?
@@ -166,7 +169,7 @@ test('创建 修改 撤销撤销  重做重做  撤销  重做', () =>
     let db = new Database();
 
     let line = new Line();
-    let id = db.ModelSpace.Append(line);
+    db.ModelSpace.Append(line);
     db.hm.StartCmd("U");
     line.StartPoint = new THREE.Vector3(1, 2, 3);
     db.hm.EndCmd();