|
|
@@ -228,6 +228,8 @@ JpcExSrv.prototype.createNew = function() {
|
|
|
const execFmlMe = this;
|
|
|
for (let execFmlIdx = 0; execFmlIdx < execFmlMe.formulas.length; execFmlIdx++) {
|
|
|
// remark: 搞这么复杂的变量名是为了防止与表达式起冲突(如循环变量i,j,k，容易造成变量冲突且不容易看出问题)
|
|
|
+ // console.log('execFmlMe.formulas[execFmlIdx][JV.PROP_RUN_TYPE]: ' + execFmlMe.formulas[execFmlIdx][JV.PROP_RUN_TYPE]);
|
|
|
+ // console.log('runType: ' + runType);
|
|
|
if (execFmlMe.formulas[execFmlIdx][JV.PROP_RUN_TYPE] === runType) {
|
|
|
const expression = execFmlMe.formulas[execFmlIdx][JV.PROP_EXPRESSION];
|
|
|
if (expression) {
|
|
|
@@ -321,7 +323,7 @@ JpcExSrv.prototype.createNew = function() {
|
|
|
try {
|
|
|
for (let page = startPage; page <= endPage; page++) {
|
|
|
me.runTimePageData.currentPage = page;
|
|
|
- me.executeFormulas(JV.RUN_TYPE_BEFORE_OUTPUT, rptTpl, dataObj, me);
|
|
|
+ me.executeFormulas($CTX_HELPER, JV.RUN_TYPE_BEFORE_OUTPUT, rptTpl, dataObj, me);
|
|
|
rst.items.push(me.outputAsSimpleJSONPage(rptTpl, dataObj, bands, page, rst[JV.NODE_CONTROL_COLLECTION], customizeCfg));
|
|
|
}
|
|
|
if (bands[JV.BAND_PROP_MERGE_BAND]) {
|
