Przeglądaj źródła

fix(report): 修复新代码对旧计算式的兼容问题

lishihao 4 lat temu
rodzic
commit
bc1b091a5f

+ 1 - 0
report/src/core/formulasDataSetter.ts

@@ -1,3 +1,4 @@
+//计算式执行的具体方法
 import { Fields, ICurrent_RPT, IDataObj, IGroupField, IParam } from "../index";
 import { IParams } from "../interface/basic";
 import { IDataObjProps } from '../interface/enum';

+ 3 - 1
report/src/core/formulasFun.ts

@@ -1,9 +1,10 @@
+// 计算式执行(不同情况的方法会不同)
 import JE from './jpc_rte';
 import formulasDataSetter from './formulasDataSetter';
 import stringUtil from '../public/stringUtil'
 import useReportDate from '../public/ReportDate'
 import { ICurrent_RPT, IRptTpl, IDataObj, Fields } from '../interface/basic'
-
+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);
@@ -38,6 +39,7 @@ export const formulaExec = (runType: string, $CURRENT_TEMPLATE: IRptTpl, $CURREN
         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) {