LookupGrid: Fix LookupGrid 3

This commit is contained in:
Jonathan Jenne 2021-02-19 11:40:51 +01:00
parent 61e3c21c16
commit b0c64badb0
2 changed files with 23 additions and 11 deletions

View File

@ -13,13 +13,6 @@ Imports DevExpress.XtraEditors.Controls
Public Class LookupControl3 Public Class LookupControl3
Inherits GridLookUpEdit Inherits GridLookUpEdit
Shared Sub New()
RepositoryItemLookupControl3.RegisterLookupControl()
End Sub
Public Sub New()
End Sub
<DesignerSerializationVisibility(DesignerSerializationVisibility.Content)> <DesignerSerializationVisibility(DesignerSerializationVisibility.Content)>
Public Shadows ReadOnly Property Properties As RepositoryItemLookupControl3 Public Shadows ReadOnly Property Properties As RepositoryItemLookupControl3
Get Get
@ -32,6 +25,13 @@ Public Class LookupControl3
Return RepositoryItemLookupControl3.CustomEditName Return RepositoryItemLookupControl3.CustomEditName
End Get End Get
End Property End Property
Shared Sub New()
RepositoryItemLookupControl3.RegisterLookupControl()
End Sub
Public Sub New()
End Sub
End Class End Class
<UserRepositoryItem("RegisterLookupControl3")> <UserRepositoryItem("RegisterLookupControl3")>
@ -42,6 +42,10 @@ Public Class RepositoryItemLookupControl3
RegisterLookupControl() RegisterLookupControl()
End Sub End Sub
Public Sub New()
SetDropdownButtonEnabled(_MultiSelect)
End Sub
Private Const TAG_DROPDOWN = "openDropdown" Private Const TAG_DROPDOWN = "openDropdown"
Private Const TAG_BUTTON_LOOKUP_FORM = "openLookupForm" Private Const TAG_BUTTON_LOOKUP_FORM = "openLookupForm"
@ -96,8 +100,8 @@ Public Class RepositoryItemLookupControl3
End Property End Property
Protected Overrides Sub RaiseQueryPopUp(e As CancelEventArgs) Protected Overrides Sub RaiseQueryPopUp(e As CancelEventArgs)
If MultiSelect = True Then If MultiSelect = False Then
MyBase.RaiseQueryPopUp(e) e.Cancel = True
End If End If
End Sub End Sub
@ -227,4 +231,10 @@ Public Class RepositoryItemLookupControl3
EndUpdate() EndUpdate()
End Try End Try
End Sub End Sub
Public Sub HandleQueryPopup(sender As Object, e As CancelEventArgs) Handles Me.QueryPopUp
If MultiSelect = False Then
e.Cancel = True
End If
End Sub
End Class End Class

View File

@ -8,8 +8,10 @@ Public Class frmLookup
_Datasource.Add($"item-{index}") _Datasource.Add($"item-{index}")
Next Next
Dim oTable = GetDatatable(10)
LookupControl31.Properties.DataSource = GetDatatable(10) LookupControl31.Properties.DataSource = oTable
LookupControl31.Properties.ValueMember = oTable.Columns.Item(0).ColumnName
LookupControl31.Properties.DisplayMember = oTable.Columns.Item(0).ColumnName
Dim oEditor As New LookupControl3 Dim oEditor As New LookupControl3
GridControl1.DataSource = New List(Of String) From {"foo", "var"} GridControl1.DataSource = New List(Of String) From {"foo", "var"}