|
@@ -556,8 +556,9 @@ async function getMultiRptsCommon(ctx, params, outputType, baseDir) {
|
|
|
Object.assign(backupData[filterTables[filterIdx]], rawDataObj[filterTables[filterIdx]]);
|
|
|
}
|
|
|
// 2. 一个一个模板创建数据
|
|
|
- let defProperties = await ctx.service.rptPreDefineCfg.getCfgById('Administrator');
|
|
|
- defProperties = JSON.parse(defProperties[0].defined_content);
|
|
|
+ // let defProperties = await ctx.service.rptPreDefineCfg.getCfgById('Administrator');
|
|
|
+ // defProperties = JSON.parse(defProperties[0].defined_content);
|
|
|
+ const defProperties = RPT_DEF_PROPERTIES;
|
|
|
for (let tplIdx = 0; tplIdx < rptTpls.length; tplIdx++) {
|
|
|
const rptTpl = (rptTpls[tplIdx]._doc) ? rptTpls[tplIdx]._doc : rptTpls[tplIdx];
|
|
|
rptDataUtil.initialize(rptTpl);
|