Commit a06b276
committed
fix(EPPlus): DoAdjustDrawings ship-blocker 在 3 处切换点补完
d54ef9d 修了 ExportHelper.AddPictures 一处 DoAdjustDrawings=false 切换,
但全 EPPlus 还有 3 处同样缺 try/finally:
- ExcelRangeBase.AutoFitColumns (字体测量循环)
- ExcelWorksheet.CreateXml (加载 xlsx xml)
- ExcelWorksheets.CloneCells (worksheet 拷贝)
任一处抛未捕获异常都会让 flag 永久卡在 false, 后续
Row.Height / Column.Width / Column.Hidden setter 不重算 drawings,
图片位置错乱.
修复: 用 try/finally 包裹原赋值, finally 恢复 prevDoAdjust.
验证: DrawingsFlush 4/4, ExcelExporter 36/36, XSSF 34/34,
ImageOptimization 25/25, 共 100 测试通过.1 parent d54ef9d commit a06b276
3 files changed
Lines changed: 21 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
868 | 868 | | |
869 | 869 | | |
870 | 870 | | |
| 871 | + | |
| 872 | + | |
871 | 873 | | |
872 | 874 | | |
873 | 875 | | |
| |||
1003 | 1005 | | |
1004 | 1006 | | |
1005 | 1007 | | |
1006 | | - | |
1007 | 1008 | | |
1008 | 1009 | | |
1009 | 1010 | | |
| |||
1014 | 1015 | | |
1015 | 1016 | | |
1016 | 1017 | | |
| 1018 | + | |
| 1019 | + | |
| 1020 | + | |
| 1021 | + | |
| 1022 | + | |
1017 | 1023 | | |
1018 | 1024 | | |
1019 | 1025 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
874 | 874 | | |
875 | 875 | | |
876 | 876 | | |
| 877 | + | |
| 878 | + | |
877 | 879 | | |
878 | 880 | | |
879 | 881 | | |
| |||
907 | 909 | | |
908 | 910 | | |
909 | 911 | | |
910 | | - | |
| 912 | + | |
| 913 | + | |
| 914 | + | |
| 915 | + | |
| 916 | + | |
911 | 917 | | |
912 | 918 | | |
913 | 919 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
526 | 526 | | |
527 | 527 | | |
528 | 528 | | |
| 529 | + | |
| 530 | + | |
529 | 531 | | |
530 | 532 | | |
531 | 533 | | |
| |||
586 | 588 | | |
587 | 589 | | |
588 | 590 | | |
589 | | - | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
| 594 | + | |
| 595 | + | |
590 | 596 | | |
591 | 597 | | |
592 | 598 | | |
| |||
0 commit comments