Skip to content

Commit 05cfd1d

Browse files
dliocodedliocode
committed
Adicionado a opção para capturar a Key e Nome da validação
1 parent 400167b commit 05cfd1d

File tree

78 files changed

+174
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+174
-118
lines changed

‎samples/JSON/Basic/Basic.dproj

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,8 @@
246246
<Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
247247
</Excluded_Packages>
248248
</Delphi.Personality>
249-
<Deployment Version="3">
250-
<DeployFile LocalName="Win32\Debug\Basic.exe" Configuration="Debug" Class="ProjectOutput">
251-
<Platform Name="Win32">
252-
<RemoteName>Basic.exe</RemoteName>
253-
<Overwrite>true</Overwrite>
254-
</Platform>
255-
</DeployFile>
249+
<Deployment Version="4">
250+
<DeployFile LocalName="Win32\Debug\Basic.exe" Configuration="Debug" Class="ProjectOutput"/>
256251
<DeployClass Name="AdditionalDebugSymbols">
257252
<Platform Name="iOSSimulator">
258253
<Operation>1</Operation>
@@ -584,7 +579,7 @@
584579
<Operation>1</Operation>
585580
<Extensions>.dylib</Extensions>
586581
</Platform>
587-
<Platform Name="iOSSimulator">
582+
<Platform Name="iOSSimARM64">
588583
<Operation>1</Operation>
589584
<Extensions>.dylib</Extensions>
590585
</Platform>
@@ -617,7 +612,7 @@
617612
<Operation>1</Operation>
618613
<Extensions>.dylib</Extensions>
619614
</Platform>
620-
<Platform Name="iOSSimulator">
615+
<Platform Name="iOSSimARM64">
621616
<Operation>1</Operation>
622617
<Extensions>.dylib</Extensions>
623618
</Platform>
@@ -654,7 +649,7 @@
654649
<Platform Name="iOSDevice64">
655650
<Operation>0</Operation>
656651
</Platform>
657-
<Platform Name="iOSSimulator">
652+
<Platform Name="iOSSimARM64">
658653
<Operation>0</Operation>
659654
</Platform>
660655
<Platform Name="OSX32">
@@ -678,13 +673,17 @@
678673
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
679674
<Operation>1</Operation>
680675
</Platform>
676+
<Platform Name="iOSSimARM64">
677+
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
678+
<Operation>1</Operation>
679+
</Platform>
681680
</DeployClass>
682681
<DeployClass Name="iPad_AppIcon152">
683682
<Platform Name="iOSDevice64">
684683
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
685684
<Operation>1</Operation>
686685
</Platform>
687-
<Platform Name="iOSSimulator">
686+
<Platform Name="iOSSimARM64">
688687
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
689688
<Operation>1</Operation>
690689
</Platform>
@@ -694,7 +693,7 @@
694693
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
695694
<Operation>1</Operation>
696695
</Platform>
697-
<Platform Name="iOSSimulator">
696+
<Platform Name="iOSSimARM64">
698697
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
699698
<Operation>1</Operation>
700699
</Platform>
@@ -704,7 +703,7 @@
704703
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
705704
<Operation>1</Operation>
706705
</Platform>
707-
<Platform Name="iOSSimulator">
706+
<Platform Name="iOSSimARM64">
708707
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
709708
<Operation>1</Operation>
710709
</Platform>
@@ -714,7 +713,7 @@
714713
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
715714
<Operation>1</Operation>
716715
</Platform>
717-
<Platform Name="iOSSimulator">
716+
<Platform Name="iOSSimARM64">
718717
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
719718
<Operation>1</Operation>
720719
</Platform>
@@ -724,7 +723,7 @@
724723
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
725724
<Operation>1</Operation>
726725
</Platform>
727-
<Platform Name="iOSSimulator">
726+
<Platform Name="iOSSimARM64">
728727
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
729728
<Operation>1</Operation>
730729
</Platform>
@@ -734,7 +733,7 @@
734733
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
735734
<Operation>1</Operation>
736735
</Platform>
737-
<Platform Name="iOSSimulator">
736+
<Platform Name="iOSSimARM64">
738737
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
739738
<Operation>1</Operation>
740739
</Platform>
@@ -744,7 +743,7 @@
744743
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
745744
<Operation>1</Operation>
746745
</Platform>
747-
<Platform Name="iOSSimulator">
746+
<Platform Name="iOSSimARM64">
748747
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
749748
<Operation>1</Operation>
750749
</Platform>
@@ -754,7 +753,7 @@
754753
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
755754
<Operation>1</Operation>
756755
</Platform>
757-
<Platform Name="iOSSimulator">
756+
<Platform Name="iOSSimARM64">
758757
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
759758
<Operation>1</Operation>
760759
</Platform>
@@ -764,7 +763,7 @@
764763
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
765764
<Operation>1</Operation>
766765
</Platform>
767-
<Platform Name="iOSSimulator">
766+
<Platform Name="iOSSimARM64">
768767
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
769768
<Operation>1</Operation>
770769
</Platform>
@@ -774,7 +773,7 @@
774773
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
775774
<Operation>1</Operation>
776775
</Platform>
777-
<Platform Name="iOSSimulator">
776+
<Platform Name="iOSSimARM64">
778777
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
779778
<Operation>1</Operation>
780779
</Platform>
@@ -784,7 +783,7 @@
784783
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
785784
<Operation>1</Operation>
786785
</Platform>
787-
<Platform Name="iOSSimulator">
786+
<Platform Name="iOSSimARM64">
788787
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
789788
<Operation>1</Operation>
790789
</Platform>
@@ -794,7 +793,7 @@
794793
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
795794
<Operation>1</Operation>
796795
</Platform>
797-
<Platform Name="iOSSimulator">
796+
<Platform Name="iOSSimARM64">
798797
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
799798
<Operation>1</Operation>
800799
</Platform>
@@ -804,7 +803,7 @@
804803
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
805804
<Operation>1</Operation>
806805
</Platform>
807-
<Platform Name="iOSSimulator">
806+
<Platform Name="iOSSimARM64">
808807
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
809808
<Operation>1</Operation>
810809
</Platform>
@@ -814,7 +813,7 @@
814813
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
815814
<Operation>1</Operation>
816815
</Platform>
817-
<Platform Name="iOSSimulator">
816+
<Platform Name="iOSSimARM64">
818817
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
819818
<Operation>1</Operation>
820819
</Platform>
@@ -824,7 +823,7 @@
824823
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
825824
<Operation>1</Operation>
826825
</Platform>
827-
<Platform Name="iOSSimulator">
826+
<Platform Name="iOSSimARM64">
828827
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
829828
<Operation>1</Operation>
830829
</Platform>
@@ -834,7 +833,7 @@
834833
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
835834
<Operation>1</Operation>
836835
</Platform>
837-
<Platform Name="iOSSimulator">
836+
<Platform Name="iOSSimARM64">
838837
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
839838
<Operation>1</Operation>
840839
</Platform>
@@ -844,7 +843,7 @@
844843
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
845844
<Operation>1</Operation>
846845
</Platform>
847-
<Platform Name="iOSSimulator">
846+
<Platform Name="iOSSimARM64">
848847
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
849848
<Operation>1</Operation>
850849
</Platform>
@@ -854,7 +853,7 @@
854853
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
855854
<Operation>1</Operation>
856855
</Platform>
857-
<Platform Name="iOSSimulator">
856+
<Platform Name="iOSSimARM64">
858857
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
859858
<Operation>1</Operation>
860859
</Platform>
@@ -864,7 +863,7 @@
864863
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
865864
<Operation>1</Operation>
866865
</Platform>
867-
<Platform Name="iOSSimulator">
866+
<Platform Name="iOSSimARM64">
868867
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
869868
<Operation>1</Operation>
870869
</Platform>
@@ -886,6 +885,10 @@
886885
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
887886
<Operation>1</Operation>
888887
</Platform>
888+
<Platform Name="iOSSimARM64">
889+
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
890+
<Operation>1</Operation>
891+
</Platform>
889892
</DeployClass>
890893
<DeployClass Name="ProjectiOSEntitlements">
891894
<Platform Name="iOSDevice32">
@@ -896,6 +899,10 @@
896899
<RemoteDir>..\</RemoteDir>
897900
<Operation>1</Operation>
898901
</Platform>
902+
<Platform Name="iOSSimARM64">
903+
<RemoteDir>..\</RemoteDir>
904+
<Operation>1</Operation>
905+
</Platform>
899906
</DeployClass>
900907
<DeployClass Name="ProjectiOSInfoPList">
901908
<Platform Name="iOSDevice32">
@@ -904,7 +911,7 @@
904911
<Platform Name="iOSDevice64">
905912
<Operation>1</Operation>
906913
</Platform>
907-
<Platform Name="iOSSimulator">
914+
<Platform Name="iOSSimARM64">
908915
<Operation>1</Operation>
909916
</Platform>
910917
</DeployClass>
@@ -913,7 +920,7 @@
913920
<RemoteDir>..\$(PROJECTNAME).launchscreen</RemoteDir>
914921
<Operation>64</Operation>
915922
</Platform>
916-
<Platform Name="iOSSimulator">
923+
<Platform Name="iOSSimARM64">
917924
<RemoteDir>..\$(PROJECTNAME).launchscreen</RemoteDir>
918925
<Operation>64</Operation>
919926
</Platform>
@@ -925,7 +932,7 @@
925932
<Platform Name="iOSDevice64">
926933
<Operation>1</Operation>
927934
</Platform>
928-
<Platform Name="iOSSimulator">
935+
<Platform Name="iOSSimARM64">
929936
<Operation>1</Operation>
930937
</Platform>
931938
</DeployClass>
@@ -996,7 +1003,7 @@
9961003
<Platform Name="iOSDevice64">
9971004
<Operation>1</Operation>
9981005
</Platform>
999-
<Platform Name="iOSSimulator">
1006+
<Platform Name="iOSSimARM64">
10001007
<Operation>1</Operation>
10011008
</Platform>
10021009
<Platform Name="Linux64">
@@ -1056,6 +1063,7 @@
10561063
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
10571064
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
10581065
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
1066+
<ProjectRoot Platform="iOSSimARM64" Name="$(PROJECTNAME).app"/>
10591067
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
10601068
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
10611069
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>

