|
|
@@ -4,7 +4,8 @@ import formulasDataSetter from './formulasDataSetter';
|
|
|
import * as stringUtil from '../public/stringUtil'
|
|
|
import { ReportDate as useReportDate } from '../public/ReportDate'
|
|
|
import { ICurrent_RPT, IRptTpl, IDataObj, Fields } from '../interface/basic'
|
|
|
-import { JV as $JV } from './jpc_value_define';
|
|
|
+import { JV } from './jpc_value_define';
|
|
|
+
|
|
|
|
|
|
export const formulaExec = (runType: string, $CURRENT_TEMPLATE: IRptTpl, $CURRENT_DATA: IDataObj, $CURRENT_RPT: ICurrent_RPT) => {
|
|
|
formulasDataSetter.setupData($CURRENT_RPT, $CURRENT_DATA);
|
|
|
@@ -39,7 +40,8 @@ export const formulaExec = (runType: string, $CURRENT_TEMPLATE: IRptTpl, $CURREN
|
|
|
formatNumber,
|
|
|
} = stringUtil;
|
|
|
|
|
|
-
|
|
|
+ const $JV= JV;
|
|
|
+ const $JE = JE;
|
|
|
const ReportDate = useReportDate;
|
|
|
for (let execFmlIdx = 0; execFmlIdx < $CURRENT_RPT.formulas.length; execFmlIdx++) {
|
|
|
if ($CURRENT_RPT.formulas[execFmlIdx].run_type === runType) {
|
|
|
@@ -47,8 +49,6 @@ 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;
|
|
|
@@ -65,6 +65,7 @@ export const formulaExec = (runType: string, $CURRENT_TEMPLATE: IRptTpl, $CURREN
|
|
|
}
|
|
|
}
|
|
|
formulasDataSetter.resetData();
|
|
|
+ return {$JE,$JV};
|
|
|
}
|
|
|
|
|
|
export const combinedGridFormula = ($RUN_TYPE: String, $TEXT: Fields, $TIMES: number, $CURRENT_RPT: ICurrent_RPT) => {
|