pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

RxFPC:fix filter in RxDBGrid

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6190 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2018-02-09 08:21:55 +00:00
parent 8145f7cdb8
commit 32a0893299
6 changed files with 81 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
components/rx/trunk/demos/RxLookup/project1.lpi
View File

@ -55,7 +55,8 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="Unit1"/> <UnitName Value="Unit1"/>
<TopLine Value="57"/> <IsVisibleTab Value="True"/>
<TopLine Value="22"/>
<CursorPos X="23" Y="74"/> <CursorPos X="23" Y="74"/>
<UsageCount Value="24"/> <UsageCount Value="24"/>
<Loaded Value="True"/> <Loaded Value="True"/>
@ -123,12 +124,10 @@
</Unit9> </Unit9>
<Unit10> <Unit10>
<Filename Value="../../rxdb/rxlookup.pas"/> <Filename Value="../../rxdb/rxlookup.pas"/>
<IsVisibleTab Value="True"/> <EditorIndex Value="-1"/>
<EditorIndex Value="1"/> <TopLine Value="1520"/>
<TopLine Value="1533"/>
<CursorPos X="33" Y="1520"/> <CursorPos X="33" Y="1520"/>
<UsageCount Value="11"/> <UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit10> </Unit10>
<Unit11> <Unit11>
<Filename Value="../../registerrx.pas"/> <Filename Value="../../registerrx.pas"/>
@ -163,7 +162,7 @@
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit14> </Unit14>
</Units> </Units>
<JumpHistory Count="16" HistoryIndex="15"> <JumpHistory Count="13" HistoryIndex="12">
<Position1> <Position1>
<Filename Value="unit1.pas"/> <Filename Value="unit1.pas"/>
<Caret Line="47" TopLine="34"/> <Caret Line="47" TopLine="34"/>
@ -216,18 +215,6 @@
<Filename Value="unit1.pas"/> <Filename Value="unit1.pas"/>
<Caret Line="62" Column="14" TopLine="57"/> <Caret Line="62" Column="14" TopLine="57"/>
</Position13> </Position13>
<Position14>
<Filename Value="../../rxdb/rxlookup.pas"/>
<Caret Line="283" Column="26" TopLine="272"/>
</Position14>
<Position15>
<Filename Value="../../rxdb/rxlookup.pas"/>
<Caret Line="1522" Column="6" TopLine="1499"/>
</Position15>
<Position16>
<Filename Value="../../rxdb/rxlookup.pas"/>
<Caret Line="1675" Column="141" TopLine="1645"/>
</Position16>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>

135
components/rx/trunk/demos/rxdbgrid/RxDBGrid/RxDBGridDemo.lpi
View File

