Merge pull request #654 from FastReports/sync_branch_2024.1.1

FastReport.OpenSource 2024.1.1
FastReports · Dec 1, 2023 · f05b4bf · f05b4bf
2 parents a6998cc + 2819c29
commit f05b4bf
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/FastReport.Base/Data/JsonConnection/JsonDataSourceConnection.cs b/FastReport.Base/Data/JsonConnection/JsonDataSourceConnection.cs
@@ -220,6 +220,7 @@ private void InitConnection(bool rebuildSchema)
                     ServicePointManager.Expect100Continue = true;
                     ServicePointManager.SecurityProtocol = (SecurityProtocolType)(0xc0 | 0x300 | 0xc00);
                     var req = WebRequest.Create(jsonText);
+                    req.Timeout = CommandTimeout * 1000;
 
                     foreach (var header in builder.Headers)
                     {

diff --git a/FastReport.Base/Export/Html/HTMLExportLayers.cs b/FastReport.Base/Export/Html/HTMLExportLayers.cs
@@ -195,6 +195,9 @@ private FastString GetSpanText(TextObjectBase obj, FastString text,
             if (top != 0)
                 style.Append("margin-top:").Append(Px((top - obj.Padding.Top) * Zoom));
 
+            if (obj is TextObject textObject && !textObject.WordWrap)
+                style.Append("overflow: hidden; text-wrap: nowrap;");
+
                 // we need to apply border width in order to position our div perfectly
             float borderLeft;
             float borderRight;

diff --git a/FastReport.Base/PictureObject.cs b/FastReport.Base/PictureObject.cs
@@ -434,7 +434,11 @@ public override void DrawImage(FRPaintEventArgs e)
             {
                 g.Restore(state);
                 g.ResetClip();
+#if !SKIA
                 path.Dispose();
+#else
+                path = null;
+#endif    
             }
 
             if (IsPrinting)

diff --git a/UsedPackages.version b/UsedPackages.version
@@ -3,20 +3,20 @@
 <!-- This group sets version used packages in FastReport.Core, FastReport.OpenSource, FastReport.CoreWin, FastReport.WPF -->
     <PropertyGroup>
 
-        <FRCompatVersionNET>[2023.3.1]</FRCompatVersionNET>
+        <FRCompatVersionNET>[2024.1.0]</FRCompatVersionNET>
 
-        <FRCompatVersion>[2023.3.1]</FRCompatVersion>
-        <FRCompatSkiaVersion>[2023.3.4]</FRCompatSkiaVersion>
+        <FRCompatVersion>[2024.1.0]</FRCompatVersion>
+        <FRCompatSkiaVersion>[2024.1.0]</FRCompatSkiaVersion>
 
-        <FRDataVisualizationVersion>[2023.3.0]</FRDataVisualizationVersion>
-        <FRDataVisualizationSkiaVersion>[2023.3.4]</FRDataVisualizationSkiaVersion>
+        <FRDataVisualizationVersion>[2024.1.0]</FRDataVisualizationVersion>
+        <FRDataVisualizationSkiaVersion>[2024.1.0]</FRDataVisualizationSkiaVersion>
 
         <!-- WPF -->
-        <FRWPFVersion>2023.3.0</FRWPFVersion>
-        <FRWPFRoslynPadVersion>2023.3.0</FRWPFRoslynPadVersion>
-        <FRFormsWPFVersion>2023.2.1</FRFormsWPFVersion>
-        <FRCompatWPFVersion>2023.3.1</FRCompatWPFVersion>
-        <FRDataVisualizationWPFVersion>2023.3.0</FRDataVisualizationWPFVersion>
+        <FRWPFVersion>2024.1.0</FRWPFVersion>
+        <FRWPFRoslynPadVersion>2024.1.0</FRWPFRoslynPadVersion>
+        <FRFormsWPFVersion>2024.1.0</FRFormsWPFVersion>
+        <FRCompatWPFVersion>2024.1.0</FRCompatWPFVersion>
+        <FRDataVisualizationWPFVersion>2024.1.0</FRDataVisualizationWPFVersion>
 
         <!-- Not available in Core3 -->
         <SystemDrawingCommonVersion>[4.7.0,)</SystemDrawingCommonVersion>