‎samples/JSON/Basic/UBasic.dfm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ object Form2: TForm2
170170
'}')
171171
ScrollBars = ssBoth
172172
TabOrder = 0
173-
ExplicitHeight = 603
174173
end
175174
object Memo22: TMemo
176175
Left = 313

‎src/core/DataValidator.Information.pas

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,20 @@ interface
4242
type
4343
TDataValidatorInformation = class(TInterfacedObject, IDataValidatorInformation)
4444
private
45+
FKey: string;
46+
FName: string;
4547
FValue: Variant;
4648
FMessages: TDataValidatorMessage;
4749
FExecute: TDataValidatorInformationExecute;
4850
public
51+
function Key: string;
52+
function Name: string;
4953
function Value: string;
5054
function Messages: TDataValidatorMessage;
5155
function Execute: TDataValidatorInformationExecute;
5256
procedure OnExecute;
5357

54-
constructor Create(const AValue: string; const AMessages: TDataValidatorMessage; const AExecute: TDataValidatorInformationExecute);
58+
constructor Create(const AKey: string; const AName: string; const AValue: string; const AMessages: TDataValidatorMessage; const AExecute: TDataValidatorInformationExecute);
5559
end;
5660

5761
TDataValidatorInformations = class(TInterfacedObject, IDataValidatorInformations)
@@ -127,13 +131,25 @@ function TDataValidatorInformations.Message: string;
127131

