paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-01 09:53:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL, improvement for dblookup components, now they work without datasource/datafield, from Leslie Kaye, issue #13868

Browse Source 
git-svn-id: trunk@20925 -
This commit is contained in:
jesus 2009-07-22 20:15:17 +00:00
parent 2be288911d
commit f87647590c
5 changed files with 155 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lcl/dbctrls.pp
View File

@ -136,12 +136,14 @@ Type
FKeyFieldNames: string;
FListFieldName: string;
FListFieldIndex: Integer;
FListLinkTmpSetActive: Boolean;
FLookUpFieldIsCached: Boolean;
FDataFields: TList; // Data Fields to lookup/edit
FKeyFields: TList; // Keyfields in lookup dataset
FListField: TField; // Result field in lookup dataset
FLookupCache: boolean;
FLookupList: TLookupList;
procedure ActiveChange(Sender: TObject);
procedure EditingChange(Sender: TObject);
procedure FetchLookupData;
function GetKeyFieldName: string;
@ -151,6 +153,9 @@ Type
procedure SetKeyFieldName(const Value: string);
procedure SetListSource(Value: TDataSource);
procedure SetLookupCache(const Value: boolean);
protected
procedure Notification(AComponent: TComponent;
Operation: TOperation); override;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
@ -345,11 +350,6 @@ Type
property DataField: string read GetDataField write SetDataField;
property DataSource: TDataSource read GetDataSource write SetDataSource;
// we need to overrride the write method for db aware.
// the Read isn't an issue since the list will be updated
// on data change anyway
property Items write SetItems;
//same as dbedit need to match the datalink status
property ReadOnly: Boolean read GetReadOnly write SetReadOnly default False;
end;
@ -370,7 +370,10 @@ Type
property DragMode;
property ExtendedSelect;
property ItemHeight;
property Items;
// we need to overrride the write method for db aware.
// the Read isn't an issue since the list will be updated
// on data change anyway
property Items write SetItems;
property MultiSelect;
property OnClick;
property OnDblClick;
@ -419,9 +422,7 @@ Type
procedure SetLookupCache(const Value: boolean);
protected
procedure DataChange(Sender: TObject); override;
procedure FinalizeWnd; override;
procedure InitializeWnd; override;
procedure Loaded; override;
procedure UpdateData(Sender: TObject); override;
public
constructor Create(AOwner: TComponent); override;
@ -726,11 +727,8 @@ Type
procedure SetListFieldIndex(const Value: Integer);
procedure SetListSource(const Value: TDataSource);
procedure SetLookupCache(const Value: boolean);
procedure UpdateLookup;
protected
procedure FinalizeWnd; override;
procedure InitializeWnd; override;
procedure Loaded; override;
procedure UpdateData(Sender: TObject); override;
procedure UpdateText; override;
public

13
lcl/include/customdbcombobox.inc
View File

@ -43,12 +43,15 @@ begin
//need to override this to make sure the datalink gets notified
//its been modified, then when post etc, it will call
//updatedata to update the field data with current value
if FDatalink.Edit then
begin
FDataLink.Modified;
if FDatalink.Active then
if FDatalink.Edit then
begin
FDataLink.Modified;
inherited Change;
end else
UpdateText
else
inherited Change;
end else
UpdateText;
end;

197
lcl/include/dblookup.inc
View File

