懒得勤快 3 gadi atpakaļ
vecāks
revīzija
e85d213c3a

+ 19 - 5
Masuit.Tools.Excel/ExcelExtension.cs

@@ -4,9 +4,12 @@ using SixLabors.ImageSharp;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Text;
+using Image = SixLabors.ImageSharp.Image;
 
 namespace Masuit.Tools.Excel
 {
@@ -270,11 +273,22 @@ namespace Masuit.Tools.Excel
             }
             catch
             {
-                var ms = new MemoryStream();
-                using var image = Image.Load(stream);
-                image.SaveAsWebp(ms);
-                stream.Dispose();
-                return (ePictureType.WebP, ms);
+                try
+                {
+                    using var image = Image.Load(stream);
+                    var ms = new MemoryStream();
+                    image.SaveAsWebp(ms);
+                    stream.Dispose();
+                    return (ePictureType.WebP, ms);
+                }
+                catch
+                {
+                    using var bmp = new Bitmap(stream);
+                    var ms = new MemoryStream();
+                    bmp.Save(ms, ImageFormat.Jpeg);
+                    stream.Dispose();
+                    return (ePictureType.Jpg, ms);
+                }
             }
         }
 

+ 1 - 1
Masuit.Tools.Excel/Masuit.Tools.Excel.csproj

@@ -3,7 +3,7 @@
         <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net5;net6</TargetFrameworks>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>1.1.2</Version>
+        <Version>1.1.2.1</Version>
         <Authors>懒得勤快</Authors>
         <Description>Masuit.Tools.Excel导出库,支持一些简单数据的导出,支持图片列</Description>
         <Copyright>懒得勤快</Copyright>