@ -59,7 +59,7 @@
<MinVersion Major="1" Release="18" Build="56" Valid="True"/> <MinVersion Major="1" Release="18" Build="56" Valid="True"/>
</Item5> </Item5>
</RequiredPackages> </RequiredPackages>
<Units Count="77"> <Units Count="78">
<Unit0> <Unit0>
<Filename Value="RxDBGridDemo.lpr"/> <Filename Value="RxDBGridDemo.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
@ -74,7 +74,9 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="RxDBGridMainUnit"/> <UnitName Value="RxDBGridMainUnit"/>
<CursorPos X="31" Y="28"/> <IsVisibleTab Value="True"/>
<TopLine Value="118"/>
<CursorPos X="50" Y="152"/>
<UsageCount Value="130"/> <UsageCount Value="130"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@ -476,14 +478,13 @@
</Unit56> </Unit56>
<Unit57> <Unit57>
<Filename Value="../../../rxdb/rxdbgrid.pas"/> <Filename Value="../../../rxdb/rxdbgrid.pas"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<TopLine Value="1143"/> <TopLine Value="1180"/>
<CursorPos X="15" Y="1162"/> <CursorPos X="45" Y="1192"/>
<UsageCount Value="12"/> <UsageCount Value="12"/>
<Bookmarks Count="2"> <Bookmarks Count="2">
<Item0 X="3" Y="7324" ID="1"/> <Item0 X="3" Y="7325" ID="1"/>
<Item1 X="17" Y="4366" ID="2"/> <Item1 X="17" Y="4367" ID="2"/>
</Bookmarks> </Bookmarks>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit57> </Unit57>
@ -514,9 +515,9 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="RxDBGrid_PopUpFilterUnit"/> <UnitName Value="RxDBGrid_PopUpFilterUnit"/>
<EditorIndex Value="6"/> <EditorIndex Value="7"/>
<TopLine Value="216"/> <TopLine Value="152"/>
<CursorPos X="3" Y="224"/> <CursorPos Y="159"/>
<UsageCount Value="11"/> <UsageCount Value="11"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@ -539,7 +540,7 @@
</Unit63> </Unit63>
<Unit64> <Unit64>
<Filename Value="../../../rxtools/rxdconst.pas"/> <Filename Value="../../../rxtools/rxdconst.pas"/>
<EditorIndex Value="4"/> <EditorIndex Value="5"/>
<TopLine Value="98"/> <TopLine Value="98"/>
<CursorPos X="3" Y="117"/> <CursorPos X="3" Y="117"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
@ -562,7 +563,7 @@
<Unit67> <Unit67>
<Filename Value="../../../../../lcl/lclproc.pas"/> <Filename Value="../../../../../lcl/lclproc.pas"/>
<UnitName Value="LCLProc"/> <UnitName Value="LCLProc"/>
<EditorIndex Value="5"/> <EditorIndex Value="6"/>
<TopLine Value="843"/> <TopLine Value="843"/>
<CursorPos Y="862"/> <CursorPos Y="862"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
@ -623,7 +624,7 @@
<Unit75> <Unit75>
<Filename Value="../../../rxdbgrid_print/rxdbgridprintgrid.pas"/> <Filename Value="../../../rxdbgrid_print/rxdbgridprintgrid.pas"/>
<UnitName Value="RxDBGridPrintGrid"/> <UnitName Value="RxDBGridPrintGrid"/>
<EditorIndex Value="2"/> <EditorIndex Value="3"/>
<TopLine Value="365"/> <TopLine Value="365"/>
<CursorPos X="3" Y="314"/> <CursorPos X="3" Y="314"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
@ -632,132 +633,140 @@
<Unit76> <Unit76>
<Filename Value="../../../rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet.pas"/> <Filename Value="../../../rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet.pas"/>
<UnitName Value="RxDBGridExportSpreadSheet"/> <UnitName Value="RxDBGridExportSpreadSheet"/>
<EditorIndex Value="3"/> <EditorIndex Value="4"/>
<TopLine Value="40"/> <TopLine Value="40"/>
<CursorPos X="3" Y="59"/> <CursorPos X="3" Y="59"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit76> </Unit76>
<Unit77>
<Filename Value="../../../rxdb/rxlookup.pas"/>
<EditorIndex Value="2"/>
<TopLine Value="34"/>
<CursorPos X="53" Y="54"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit77>
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="234" TopLine="216"/> <Caret Line="1182" Column="61" TopLine="1151"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="235" TopLine="216"/> <Caret Line="2340" Column="3" TopLine="2338"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="236" TopLine="216"/> <Caret Line="1182" Column="15" TopLine="1164"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="232" TopLine="216"/> <Caret Line="1162" Column="15" TopLine="1143"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="234" TopLine="216"/> <Caret Line="2341" Column="3" TopLine="2338"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="235" TopLine="216"/> <Caret Line="1161" Column="15" TopLine="1101"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="236" TopLine="216"/> <Caret Line="1269" TopLine="1241"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="232" TopLine="216"/> <Caret Line="3023" Column="13" TopLine="3017"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxlookup.pas"/>
<Caret Line="234" TopLine="216"/> <Caret Line="322" Column="14" TopLine="305"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="235" TopLine="216"/> <Caret Line="3023" Column="26" TopLine="3017"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="236" TopLine="216"/> <Caret Line="1192" Column="45" TopLine="1180"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="232" TopLine="216"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="234" TopLine="216"/> <Caret Line="80" Column="27" TopLine="50"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="235" TopLine="216"/> <Caret Line="162" TopLine="153"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="236" TopLine="216"/> <Caret Line="159" TopLine="152"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="232" TopLine="216"/> <Caret Line="160" TopLine="152"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="240" TopLine="216"/> <Caret Line="161" TopLine="152"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="243" TopLine="216"/> <Caret Line="163" TopLine="152"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="246" TopLine="216"/> <Caret Line="164" TopLine="152"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="241" Column="22" TopLine="216"/> <Caret Line="166" TopLine="152"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="248" Column="39" TopLine="216"/> <Caret Line="165" Column="2" TopLine="152"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="rxdbgridmainunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="188" Column="138" TopLine="152"/> <Caret Line="159" TopLine="152"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="rxdbgridmainunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="160" TopLine="152"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="rxdbgridmainunit.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="28" Column="31"/> <Caret Line="161" TopLine="152"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="../../../rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="59" Column="3" TopLine="40"/> <Caret Line="166" TopLine="152"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="../../../rxdb/rxdbgrid.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="1182" Column="61" TopLine="1151"/> <Caret Line="169" Column="4" TopLine="152"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="../../../rxdb/rxdbgrid.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="2340" Column="3" TopLine="2338"/> <Caret Line="159" TopLine="152"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="../../../rxdb/rxdbgrid.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="1182" Column="15" TopLine="1164"/> <Caret Line="160" TopLine="152"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="../../../rxdb/rxdbgrid.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="1162" Column="15" TopLine="1143"/> <Caret Line="161" TopLine="152"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="../../../rxdb/rxdbgrid.pas"/> <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<Caret Line="2341" Column="3" TopLine="2338"/> <Caret Line="166" TopLine="152"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>

