|
|
@@ -38,8 +38,8 @@ export const formulaExec = (runType: string, $CURRENT_TEMPLATE: IRptTpl, $CURREN
|
|
|
convertStrToBoolean,
|
|
|
formatNumber,
|
|
|
} = stringUtil;
|
|
|
- const $JE = JE;
|
|
|
- const JV= $JV;
|
|
|
+
|
|
|
+
|
|
|
const ReportDate = useReportDate;
|
|
|
for (let execFmlIdx = 0; execFmlIdx < $CURRENT_RPT.formulas.length; execFmlIdx++) {
|
|
|
if ($CURRENT_RPT.formulas[execFmlIdx].run_type === runType) {
|
|
|
@@ -47,6 +47,8 @@ export const formulaExec = (runType: string, $CURRENT_TEMPLATE: IRptTpl, $CURREN
|
|
|
if (expression) {
|
|
|
// 计算式集合,目前是放置打印信息的,用于配置属性的计算
|
|
|
let $ME = $CURRENT_RPT.formulas[execFmlIdx];
|
|
|
+ const JV= $JV;
|
|
|
+ const $JE = JE;
|
|
|
try {
|
|
|
let newExpression=expression;
|
|
|
const { format } = $ME;
|