@ -70,8 +70,10 @@ begin
FListLink:= TFieldDataLink.Create;
FListLink.DataSource := TDataSource.Create(Self);
FListLink.Control := Self;
FListLink.OnActiveChange := @ActiveChange;
FListLink.OnEditingChange:=@EditingChange;
FHasLookUpField:= False;
FListLinkTmpSetActive := False;
FLookupCache := False;
end;
@ -84,6 +86,14 @@ begin
inherited Destroy;
end;
procedure TDBLookup.ActiveChange(Sender: TObject);
begin
if (csDestroying in ComponentState) then
Exit;
if FListLink.Active and not FListLinkTmpSetActive then
Initialize(FControlLink, FControlItems);
end;
procedure TDBLookup.EditingChange(Sender: TObject);
begin
if not (FListLink.Editing) then
@ -114,7 +124,13 @@ end;
procedure TDBLookup.SetListSource(Value: TDataSource);
begin
if FListSource = Value then
Exit;
if Assigned(FListSource) then
FListSource.RemoveFreeNotification(Self);
FListSource:= Value;
if Assigned(FListSource) then
FListSource.FreeNotification(Self);
end;
procedure TDBLookup.SetLookupCache(const Value: boolean);
@ -124,14 +140,34 @@ begin
FLookupList := TLookupList.Create;
end;
procedure TDBLookup.Notification(AComponent: TComponent; Operation: TOperation);
begin
inherited Notification(AComponent, Operation);
if (Operation=opRemove) then
if (AComponent = FListSource) then
FListSource:= nil;
end;
procedure TDBLookup.LinkGetBookMark;
begin
FLinkBookMark := FListLink.DataSet.GetBookmark;
FListLink.DataSet.DisableControls;
FListLinkTmpSetActive := not FListLink.DataSet.Active;
if FListLinkTmpSetActive then
FListLink.DataSet.Active := True
else
begin
FLinkBookMark := FListLink.DataSet.GetBookmark;
FListLink.DataSet.DisableControls;
end;
end;
procedure TDBLookup.LinkGotoBookMark;
begin
if FListLinkTmpSetActive then
begin
FListLink.DataSet.Active := False;
FListLinkTmpSetActive := False;
end
else
try
FListLink.DataSet.GotoBookmark(FLinkBookMark);
FListLink.DataSet.FreeBookmark(FLinkBookMark);
@ -141,19 +177,13 @@ begin
end;
procedure TDBLookup.FetchLookupData;
var
TmpActive: Boolean;
begin
if not Assigned(FControlItems) then
Exit;
FControlItems.Clear;
if not (Assigned(FListLink.DataSet) and Assigned(FListField)) then
Exit;
TmpActive := FListLink.DataSet.Active;
if TmpActive then
LinkGetBookMark
else
FListLink.DataSet.Active := True;
LinkGetBookMark;
try
if FLookupCache then
FLookupList.Clear;
@ -167,79 +197,93 @@ begin
FListLink.DataSet.Next;
end;
finally
if TmpActive then
LinkGotoBookMark
else
FListLink.DataSet.Active := False;
LinkGotoBookMark;
end;
end;
procedure TDBLookup.Initialize(AControlDataLink: TFieldDataLink; AControlItems: TStrings);
var
ListFields: TList;
TmpActive: Boolean;
S: string;
begin
FDataFields.Clear;
FKeyFields.Clear;
FListField := nil;
if not (Assigned(AControlDataLink) and Assigned(AControlItems)) then
Exit; // Closing or our DataLink is Active but not the Control's DataLink
FControlLink:= AControlDataLink;
FControlItems:= AControlItems;
if not Assigned(AControlDataLink.Field) then
// should be but (sometimes) not (bug?)
FHasLookUpField := False;
FLookUpFieldIsCached := False;
FControlItems := AControlItems;
FControlLink := AControlDataLink;
if Assigned(FControlLink) and Assigned(FControlLink.DataSet)
and FControlLink.DataSet.Active then
begin
S:= AControlDataLink.FieldName;
AControlDataLink.FieldName:= '';
AControlDataLink.FieldName:= S;
end;
if not Assigned(AControlDataLink.Field) then
Exit;
FHasLookUpField := (AControlDataLink.Field.FieldKind = fkLookup);
FLookUpFieldIsCached := (FHasLookupField and AControlDataLink.Field.LookupCache);
if FHasLookUpField then
begin
FListLink.DataSource.DataSet:= AControlDataLink.Field.LookupDataSet;
FDataFieldNames := AControlDataLink.Field.KeyFields;
FKeyFieldNames := AControlDataLink.Field.LookupKeyFields;
end
else
if FListSource<>nil then begin
FListLink.DataSource.DataSet := FListSource.DataSet;
FDataFieldNames := AControlDataLink.Field.FieldName;
end else
FListLink.Datasource.DataSet := nil;
if (FKeyFieldNames <> '') and (FListLink.Dataset<>nil) then
begin
ListFields := TList.Create;
TmpActive := FListLink.DataSet.Active;
try
AControlDataLink.DataSet.GetFieldList(FDataFields, FDataFieldNames);
FListLink.DataSet.Active := True;
FListLink.DataSet.GetFieldList(ListFields, FListFieldName);
FListLink.DataSet.GetFieldList(FKeyFields, FKeyFieldNames);
if not Assigned(FControlLink.Field) then
// should be but (sometimes) not (bug?)
begin
S:= FControlLink.FieldName;
FControlLink.FieldName:= '';
FControlLink.FieldName:= S;
end;
if Assigned(FControlLink.Field) then
begin
FHasLookUpField := (FControlLink.Field.FieldKind = fkLookup);
FLookUpFieldIsCached := (FHasLookupField and FControlLink.Field.LookupCache);
if FHasLookUpField then
begin
FListField := FListLink.DataSet.FindField(AControlDataLink.Field.LookupResultField);
if (Assigned(FListField) and (ListFields.IndexOf(FListField) < 0)) then
ListFields.Insert(0, FListField);
if (ListFields.Count > 0) then
FListField := TField(ListFields[0]);
if (FListLink.DataSource.DataSet <> FControlLink.Field.LookupDataSet) then
FListLink.DataSource.DataSet:= FControlLink.Field.LookupDataSet;
FDataFieldNames := FControlLink.Field.KeyFields;
FKeyFieldNames := FControlLink.Field.LookupKeyFields;
end else
FDataFieldNames := FControlLink.Field.FieldName;
FControlLink.DataSet.GetFieldList(FDataFields, FDataFieldNames);
end;
end;
if not FHasLookUpField then
if Assigned(FListSource) then
begin
if (FListLink.DataSource.DataSet <> FListSource.DataSet) then
FListLink.DataSource.DataSet := FListSource.DataSet;
end
else
FListLink.Datasource.DataSet := nil;
if (FKeyFieldNames > '') and Assigned(FListLink.Dataset) then
begin
ListFields := TList.Create;
FListLinkTmpSetActive := not FListLink.DataSet.Active;
try
if FListLinkTmpSetActive then
FListLink.DataSet.Open;
if FListLink.DataSet.Active then
begin
if ((FKeyFields.Count > 0) and (ListFields.Count = 0)) then
ListFields.Add(FKeyFields[0]);
if ((FListFieldIndex >= 0) and (FListFieldIndex < ListFields.Count)) then
FListField := TField(ListFields[FListFieldIndex]) else
FListField := TField(ListFields[0]);
FListLink.DataSet.GetFieldList(ListFields, FListFieldName);
FListLink.DataSet.GetFieldList(FKeyFields, FKeyFieldNames);
if FHasLookUpField then
begin
FListField := FListLink.DataSet.FindField(AControlDataLink.Field.LookupResultField);
if (Assigned(FListField) and (ListFields.IndexOf(FListField) < 0)) then
ListFields.Insert(0, FListField);
if (ListFields.Count > 0) then
FListField := TField(ListFields[0]);
end else
begin
if ((FKeyFields.Count > 0) and (ListFields.Count = 0)) then
ListFields.Add(FKeyFields[0]);
if ((FListFieldIndex > -1) and (FListFieldIndex < ListFields.Count)) then
FListField := TField(ListFields[FListFieldIndex])
else
FListField := TField(ListFields[0]);
end;
if Assigned(FListField) then
FListLink.FieldName:= FListField.FieldName;
end;
if Assigned(FListField) then
FListLink.FieldName:= FListField.FieldName;
finally
ListFields.Free;
FListLink.DataSet.Active := TmpActive;
if FListLinkTmpSetActive then
begin
FListLink.DataSet.Active := False;
FListLinkTmpSetActive := False;
end;
end;
FetchLookupData;
end;
@ -248,10 +292,10 @@ end;
function TDBLookup.ListFieldValue: string;
var
Key: Variant;
TmpActive: Boolean;
begin
Result := '';
if not ((Assigned(FControlLink) and assigned(FListField) and FControlLink.Active)) then
if not (Assigned(FControlLink) and (FDataFieldNames<>'') and
Assigned(FListField) and FControlLink.Active) then
Exit;
Key := FControlLink.DataSet.FieldValues[FDataFieldNames];
if FHasLookupField then
@ -267,21 +311,14 @@ begin
Result := FLookupList.ValueOfKey(Key);
Exit;
end;
TmpActive := FListLink.DataSet.Active;
if TmpActive then
LinkGetBookMark
else
FListLink.DataSet.Active := True;
LinkGetBookMark;
try
if FListLink.DataSet.Locate(FKeyFieldNames,
FControlLink.DataSet.FieldValues[FDataFieldNames], []) then
Result := FListField.AsString
else Result:= '';
finally
if TmpActive then
LinkGotoBookMark
else
FListLink.DataSet.Active := False;
LinkGotoBookMark;
end;
end;
@ -292,7 +329,6 @@ end;
{$ELSE}
var
I: Integer;
TmpActive: Boolean;
Key: Variant;
begin
if AListFieldValue = FControlLink.Field.AsString then
@ -312,11 +348,7 @@ begin
end;
if not (Assigned(FListLink.DataSet) and Assigned(FListField)) then
Exit;
TmpActive := FListLink.DataSet.Active;
if TmpActive then
LinkGetBookMark
else
FListLink.DataSet.Active := True;
LinkGetBookMark;
try
if FListLink.DataSet.Locate(FListField.FieldName, VarArrayOf([AListFieldValue]), []) then
begin
@ -327,10 +359,7 @@ begin
FControlLink.Field.AsString := AListFieldValue;
end;
finally
if TmpActive then
LinkGotoBookMark
else
FListLink.DataSet.Active := False;
LinkGotoBookMark;
end;
end;
{$ENDIF}

