|
|
@@ -11,16 +11,29 @@ import JpcDiscreteHelper from './helper/jpc_helper_discrete';
|
|
|
import JpcTextHelper from './helper/jpc_helper_text';
|
|
|
import JpcCommonOutputHelper from './helper/jpc_helper_common_output';
|
|
|
import JpcAreaHelper from './helper/jpc_helper_area';
|
|
|
-
|
|
|
+import {
|
|
|
+ Fields,
|
|
|
+ IDefProperties,
|
|
|
+ ICurrent_RPT,
|
|
|
+ ICustomizeCfg,
|
|
|
+ IBands,
|
|
|
+ IBandDetail,
|
|
|
+ IControlCollection,
|
|
|
+ IRptTpl,
|
|
|
+ IDataObj,
|
|
|
+ ICrossTab,
|
|
|
+ IGroupField
|
|
|
+} from '../interface/basic';
|
|
|
+import { IDataObj_props } from '../interface/enum'
|
|
|
class JpcCrossTabClass {
|
|
|
- dispValueIdxLst_Row: any[];
|
|
|
+ dispValueIdxLst_Row: number[][];
|
|
|
dispValueIdxLst_Col: any[];
|
|
|
- dispValueIdxLst_Content: any[];
|
|
|
- dispSerialIdxLst_Row: any[];
|
|
|
+ dispValueIdxLst_Content: number[][][];
|
|
|
+ dispSerialIdxLst_Row: number[][];
|
|
|
col_sum_fields_idx: any[];
|
|
|
- col_sum_fields_value_total: any[];
|
|
|
+ col_sum_fields_value_total:any[][];
|
|
|
dispSumValueLst_Col: any[];
|
|
|
- page_seg_map: any[];
|
|
|
+ page_seg_map: any;
|
|
|
row_fields_idx: any[];
|
|
|
row_fields_adhoc_idx: any[];
|
|
|
col_fields_idx: any[];
|
|
|
@@ -33,7 +46,7 @@ class JpcCrossTabClass {
|
|
|
crsOrient: number;
|
|
|
pageStatusLst: any[];
|
|
|
paging_option: string;
|
|
|
-
|
|
|
+
|
|
|
constructor() {
|
|
|
this.dispValueIdxLst_Row = [];
|
|
|
this.dispValueIdxLst_Col = [];
|
|
|
@@ -56,23 +69,23 @@ class JpcCrossTabClass {
|
|
|
this.pageStatusLst = [];
|
|
|
this.paging_option = JV.PAGING_OPTION_NORMAL;
|
|
|
};
|
|
|
- sorting(rptTpl: any, dataObj: any, dataSeq: any[], $CURRENT_RPT: any) {
|
|
|
+ sorting(rptTpl: IRptTpl, dataObj: IDataObj, dataSeq: number[][], $CURRENT_RPT: ICurrent_RPT) {
|
|
|
let me = this;
|
|
|
//IMPORTANT: the data should be sorted in SQL/NoSQL level!
|
|
|
me.sortedRowSequence = _SortAndOptimize(rptTpl, dataObj, dataSeq, JV.NODE_CROSS_ROW, me.row_fields_idx, $CURRENT_RPT);
|
|
|
_SortAndOptimize(rptTpl, dataObj, dataSeq, JV.NODE_CROSS_ROW_AD_HOC, me.row_fields_adhoc_idx, $CURRENT_RPT);
|
|
|
me.sortedColSequence = _SortAndOptimize(rptTpl, dataObj, dataSeq, JV.NODE_CROSS_COL, me.col_fields_idx, $CURRENT_RPT);
|
|
|
me.sortedContentSequence = _SortForDisplayContent(rptTpl, me.sortedRowSequence, me.sortedColSequence, me.content_fields_idx);
|
|
|
- JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_COL_SUM][JV.PROP_CROSS_FIELDS], null, me.col_sum_fields_idx, false);
|
|
|
+ JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, rptTpl.交叉表_信息.交叉列合计.cross_field_s, null, me.col_sum_fields_idx, false);
|
|
|
//pre-sum the data(for col sum display)
|
|
|
- let data_details = dataObj[JV.DATA_DETAIL_DATA],
|
|
|
+ let data_details = dataObj.detail_data,
|
|
|
data_fields = [];
|
|
|
for (let i = 0; i < me.col_sum_fields_idx.length; i++) {
|
|
|
let data_field = null;
|
|
|
if (typeof me.col_sum_fields_idx[i] === 'object') {
|
|
|
- let exField = JE.F(me.col_sum_fields_idx[i][JV.PROP_ID], $CURRENT_RPT);
|
|
|
+ let exField = JE.F(me.col_sum_fields_idx[i].ID, $CURRENT_RPT);
|
|
|
if (exField) {
|
|
|
- data_field = exField[JV.PROP_AD_HOC_DATA];
|
|
|
+ data_field = exField.data_field;
|
|
|
}
|
|
|
} else {
|
|
|
data_field = data_details[me.col_sum_fields_idx[i]];
|
|
|
@@ -101,9 +114,9 @@ class JpcCrossTabClass {
|
|
|
|
|
|
}
|
|
|
};
|
|
|
- preSetupPages(rptTpl: any, defProperties: any, option: any) {
|
|
|
+ preSetupPages(rptTpl: IRptTpl, defProperties: IDefProperties, option: string) {
|
|
|
let me = this, rst = 0;
|
|
|
- me.paging_option = option||JV.PAGING_OPTION_NORMAL;
|
|
|
+ me.paging_option = option || JV.PAGING_OPTION_NORMAL;
|
|
|
//1. original initialize
|
|
|
let maxRowRec = 1, maxColRec = 1, counterRowRec = 0, counterColRec = 0, pageIdx = 0, segCnt = me.sortedContentSequence.length;
|
|
|
let pageStatus: boolean[] = [true, true, false, true, false, false, false, false];
|
|
|
@@ -114,8 +127,8 @@ class JpcCrossTabClass {
|
|
|
maxRowRec = JpcCrossTabHelper.getMaxRowsPerPage(bands, rptTpl);
|
|
|
maxColRec = JpcCrossTabHelper.getMaxColsPerPage(bands, rptTpl);
|
|
|
}
|
|
|
- JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_ROW_EXT][JV.PROP_CROSS_FIELDS], null, me.row_extension_fields_idx, false);
|
|
|
- JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_ROW_SUM_EXT][JV.PROP_CROSS_FIELDS], null, me.row_sum_extension_fields_idx, false);
|
|
|
+ JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, rptTpl.交叉表_信息.交叉行拓展.cross_field_s, null, me.row_extension_fields_idx, false);
|
|
|
+ JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, rptTpl.交叉表_信息.交叉行拓展合计.cross_field_s, null, me.row_sum_extension_fields_idx, false);
|
|
|
if (me.paging_option === JV.PAGING_OPTION_INFINITY) {
|
|
|
// 交叉表暂时不支持无限拓展
|
|
|
} else {
|
|
|
@@ -140,7 +153,7 @@ class JpcCrossTabClass {
|
|
|
if (hasAdHocRow) rowSplitCnt++;
|
|
|
if (hasAdHocCol) colSplitCnt++;
|
|
|
//2.2
|
|
|
- if (rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_CROSS_DISPLAY_ORDER] === JV.PAGE_ORIENTATION_H_FIRST) {
|
|
|
+ if (rptTpl.主信息.打印页面_信息.cross_display_order === JV.PAGE_ORIENTATION_H_FIRST) {
|
|
|
for (let rowIdx = 0; rowIdx < rowSplitCnt; rowIdx++) {
|
|
|
pageStatus[JV.STATUS_CROSS_ROW_END] = (rowIdx === (rowSplitCnt - 1));
|
|
|
private_resetBandArea();
|
|
|
@@ -207,7 +220,7 @@ class JpcCrossTabClass {
|
|
|
// bands = null;
|
|
|
return rst;
|
|
|
};
|
|
|
- outputAsPreviewPage(rptTpl: any, bands: any, controls: any, $CURRENT_RPT: any, customizeCfg: any) {
|
|
|
+ outputAsPreviewPage(rptTpl: IRptTpl, bands: IBands, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg) {
|
|
|
let me = this, rst: any[] = [];
|
|
|
let pageStatus: boolean[] = [true, true, true, true, true, true, true, true];
|
|
|
me.pageStatusLst.push(pageStatus);
|
|
|
@@ -227,44 +240,44 @@ class JpcCrossTabClass {
|
|
|
//5. 交叉行拓展合计
|
|
|
rst = rst.concat(me.outputPreviewSumTabExt(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, unitFactor));
|
|
|
//6. 交叉列合计
|
|
|
- rst = rst.concat(me.outputPreviewTabSum(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, JV.NODE_CROSS_COL_SUM, unitFactor));
|
|
|
+ rst = rst.concat(me.outputPreviewTabSum(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, '交叉列合计', unitFactor));
|
|
|
//7. 离散
|
|
|
- rst = rst.concat(JpcDiscreteHelper.outputPreviewDiscreteInfo(rptTpl[JV.NODE_CROSS_INFO][JV.NODE_DISCRETE_INFO], bands, unitFactor, pageStatus));
|
|
|
+ rst = rst.concat(JpcDiscreteHelper.outputPreviewDiscreteInfo(rptTpl.交叉表_信息.离散信息, bands, unitFactor, pageStatus));
|
|
|
return rst;
|
|
|
};
|
|
|
- outputPreviewContent(rptTpl: any, bands: any, controls: any, $CURRENT_RPT: any, customizeCfg: any, maxRowRec: number, maxColRec: number, unitFactor: number) {
|
|
|
- return this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, maxColRec, rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_CONTENT], unitFactor);
|
|
|
+ outputPreviewContent(rptTpl: IRptTpl, bands: IBands, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg, maxRowRec: number, maxColRec: number, unitFactor: number) {
|
|
|
+ return this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, maxColRec, rptTpl.交叉表_信息.交叉数据, unitFactor);
|
|
|
};
|
|
|
- outputPreviewRowTab(rptTpl: any, bands: any, controls: any, $CURRENT_RPT: any, customizeCfg: any, maxRowRec: number, unitFactor: number) {
|
|
|
- let rst = this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, 1, rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_ROW], unitFactor);
|
|
|
- rst = rst.concat(this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, 1, rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_ROW_AD_HOC], unitFactor));
|
|
|
+ outputPreviewRowTab(rptTpl: IRptTpl, bands: IBands, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg, maxRowRec: number, unitFactor: number) {
|
|
|
+ let rst = this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, 1, rptTpl.交叉表_信息.交叉行, unitFactor);
|
|
|
+ rst = rst.concat(this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, 1, rptTpl.交叉表_信息.交叉行AD_HOC, unitFactor));
|
|
|
return rst;
|
|
|
};
|
|
|
- outputPreviewColTab(rptTpl: any, bands: any, controls: any, $CURRENT_RPT: any, customizeCfg: any, maxColRec: number, unitFactor: number) {
|
|
|
- return this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, 1, maxColRec, rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_COL], unitFactor);
|
|
|
+ outputPreviewColTab(rptTpl: IRptTpl, bands: IBands, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg, maxColRec: number, unitFactor: number) {
|
|
|
+ return this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, 1, maxColRec, rptTpl.交叉表_信息.交叉列, unitFactor);
|
|
|
};
|
|
|
- outputPreviewTabExt(rptTpl: any, bands: any, controls: any, $CURRENT_RPT: any, customizeCfg: any, maxColRec: number, unitFactor: number) {
|
|
|
+ outputPreviewTabExt(rptTpl: IRptTpl, bands: IBands, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg, maxColRec: number, unitFactor: number) {
|
|
|
//交叉行拓展
|
|
|
- return this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, 1, maxColRec, rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_ROW_EXT], unitFactor);
|
|
|
+ return this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, 1, maxColRec, rptTpl.交叉表_信息.交叉行拓展, unitFactor);
|
|
|
};
|
|
|
- outputPreviewSumTabExt(rptTpl: any, bands: any, controls: any, $CURRENT_RPT: any, customizeCfg: any, unitFactor: number) {
|
|
|
+ outputPreviewSumTabExt(rptTpl: IRptTpl, bands: IBands, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg, unitFactor: number) {
|
|
|
//交叉行拓展合计
|
|
|
- return this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, 1, 1, rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_ROW_SUM_EXT], unitFactor);
|
|
|
+ return this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, 1, 1, rptTpl.交叉表_信息.交叉行拓展合计, unitFactor);
|
|
|
};
|
|
|
- outputPreviewTabSum(rptTpl: any, bands: any, controls: any, $CURRENT_RPT: any, customizeCfg: any, maxRowRec: number, tabNodeName: string, unitFactor: number) {
|
|
|
- return this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, 1, rptTpl[JV.NODE_CROSS_INFO][tabNodeName], unitFactor);
|
|
|
+ outputPreviewTabSum(rptTpl: IRptTpl, bands: IBands, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg, maxRowRec: number, tabNodeName: string, unitFactor: number) {
|
|
|
+ return this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, 1, rptTpl.交叉表_信息[tabNodeName], unitFactor);
|
|
|
};
|
|
|
- private_OutputPreviewCommon(rptTpl: any, bands: any, controls: any, $CURRENT_RPT: any, customizeCfg: any, maxRowRec: number, maxColRec: number, tab: any, unitFactor: number) {
|
|
|
+ private_OutputPreviewCommon(rptTpl: IRptTpl, bands: IBands, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg, maxRowRec: number, maxColRec: number, tab: ICrossTab, unitFactor: number) {
|
|
|
let me = this, rst = [];
|
|
|
- let band = (tab)?bands[tab[JV.PROP_BAND_NAME]]:null;
|
|
|
+ let band = (tab) ? bands[tab.BandName] : null;
|
|
|
if (band) {
|
|
|
- let tab_fields = tab[JV.PROP_CROSS_FIELDS];
|
|
|
+ let tab_fields = tab.cross_field_s;
|
|
|
for (let rowIdx = 0; rowIdx < maxRowRec; rowIdx++) {
|
|
|
for (let i = 0; i < tab_fields.length; i++) {
|
|
|
let tab_field = tab_fields[i];
|
|
|
- if (!(tab_field[JV.PROP_HIDDEN])) {
|
|
|
+ if (!(tab_field.Hidden)) {
|
|
|
for (let colIdx = 0; colIdx < maxColRec; colIdx++) {
|
|
|
- if (tab_field[JV.PROP_IS_SERIAL]) {
|
|
|
+ if (tab_field.isSerial) {
|
|
|
rst.push(me.outputTabField(band, tab_field, [rowIdx + 1], 0, -1, maxRowRec, rowIdx, maxColRec, colIdx, unitFactor, false, controls));
|
|
|
} else {
|
|
|
rst.push(me.outputTabField(band, tab_field, null, -1, -1, maxRowRec, rowIdx, maxColRec, colIdx, unitFactor, false, controls));
|
|
|
@@ -272,10 +285,10 @@ class JpcCrossTabClass {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (tab[JV.PROP_TEXTS]) {
|
|
|
- for (let j = 0; j < tab[JV.PROP_TEXTS].length; j++) {
|
|
|
+ if (tab.text_s) {
|
|
|
+ for (let j = 0; j < tab.text_s.length; j++) {
|
|
|
for (let colIdx = 0; colIdx < maxColRec; colIdx++) {
|
|
|
- rst.push(JpcTextHelper.outputText(tab[JV.PROP_TEXTS][j], band, unitFactor, maxRowRec, rowIdx, maxColRec, colIdx, 1, 0));
|
|
|
+ rst.push(JpcTextHelper.outputText(tab.text_s[j], band, unitFactor, maxRowRec, rowIdx, maxColRec, colIdx, 1, 0));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -283,7 +296,7 @@ class JpcCrossTabClass {
|
|
|
}
|
|
|
return rst;
|
|
|
};
|
|
|
- outputAsSimpleJSONPage(rptTpl: any, dataObj: any, page: number, bands: any, controls: any, $CURRENT_RPT: any, customizeCfg: any) {
|
|
|
+ outputAsSimpleJSONPage(rptTpl: IRptTpl, dataObj: IDataObj, page: number, bands: IBands, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg) {
|
|
|
let me = this, rst: any = [], tabRstLst = [];
|
|
|
let unitFactor = JpcCommonHelper.getUnitFactor(rptTpl);
|
|
|
if (me.paging_option === JV.PAGING_OPTION_INFINITY) {
|
|
|
@@ -308,7 +321,7 @@ class JpcCrossTabClass {
|
|
|
tabRstLst.push(me.outputTabExt(rptTpl, dataObj, page, bands, unitFactor, controls, $CURRENT_RPT, customizeCfg));
|
|
|
tabRstLst.push(me.outputSumTabExt(rptTpl, dataObj, page, bands, unitFactor, segIdx, controls, $CURRENT_RPT, customizeCfg));
|
|
|
//2.5 Discrete
|
|
|
- tabRstLst.push(JpcDiscreteHelper.outputDiscreteInfo(rptTpl[JV.NODE_CROSS_INFO][JV.NODE_DISCRETE_INFO], bands, dataObj, unitFactor, me.pageStatusLst[page - 1], segIdx, 1, 0, $CURRENT_RPT, customizeCfg));
|
|
|
+ tabRstLst.push(JpcDiscreteHelper.outputDiscreteInfo(rptTpl.交叉表_信息.离散信息, bands, dataObj, unitFactor, me.pageStatusLst[page - 1], segIdx, 1, 0, $CURRENT_RPT, customizeCfg));
|
|
|
}
|
|
|
for (let i = 0; i < tabRstLst.length; i++) {
|
|
|
rst = rst.concat(tabRstLst[i]);
|
|
|
@@ -316,18 +329,18 @@ class JpcCrossTabClass {
|
|
|
}
|
|
|
return rst;
|
|
|
};
|
|
|
- outputTabSum(rptTpl: any, dataObj: any, page: number, bands: any, unitFactor: number, tabNodeName: string, controls: any, $CURRENT_RPT: any, customizeCfg: any) {
|
|
|
+ outputTabSum(rptTpl: IRptTpl, dataObj: IDataObj, page: number, bands: IBands, unitFactor: number, tabNodeName: string, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg) {
|
|
|
let me = this, rst: any = [],
|
|
|
- tab = rptTpl[JV.NODE_CROSS_INFO][tabNodeName],
|
|
|
- band = bands[tab[JV.PROP_BAND_NAME]];
|
|
|
+ tab = rptTpl.交叉表_信息[tabNodeName],
|
|
|
+ band = bands[tab.BandName];
|
|
|
if (band) {
|
|
|
let pageStatus = me.pageStatusLst[page - 1];
|
|
|
- if (pageStatus[band[JV.BAND_PROP_DISPLAY_TYPE]] === true) {
|
|
|
- let tab_fields = tab[JV.PROP_CROSS_FIELDS];
|
|
|
+ if (pageStatus[(band.DisplayType) as number] === true) {
|
|
|
+ let tab_fields = tab.cross_field_s;
|
|
|
for (let i = 0; i < me.dispSumValueLst_Col[page - 1].length; i++) {
|
|
|
if (i === 0) {
|
|
|
for (let tfIdx = 0; tfIdx < tab_fields.length; tfIdx++) {
|
|
|
- let map_data_field = JE.F(tab_fields[tfIdx][JV.PROP_FIELD_ID], $CURRENT_RPT);
|
|
|
+ let map_data_field = JE.F(tab_fields[tfIdx].FieldID, $CURRENT_RPT);
|
|
|
JpcFieldHelper.resetFormat(tab_fields[tfIdx], map_data_field, customizeCfg);
|
|
|
}
|
|
|
}
|
|
|
@@ -336,7 +349,7 @@ class JpcCrossTabClass {
|
|
|
let tab_field = tab_fields[j];
|
|
|
let val = me.dispSumValueLst_Col[page - 1][i][j];
|
|
|
let 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);
|
|
|
+ cellItem.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);
|
|
|
}
|
|
|
} else {
|
|
|
@@ -351,7 +364,7 @@ class JpcCrossTabClass {
|
|
|
let tab_field = tab_fields[j];
|
|
|
let val = null;
|
|
|
let 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);
|
|
|
+ cellItem.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);
|
|
|
}
|
|
|
}
|
|
|
@@ -360,41 +373,41 @@ class JpcCrossTabClass {
|
|
|
}
|
|
|
return rst;
|
|
|
};
|
|
|
- outputTabExt(rptTpl: any, dataObj: any, page: number, bands: any, unitFactor: number, controls: any, $CURRENT_RPT: any, customizeCfg: any) {
|
|
|
+ outputTabExt(rptTpl: IRptTpl, dataObj: IDataObj, page: number, bands: IBands, unitFactor: number, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg) {
|
|
|
let me = this, rst: any = [], firstTextOutput = true,
|
|
|
- tab = rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_ROW_EXT];
|
|
|
- let band = bands[tab[JV.PROP_BAND_NAME]];
|
|
|
+ tab = rptTpl.交叉表_信息.交叉行拓展;
|
|
|
+ let band = bands[tab.BandName];
|
|
|
if (band) {
|
|
|
let pageStatus = me.pageStatusLst[page - 1];
|
|
|
- if (pageStatus[band[JV.BAND_PROP_DISPLAY_TYPE]] === true) {
|
|
|
- let tab_fields = tab[JV.PROP_CROSS_FIELDS],
|
|
|
- data_details = dataObj[JV.DATA_DETAIL_DATA],
|
|
|
+ if (pageStatus[(band.DisplayType) as number] === true) {
|
|
|
+ let tab_fields = tab.cross_field_s,
|
|
|
+ data_details = dataObj[IDataObj_props.detail_data],
|
|
|
valuesIdx = me.dispValueIdxLst_Col[page - 1];
|
|
|
for (let i = 0; i < me.row_extension_fields_idx.length; i++) {
|
|
|
let tab_field = tab_fields[i];
|
|
|
let data_field = null;
|
|
|
- let map_data_field = JE.F(tab_field[JV.PROP_FIELD_ID], $CURRENT_RPT);
|
|
|
+ let map_data_field = JE.F(tab_field.FieldID, $CURRENT_RPT);
|
|
|
if (typeof me.row_extension_fields_idx[i] !== 'object') {
|
|
|
data_field = data_details[me.row_extension_fields_idx[i]];
|
|
|
} else {
|
|
|
if (map_data_field) {
|
|
|
- data_field = map_data_field[JV.PROP_AD_HOC_DATA];
|
|
|
+ data_field = map_data_field.data_field;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (!(tab_field[JV.PROP_HIDDEN])) {
|
|
|
+ if (!(tab_field.Hidden)) {
|
|
|
let cols = valuesIdx.length;
|
|
|
for (let colIdx = 0; colIdx < cols; colIdx++) {
|
|
|
if (colIdx === 0) JpcFieldHelper.resetFormat(tab_field, map_data_field, customizeCfg);
|
|
|
rst.push(me.outputTabField(band, tab_field, data_field, valuesIdx[colIdx], -1, 1, 0, cols, colIdx, unitFactor, false, controls));
|
|
|
//2. output texts if has
|
|
|
if (firstTextOutput) {
|
|
|
- if (tab[JV.PROP_TEXT]) {
|
|
|
- rst.push(JpcTextHelper.outputText(tab[JV.PROP_TEXT], band, unitFactor, 1, 0, cols, colIdx, 1, 0));
|
|
|
+ if (tab.text) {
|
|
|
+ rst.push(JpcTextHelper.outputText(tab.text, band, unitFactor, 1, 0, cols, colIdx, 1, 0));
|
|
|
}
|
|
|
- if (tab[JV.PROP_TEXTS]) {
|
|
|
- for (let j = 0; j < tab[JV.PROP_TEXTS].length; j++) {
|
|
|
- rst.push(JpcTextHelper.outputText(tab[JV.PROP_TEXTS][j], band, unitFactor, 1, 0, cols, colIdx, 1, 0));
|
|
|
+ if (tab.text_s) {
|
|
|
+ for (let j = 0; j < tab.text_s.length; j++) {
|
|
|
+ rst.push(JpcTextHelper.outputText(tab.text_s[j], band, unitFactor, 1, 0, cols, colIdx, 1, 0));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -406,26 +419,26 @@ class JpcCrossTabClass {
|
|
|
}
|
|
|
return rst;
|
|
|
};
|
|
|
- outputSumTabExt(rptTpl: any, dataObj: any, page: number, bands: any, unitFactor: number, segIdx: number, controls: any, $CURRENT_RPT: any, customizeCfg: any) {
|
|
|
+ outputSumTabExt(rptTpl: IRptTpl, dataObj: IDataObj, page: number, bands: IBands, unitFactor: number, segIdx: number, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg) {
|
|
|
let me = this, rst = [],
|
|
|
- tab = rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_ROW_SUM_EXT];
|
|
|
- let band = bands[tab[JV.PROP_BAND_NAME]];
|
|
|
+ tab = rptTpl.交叉表_信息.交叉行拓展合计;
|
|
|
+ let band = bands[tab.BandName];
|
|
|
if (band) {
|
|
|
let pageStatus = me.pageStatusLst[page - 1];
|
|
|
- if (pageStatus[band[JV.BAND_PROP_DISPLAY_TYPE]] === true && pageStatus[JV.STATUS_CROSS_ROW_END] === true) {
|
|
|
- let tab_fields = tab[JV.PROP_CROSS_FIELDS],
|
|
|
- data_details = dataObj[JV.DATA_DETAIL_DATA],
|
|
|
+ if (pageStatus[(band.DisplayType) as number] === true && pageStatus[6] === true) {
|
|
|
+ let tab_fields = tab.cross_field_s,
|
|
|
+ data_details = dataObj[IDataObj_props.detail_data],
|
|
|
data_fields = [];
|
|
|
for (let i = 0; i < me.row_sum_extension_fields_idx.length; i++) {
|
|
|
// let data_field = data_details[me.row_sum_extension_fields_idx[i]];
|
|
|
let tab_field = tab_fields[i];
|
|
|
let data_field = null;
|
|
|
- let map_data_field = JE.F(tab_field[JV.PROP_FIELD_ID], $CURRENT_RPT);
|
|
|
+ let map_data_field = JE.F(tab_field.FieldID, $CURRENT_RPT);
|
|
|
if (typeof me.row_sum_extension_fields_idx[i] !== 'object') {
|
|
|
data_field = data_details[me.row_sum_extension_fields_idx[i]];
|
|
|
} else {
|
|
|
if (map_data_field) {
|
|
|
- data_field = map_data_field[JV.PROP_AD_HOC_DATA];
|
|
|
+ data_field = map_data_field.data_field;
|
|
|
}
|
|
|
}
|
|
|
JpcFieldHelper.resetFormat(tab_field, map_data_field, customizeCfg);
|
|
|
@@ -444,58 +457,58 @@ class JpcCrossTabClass {
|
|
|
//4. output
|
|
|
for (let di = 0; di < tab_fields.length; di++) {
|
|
|
let tab_field = tab_fields[di];
|
|
|
- if (!tab_field[JV.PROP_HIDDEN]) {
|
|
|
+ if (!tab_field.Hidden) {
|
|
|
let val = rowGrandTotal[di];
|
|
|
let cellItem = JpcCommonOutputHelper.createCommonOutput(tab_field, val, controls);
|
|
|
- cellItem[JV.PROP_AREA] = JpcAreaHelper.outputArea(tab_field[JV.PROP_AREA], band, unitFactor, 1, 0, 1, 0, 1, 0, false, false);
|
|
|
+ cellItem.area = JpcAreaHelper.outputArea(tab_field.area, band, unitFactor, 1, 0, 1, 0, 1, 0, false, false);
|
|
|
rst.push(cellItem);
|
|
|
}
|
|
|
}
|
|
|
//output texts if has
|
|
|
- if (tab[JV.PROP_TEXT]) {
|
|
|
- rst.push(JpcTextHelper.outputText(tab[JV.PROP_TEXT], band, unitFactor, 1, 0, 1, 0, 1, 0));
|
|
|
+ if (tab.text) {
|
|
|
+ rst.push(JpcTextHelper.outputText(tab.text, band, unitFactor, 1, 0, 1, 0, 1, 0));
|
|
|
}
|
|
|
- if (tab[JV.PROP_TEXTS]) {
|
|
|
- for (let j = 0; j < tab[JV.PROP_TEXTS].length; j++) {
|
|
|
- rst.push(JpcTextHelper.outputText(tab[JV.PROP_TEXTS][j], band, unitFactor, 1, 0, 1, 0, 1, 0));
|
|
|
+ if (tab.text_s) {
|
|
|
+ for (let j = 0; j < tab.text_s.length; j++) {
|
|
|
+ rst.push(JpcTextHelper.outputText(tab.text_s[j], band, unitFactor, 1, 0, 1, 0, 1, 0));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
return rst;
|
|
|
};
|
|
|
- outputContent(rptTpl: any, dataObj: any, page: number, bands: any, unitFactor: number, controls: any, $CURRENT_RPT: any, customizeCfg: any) {
|
|
|
+ outputContent(rptTpl: IRptTpl, dataObj: IDataObj, page: number, bands: IBands, unitFactor: number, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg) {
|
|
|
let me = this, rst: any = [];
|
|
|
- let tab = rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_CONTENT];
|
|
|
- let band = bands[tab[JV.PROP_BAND_NAME]];
|
|
|
+ let tab = rptTpl.交叉表_信息.交叉数据;
|
|
|
+ let band = bands[tab.BandName];
|
|
|
if (band) {
|
|
|
let pageStatus = me.pageStatusLst[page - 1];
|
|
|
- if (pageStatus[band[JV.BAND_PROP_DISPLAY_TYPE]] === true) {
|
|
|
- let tab_fields = tab[JV.PROP_CROSS_FIELDS];
|
|
|
- let data_details = dataObj[JV.DATA_DETAIL_DATA];
|
|
|
+ if (pageStatus[(band.DisplayType) as number] === true) {
|
|
|
+ let tab_fields = tab.cross_field_s;
|
|
|
+ let data_details = dataObj[IDataObj_props.detail_data];
|
|
|
let contentValuesIdx = me.dispValueIdxLst_Content[page - 1];
|
|
|
let flexiblePrecisionRefObj: any = null, flexibleRefField = null, precision_ref_data = null;
|
|
|
for (let i = 0; i < tab_fields.length; i++) {
|
|
|
let tab_field = tab_fields[i];
|
|
|
let data_field = null;
|
|
|
- let map_data_field = JE.F(tab_field[JV.PROP_FIELD_ID], $CURRENT_RPT);
|
|
|
+ let map_data_field = JE.F(tab_field.FieldID, $CURRENT_RPT);
|
|
|
if (typeof me.content_fields_idx[i] !== 'object') {
|
|
|
data_field = data_details[me.content_fields_idx[i]];
|
|
|
} else {
|
|
|
if (map_data_field) {
|
|
|
- data_field = map_data_field[JV.PROP_AD_HOC_DATA];
|
|
|
+ data_field = map_data_field.data_field;
|
|
|
}
|
|
|
}
|
|
|
- if (!(tab_field[JV.PROP_HIDDEN])) {
|
|
|
+ if (!(tab_field.Hidden)) {
|
|
|
let rows = contentValuesIdx.length;
|
|
|
for (let rowIdx = 0; rowIdx < rows; rowIdx++) {
|
|
|
let cols = contentValuesIdx[rowIdx].length;
|
|
|
for (let colIdx = 0; colIdx < cols; colIdx++) {
|
|
|
- if (map_data_field && map_data_field[JV.PROP_PRECISION] && map_data_field.flexiblePrecisionRefObj) {
|
|
|
+ if (map_data_field && map_data_field.Precision && map_data_field.flexiblePrecisionRefObj && map_data_field.Precision.flexibleRefFieldID) {
|
|
|
if (flexiblePrecisionRefObj === null) {
|
|
|
flexiblePrecisionRefObj = {};
|
|
|
- flexibleRefField = JE.F(map_data_field[JV.PROP_PRECISION][JV.PROP_FLEXIBLE_REF_FILED_ID], $CURRENT_RPT);
|
|
|
- precision_ref_data = dataObj[map_data_field.DataNodeName][flexibleRefField.DataSeq];
|
|
|
+ flexibleRefField = JE.F(map_data_field.Precision.flexibleRefFieldID, $CURRENT_RPT);
|
|
|
+ if (flexibleRefField && flexibleRefField.DataSeq) precision_ref_data = dataObj[map_data_field.DataNodeName][flexibleRefField.DataSeq];
|
|
|
for (let decimalObj of map_data_field.flexiblePrecisionRefObj) {
|
|
|
flexiblePrecisionRefObj["refUnit_" + decimalObj.unit] = decimalObj.decimal;
|
|
|
}
|
|
|
@@ -513,37 +526,37 @@ class JpcCrossTabClass {
|
|
|
}
|
|
|
return rst;
|
|
|
};
|
|
|
- outputColTab(rptTpl: any, dataObj: any, page: number, bands: any, unitFactor: number, controls: any, $CURRENT_RPT: any, customizeCfg: any) {
|
|
|
+ outputColTab(rptTpl: IRptTpl, dataObj: IDataObj, page: number, bands: IBands, unitFactor: number, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg) {
|
|
|
let me = this, rst: any = [], firstTextOutput = true;
|
|
|
- let tab = rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_COL];
|
|
|
- let band = bands[tab[JV.PROP_BAND_NAME]];
|
|
|
+ let tab = rptTpl.交叉表_信息.交叉列;
|
|
|
+ let band = bands[tab.BandName];
|
|
|
if (band) {
|
|
|
let pageStatus = me.pageStatusLst[page - 1];
|
|
|
- if (pageStatus[band[JV.BAND_PROP_DISPLAY_TYPE]] === true) {
|
|
|
- let tab_fields = tab[JV.PROP_CROSS_FIELDS];
|
|
|
- let data_details = dataObj[JV.DATA_DETAIL_DATA];
|
|
|
+ if (pageStatus[(band.DisplayType) as number] === true) {
|
|
|
+ let tab_fields = tab.cross_field_s;
|
|
|
+ let data_details = dataObj[IDataObj_props.detail_data];
|
|
|
let valuesIdx = me.dispValueIdxLst_Col[page - 1];
|
|
|
let flexiblePrecisionRefObj: any = null, flexibleRefField = null, precision_ref_data = null;
|
|
|
for (let i = 0; i < me.col_fields_idx.length; i++) {
|
|
|
let tab_field = tab_fields[i];
|
|
|
- if (!(tab_field[JV.PROP_HIDDEN])) {
|
|
|
+ if (!(tab_field.Hidden)) {
|
|
|
let mergedRst = [];
|
|
|
let data_field = null;
|
|
|
- let map_data_field = JE.F(tab_field[JV.PROP_FIELD_ID], $CURRENT_RPT);
|
|
|
+ let map_data_field = JE.F(tab_field.FieldID, $CURRENT_RPT);
|
|
|
if (typeof me.col_fields_idx[i] !== 'object') {
|
|
|
data_field = data_details[me.col_fields_idx[i]];
|
|
|
} else {
|
|
|
if (map_data_field) {
|
|
|
- data_field = map_data_field[JV.PROP_AD_HOC_DATA];
|
|
|
+ data_field = map_data_field.data_field;
|
|
|
}
|
|
|
}
|
|
|
let cols = valuesIdx.length;
|
|
|
for (let colIdx = 0; colIdx < cols; colIdx++) {
|
|
|
- if (map_data_field && map_data_field[JV.PROP_PRECISION] && map_data_field.flexiblePrecisionRefObj) {
|
|
|
+ if (map_data_field && map_data_field.Precision && map_data_field.flexiblePrecisionRefObj && map_data_field.Precision.flexibleRefFieldID) {
|
|
|
if (flexiblePrecisionRefObj === null) {
|
|
|
flexiblePrecisionRefObj = {};
|
|
|
- flexibleRefField = JE.F(map_data_field[JV.PROP_PRECISION][JV.PROP_FLEXIBLE_REF_FILED_ID], $CURRENT_RPT);
|
|
|
- precision_ref_data = dataObj[map_data_field.DataNodeName][flexibleRefField.DataSeq];
|
|
|
+ flexibleRefField = JE.F(map_data_field.Precision.flexibleRefFieldID, $CURRENT_RPT);
|
|
|
+ if (flexibleRefField && flexibleRefField.DataSeq) precision_ref_data = dataObj[map_data_field.DataNodeName][flexibleRefField.DataSeq];
|
|
|
for (let decimalObj of map_data_field.flexiblePrecisionRefObj) {
|
|
|
flexiblePrecisionRefObj["refUnit_" + decimalObj.unit] = decimalObj.decimal;
|
|
|
}
|
|
|
@@ -556,25 +569,25 @@ class JpcCrossTabClass {
|
|
|
//rst.push(me.outputTabField(band, tab_field, data_field, valuesIdx[colIdx], -1, 1, 0, cols, colIdx, unitFactor, false, controls));
|
|
|
//2. output texts
|
|
|
if (firstTextOutput) {
|
|
|
- if (tab[JV.PROP_TEXT]) {
|
|
|
- // mergedRst.push(JpcTextHelper.outputText(tab[JV.PROP_TEXT], band, unitFactor, 1, 0, cols, colIdx, 1, 0));
|
|
|
- rst.push(JpcTextHelper.outputText(tab[JV.PROP_TEXT], band, unitFactor, 1, 0, cols, colIdx, 1, 0));
|
|
|
+ if (tab.text) {
|
|
|
+ // mergedRst.push(JpcTextHelper.outputText(tab.text, band, unitFactor, 1, 0, cols, colIdx, 1, 0));
|
|
|
+ rst.push(JpcTextHelper.outputText(tab.text, band, unitFactor, 1, 0, cols, colIdx, 1, 0));
|
|
|
}
|
|
|
- if (tab[JV.PROP_TEXTS]) {
|
|
|
- for (let j = 0; j < tab[JV.PROP_TEXTS].length; j++) {
|
|
|
- // mergedRst.push(JpcTextHelper.outputText(tab[JV.PROP_TEXTS][j], band, unitFactor, 1, 0, cols, colIdx, 1, 0));
|
|
|
- rst.push(JpcTextHelper.outputText(tab[JV.PROP_TEXTS][j], band, unitFactor, 1, 0, cols, colIdx, 1, 0));
|
|
|
+ if (tab.text_s) {
|
|
|
+ for (let j = 0; j < tab.text_s.length; j++) {
|
|
|
+ // mergedRst.push(JpcTextHelper.outputText(tab.text_s[j], band, unitFactor, 1, 0, cols, colIdx, 1, 0));
|
|
|
+ rst.push(JpcTextHelper.outputText(tab.text_s[j], band, unitFactor, 1, 0, cols, colIdx, 1, 0));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
firstTextOutput = false;
|
|
|
//判断是否需要合并
|
|
|
- if (tab_field[JV.PROP_IS_MERGE] && mergedRst.length > 1) {
|
|
|
+ if (tab_field.isMerge && mergedRst.length > 1) {
|
|
|
let lastCell = mergedRst[mergedRst.length - 1];
|
|
|
for (let mergeIdx = mergedRst.length - 2; mergeIdx >= 0; mergeIdx--) {
|
|
|
- if (lastCell[JV.PROP_VALUE] === mergedRst[mergeIdx][JV.PROP_VALUE]) {
|
|
|
- mergedRst[mergeIdx][JV.PROP_AREA][JV.PROP_RIGHT] = lastCell[JV.PROP_AREA][JV.PROP_RIGHT];
|
|
|
+ if (lastCell.Value === mergedRst[mergeIdx].Value) {
|
|
|
+ mergedRst[mergeIdx].area.Right = lastCell.area.Right;
|
|
|
mergedRst.splice(mergeIdx + 1, 1);
|
|
|
}
|
|
|
lastCell = mergedRst[mergeIdx];
|
|
|
@@ -587,37 +600,37 @@ class JpcCrossTabClass {
|
|
|
}
|
|
|
return rst;
|
|
|
};
|
|
|
- outputRowTabCommon(rptTpl: any, dataObj: any, page: number, bands: any, tabStr: string, rowFieldsIdxArr: any[], unitFactor: number, controls: any, $CURRENT_RPT: any, customizeCfg: any) {
|
|
|
+ outputRowTabCommon(rptTpl: IRptTpl, dataObj: IDataObj, page: number, bands: IBands, tabStr: string, rowFieldsIdxArr: any[], unitFactor: number, controls: IControlCollection, $CURRENT_RPT: ICurrent_RPT, customizeCfg: ICustomizeCfg) {
|
|
|
let me = this, rst = [];
|
|
|
- let tab = rptTpl[JV.NODE_CROSS_INFO][tabStr];
|
|
|
- let band = (tab)?bands[tab[JV.PROP_BAND_NAME]]:null;
|
|
|
+ let tab = rptTpl.交叉表_信息[tabStr];
|
|
|
+ let band = (tab) ? bands[tab.BandName] : null;
|
|
|
if (band) {
|
|
|
let pageStatus = me.pageStatusLst[page - 1];
|
|
|
- if (pageStatus[band[JV.BAND_PROP_DISPLAY_TYPE]] === true) {
|
|
|
- let tab_fields = tab[JV.PROP_CROSS_FIELDS];
|
|
|
- let data_details = dataObj[JV.DATA_DETAIL_DATA];
|
|
|
+ if (pageStatus[(band.DisplayType) as number] === true) {
|
|
|
+ let tab_fields = tab.cross_field_s;
|
|
|
+ let data_details = dataObj[IDataObj_props.detail_data];
|
|
|
let valuesIdx = me.dispValueIdxLst_Row[page - 1];
|
|
|
let serialsIdx = me.dispSerialIdxLst_Row[page - 1];
|
|
|
let flexiblePrecisionRefObj: any = null, flexibleRefField = null, precision_ref_data = null;
|
|
|
for (let i = 0; i < rowFieldsIdxArr.length; i++) {
|
|
|
let tab_field = tab_fields[i];
|
|
|
- if (!(tab_field[JV.PROP_HIDDEN])) {
|
|
|
+ if (!(tab_field.Hidden)) {
|
|
|
let data_field = null;
|
|
|
- let map_data_field = JE.F(tab_field[JV.PROP_FIELD_ID], $CURRENT_RPT);
|
|
|
+ let map_data_field = JE.F(tab_field.FieldID, $CURRENT_RPT);
|
|
|
if (typeof rowFieldsIdxArr[i] !== 'object') {
|
|
|
data_field = data_details[rowFieldsIdxArr[i]];
|
|
|
} else {
|
|
|
if (map_data_field) {
|
|
|
- data_field = map_data_field[JV.PROP_AD_HOC_DATA];
|
|
|
+ data_field = map_data_field.data_field;
|
|
|
}
|
|
|
}
|
|
|
let rows = valuesIdx.length;
|
|
|
for (let rowIdx = 0; rowIdx < rows; rowIdx++) {
|
|
|
- if (map_data_field && map_data_field[JV.PROP_PRECISION] && map_data_field.flexiblePrecisionRefObj) {
|
|
|
+ if (map_data_field && map_data_field.Precision && map_data_field.flexiblePrecisionRefObj && map_data_field.Precision.flexibleRefFieldID) {
|
|
|
if (flexiblePrecisionRefObj === null) {
|
|
|
flexiblePrecisionRefObj = {};
|
|
|
- flexibleRefField = JE.F(map_data_field[JV.PROP_PRECISION][JV.PROP_FLEXIBLE_REF_FILED_ID], $CURRENT_RPT);
|
|
|
- precision_ref_data = dataObj[map_data_field.DataNodeName][flexibleRefField.DataSeq];
|
|
|
+ flexibleRefField = JE.F(map_data_field.Precision.flexibleRefFieldID, $CURRENT_RPT);
|
|
|
+ if (flexibleRefField && flexibleRefField.DataSeq) precision_ref_data = dataObj[map_data_field.DataNodeName][flexibleRefField.DataSeq];
|
|
|
for (let decimalObj of map_data_field.flexiblePrecisionRefObj) {
|
|
|
flexiblePrecisionRefObj["refUnit_" + decimalObj.unit] = decimalObj.decimal;
|
|
|
}
|
|
|
@@ -634,9 +647,10 @@ class JpcCrossTabClass {
|
|
|
}
|
|
|
return rst;
|
|
|
};
|
|
|
- outputTabField(band: any, tab_field: any, data_field: any, valueIdx: number, serialIdx: number, rows: number, rowIdx: number, cols: number, colIdx: number, unitFactor: number, isRow: boolean, controls: any) {
|
|
|
+ //暂定
|
|
|
+ outputTabField(band: IBandDetail, tab_field: Fields, data_field: any, valueIdx: number, serialIdx: number, rows: number, rowIdx: number, cols: number, colIdx: number, unitFactor: number, isRow: boolean, controls: IControlCollection) {
|
|
|
let rst = null;
|
|
|
- if (isRow === true && tab_field[JV.PROP_IS_SERIAL] && tab_field[JV.PROP_IS_SERIAL] === true) {
|
|
|
+ if (isRow === true && tab_field.isSerial && tab_field.isSerial === true) {
|
|
|
if (serialIdx >= 0) {
|
|
|
rst = JpcCommonOutputHelper.createCommonOutput(tab_field, serialIdx + 1, null);
|
|
|
} else rst = JpcCommonOutputHelper.createCommonOutput(tab_field, "", controls);
|
|
|
@@ -645,14 +659,14 @@ class JpcCrossTabClass {
|
|
|
}
|
|
|
//position
|
|
|
if (isRow === true) {
|
|
|
- rst[JV.PROP_AREA] = JpcAreaHelper.outputArea(tab_field[JV.PROP_AREA], band, unitFactor, rows, rowIdx, cols, colIdx, 1, 0, true, false);
|
|
|
+ rst.area = JpcAreaHelper.outputArea(tab_field.area, band, unitFactor, rows, rowIdx, cols, colIdx, 1, 0, true, false);
|
|
|
} else {
|
|
|
- rst[JV.PROP_AREA] = JpcAreaHelper.outputArea(tab_field[JV.PROP_AREA], band, unitFactor, rows, rowIdx, cols, colIdx, 1, 0, false, false);
|
|
|
+ rst.area = JpcAreaHelper.outputArea(tab_field.area, band, unitFactor, rows, rowIdx, cols, colIdx, 1, 0, false, false);
|
|
|
}
|
|
|
return rst;
|
|
|
};
|
|
|
};
|
|
|
-function _addTabValue(tabValuedIdxLst: any[], sortedSequence: any[], segIdx: number, preRec: number, nextRec: number, dispSerialIdxLst: any, sorted_sum_value_Lst: any, rst_sum_value_Lst: any) {
|
|
|
+function _addTabValue(tabValuedIdxLst: number[][], sortedSequence: number[][][], segIdx: number, preRec: number, nextRec: number, dispSerialIdxLst: any, sorted_sum_value_Lst: any, rst_sum_value_Lst: any) {
|
|
|
if (tabValuedIdxLst) {
|
|
|
let serial1stTier = null;
|
|
|
if (dispSerialIdxLst) serial1stTier = [];
|
|
|
@@ -714,9 +728,9 @@ function _addTabValue(tabValuedIdxLst: any[], sortedSequence: any[], segIdx: num
|
|
|
}
|
|
|
};
|
|
|
|
|
|
-function _addContentValue(dispValueIdxLst_Content: any[], sortedContentSequence: any, segIdx: number, counterRowRec: number, maxRowRec: number, counterColRec: number, maxColRec: number, page_seg_map: any[], pageIdx: number) {
|
|
|
+function _addContentValue(dispValueIdxLst_Content: number[][][], sortedContentSequence: string[][], segIdx: number, counterRowRec: number, maxRowRec: number, counterColRec: number, maxColRec: number, page_seg_map: [number, number][], pageIdx: number) {
|
|
|
if (dispValueIdxLst_Content !== null) {
|
|
|
- page_seg_map.push([pageIdx,segIdx]);
|
|
|
+ page_seg_map.push([pageIdx, segIdx]);
|
|
|
let arrContents: any[] = [];
|
|
|
if (sortedContentSequence !== null) {
|
|
|
let arrAllContent = sortedContentSequence[segIdx];
|
|
|
@@ -744,15 +758,15 @@ function _addContentValue(dispValueIdxLst_Content: any[], sortedContentSequence:
|
|
|
}
|
|
|
};
|
|
|
|
|
|
-function _SortAndOptimize(rptTpl: any, dataObj: any, dataSeq: any[], sortTab: string, rstFieldsIdx: any[], $CURRENT_RPT: any) {
|
|
|
+function _SortAndOptimize(rptTpl: IRptTpl, dataObj: IDataObj, dataSeq: number[][], sortTab: string, rstFieldsIdx: any[], $CURRENT_RPT: ICurrent_RPT) {
|
|
|
let result = [];
|
|
|
- let tab = rptTpl[JV.NODE_CROSS_INFO][sortTab];
|
|
|
+ let tab = rptTpl.交叉表_信息[sortTab];
|
|
|
if (tab) {
|
|
|
let sIDX = 0;
|
|
|
//1. prepare and sort by tab-field
|
|
|
let fields: any[] = [];
|
|
|
- JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, tab[JV.PROP_CROSS_FIELDS], fields, rstFieldsIdx, false);
|
|
|
- let data_details = dataObj[JV.DATA_DETAIL_DATA];
|
|
|
+ JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, tab.cross_field_s, fields, rstFieldsIdx, false);
|
|
|
+ let data_details = dataObj[IDataObj_props.detail_data];
|
|
|
JpcCrossTabHelper.sortTabFields(fields, rstFieldsIdx, data_details, dataSeq, $CURRENT_RPT);
|
|
|
//2. distinguish sort tab fields value
|
|
|
let b1 = false;
|
|
|
@@ -767,9 +781,9 @@ function _SortAndOptimize(rptTpl: any, dataObj: any, dataSeq: any[], sortTab: st
|
|
|
for (let k = 0; k < rstFieldsIdx.length; k++) {
|
|
|
if (fields[k].hasOwnProperty(JV.TAB_FIELD_PROP_SORT)) {
|
|
|
//只有被选择了作为排序字段的才进入排序及优化
|
|
|
- if (typeof(rstFieldsIdx[k]) === 'object') {
|
|
|
- let map_data_field = JE.F(rstFieldsIdx[k][JV.PROP_ID], $CURRENT_RPT);
|
|
|
- if (map_data_field[JV.PROP_AD_HOC_DATA][dataSeq[i][j - 1]] !== map_data_field[JV.PROP_AD_HOC_DATA][dataSeq[i][j]]) {
|
|
|
+ if (typeof (rstFieldsIdx[k]) === 'object') {
|
|
|
+ let map_data_field = JE.F(rstFieldsIdx[k].ID, $CURRENT_RPT);
|
|
|
+ if (map_data_field && map_data_field.data_field[dataSeq[i][j - 1]] !== map_data_field.data_field[dataSeq[i][j]]) {
|
|
|
b1 = true;
|
|
|
break;
|
|
|
}
|
|
|
@@ -798,15 +812,15 @@ function _SortAndOptimize(rptTpl: any, dataObj: any, dataSeq: any[], sortTab: st
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
-function _SortForDisplayContent(rptTpl: any, rowSeq: any[], colSeq: any[], rstFieldsIdx: any[]){
|
|
|
+function _SortForDisplayContent(rptTpl: IRptTpl, rowSeq: number[][][], colSeq: number[][][], rstFieldsIdx: any[]) {
|
|
|
let result = [];
|
|
|
- let tab = rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_CONTENT];
|
|
|
+ let tab = rptTpl.交叉表_信息.交叉数据;
|
|
|
if (tab) {
|
|
|
- JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, tab[JV.PROP_CROSS_FIELDS], [], rstFieldsIdx, false);
|
|
|
+ JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, tab.cross_field_s, [], rstFieldsIdx, false);
|
|
|
}
|
|
|
for (let i = 0; i < rowSeq.length; i++) {
|
|
|
let rl = rowSeq[i], cl = colSeq[i];
|
|
|
- let ds: any[] = [];
|
|
|
+ let ds: number[][] = [];
|
|
|
//1. initialize to blank value index
|
|
|
for (let j = 0; j < rl.length; j++) {
|
|
|
ds.push([]);
|
