ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/public/ibx/branches/journaling/ibcontrols/IBLookupComboEditBox.pas

Comparing ibx/trunk/ibcontrols/IBLookupComboEditBox.pas (file contents):
Revision 35 by tony, Tue Jan 26 14:38:47 2016 UTC vs.
Revision 209 by tony, Wed Mar 14 12:48:51 2018 UTC

#	Line 31 | Line 31 | interface
31
32		uses
33		Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, DbCtrls,
34	<	ExtCtrls, IBSQLParser, DB, StdCtrls, IBCustomDataSet;
34	>	ExtCtrls, IBSQLParser, DB, StdCtrls, IBCustomDataSet, LCLVersion;
35
36		type
37
#	Line 54 | Line 54 | type
54		FOwner: TIBLookupComboEditBox;
55		protected
56		procedure ActiveChanged; override;
57	+	procedure DataEvent(Event: TDataEvent; Info: Ptrint); override;
58		procedure RecordChanged(Field: TField); override;
59		procedure UpdateData; override;
60		public
#	Line 95 | Line 96 | type
96		FForceAutoComplete: boolean;
97		FInCheckAndInsert: boolean;
98		FLastKeyValue: variant;
99	+	FCurText: string;
100	+	FModified: boolean;
101		procedure DoActiveChanged(Data: PtrInt);
102		function GetAutoCompleteText: TComboBoxAutoCompleteText;
103		function GetListSource: TDataSource;
#	Line 121 | Line 124 | type
124		procedure SetItemIndex(const Val: integer); override;
125		function SQLSafe(aText: string): string;
126		procedure UpdateShowing; override;
127	<
127	>	procedure UpdateData(Sender: TObject); override;
128		public
129		{ Public declarations }
130		constructor Create(TheComponent: TComponent); override;
#	Line 145 | Line 148 | type
148
149		implementation
150
151	<	uses IBQuery, LCLType, Variants, LCLProc;
151	>	uses IBQuery, LCLType, Variants, LCLProc, LazUTF8;
152
153		{ TIBLookupControlLink }
154
#	Line 167 | Line 170 | begin
170		FOwner.ActiveChanged(self)
171		end;
172
173	+	procedure TIBLookupComboDataLink.DataEvent(Event: TDataEvent; Info: Ptrint);
174	+	begin
175	+	inherited DataEvent(Event, Info);
176	+	if Event = deLayoutChange then
177	+	FOwner.LookupCache := FOwner.LookupCache; {sneaky way of calling UpdateLookup}
178	+	end;
179	+
180		procedure TIBLookupComboDataLink.RecordChanged(Field: TField);
181		begin
182		FOwner.RecordChanged(self,Field);
#	Line 315 | Line 325 | procedure TIBLookupComboEditBox.UpdateLi
325		var
326		iSelStart: Integer; // char position
327		sCompleteText, sPrefixText, sResultText: string;
318	–	curText: string;
328		begin
329		if assigned(ListSource) and assigned(ListSource.DataSet) and (ListSource.DataSet is TIBCustomDataSet)
330		and ListSource.DataSet.Active then
331		begin
332	+	FCurText := Text;
333		FUpdating := true;
334		try
335		iSelStart := SelStart;//Capture original cursor position
336		if ((iSelStart < UTF8Length(Text)) and
337		(cbactEndOfLineComplete in AutoCompleteText)) then
338		Exit;
329	–	curText := Text;
339		sPrefixText := UTF8Copy(Text, 1, iSelStart);
340		ListSource.DataSet.Active := false;
341		ListSource.DataSet.Active :=  true;
342	<	Text := curText;
343	<	if not FExiting and (FForceAutoComplete or Focused) and (Text <> '')then
342	>	Text := FCurText;
343	>	if not FExiting and (FForceAutoComplete or Focused) and (FCurText <> '')then
344		begin
345		if ListSource.DataSet.Active and (ListSource.DataSet.RecordCount > 0) then
346		begin
347		sCompleteText := ListSource.DataSet.FieldByName(ListField).AsString;
348	<	if (sCompleteText <> Text) then
348	>	if (sCompleteText <> FCurText) then
349		begin
350		sResultText := sCompleteText;
351		if ((cbactEndOfLineComplete in AutoCompleteText) and
#	Line 350 | Line 359 | begin
359		SelLength := UTF8Length(Text);
360		end;
361		KeyValue := ListSource.DataSet.FieldByName(KeyField).AsVariant;
362	+	end
363	+	else
364	+	begin
365	+	SelStart := iSelStart;
366	+	SelLength := 0;
367		end;
368		end;
369		finally
370		FUpdating := false
371		end;
372	+	FModified := true;
373		end;
374		end;
375
376		procedure TIBLookupComboEditBox.UpdateSQL(Sender: TObject;
377		Parser: TSelectSQLParser);
378		var FieldPosition: integer;
379	+	FilterText: string;
380		begin
381		if FFiltered then
382		begin
383	+	if FUpdating then
384	+	FilterText := FCurText
385	+	else
386	+	FilterText := Text;
387		if cbactSearchCaseSensitive in AutoCompleteText then
388		Parser.Add2WhereClause(GetRelationNameQualifier + '"' + ListField + '" Like ''' +
389	<	SQLSafe(Text) + '%''')
389	>	SQLSafe(FilterText) + '%''')
390		else
391	<	Parser.Add2WhereClause(GetRelationNameQualifier + 'Upper("' + ListField + '") Like Upper(''' +
392	<	SQLSafe(Text) + '%'')');
391	>	Parser.Add2WhereClause('Upper(' + GetRelationNameQualifier + '"' +  ListField + '") Like Upper(''' +
392	>	SQLSafe(FilterText) + '%'')');
393
394	<	end;
395	<	if cbactSearchAscending in AutoCompleteText then
396	<	begin
397	<	FieldPosition := Parser.GetFieldPosition(ListField);
378	<	if FieldPosition = 0 then Exit;
394	>	if cbactSearchAscending in AutoCompleteText then
395	>	begin
396	>	FieldPosition := Parser.GetFieldPosition(ListField);
397	>	if FieldPosition = 0 then Exit;
398
399	<	Parser.OrderByClause := IntToStr(FieldPosition) + ' ascending';
399	>	Parser.OrderByClause := IntToStr(FieldPosition) + ' ascending';
400	>	end;
401		end;
402		end;
403
#	Line 541 | Line 561 | begin
561		ActiveChanged(nil);
562		end;
563
564	+	procedure TIBLookupComboEditBox.UpdateData(Sender: TObject);
565	+	begin
566	+	inherited UpdateData(Sender);
567	+	FModified := false;
568	+	end;
569	+
570		constructor TIBLookupComboEditBox.Create(TheComponent: TComponent);
571		begin
572		inherited Create(TheComponent);
#	Line 559 | Line 585 | begin
585		if assigned(FDataLink) then FDataLink.Free;
586		if assigned(FIBLookupControlLink) then FIBLookupControlLink.Free;
587		if assigned(FTimer) then FTimer.Free;
588	+	Application.RemoveAsyncCalls(self);
589		inherited Destroy;
590		end;
591
#	Line 572 | Line 599 | begin
599		FForceAutoComplete := false;
600		end;
601		CheckAndInsert;
602	+	if FModified then
603	+	Change; {ensure Update}
604		inherited EditingDone;
605		end;
606

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines