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

整理交叉行、列合计功能

Tony Kang 3 лет назад
Родитель
Сommit
a05a412f37
1 измененных файлов с 6 добавлено и 2 удалено
  1. 6 2
      app/reports/rpt_component/jpc_cross_tab.js

+ 6 - 2
app/reports/rpt_component/jpc_cross_tab.js

@@ -859,7 +859,9 @@ JpcCrossTabSrv.prototype.createNew = function() {
                             const cellItem = JpcCommonOutputHelper.createCommonOutput(tab_field, val, controls);
                             cellItem[JV.PROP_AREA] = JpcAreaHelper.outputArea(tab_field[JV.PROP_AREA], band, unitFactor, 1, 0, me.dispSumValueLst_Row[page - 1].length, i, 1, 0, true, false);
                             // 方向不同,需要调整下
-                            rst.push(cellItem);
+                            if (!(tab_field[JV.PROP_HIDDEN])) {
+                                rst.push(cellItem);
+                            }
                         }
                     } else {
                         let sumL = 1;
@@ -906,7 +908,9 @@ JpcCrossTabSrv.prototype.createNew = function() {
                             const val = me.dispSumValueLst_Col[page - 1][i][j];
                             const cellItem = JpcCommonOutputHelper.createCommonOutput(tab_field, val, controls);
                             cellItem[JV.PROP_AREA] = JpcAreaHelper.outputArea(tab_field[JV.PROP_AREA], band, unitFactor, me.dispSumValueLst_Col[page - 1].length, i, 1, 0, 1, 0, true, false);
-                            rst.push(cellItem);
+                            if (!(tab_field[JV.PROP_HIDDEN])) {
+                                rst.push(cellItem);
+                            }
                         }
                     } else {
                         let sumL = 1;