admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-09-08 18:33:57 +00:00
parent cd28367cb0
commit 10abb41a0c
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/AyaNova/biz/ReportBiz.cs
View File

@@ -405,27 +405,22 @@ namespace AyaNova.Biz
var serverMeta=$"{{ayApiUrl:`{apiUrl}`}}"; var serverMeta=$"{{ayApiUrl:`{apiUrl}`}}";
//this is how you view the contents of the page
#if (DEBUG) #if (DEBUG)
//view page contents
var pagecontent = await page.GetContentAsync(); var pagecontent = await page.GetContentAsync();
#endif #endif
//compile and run handlebars template //prePareData / preRender
//var compileScript = $"Handlebars.compile(`{report.Template}`)({{ ayReportData:ayPreRender({ReportData}), ayClientMetaData:{clientMeta}, ayServerMetaData:{{ayApiUrl:`{apiUrl}`}} }});"; var ReportDataObject=$"{{ ayReportData:{ReportData}, ayClientMetaData:{clientMeta}, ayServerMetaData:{serverMeta} }}";
//var compileScript = $"Handlebars.compile(`{report.Template}`)( (async () => {{await ayPreRender({{ ayReportData:{ReportData}, ayClientMetaData:{clientMeta}, ayServerMetaData:{serverMeta} }})}})());";
var ReportDataObject=$"{{ ayReportData:{ReportData}, ayClientMetaData:{clientMeta}, ayServerMetaData:{serverMeta} }}";
// var ReportDataObject=$"{{ ayReportData:[1,2] }}";
var preRenderResult=await page.EvaluateExpressionAsync<dynamic>($"ayPreRender({ReportDataObject});"); var preRenderResult=await page.EvaluateExpressionAsync<dynamic>($"ayPreRender({ReportDataObject});");
// var preRenderResult=await page.EvaluateExpressionAsync<string>("ayPreRender('stringofdata');");
//compile the template
var compileScript = $"Handlebars.compile(`{report.Template}`)({preRenderResult});"; var compileScript = $"Handlebars.compile(`{report.Template}`)({preRenderResult});";
var resultHTML = await page.EvaluateExpressionAsync<string>(compileScript); var compiledHTML = await page.EvaluateExpressionAsync<string>(compileScript);
//render report as HTML //render report as HTML
await page.SetContentAsync(resultHTML); await page.SetContentAsync(compiledHTML);
//add style (after page or it won't work) //add style (after page or it won't work)
if (!string.IsNullOrWhiteSpace(report.Style)) if (!string.IsNullOrWhiteSpace(report.Style))

22
server/AyaNova/resource/rpt/ay-report.js
View File

@@ -26,13 +26,13 @@ function ayRegisterHelpers() {
}); });
} //eof } //eof
// async function ayPreRender(ayAllData) { async function ayPreRender(ayAllData) {
// if (typeof ayPrepareData === "function") { if (typeof ayPrepareData === "function") {
// return await ayPrepareData(ayAllData); return await ayPrepareData(ayAllData);
// } else { } else {
// return ayAllData; return ayAllData;
// } }
// } }
// function ayPreRender(ayAllData) { // function ayPreRender(ayAllData) {
// if (typeof ayPrepareData === "function") { // if (typeof ayPrepareData === "function") {
@@ -42,7 +42,7 @@ function ayRegisterHelpers() {
// } // }
// } // }
function ayPreRender(ayAllData) { // function ayPreRender(ayAllData) {
return ayAllData; // return ayAllData;
// return typeof ayPrepareData; // // return typeof ayPrepareData;
} // }