45
lcl/include/dblookupcombobox.inc
View File

@ -30,12 +30,6 @@ begin
FDataLink.OnActiveChange:= @ActiveChange;
end;
procedure TDBLookupComboBox.Loaded;
begin
inherited Loaded;
UpdateLookup;
end;
procedure TDBLookupComboBox.UpdateData(Sender: TObject);
begin
FLookup.UpdateData(Text);
@ -43,10 +37,10 @@ end;
procedure TDBLookupComboBox.ActiveChange(Sender: TObject);
begin
if FDataLink.Active then
FLookup.Initialize(FDataLink, Items)
else FLookup.Initialize(nil, nil);
inherited;
if (csLoading in ComponentState) then
Exit;
FLookup.Initialize(FDataLink, Items);
UpdateText;
end;
procedure TDBLookupComboBox.UpdateText;
@ -54,6 +48,12 @@ begin
Text:= FLookup.ListFieldValue;
end;
procedure TDBLookupComboBox.InitializeWnd;
begin
inherited InitializeWnd;
ActiveChange(Self);
end;
function TDBLookupComboBox.GetKeyField: string;
begin
Result := FLookup.KeyField;
@ -82,46 +82,31 @@ end;
procedure TDBLookupComboBox.SetKeyField(const Value: string);
begin
FLookup.KeyField:= Value;
UpdateLookup;
ActiveChange(Self);
end;
procedure TDBLookupComboBox.SetListField(const Value: string);
begin
FLookup.ListField:= Value;
UpdateLookup;
ActiveChange(Self);
end;
procedure TDBLookupComboBox.SetListFieldIndex(const Value: Integer);
begin
FLookup.ListFieldIndex:= Value;
ActiveChange(Self);
end;
procedure TDBLookupComboBox.SetListSource(const Value: TDataSource);
begin
FLookup.ListSource:= Value;
UpdateLookup;
ActiveChange(Self);
end;
procedure TDBLookupComboBox.SetLookupCache(const Value: boolean);
begin
FLookup.LookupCache := Value;
ActiveChange(Self);
end;
procedure TDBLookupComboBox.UpdateLookup;
begin
if FDataLink.Active then
ActiveChange(Self);
end;
procedure TDBLookupComboBox.FinalizeWnd;
begin
inherited FinalizeWnd;
FLookup.FControlItems := Items;
end;
procedure TDBLookupComboBox.InitializeWnd;
begin
inherited InitializeWnd;
FLookup.FControlItems := Items;
end;

31
lcl/include/dblookuplistbox.inc
View File

@ -29,14 +29,6 @@ begin
FDataLink.OnActiveChange:= @ActiveChange;
end;
procedure TDBLookupListBox.Loaded;
begin
inherited Loaded;
if FDataLink.Active then
ActiveChange(Self);
end;
procedure TDBLookupListBox.UpdateData(Sender: TObject);
begin
if (ItemIndex < 0) then
@ -46,12 +38,10 @@ end;
procedure TDBLookupListBox.ActiveChange(Sender: TObject);
begin
if FDataLink.Active then
begin
FLookup.Initialize(FDataLink, Items);
DataChange(Self);
end
else FLookup.Initialize(nil,nil);
if (csLoading in ComponentState) then
Exit;
FLookup.Initialize(FDataLink, Items);
DataChange(Self);
end;
procedure TDBLookupListBox.DataChange(Sender: TObject);
@ -59,16 +49,10 @@ begin
ItemIndex:= Items.IndexOf(FLookup.ListFieldValue);
end;
procedure TDBLookupListBox.FinalizeWnd;
begin
inherited FinalizeWnd;
FLookup.FControlItems := Items;
end;
procedure TDBLookupListBox.InitializeWnd;
begin
inherited InitializeWnd;
FLookup.FControlItems := Items;
ActiveChange(Self);
end;
function TDBLookupListBox.GetKeyField: string;
@ -99,25 +83,30 @@ end;
procedure TDBLookupListBox.SetKeyField(const Value: string);
begin
FLookup.KeyField:= Value;
ActiveChange(Self);
end;
procedure TDBLookupListBox.SetListField(const Value: string);
begin
FLookup.ListField:= Value;
ActiveChange(Self);
end;
procedure TDBLookupListBox.SetListFieldIndex(const Value: Integer);
begin
FLookup.ListFieldIndex:= Value;
ActiveChange(Self);
end;
procedure TDBLookupListBox.SetListSource(const Value: TDataSource);
begin
FLookup.ListSource:= Value;
ActiveChange(Self);
end;
procedure TDBLookupListBox.SetLookupCache(const Value: boolean);
begin
FLookup.LookupCache := Value;
ActiveChange(Self);
end;