diff --git a/CADShared/Runtime/DBTrans.cs b/CADShared/Runtime/DBTrans.cs index 38af048c03807e3c600dbdac1a6e8a73f7d3b6b8..38510afabecb998b9f6105ea27fff1331f82cc28 100644 --- a/CADShared/Runtime/DBTrans.cs +++ b/CADShared/Runtime/DBTrans.cs @@ -177,6 +177,14 @@ public DBTrans(Database database, bool commit = true) /// /// 事务栈 /// 打开文件,默认提交事务 + /// 建议用法: + /// try + /// { + /// using var tr = new DBTrans(...); + /// ... + /// } + /// catch (...) { ... } + /// /// /// 要打开的文件名 /// 事务是否提交 @@ -190,7 +198,10 @@ public DBTrans(string fileName, bool activeOpen = false) { if (string.IsNullOrWhiteSpace(fileName)) + { + IsDisposed = true; // 出错后未 Push 会造成 Pop 抛错, 固设为 true throw new ArgumentNullException(nameof(fileName)); + } _fileName = fileName.Replace("/", "\\"); // doc.Name总是"D:\\JX.dwg" @@ -200,6 +211,7 @@ public DBTrans(string fileName, { if (activeOpen) { + IsDisposed = true; // 出错后未 Push 会造成 Pop 抛错, 固设为 true throw new IOException("错误:事务栈明确为前台开图时,文件不存在"); } else @@ -213,8 +225,8 @@ public DBTrans(string fileName, else { var doc = Acaop.DocumentManager - .Cast() - .FirstOrDefault(doc => !doc.IsDisposed && doc.Name == _fileName); + .Cast() + .FirstOrDefault(doc => !doc.IsDisposed && doc.Name == _fileName); if (activeOpen) { @@ -228,6 +240,7 @@ public DBTrans(string fileName, } catch (Exception e) { + IsDisposed = true; // 出错后未 Push 会造成 Pop 抛错, 固设为 true throw new IOException($"错误:此文件打开错误:{fileName}\n错误信息:{e.Message}"); } } @@ -250,16 +263,27 @@ public DBTrans(string fileName, if (doc is null) { Database = new Database(false, true); - if (Path.GetExtension(_fileName).ToLower().Contains("dxf")) + try { - Database.DxfIn(_fileName, null); + if (Path.GetExtension(_fileName).ToLower().Contains("dxf")) + { + Database.DxfIn(_fileName, null); + } + else + { + Database.ReadDwgFile(_fileName, fileOpenMode, true, password); + } } - else + catch (Exception e) { - Database.ReadDwgFile(_fileName, fileOpenMode, true, password); + IsDisposed = true; // 出错后未 Push 会造成 Pop 抛错, 固设为 true + Acap.ShowAlertDialog($"错误:此文件打开错误:{fileName}\n格式版本可能高于当前CAD版本\n错误信息:{e.Message}"); + throw; // 交给调用处处理更灵活,避免再次报错时CAD就直接退出 + } + finally + { + Database.CloseInput(true); } - - Database.CloseInput(true); } else {