Просмотр исходного кода

fix(report): 1.修改计算式中含有JV变量计算时报错的问题。2.修复流水表生成数据不完整的问题

lishihao 4 лет назад
Родитель
Сommit
bd232c7215
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      report/src/core/jpc_ex.ts
  2. 1 1
      report/src/core/jpc_flow_tab.ts

+ 2 - 2
report/src/core/jpc_ex.ts

@@ -1,6 +1,6 @@
 
 import JE from './jpc_rte'; //Important: for self-define function execution purpose
-import JV from './jpc_value_define';
+import $JV from './jpc_value_define';
 import JpcBand from './jpc_band';
 import JpcFlowTab from './jpc_flow_tab';
 import JpcBillTab from './jpc_bill_tab';
@@ -18,7 +18,7 @@ import { IDefProperties, IFormula, IParams, ICurrent_RPT, ICurrent_DATA, ICustom
 import { IFlowTabClass, IBillTabClass, ICostTabClass } from '../interface/classType';
 import { IControlProps, IFontProps, IPagingOption } from '../interface/enum';
 import { Key } from 'readline';
-
+const JV=$JV;
 class JpcExClass {
     flowTab!: IFlowTabClass;
     flowTabEx!: IFlowTabClass;

+ 1 - 1
report/src/core/jpc_flow_tab.ts

@@ -1336,7 +1336,7 @@ function _addPageValue(ValuedIdxLst: number[][][], sortedSequence: number[], grp
     let private_addAutoHeightPageValue = function (vi: number) {
         let couldBreak = false, startIdx = 0;
         let ttlValAmt = 0;
-        if (segAutoHeightInfo && [segIdx].length > startRecIdx + vi) {
+        if (segAutoHeightInfo && segAutoHeightInfo[segIdx].length > startRecIdx + vi) {
             ttlValAmt = segAutoHeightInfo[segIdx][startRecIdx + vi];
         }
         if (prePageLeftAutoHeightRecAmt > 0 && vi === 0) {