Merge mit Branch 2.5.4.0

This commit is contained in:
Developer01
2025-08-15 08:29:46 +02:00
52 changed files with 606 additions and 206 deletions

View File

@@ -16,26 +16,34 @@ Public Class ClassSQLEditor
Dim oValueObject = DirectCast(value, SQLValue)
Dim oSQLString As String = oValueObject.Value
Dim oSQLConnection As Integer = oValueObject.ConnectionId
'Dim oSQLConnection As Integer = oValueObject.ConnectionId
If oService IsNot Nothing AndAlso oSQLString IsNot Nothing Then
'CURRENT_DESIGN_TYPE = "INPUT_INDEX"
Using oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM)
oForm.SQLCommand = oSQLString
oForm.SQLConnection = oSQLConnection
oForm.SQLConnection = 0 'oSQLConnection
oForm.PlaceholdersManualPrefix = "CTRL"
oForm.PlaceholdersManualTitle = "Controls"
oForm.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.
ToDictionary(Function(name) name, Function(name) name)
If IDB_ACTIVE = False Then
oForm.ATTRIBUTE_STORE = "WM"
oForm.PlaceholdersWindream = MVSource_AllIndicies
Else
oForm.ATTRIBUTE_STORE = "IDB"
End If
If oService.ShowDialog(oForm) = DialogResult.OK Then
Dim sql As New SQLValue(oForm.SQLCommand, oForm.SQLConnection)
Dim sql As New SQLValue(oForm.SQLCommand) ', oForm.SQLConnection
' CURRENT_CONN_ID_FINAL_INDEX = oForm.SQLConnection
' CURRENT_CONN_ID = oForm.SQLConnection
value = sql
End If
End Using
End If
Return value