Compare commits
2 Commits
Release-Sp
...
Release-2.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8704691d4c | ||
|
|
2a781f0be7 |
@@ -804,7 +804,6 @@ Public Class ClassControlCreator
|
||||
|
||||
Public Function GridTables_GetRepositoryItemForColumn(pColumnName As String, pDataTable As DataTable, pIsAdvancedLookup As Boolean) As RepositoryItem
|
||||
If pIsAdvancedLookup Then
|
||||
|
||||
Dim oEditor = New RepositoryItemLookupControl3
|
||||
|
||||
If pDataTable IsNot Nothing Then
|
||||
@@ -813,18 +812,34 @@ Public Class ClassControlCreator
|
||||
oEditor.DataSource = pDataTable
|
||||
End If
|
||||
|
||||
' Erlaube ungültige Werte (verhindert automatisches Löschen)
|
||||
oEditor.NullText = "[Ungültiger Wert]"
|
||||
oEditor.ShowFooter = False
|
||||
oEditor.AllowNullInput = DefaultBoolean.True
|
||||
oEditor.ValidateOnEnterKey = True
|
||||
|
||||
' KRITISCH: Erlaube Texteingabe für ungültige Werte
|
||||
oEditor.TextEditStyle = TextEditStyles.Standard
|
||||
|
||||
' Weitere Standard-Eigenschaften für LookupControl3
|
||||
'oEditor.ImmediatePopup = False
|
||||
|
||||
Return oEditor
|
||||
Else
|
||||
Dim oEditor = New RepositoryItemComboBox()
|
||||
Dim oItems As New List(Of String)
|
||||
|
||||
AddHandler oEditor.Validating, Sub(_sender As ComboBoxEdit, _e As CancelEventArgs)
|
||||
If oItems.Contains(_sender.EditValue) Then
|
||||
_e.Cancel = False
|
||||
Else
|
||||
_e.Cancel = True
|
||||
End If
|
||||
' KRITISCH: Erlaube Anzeige ungültiger Werte
|
||||
oEditor.TextEditStyle = TextEditStyles.Standard ' Statt DisableTextEditor!
|
||||
oEditor.AllowNullInput = DefaultBoolean.True
|
||||
oEditor.ValidateOnEnterKey = True
|
||||
|
||||
AddHandler oEditor.Validating, Sub(_sender As ComboBoxEdit, _e As CancelEventArgs)
|
||||
' Prüfe nur bei Änderung, nicht beim Anzeigen
|
||||
If Not oItems.Contains(_sender.EditValue) AndAlso _sender.IsModified Then
|
||||
_e.Cancel = True
|
||||
_sender.ErrorText = "Ungültiger Wert - bitte neu auswählen"
|
||||
End If
|
||||
End Sub
|
||||
|
||||
If pDataTable IsNot Nothing Then
|
||||
@@ -846,7 +861,6 @@ Public Class ClassControlCreator
|
||||
Return oEditor
|
||||
End If
|
||||
End Function
|
||||
|
||||
Public Sub GridTables_HandleControlValueChange(pControlPanel As XtraScrollableControl, pColumnsWithSqlAndControlPlaceholders As DataTable)
|
||||
If Not IsNothing(pColumnsWithSqlAndControlPlaceholders) AndAlso pColumnsWithSqlAndControlPlaceholders.Rows.Count > 0 Then
|
||||
For Each oRow As DataRow In pColumnsWithSqlAndControlPlaceholders.Rows
|
||||
|
||||
@@ -57,16 +57,7 @@ Namespace ControlCreator
|
||||
Case Else
|
||||
oColumn.DataType = GetType(String)
|
||||
End Select
|
||||
Dim oFormulaExpression = ObjectEx.NotNull(oRow.Item("FORMULA_EXPRESSION"), String.Empty)
|
||||
If oFormulaExpression <> String.Empty Then
|
||||
Try
|
||||
oColumn.Expression = oFormulaExpression
|
||||
oColumn.ReadOnly = True
|
||||
Catch ex As Exception
|
||||
_Logger.Warn("⚠️ Invalid FORMULA_EXPRESSION for column {0}: {1}", oColumn.ColumnName, oFormulaExpression)
|
||||
_Logger.Error(ex)
|
||||
End Try
|
||||
End If
|
||||
|
||||
oDataTable.Columns.Add(oColumn)
|
||||
Next
|
||||
|
||||
@@ -188,13 +179,6 @@ Namespace ControlCreator
|
||||
Dim oReadOnlyInt As Integer
|
||||
oIsReadOnly = Integer.TryParse(oReadOnlyValue.ToString(), oReadOnlyInt) AndAlso oReadOnlyInt = 1
|
||||
End If
|
||||
|
||||
Dim oFormulaExpression = ObjectEx.NotNull(oColumnData.Item("FORMULA_EXPRESSION"), String.Empty)
|
||||
If oFormulaExpression <> String.Empty Then
|
||||
oIsReadOnly = True
|
||||
End If
|
||||
|
||||
|
||||
oCol.OptionsColumn.AllowEdit = Not oIsReadOnly
|
||||
|
||||
Dim oColumnType As String = oColumnData.Item("TYPE_COLUMN")
|
||||
@@ -478,23 +462,43 @@ Namespace ControlCreator
|
||||
isApplyingInheritedValue = True
|
||||
Try
|
||||
_Logger.Info(String.Format("Inherit Value is active for column. So inheritting the value [{0}]...", valueToApply))
|
||||
For dataIndex As Integer = listIndex + 1 To pView.DataRowCount - 1
|
||||
Dim targetHandle = pView.GetRowHandle(dataIndex)
|
||||
If targetHandle = DevExpress.XtraGrid.GridControl.InvalidRowHandle OrElse pView.IsGroupRow(targetHandle) Then
|
||||
Continue For
|
||||
End If
|
||||
|
||||
If pView.IsNewItemRow(targetHandle) Then
|
||||
Exit For
|
||||
End If
|
||||
' Batch-Update mit BeginUpdate/EndUpdate für bessere Performance
|
||||
pView.BeginUpdate()
|
||||
Try
|
||||
For dataIndex As Integer = listIndex + 1 To pView.DataRowCount - 1
|
||||
Dim targetHandle = pView.GetRowHandle(dataIndex)
|
||||
If targetHandle = DevExpress.XtraGrid.GridControl.InvalidRowHandle OrElse pView.IsGroupRow(targetHandle) Then
|
||||
Continue For
|
||||
End If
|
||||
|
||||
Dim existingValue = pView.GetRowCellValue(targetHandle, pArgs.Column.FieldName)
|
||||
If Equals(existingValue, valueToApply) Then
|
||||
Continue For
|
||||
End If
|
||||
If pView.IsNewItemRow(targetHandle) Then
|
||||
Exit For
|
||||
End If
|
||||
|
||||
Dim existingValue = pView.GetRowCellValue(targetHandle, pArgs.Column.FieldName)
|
||||
If Equals(existingValue, valueToApply) Then
|
||||
Continue For
|
||||
End If
|
||||
|
||||
pView.SetRowCellValue(targetHandle, pArgs.Column.FieldName, valueToApply)
|
||||
Next
|
||||
|
||||
' WICHTIG: Nach dem Setzen der Werte die Spalte neu zeichnen
|
||||
pView.LayoutChanged()
|
||||
|
||||
' Nur die betroffene Spalte invalidieren (effizienter als alle Zeilen)
|
||||
For dataIndex As Integer = listIndex + 1 To pView.DataRowCount - 1
|
||||
Dim targetHandle = pView.GetRowHandle(dataIndex)
|
||||
If targetHandle <> DevExpress.XtraGrid.GridControl.InvalidRowHandle AndAlso Not pView.IsNewItemRow(targetHandle) Then
|
||||
pView.InvalidateRowCell(targetHandle, pArgs.Column)
|
||||
End If
|
||||
Next
|
||||
|
||||
Finally
|
||||
pView.EndUpdate()
|
||||
End Try
|
||||
|
||||
pView.SetRowCellValue(targetHandle, pArgs.Column.FieldName, valueToApply)
|
||||
Next
|
||||
Finally
|
||||
isApplyingInheritedValue = False
|
||||
End Try
|
||||
|
||||
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.7.9.0")>
|
||||
<Assembly: AssemblyVersion("2.8.0.0")>
|
||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||
<Assembly: NeutralResourcesLanguage("")>
|
||||
|
||||
Reference in New Issue
Block a user