Erweiterung von frmSQLEditor-Initialisierung
Die Initialisierung des Formulars `frmSQLEditor` wurde in den Klassen `frmColumn_Detail` und `frmFormDesigner` erweitert. Neue Eigenschaften wie `PlaceholdersManualPrefix`, `PlaceholdersManualTitle` und `PlaceholdersManual` wurden hinzugefügt. Eine Bedingung für `IDB_ACTIVE` wurde eingeführt, um die Eigenschaften `ATTRIBUTE_STORE` und `PlaceholdersWindream` dynamisch zu setzen. Die Eigenschaft `SQLConnection` wurde in beiden Klassen auf `1` geändert.
This commit is contained in:
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("2.9.2.0")>
|
<Assembly: AssemblyVersion("2.9.3.0")>
|
||||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||||
<Assembly: NeutralResourcesLanguage("")>
|
<Assembly: NeutralResourcesLanguage("")>
|
||||||
|
|||||||
@@ -136,9 +136,18 @@ Public Class frmColumn_Detail
|
|||||||
CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN"
|
CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN"
|
||||||
CURRENT_INDEX_ID = GUIDTextBox.Text
|
CURRENT_INDEX_ID = GUIDTextBox.Text
|
||||||
Dim oForm2 As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
Dim oForm2 As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
||||||
.SQLCommand = SQL_COMMANDTextBox.Text,
|
.SQLCommand = SQL_COMMANDTextBox.Text,
|
||||||
.SQLConnection = 0
|
.SQLConnection = 1,
|
||||||
}
|
.PlaceholdersManualPrefix = "CTRL",
|
||||||
|
.PlaceholdersManualTitle = "Controls",
|
||||||
|
.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name)
|
||||||
|
}
|
||||||
|
If IDB_ACTIVE = False Then
|
||||||
|
oForm2.ATTRIBUTE_STORE = "WM"
|
||||||
|
oForm2.PlaceholdersWindream = MVSource_AllIndicies
|
||||||
|
Else
|
||||||
|
oForm2.ATTRIBUTE_STORE = "IDB"
|
||||||
|
End If
|
||||||
oForm2.ShowDialog()
|
oForm2.ShowDialog()
|
||||||
|
|
||||||
If oForm2.DialogResult = DialogResult.OK Then
|
If oForm2.DialogResult = DialogResult.OK Then
|
||||||
|
|||||||
@@ -1021,12 +1021,19 @@ Public Class frmFormDesigner
|
|||||||
Dim oSQL = $"SELECT SQL_BTN_FINISH FROM TBPM_PROFILE WHERE GUID = {ProfileId}"
|
Dim oSQL = $"SELECT SQL_BTN_FINISH FROM TBPM_PROFILE WHERE GUID = {ProfileId}"
|
||||||
Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL)
|
Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL)
|
||||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
||||||
.SQLCommand = oldSQL,
|
.SQLCommand = oldSQL,
|
||||||
.SQLConnection = 1,
|
.SQLConnection = 1,
|
||||||
.PlaceholdersManualPrefix = "CTRL",
|
.PlaceholdersManualPrefix = "CTRL",
|
||||||
.PlaceholdersManualTitle = "Controls",
|
.PlaceholdersManualTitle = "Controls",
|
||||||
.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name)
|
.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
|
||||||
|
|
||||||
oForm.ShowDialog()
|
oForm.ShowDialog()
|
||||||
|
|
||||||
If oForm.DialogResult = DialogResult.OK Then
|
If oForm.DialogResult = DialogResult.OK Then
|
||||||
|
|||||||
Reference in New Issue
Block a user