3
components/rx/trunk/demos/rxdbgrid/RxDBGrid/rxdbgridmainunit.lfm
View File

@ -613,7 +613,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
ButtonWidth = 23 ButtonWidth = 23
DialogTitle = 'Select a Date' DialogTitle = 'Select a Date'
MaxLength = 10 MaxLength = 10
NumGlyphs = 2
PasswordChar = #0 PasswordChar = #0
PopupColor = clWindow PopupColor = clWindow
TabOrder = 8 TabOrder = 8
@ -700,8 +699,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
ReadOnly = False ReadOnly = False
Required = False Required = False
DisplayFormat = '#,##0.00' DisplayFormat = '#,##0.00'
MaxValue = 0
MinValue = 0
Precision = 2 Precision = 2
end end
object RxMemoryData1Developer1: TStringField object RxMemoryData1Developer1: TStringField

2
components/rx/trunk/demos/rxdbgrid/RxDBGrid/rxdbgridmainunit.pas
View File

@ -149,7 +149,7 @@ begin
RxMemoryData1.AppendRecord([16, 'Гарант', 480, 'Гарант', EncodeDate(2007, 2, 1), 3]); RxMemoryData1.AppendRecord([16, 'Гарант', 480, 'Гарант', EncodeDate(2007, 2, 1), 3]);
RxMemoryData1.AppendRecord([17, 'Fedora Linux', 0, 'Open source', EncodeDate(2007, 2, 1), 3]); RxMemoryData1.AppendRecord([17, 'Fedora Linux', 0, 'Open source', EncodeDate(2007, 2, 1), 3]);
RxMemoryData1.AppendRecord([17, 'Ubuntu Linux', 0, 'Open source', EncodeDate(2007, 2, 1), 3]); RxMemoryData1.AppendRecord([17, 'Ubuntu Linux', 0, 'Open source', EncodeDate(2007, 2, 1), 3]);
RxMemoryData1.AppendRecord([17, 'Linux', 0, null, EncodeDate(2007, 2, 1), 3]); RxMemoryData1.AppendRecord([17, 'Linux', 0, 'a', EncodeDate(2007, 2, 1), 3]);
RxMemoryData1.First; RxMemoryData1.First;

1
components/rx/trunk/rxdb/rxdbgrid.pas
View File

@ -3020,6 +3020,7 @@ begin
FLDS := TDataSource.Create(nil); FLDS := TDataSource.Create(nil);
LookupSource := FLDS; LookupSource := FLDS;
AutoSize := false; AutoSize := false;
Style:=rxcsDropDownList;
end; end;
destructor TRxDBGridLookupComboEditor.Destroy; destructor TRxDBGridLookupComboEditor.Destroy;

4
components/rx/trunk/rxdb/rxdbgrid_popupfilterunit.pas
View File

@ -159,10 +159,10 @@ begin
CheckListBox1.Items.BeginUpdate; CheckListBox1.Items.BeginUpdate;
CheckListBox1.Items.Clear; CheckListBox1.Items.Clear;
Cnt:=FRxColumn.Filter.ValueList.Count - 1; Cnt:=FRxColumn.Filter.ValueList.Count - 1;
{
if FRxColumn.Filter.Style = rxfstBoth then if FRxColumn.Filter.Style = rxfstBoth then
Dec(Cnt); Dec(Cnt);
}
for i:=0 to Cnt do for i:=0 to Cnt do
begin begin
S:=FRxColumn.Filter.ValueList[i]; S:=FRxColumn.Filter.ValueList[i];