mirror of
https://gitlab.com/freepascal.org/fpc/pas2js.git
synced 2025-08-29 08:10:11 +02:00
* Fix compilation after refactoring of ExtJSDataset in separate units, and TJSJSON returns now a JSValue, no longer object
This commit is contained in:
parent
c84cab9d4a
commit
3df8a9b070
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<CONFIG>
|
<CONFIG>
|
||||||
<ProjectOptions>
|
<ProjectOptions>
|
||||||
<Version Value="10"/>
|
<Version Value="11"/>
|
||||||
<General>
|
<General>
|
||||||
<Flags>
|
<Flags>
|
||||||
<MainUnitHasCreateFormStatements Value="False"/>
|
<MainUnitHasCreateFormStatements Value="False"/>
|
||||||
@ -21,9 +21,10 @@
|
|||||||
<Version Value="2"/>
|
<Version Value="2"/>
|
||||||
</PublishOptions>
|
</PublishOptions>
|
||||||
<RunParams>
|
<RunParams>
|
||||||
<local>
|
<FormatVersion Value="2"/>
|
||||||
<FormatVersion Value="1"/>
|
<Modes Count="1">
|
||||||
</local>
|
<Mode0 Name="default"/>
|
||||||
|
</Modes>
|
||||||
</RunParams>
|
</RunParams>
|
||||||
<RequiredPackages Count="2">
|
<RequiredPackages Count="2">
|
||||||
<Item1>
|
<Item1>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
program demoxhr;
|
program demoxhr;
|
||||||
|
|
||||||
uses SysUtils, JS, Web, DB, JSonDataset, DBConst;
|
uses SysUtils, JS, Web, DB, JSonDataset, ExtJSDataset, DBConst;
|
||||||
|
|
||||||
Type
|
Type
|
||||||
|
|
||||||
@ -71,7 +71,7 @@ begin
|
|||||||
PanelContent.removeChild(PanelContent.childNodes.item(PanelContent.childNodes.length-1));}
|
PanelContent.removeChild(PanelContent.childNodes.item(PanelContent.childNodes.length-1));}
|
||||||
if (xhr.status = 200) then
|
if (xhr.status = 200) then
|
||||||
begin
|
begin
|
||||||
J:=TJSJSON.parse(xhr.responseText);
|
J:=TJSJSON.parseObject(xhr.responseText);
|
||||||
DS.Metadata:=TJSObject(J.Properties['metaData']);
|
DS.Metadata:=TJSObject(J.Properties['metaData']);
|
||||||
DS.Rows:=TJSArray(J.Properties['Data']);
|
DS.Rows:=TJSArray(J.Properties['Data']);
|
||||||
DS.Open;
|
DS.Open;
|
||||||
|
Loading…
Reference in New Issue
Block a user