| 95 |
|
FForceAutoComplete: boolean; |
| 96 |
|
FInCheckAndInsert: boolean; |
| 97 |
|
FLastKeyValue: variant; |
| 98 |
+ |
FCurText: string; |
| 99 |
|
procedure DoActiveChanged(Data: PtrInt); |
| 100 |
|
function GetAutoCompleteText: TComboBoxAutoCompleteText; |
| 101 |
|
function GetListSource: TDataSource; |
| 316 |
|
var |
| 317 |
|
iSelStart: Integer; // char position |
| 318 |
|
sCompleteText, sPrefixText, sResultText: string; |
| 318 |
– |
curText: string; |
| 319 |
|
begin |
| 320 |
|
if assigned(ListSource) and assigned(ListSource.DataSet) and (ListSource.DataSet is TIBCustomDataSet) |
| 321 |
|
and ListSource.DataSet.Active then |
| 322 |
|
begin |
| 323 |
+ |
FCurText := Text; |
| 324 |
|
FUpdating := true; |
| 325 |
|
try |
| 326 |
|
iSelStart := SelStart;//Capture original cursor position |
| 327 |
|
if ((iSelStart < UTF8Length(Text)) and |
| 328 |
|
(cbactEndOfLineComplete in AutoCompleteText)) then |
| 329 |
|
Exit; |
| 329 |
– |
curText := Text; |
| 330 |
|
sPrefixText := UTF8Copy(Text, 1, iSelStart); |
| 331 |
|
ListSource.DataSet.Active := false; |
| 332 |
|
ListSource.DataSet.Active := true; |
| 333 |
< |
Text := curText; |
| 334 |
< |
if not FExiting and (FForceAutoComplete or Focused) and (Text <> '')then |
| 333 |
> |
Text := FCurText; |
| 334 |
> |
if not FExiting and (FForceAutoComplete or Focused) and (FCurText <> '')then |
| 335 |
|
begin |
| 336 |
|
if ListSource.DataSet.Active and (ListSource.DataSet.RecordCount > 0) then |
| 337 |
|
begin |
| 338 |
|
sCompleteText := ListSource.DataSet.FieldByName(ListField).AsString; |
| 339 |
< |
if (sCompleteText <> Text) then |
| 339 |
> |
if (sCompleteText <> FCurText) then |
| 340 |
|
begin |
| 341 |
|
sResultText := sCompleteText; |
| 342 |
|
if ((cbactEndOfLineComplete in AutoCompleteText) and |
| 350 |
|
SelLength := UTF8Length(Text); |
| 351 |
|
end; |
| 352 |
|
KeyValue := ListSource.DataSet.FieldByName(KeyField).AsVariant; |
| 353 |
+ |
end |
| 354 |
+ |
else |
| 355 |
+ |
begin |
| 356 |
+ |
SelStart := iSelStart; |
| 357 |
+ |
SelLength := 0; |
| 358 |
|
end; |
| 359 |
|
end; |
| 360 |
|
finally |
| 366 |
|
procedure TIBLookupComboEditBox.UpdateSQL(Sender: TObject; |
| 367 |
|
Parser: TSelectSQLParser); |
| 368 |
|
var FieldPosition: integer; |
| 369 |
+ |
FilterText: string; |
| 370 |
|
begin |
| 371 |
|
if FFiltered then |
| 372 |
|
begin |
| 373 |
+ |
if FUpdating then |
| 374 |
+ |
FilterText := FCurText |
| 375 |
+ |
else |
| 376 |
+ |
FilterText := Text; |
| 377 |
|
if cbactSearchCaseSensitive in AutoCompleteText then |
| 378 |
|
Parser.Add2WhereClause(GetRelationNameQualifier + '"' + ListField + '" Like ''' + |
| 379 |
< |
SQLSafe(Text) + '%''') |
| 379 |
> |
SQLSafe(FilterText) + '%''') |
| 380 |
|
else |
| 381 |
|
Parser.Add2WhereClause('Upper(' + GetRelationNameQualifier + '"' + ListField + '") Like Upper(''' + |
| 382 |
< |
SQLSafe(Text) + '%'')'); |
| 382 |
> |
SQLSafe(FilterText) + '%'')'); |
| 383 |
|
|
| 384 |
|
if cbactSearchAscending in AutoCompleteText then |
| 385 |
|
begin |