128132
{ TDataValidatorInformation }
129133

130-
constructor TDataValidatorInformation.Create(const AValue: string; const AMessages: TDataValidatorMessage; const AExecute: TDataValidatorInformationExecute);
134+
constructor TDataValidatorInformation.Create(const AKey: string; const AName: string; const AValue: string; const AMessages: TDataValidatorMessage; const AExecute: TDataValidatorInformationExecute);
131135
begin
136+
FKey := AKey;
137+
FName := AName;
132138
FValue := AValue;
133139
FMessages := AMessages;
134140
FExecute := AExecute;
135141
end;
136142

143+
function TDataValidatorInformation.Key: string;
144+
begin
145+
Result := FKey;
146+
end;
147+
148+
function TDataValidatorInformation.Name: string;
149+
begin
150+
REsult := FName;
151+
end;
152+
137153
function TDataValidatorInformation.Value: string;
138154
begin
139155
Result := FValue;

‎src/core/DataValidator.Intf.pas

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ interface
4444
// Information
4545
IDataValidatorInformation = interface
4646
['{972F5617-FDED-4D8E-8F89-5F372C1D62AB}']
47+
function Key: string;
48+
function Name: string;
4749
function Value: string;
4850
function Messages: TDataValidatorMessage;
4951
function Execute: TDataValidatorInformationExecute;

‎src/core/DataValidator.ItemBase.pas

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ procedure TDataValidatorItemBase.SetMessage(const AMessage: TDataValidatorMessag
140140
if not AMessage.Description.Trim.IsEmpty then
141141
FMessage.Description := AMessage.Description;
142142

143+
if Length(AMessage.Details) > 0 then
144+
FMessage.Details := AMessage.Details;
145+
143146
if not AMessage.Solution.Trim.IsEmpty then
144147
FMessage.Solution := AMessage.Solution;
145148

0 commit comments

Comments
 (0)