Vor Übernahme
This commit is contained in:
Developer01
@@ -143,6 +143,13 @@
|
||||
|
||||
<Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
|
||||
<File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" KeyPath="yes" />
|
||||
<File Id="GdPicture.NET.14.barcode.1d.reader.64" Name="GdPicture.NET.14.barcode.1d.reader.64.dll" />
|
||||
<File Id="GdPicture.NET.14.barcode.1d.reader" Name="GdPicture.NET.14.barcode.1d.reader.dll" />
|
||||
<File Id="GdPicture.NET.14.barcode.1d.writer" Name="GdPicture.NET.14.barcode.1d.writer.dll" />
|
||||
<File Id="GdPicture.NET.14.barcode.2d.reader.64" Name="GdPicture.NET.14.barcode.2d.reader.64.dll" />
|
||||
<File Id="GdPicture.NET.14.barcode.2d.reader" Name="GdPicture.NET.14.barcode.2d.reader.dll" />
|
||||
<File Id="GdPicture.NET.14.barcode.2d.writer" Name="GdPicture.NET.14.barcode.2d.writer.dll" />
|
||||
<File Id="GdPicture.NET.14.WinForms" Name="GdPicture.NET.14.WinForms.dll" />
|
||||
<File Id="GdPicture.NET.14.CAD" Name="GdPicture.NET.14.CAD.dll" />
|
||||
<File Id="GdPicture.NET.14.CAD.DWG" Name="GdPicture.NET.14.CAD.DWG.dll" />
|
||||
<File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" />
|
||||
@@ -157,6 +164,9 @@
|
||||
<File Id="GdPicture.NET.14.Imaging.ML.64" Name="GdPicture.NET.14.Imaging.ML.64.dll" />
|
||||
<File Id="GdPicture.NET.14.Imaging.ML" Name="GdPicture.NET.14.Imaging.ML.dll" />
|
||||
<File Id="GdPicture.NET.14.Imaging.Formats.Conversion" Name="GdPicture.NET.14.Imaging.Formats.Conversion.dll" />
|
||||
<File Id="GdPicture.NET.14.machine.vision.64" Name="GdPicture.NET.14.machine.vision.64.dll" />
|
||||
<File Id="GdPicture.NET.14.machine.vision" Name="GdPicture.NET.14.machine.vision.dll" />
|
||||
<File Id="GdPicture.NET.14.Markdown" Name="GdPicture.NET.14.Markdown.dll" />
|
||||
<File Id="GdPicture.NET.14.Common" Name="GdPicture.NET.14.Common.dll" />
|
||||
<File Id="GdPicture.NET.14.Document" Name="GdPicture.NET.14.Document.dll" />
|
||||
<File Id="GdPicture.NET.14.PDF" Name="GdPicture.NET.14.PDF.dll" />
|
||||
@@ -170,22 +180,142 @@
|
||||
<File Id="BouncyCastle.Cryptography" Name="BouncyCastle.Cryptography.dll"/>
|
||||
<File Id="DocumentFormat.OpenXml" Name="DocumentFormat.OpenXml.dll" />
|
||||
<File Id="DocumentFormat.OpenXml.Framework" Name="DocumentFormat.OpenXml.Framework.dll" />
|
||||
<File Id="GdPicture.NET.14.OpenXML.Templating" Name="GdPicture.NET.14.OpenXML.Templating.dll" />
|
||||
<File Id="GdPicture.NET.14.twain.client.64" Name="GdPicture.NET.14.twain.client.64.dll" />
|
||||
<File Id="GdPicture.NET.14.twain.client" Name="GdPicture.NET.14.twain.client.dll" />
|
||||
<File Id="Microsoft.Bcl.AsyncInterfaces" Name="Microsoft.Bcl.AsyncInterfaces.dll" />
|
||||
<File Id="Microsoft.Bcl.Cryptography" Name="Microsoft.Bcl.Cryptography.dll" />
|
||||
<File Id="Microsoft.Bcl.HashCode" Name="Microsoft.Bcl.HashCode.dll" />
|
||||
<File Id="Microsoft.Identity.Client" Name="Microsoft.Identity.Client.dll" />
|
||||
<File Id="Microsoft.IdentityModel.Abstractions" Name="Microsoft.IdentityModel.Abstractions.dll" />
|
||||
<File Id="Microsoft.Win32.Primitives" Name="Microsoft.Win32.Primitives.dll" />
|
||||
<File Id="Microsoft.Win32.Registry" Name="Microsoft.Win32.Registry.dll" />
|
||||
<File Id="OpenMcdf" Name="OpenMcdf.dll" />
|
||||
<File Id="netstandard" Name="netstandard.dll" />
|
||||
<File Id="Newtonsoft.Json.Bson" Name="Newtonsoft.Json.Bson.dll" />
|
||||
<File Id="Google.Protobuf" Name="Google.Protobuf.dll" />
|
||||
<File Id="protobufnet.Core" Name="protobuf-net.Core.dll" />
|
||||
<File Id="protobufnet" Name="protobuf-net.dll" />
|
||||
<File Id="RtfPipe" Name="RtfPipe.dll" />
|
||||
<File Id="System.AppContext" Name="System.AppContext.dll" />
|
||||
<File Id="System.Buffers" Name="System.Buffers.dll" />
|
||||
<File Id="System.CodeDom" Name="System.CodeDom.dll" />
|
||||
<File Id="System.Collections.Concurrent" Name="System.Collections.Concurrent.dll" />
|
||||
<File Id="System.Collections" Name="System.Collections.dll" />
|
||||
<File Id="System.Collections.Immutable" Name="System.Collections.Immutable.dll" />
|
||||
<File Id="System.Collections.NonGeneric" Name="System.Collections.NonGeneric.dll" />
|
||||
<File Id="System.Collections.Specialized" Name="System.Collections.Specialized.dll" />
|
||||
<File Id="System.ComponentModel.EventBasedAsync" Name="System.ComponentModel.EventBasedAsync.dll" />
|
||||
<File Id="System.ComponentModel.Primitives" Name="System.ComponentModel.Primitives.dll" />
|
||||
<File Id="System.ComponentModel" Name="System.ComponentModel.dll" />
|
||||
<File Id="System.ComponentModel.TypeConverter" Name="System.ComponentModel.TypeConverter.dll" />
|
||||
<File Id="System.Console" Name="System.Console.dll" />
|
||||
<File Id="System.Data.Common" Name="System.Data.Common.dll" />
|
||||
<File Id="System.Data.Odbc" Name="System.Data.Odbc.dll" />
|
||||
<File Id="System.Diagnostics.Contracts" Name="System.Diagnostics.Contracts.dll" />
|
||||
<File Id="System.Diagnostics.Debug" Name="System.Diagnostics.Debug.dll" />
|
||||
<File Id="System.Diagnostics.FileVersionInfo" Name="System.Diagnostics.FileVersionInfo.dll" />
|
||||
<File Id="System.Diagnostics.Process" Name="System.Diagnostics.Process.dll" />
|
||||
<File Id="System.Diagnostics.StackTrace" Name="System.Diagnostics.StackTrace.dll" />
|
||||
<File Id="System.Diagnostics.TextWriterTraceListener" Name="System.Diagnostics.TextWriterTraceListener.dll" />
|
||||
<File Id="System.Diagnostics.Tools" Name="System.Diagnostics.Tools.dll" />
|
||||
<File Id="System.Diagnostics.TraceSource" Name="System.Diagnostics.TraceSource.dll" />
|
||||
<File Id="System.Diagnostics.Tracing" Name="System.Diagnostics.Tracing.dll" />
|
||||
<File Id="System.Drawing.Primitives" Name="System.Drawing.Primitives.dll" />
|
||||
<File Id="System.Dynamic.Runtime" Name="System.Dynamic.Runtime.dll" />
|
||||
<File Id="System.Formats.Asn1" Name="System.Formats.Asn1.dll" />
|
||||
<File Id="System.Globalization.Calendars" Name="System.Globalization.Calendars.dll" />
|
||||
<File Id="System.Globalization" Name="System.Globalization.dll" />
|
||||
<File Id="System.Globalization.Extensions" Name="System.Globalization.Extensions.dll" />
|
||||
<File Id="System.IO.Compression" Name="System.IO.Compression.dll" />
|
||||
<File Id="System.IO.Compression.ZipFile" Name="System.IO.Compression.ZipFile.dll" />
|
||||
<File Id="System.IO" Name="System.IO.dll" />
|
||||
<File Id="System.IO.FileSystem" Name="System.IO.FileSystem.dll" />
|
||||
<File Id="System.IO.FileSystem.DriveInfo" Name="System.IO.FileSystem.DriveInfo.dll" />
|
||||
<File Id="System.IO.FileSystem.Primitives" Name="System.IO.FileSystem.Primitives.dll" />
|
||||
<File Id="System.IO.FileSystem.Watcher" Name="System.IO.FileSystem.Watcher.dll" />
|
||||
<File Id="System.IO.IsolatedStorage" Name="System.IO.IsolatedStorage.dll" />
|
||||
<File Id="System.IO.MemoryMappedFiles" Name="System.IO.MemoryMappedFiles.dll" />
|
||||
<File Id="System.IO.Pipelines" Name="System.IO.Pipelines.dll" />
|
||||
<File Id="System.IO.Pipes" Name="System.IO.Pipes.dll" />
|
||||
<File Id="System.IO.UnmanagedMemoryStream" Name="System.IO.UnmanagedMemoryStream.dll" />
|
||||
<File Id="System.Linq" Name="System.Linq.dll" />
|
||||
<File Id="System.Linq.Expressions" Name="System.Linq.Expressions.dll" />
|
||||
<File Id="System.Linq.Parallel" Name="System.Linq.Parallel.dll" />
|
||||
<File Id="System.Linq.Queryable" Name="System.Linq.Queryable.dll" />
|
||||
<File Id="System.Memory2" Name="System.Memory.dll" />
|
||||
<File Id="System.Net.Http" Name="System.Net.Http.dll" />
|
||||
<File Id="System.Net.Http.Formatting" Name="System.Net.Http.Formatting.dll" />
|
||||
<File Id="System.Net.NameResolution" Name="System.Net.NameResolution.dll" />
|
||||
<File Id="System.Net.NetworkInformation" Name="System.Net.NetworkInformation.dll" />
|
||||
<File Id="System.Net.Ping" Name="System.Net.Ping.dll" />
|
||||
<File Id="System.Net.Primitives" Name="System.Net.Primitives.dll" />
|
||||
<File Id="System.Net.Requests" Name="System.Net.Requests.dll" />
|
||||
<File Id="System.Net.Security" Name="System.Net.Security.dll" />
|
||||
<File Id="System.Net.Sockets" Name="System.Net.Sockets.dll" />
|
||||
<File Id="System.Net.WebHeaderCollection" Name="System.Net.WebHeaderCollection.dll" />
|
||||
<File Id="System.Net.WebSockets.Client" Name="System.Net.WebSockets.Client.dll" />
|
||||
<File Id="System.Net.WebSockets" Name="System.Net.WebSockets.dll" />
|
||||
<File Id="System.Numerics.Vectors.xml" Name="System.Numerics.Vectors.xml" />
|
||||
<File Id="System.ObjectModel" Name="System.ObjectModel.dll" />
|
||||
<File Id="System.Reflection" Name="System.Reflection.dll" />
|
||||
<File Id="System.Reflection.Extensions" Name="System.Reflection.Extensions.dll" />
|
||||
<File Id="System.Reflection.Primitives" Name="System.Reflection.Primitives.dll" />
|
||||
<File Id="System.Resources.Reader" Name="System.Resources.Reader.dll" />
|
||||
<File Id="System.Resources.ResourceManager" Name="System.Resources.ResourceManager.dll" />
|
||||
<File Id="System.Resources.Writer" Name="System.Resources.Writer.dll" />
|
||||
<File Id="System.Runtime.CompilerServices.Unsafe.xml" Name="System.Runtime.CompilerServices.Unsafe.xml" />
|
||||
<File Id="System.Runtime.CompilerServices.VisualC" Name="System.Runtime.CompilerServices.VisualC.dll" />
|
||||
<File Id="System.Runtime" Name="System.Runtime.dll" />
|
||||
<File Id="System.Runtime.Extensions" Name="System.Runtime.Extensions.dll" />
|
||||
<File Id="System.Runtime.Handles" Name="System.Runtime.Handles.dll" />
|
||||
<File Id="System.Runtime.InteropServices" Name="System.Runtime.InteropServices.dll" />
|
||||
<File Id="System.Runtime.InteropServices.RuntimeInformation" Name="System.Runtime.InteropServices.RuntimeInformation.dll" />
|
||||
<File Id="System.Runtime.Numerics" Name="System.Runtime.Numerics.dll" />
|
||||
<File Id="System.Runtime.Serialization.Formatters" Name="System.Runtime.Serialization.Formatters.dll" />
|
||||
<File Id="System.Runtime.Serialization.Json" Name="System.Runtime.Serialization.Json.dll" />
|
||||
<File Id="System.Runtime.Serialization.Primitives" Name="System.Runtime.Serialization.Primitives.dll" />
|
||||
<File Id="System.Runtime.Serialization.Xml" Name="System.Runtime.Serialization.Xml.dll" />
|
||||
<File Id="System.Security.Claims" Name="System.Security.Claims.dll" />
|
||||
<File Id="System.Security.Cryptography.Algorithms" Name="System.Security.Cryptography.Algorithms.dll" />
|
||||
<File Id="System.Security.Cryptography.Csp" Name="System.Security.Cryptography.Csp.dll" />
|
||||
<File Id="System.Security.Cryptography.Encoding" Name="System.Security.Cryptography.Encoding.dll" />
|
||||
<File Id="System.Security.Cryptography.Pkcs.xml" Name="System.Security.Cryptography.Pkcs.xml" />
|
||||
<File Id="System.Security.Cryptography.Primitives" Name="System.Security.Cryptography.Primitives.dll" />
|
||||
<File Id="System.Security.Cryptography.X509Certificates" Name="System.Security.Cryptography.X509Certificates.dll" />
|
||||
<File Id="System.Security.Principal" Name="System.Security.Principal.dll" />
|
||||
<File Id="System.Security.SecureString" Name="System.Security.SecureString.dll" />
|
||||
<File Id="System.Text.Encoding" Name="System.Text.Encoding.dll" />
|
||||
<File Id="System.Text.Encoding.Extensions" Name="System.Text.Encoding.Extensions.dll" />
|
||||
<File Id="System.Text.Encodings.Web.xml" Name="System.Text.Encodings.Web.xml" />
|
||||
<File Id="System.Text.Json.xml" Name="System.Text.Json.xml" />
|
||||
<File Id="System.Text.RegularExpressions" Name="System.Text.RegularExpressions.dll" />
|
||||
<File Id="System.Threading.Channels" Name="System.Threading.Channels.dll" />
|
||||
<File Id="System.Threading.Channels.xml" Name="System.Threading.Channels.xml" />
|
||||
<File Id="System.Threading" Name="System.Threading.dll" />
|
||||
<File Id="System.Threading.Overlapped" Name="System.Threading.Overlapped.dll" />
|
||||
<File Id="System.Threading.Tasks" Name="System.Threading.Tasks.dll" />
|
||||
<File Id="System.Threading.Tasks.Extensions.xml" Name="System.Threading.Tasks.Extensions.xml" />
|
||||
<File Id="System.Threading.Tasks.Parallel" Name="System.Threading.Tasks.Parallel.dll" />
|
||||
<File Id="System.IO.Packaging" Name="System.IO.Packaging.dll" />
|
||||
<File Id="System.Memory" Name="System.Memory.dll" />
|
||||
<File Id="System.Numerics.Vectors" Name="System.Numerics.Vectors.dll" />
|
||||
<File Id="System.Threading.Thread" Name="System.Threading.Thread.dll" />
|
||||
<File Id="System.Threading.ThreadPool" Name="System.Threading.ThreadPool.dll" />
|
||||
<File Id="System.Threading.Timer" Name="System.Threading.Timer.dll" />
|
||||
<File Id="System.ValueTuple.xml" Name="System.ValueTuple.xml" />
|
||||
<File Id="System.Xml.ReaderWriter" Name="System.Xml.ReaderWriter.dll" />
|
||||
<File Id="System.Xml.XDocument" Name="System.Xml.XDocument.dll" />
|
||||
<File Id="System.Xml.XmlDocument" Name="System.Xml.XmlDocument.dll" />
|
||||
<File Id="System.Xml.XmlSerializer" Name="System.Xml.XmlSerializer.dll" />
|
||||
<File Id="System.Xml.XPath" Name="System.Xml.XPath.dll" />
|
||||
<File Id="System.Xml.XPath.XDocument" Name="System.Xml.XPath.XDocument.dll" />
|
||||
<File Id="System.Runtime.CompilerServices.Unsafe" Name="System.Runtime.CompilerServices.Unsafe.dll" />
|
||||
<File Id="System.Security.Cryptography.Pkcs" Name="System.Security.Cryptography.Pkcs.dll" />
|
||||
<File Id="System.Text.Encodings.Web" Name="System.Text.Encodings.Web.dll" />
|
||||
<File Id="System.Threading.Tasks.Extensions" Name="System.Threading.Tasks.Extensions.dll" />
|
||||
<File Id="System.ValueTuple" Name="System.ValueTuple.dll" />
|
||||
<File Id="NativeSDK.Settings" Name="NativeSDK.Settings.dll" />
|
||||
<File Id="NativeSDK.Settings.Edition" Name="NativeSDK.Settings.Edition.dll" />
|
||||
<File Id="NativeSDK.Exceptions" Name="NativeSDK.Exceptions.dll" />
|
||||
</Component>
|
||||
|
||||
<Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
|
||||
|
||||
@@ -94,6 +94,7 @@ Namespace ControlCreator
|
||||
resolvedSql = resolvedSql.Replace(match.Value, safeValue)
|
||||
Next
|
||||
|
||||
' *** SCHRITT 2: {#CTRL#...} via clsPatterns - MIT CACHE ***
|
||||
' *** SCHRITT 2: {#CTRL#...} via clsPatterns - MIT CACHE ***
|
||||
If _ParentControl IsNot Nothing AndAlso resolvedSql.Contains("{#CTRL#") Then
|
||||
' Cache-Key: Hash aus SQL + Control-Werten
|
||||
@@ -101,15 +102,62 @@ Namespace ControlCreator
|
||||
|
||||
SyncLock _ResolvedSqlCache
|
||||
If _ResolvedSqlCache.ContainsKey(cacheKey) Then
|
||||
' ✅ CACHE HIT: Kein Logging → spart 380+ Log-Zeilen
|
||||
resolvedSql = _ResolvedSqlCache(cacheKey)
|
||||
' Kein Log → spart 200+ Zeilen
|
||||
Else
|
||||
' ❌ CACHE MISS: Nur HIER Debug-Logs
|
||||
_Logger.Debug("[ResolveSqlTemplate] ReplaceAllValues-Cache MISS")
|
||||
|
||||
' *** DEBUG: Log Parent-Control (NUR beim ersten Aufruf) ***
|
||||
If LOG_HOTSPOTS Then
|
||||
_Logger.Debug("[ResolveSqlTemplate] _ParentControl is [{0}], has {1} controls",
|
||||
_ParentControl.GetType().Name, _ParentControl.Controls.Count)
|
||||
|
||||
' *** ERWEITERTE SUCHE: Alle Controls durchsuchen ***
|
||||
Dim testLU As Control = Nothing
|
||||
For Each ctrl As Control In _ParentControl.Controls
|
||||
If ctrl.Name = "LU_LieferantenNummer" Then
|
||||
testLU = ctrl
|
||||
Exit For
|
||||
End If
|
||||
' Rekursiv in Child-Controls suchen
|
||||
If ctrl.HasChildren Then
|
||||
testLU = FindControlRecursive(ctrl, "LU_LieferantenNummer")
|
||||
If testLU IsNot Nothing Then Exit For
|
||||
End If
|
||||
Next
|
||||
|
||||
If testLU IsNot Nothing AndAlso TypeOf testLU Is LookupControl3 Then
|
||||
Dim luValue = DirectCast(testLU, LookupControl3).EditValue
|
||||
_Logger.Debug("[ResolveSqlTemplate] LU_LieferantenNummer.EditValue = [{0}]", luValue)
|
||||
Else
|
||||
_Logger.Warn("[ResolveSqlTemplate] LU_LieferantenNummer NOT FOUND in _ParentControl!")
|
||||
' *** LISTE ALLE CONTROLS AUF (nur beim ersten Fehler) ***
|
||||
_Logger.Debug("[ResolveSqlTemplate] Available controls in _ParentControl:")
|
||||
For Each ctrl In _ParentControl.Controls
|
||||
_Logger.Debug(" - {0} (Type: {1})", ctrl.Name, ctrl.GetType().Name)
|
||||
Next
|
||||
End If
|
||||
End If
|
||||
|
||||
' Nur bei Cache-Miss ReplaceAllValues aufrufen
|
||||
Dim beforeReplace = resolvedSql
|
||||
resolvedSql = clsPatterns.ReplaceAllValues(resolvedSql, _ParentControl, True)
|
||||
_ResolvedSqlCache(cacheKey) = resolvedSql
|
||||
If LOG_HOTSPOTS Then _Logger.Debug("[ResolveSqlTemplate] ReplaceAllValues-Cache MISS")
|
||||
|
||||
' *** DEBUG: Log VOR/NACH (nur bei MISS) ***
|
||||
If LOG_HOTSPOTS Then
|
||||
_Logger.Info("[ResolveSqlTemplate] BEFORE: {0}",
|
||||
beforeReplace.Substring(0, Math.Min(150, beforeReplace.Length)))
|
||||
_Logger.Info("[ResolveSqlTemplate] AFTER: {0}",
|
||||
resolvedSql.Substring(0, Math.Min(150, resolvedSql.Length)))
|
||||
End If
|
||||
End If
|
||||
End SyncLock
|
||||
Else
|
||||
If _ParentControl Is Nothing Then
|
||||
_Logger.Warn("[ResolveSqlTemplate] _ParentControl is NOTHING! Cannot replace {{#CTRL#...}}")
|
||||
End If
|
||||
End If
|
||||
|
||||
Return resolvedSql
|
||||
@@ -134,6 +182,27 @@ Namespace ControlCreator
|
||||
End If
|
||||
End Function
|
||||
''' <summary>
|
||||
''' Durchsucht rekursiv alle Child-Controls nach einem bestimmten Namen.
|
||||
''' Notwendig, weil Controls.Find() in TableLayoutPanels/GroupBoxen manchmal versagt.
|
||||
''' </summary>
|
||||
Private Function FindControlRecursive(parent As Control, controlName As String) As Control
|
||||
If parent Is Nothing Then Return Nothing
|
||||
|
||||
For Each child As Control In parent.Controls
|
||||
If child.Name = controlName Then
|
||||
Return child
|
||||
End If
|
||||
|
||||
' Rekursiv in Kindern suchen
|
||||
If child.HasChildren Then
|
||||
Dim found = FindControlRecursive(child, controlName)
|
||||
If found IsNot Nothing Then Return found
|
||||
End If
|
||||
Next
|
||||
|
||||
Return Nothing
|
||||
End Function
|
||||
''' <summary>
|
||||
''' Placeholder für Control-Value-Hashing.
|
||||
''' </summary>
|
||||
Private Function GenerateCacheKey(sql As String, parent As Control) As String
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user