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:11:57 +00:00
parent f04a8124ae
commit cd28367cb0
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -412,7 +412,16 @@ namespace AyaNova.Biz
#endif #endif
//compile and run handlebars template //compile and run handlebars template
//var compileScript = $"Handlebars.compile(`{report.Template}`)({{ ayReportData:ayPreRender({ReportData}), ayClientMetaData:{clientMeta}, ayServerMetaData:{{ayApiUrl:`{apiUrl}`}} }});"; //var compileScript = $"Handlebars.compile(`{report.Template}`)({{ ayReportData:ayPreRender({ReportData}), ayClientMetaData:{clientMeta}, ayServerMetaData:{{ayApiUrl:`{apiUrl}`}} }});";
var compileScript = $"Handlebars.compile(`{report.Template}`)(ayPreRender({{ 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<string>("ayPreRender('stringofdata');");
var compileScript = $"Handlebars.compile(`{report.Template}`)({preRenderResult});";
var resultHTML = await page.EvaluateExpressionAsync<string>(compileScript); var resultHTML = await page.EvaluateExpressionAsync<string>(compileScript);
//render report as HTML //render report as HTML

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

@@ -26,10 +26,23 @@ 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) {
// if (typeof ayPrepareData === "function") {
// return ayPrepareData(ayAllData);
// } else {
// return ayAllData;
// }
// }
function ayPreRender(ayAllData) {
return ayAllData;
// return typeof ayPrepareData;
} }