瀏覽代碼

code sync

Tony Kang 2 年之前
父節點
當前提交
c5ed8cbcd9
共有 2 個文件被更改,包括 12 次插入1 次删除
  1. 2 0
      app/reports/rpt_component/helper/jpc_helper_discrete.js
  2. 10 1
      app/reports/rpt_component/jpc_bill_tab.js

+ 2 - 0
app/reports/rpt_component/helper/jpc_helper_discrete.js

@@ -229,6 +229,8 @@ const JpcDiscreteHelper = {
                 interactItem[JV.PROP_AREA] = JpcAreaHelper.outputArea(df[JV.PROP_AREA], band, unitFactor, 1, 0, 1, 0, 1, 0, false, false);
                 interactItem[JV.PROP_BAND_NAME] = band.Name;
                 interactItem[JV.PROP_DATA_TYPE] = iParam[JV.PROP_DATA_TYPE];
+                interactItem[JV.PROP_LABEL] = iParam[JV.PROP_NAME];
+                interactItem[JV.PROP_PREFIX] = df[JV.PROP_PREFIX];
                 interactRst.push(interactItem);
                 rst = true;
             }

+ 10 - 1
app/reports/rpt_component/jpc_bill_tab.js

@@ -105,7 +105,16 @@ JpcBillTabSrv.prototype.createNew = function() {
                     if (!(tab_field[JV.PROP_HIDDEN])) {
                         const cellItem = JpcCommonOutputHelper.createCommonOutput(tab_field, '', controls);
                         cellItem[JV.PROP_AREA] = JpcAreaHelper.outputArea(tab_field[JV.PROP_AREA], band, unitFactor, 1, 0, 1, 0, 1, 0, false, false);
-                        rst.push(cellItem);
+                        if (JE.isInterActionParam(tab_field[JV.PROP_PARAM_ID], $CURRENT_RPT)) {
+                            const iParam = JE.P(tab_field[JV.PROP_PARAM_ID], $CURRENT_RPT);
+                            cellItem[JV.PROP_BAND_NAME] = band.Name;
+                            cellItem[JV.PROP_DATA_TYPE] = iParam[JV.PROP_DATA_TYPE];
+                            cellItem[JV.PROP_LABEL] = iParam[JV.PROP_NAME];
+                            cellItem[JV.PROP_PREFIX] = tab_field[JV.PROP_PREFIX];
+                            this.interactRst.push(cellItem);
+                        } else {
+                            rst.push(cellItem);
+                        }
                     }
                 }
                 if (tab[JV.PROP_TEXT]) {