diff --git a/src/Add-on/ExportData.tsx b/src/Add-on/ExportData.tsx
index 0f91b318b..de4479c99 100644
--- a/src/Add-on/ExportData.tsx
+++ b/src/Add-on/ExportData.tsx
@@ -36,6 +36,7 @@ import { Command } from "../Editor/CommandMachine";
 import { PromptSsgetResult, PromptStatus } from "../Editor/PromptResult";
 import { Orbit } from '../Geometry/Orbit';
 import { RenderType } from '../GraphicsSystem/RenderType';
+import { arrayPushArray } from '../Nest/Common/ArrayExt';
 import { GetCompoentObjectIdString } from '../UI/Components/ComponentObjectId';
 import { ModalFooter, ModalHeader } from '../UI/Components/Modal/ModalContainer';
 import { ModalPosition } from '../UI/Components/Modal/ModalInterface';
@@ -154,7 +155,7 @@ export function Entitys2Data(ents: Entity[]): Data
         else if (e instanceof Hole)
             d.Entitys.push(ConvertHole2Data(e));
         else if (e instanceof CompositeEntity)
-            d.Entitys.push(...CompositeEntity2Data(e));
+            arrayPushArray(d.Entitys, CompositeEntity2Data(e));
         else if (e instanceof RevolveSolid)
             d.Entitys.push(ConvertRevolve2Data(e));
         else if (e instanceof EntityRef)
diff --git a/src/DatabaseServices/FileServer.ts b/src/DatabaseServices/FileServer.ts
index 4a49e56f5..0ef5e284e 100644
--- a/src/DatabaseServices/FileServer.ts
+++ b/src/DatabaseServices/FileServer.ts
@@ -123,7 +123,11 @@ export class FileServer extends Singleton
                     intent: Intent.DANGER
                 });
 
-                if (!status) return status;//如果不肯放弃保存,那么终止本次文件打开
+                if (!status)
+                {
+                    AppToaster.dismiss("openfile");
+                    return status;//如果不肯放弃保存,那么终止本次文件打开
+                }
             }
             if (status)
                 try