diff --git a/src/Add-on/DrawArc.ts b/src/Add-on/DrawArc.ts
index 1e09904b8..e97f427fe 100644
--- a/src/Add-on/DrawArc.ts
+++ b/src/Add-on/DrawArc.ts
@@ -30,8 +30,7 @@ export class DrawArc implements Command
         pt2 = ptRes2.Value;
 
         let arc = new Arc();
-        let obj = arc.Draw(RenderType.Wireframe);
-        app.m_Editor.AddNoSnapEntity(obj);
+        app.m_Editor.AddNoSnapEntity(arc);
 
         let ptRes3 = await app.m_Editor.GetPoint({
             Msg: "请输入第三个点:", Callback: (p) =>
diff --git a/src/Add-on/DrawEllipse.ts b/src/Add-on/DrawEllipse.ts
index 5f5a007d6..193bc2c99 100644
--- a/src/Add-on/DrawEllipse.ts
+++ b/src/Add-on/DrawEllipse.ts
@@ -35,7 +35,7 @@ export class DrawEllipse implements Command
         let ellipse = new Ellipse(ptRes.Value, ellipseDist, 0, Math.atan2(disVec.y, disVec.x));
 
         app.m_Database.ModelSpace.Append(ellipse);
-        app.m_Editor.AddNoSnapEntity(ellipse.Draw(RenderType.Wireframe));
+        app.m_Editor.AddNoSnapEntity(ellipse);
         //椭圆Y轴
         let radY = await app.m_Editor.GetDistance({
             Msg: "指定轴端点:",
@@ -48,4 +48,4 @@ export class DrawEllipse implements Command
         app.m_Database.hm.EndCmd();
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/Add-on/DrawLine.ts b/src/Add-on/DrawLine.ts
index 0cdb9049c..79edcf3eb 100644
--- a/src/Add-on/DrawLine.ts
+++ b/src/Add-on/DrawLine.ts
@@ -248,7 +248,7 @@ export class DrawCircle implements Command
         let cir = new Circle(app.m_Editor.m_MouseCtrl.m_CurMousePointWCS.clone(), 1e-3);
         app.m_Database.ModelSpace.Append(cir);
 
-        app.m_Editor.AddNoSnapEntity(cir.Draw(RenderType.Wireframe));
+        app.m_Editor.AddNoSnapEntity(cir);
 
         let disRes = await app.m_Editor.GetDistance({
             Msg: "指定圆的半径:",
@@ -274,7 +274,7 @@ export class DrawCircle implements Command
 
         app.m_Database.ModelSpace.Append(cir);
 
-        app.m_Editor.AddNoSnapEntity(cir.Draw(RenderType.Wireframe));
+        app.m_Editor.AddNoSnapEntity(cir);
 
         let ptRes2 = await app.m_Editor.GetPoint({
             Msg: "指定圆直径的第二个端点:",
@@ -314,7 +314,7 @@ export class DrawCircle implements Command
         if (ptRes2.Status != PromptStatus.OK)
             return;
 
-        app.m_Editor.AddNoSnapEntity(cir.Draw(RenderType.Wireframe));
+        app.m_Editor.AddNoSnapEntity(cir);
         let ptRes3 = await app.m_Editor.GetPoint({
             Msg: "指定圆上第三个点:",
             BasePoint: ptRes2.Value,
diff --git a/src/Add-on/Stretch.ts b/src/Add-on/Stretch.ts
index d44b8aaa5..d72f315b0 100644
--- a/src/Add-on/Stretch.ts
+++ b/src/Add-on/Stretch.ts
@@ -31,7 +31,7 @@ export class Stretch implements Command
         if (p1.Status != PromptStatus.OK) return;
         let data = this.parse(ss);
         for (let [obj] of data.str)
-            app.m_Editor.AddNoSnapEntity(obj);
+            app.m_Editor.AddNoSnapEntity(obj.userData);
 
         let lastP = p1.Value.clone();
         let p2 = await app.m_Editor.GetPoint(
diff --git a/src/Editor/Editor.ts b/src/Editor/Editor.ts
index 75c436707..19f0fd1fb 100644
--- a/src/Editor/Editor.ts
+++ b/src/Editor/Editor.ts
@@ -94,7 +94,7 @@ export class Editor
     {
         return this.m_KeywordsServices.Start(prompt);
     }
-    AddNoSnapEntity(e)
+    AddNoSnapEntity(e: Entity)
     {
         this.m_GetpointServices.snapServices.notSnapEntity.add(e);
     }
diff --git a/src/Editor/SnapServices.ts b/src/Editor/SnapServices.ts
index b6b840c9b..65108bc1f 100644
--- a/src/Editor/SnapServices.ts
+++ b/src/Editor/SnapServices.ts
@@ -30,7 +30,7 @@ export class SnapServices
 {
     m_Disabled: boolean = false;//禁用捕捉
     private preLines: THREE.Line[] = []; //前视图绘制的线表
-    notSnapEntity = new Set<THREE.Object3D>();//不参与捕捉的实体列表,这个属性由开发人员维护.
+    notSnapEntity = new Set<Entity>();//不参与捕捉的实体列表,这个属性由开发人员维护.
     private snapPoints: THREE.Vector3[] = [];//捕捉的点列表
     //开始捕捉
     Start(prompt: GetPointPrompt)
diff --git a/src/Editor/TranstrolControl/TransformServices.ts b/src/Editor/TranstrolControl/TransformServices.ts
index b96394b88..30678c392 100644
--- a/src/Editor/TranstrolControl/TransformServices.ts
+++ b/src/Editor/TranstrolControl/TransformServices.ts
@@ -85,7 +85,7 @@ export class TransformServicess implements EditorService
             {
                 let newE = e.Clone() as Entity;
                 app.m_Viewer.Scene.add(newE.Draw(RenderType.Wireframe));
-                app.m_Editor.AddNoSnapEntity(newE.Draw(RenderType.Wireframe));
+                app.m_Editor.AddNoSnapEntity(newE);
                 return { old: e, new: newE };
             });
             let base = new THREE.Vector3().setFromMatrixColumn(this.m_Matrix, 3);
diff --git a/src/UI/Components/Panel.tsx b/src/UI/Components/Panel.tsx
index 97e67ee49..11fa7ae19 100644
--- a/src/UI/Components/Panel.tsx
+++ b/src/UI/Components/Panel.tsx
@@ -76,7 +76,7 @@ export class TopPanel extends React.Component<{}, {}>
                                 height: this.state.isCollapse ? "auto" : 0
                             }}
                         >
-                            < button className="pt-button pt-minimal pt-icon-home" >
+                            <button className="pt-button pt-minimal pt-icon-home" >
                                 <span className="hidden">
                                     主页
                                 </span>
@@ -91,13 +91,13 @@ export class TopPanel extends React.Component<{}, {}>
                             </ button >
                             < button className="pt-button pt-minimal pt-icon-annotation" />
                             <span className="pt-navbar-divider hidden" > </span>
-                            < button className="pt-button pt-minimal pt-icon-user" />
+                            <button className="pt-button pt-minimal pt-icon-user" />
                             <span></span>
-                            < button className="pt-button pt-minimal pt-icon-notifications" />
-                            < button className="pt-button pt-minimal pt-icon-cog" onClick={() => this.handleClick('setting')} />
+                            <button className="pt-button pt-minimal pt-icon-notifications" />
+                            <button className="pt-button pt-minimal pt-icon-cog" onClick={() => this.handleClick('setting')} />
                         </div> :
                         <div className="pt-navbar-group pt-align-right info" >
-                            < button className="pt-button pt-minimal pt-icon-home" > 主页 </ button >
+                            <button className="pt-button pt-minimal pt-icon-home" > 主页 </ button >
                             <span className="pt-navbar-divider" > </span>
                             <button
                                 className="pt-button pt-minimal"