report template tuning

modules/all_models/tpl_tree_node.js

@@ -30,7 +30,7 @@ let TplNodeSchema = new Schema({
 let RptTplTreeSchema = new Schema({
     compilationId: String,  //编办的ObjectId
     engineerId: Number,     //工程专业Id(参考 /modules/common/const/engineering.js)
-    userId: Number,         //userId，如果是标准模板，则为-100
+    userId: String,        //用户名的object_id串
     properties: [],         //这是一个预留的属性，假定未来还会有不同的划分细节(如：招标/投标/清单 ... etc)
     name: String,           //显示名称
     released: Boolean,      //是否已发布

modules/reports/controllers/rpt_tpl_controller.js

@@ -27,7 +27,7 @@ let callback = function(req, res, err, message, data){
 
 let mExport = {
     getDftTemplates(req, res) {
-        let filter = {"userId": -100, "$or": [{"isDeleted": null}, {"isDeleted": false} ]};
+        let filter = {"userId": "-100", "$or": [{"isDeleted": null}, {"isDeleted": false} ]};
         TreeNodeModel.find(filter, '-_id', function(err, data){
             if (err) {
                 callback(req,res, true,"", null);

web/maintain/report/js/cfg_const.js

@@ -176,7 +176,8 @@ let selectedFieldMapSetting = {
         },
         key: {
             children: 'items',
-            name: "Name"
+            name: "Name",
+            title: "Title"
         },
         simpleData: {
             enable: true
@@ -302,7 +303,7 @@ let rptDataInfoSetting = {
         key: {
             children: 'items',
             name: "Name",
-            title: "Title",
+            title: "Title"
         },
         simpleData: {
             enable: true

web/maintain/report/js/rpt_tpl_data_map.js

@@ -520,7 +520,7 @@ let dataInfoMapTreeOprObj = {
                 } else if (node[JV.PROP_NAME] === JV.NODE_FLOW_COLUMN) {
                     let newColumn = {};
                     newColumn[JV.PROP_BAND_NAME] = node[JV.PROP_BAND_NAME];
-                    if (node.items.length > 0) {
+                    if (node.items && node.items.length > 0) {
                         newColumn[JV.PROP_TEXTS] = [];
                         for (let txt of node.items) {
                             let item = {};

web/maintain/report/js/rpt_tpl_field_map.js

@@ -51,7 +51,7 @@ let fieldMapTreeOprObj = {
         if (me.treeObj) {
             let nodes = me.treeObj.getNodes();
             for (let node of nodes) {
-                let item = {Name: node.Name, items: [], isParent: true};
+                let item = {Name: node.Name, items: [], isParent: true, Title: ""};
                 if (node.items) {
                     for (let subNode of node.items) {
                         let subItem = me.createMapFieldByNode(subNode);
@@ -144,6 +144,7 @@ let fieldMapTreeOprObj = {
         rst.mapExpression = node.mapExpression;
         rst.adHocFormula = node.adHocFormula;
         rst.descr = node.descr;
+        rst.Title = "ID: " + node[JV.PROP_ID];
         return rst;
     }
 };

web/maintain/report/js/rpt_tpl_main.js

@@ -334,7 +334,7 @@ let zTreeOprObj = {
         let rst = {
             compilationId: $("#compilations").get(0).selectedOptions[0].value,
             engineerId: parseInt($("#engineerIds").get(0).selectedOptions[0].value),
-            userId: (userAccount ===  'admin')?(-100):userID,
+            userId: (userAccount ===  'admin')?("-100"):userID,
             properties: [],
             released: true,
             isDeleted: false,
@@ -465,6 +465,13 @@ let zTreeOprObj = {
                 CommonAjax.postEx("report_tpl_api/getRefRptTpl", params, 20000, true, function(result){
                         me.currentNode.rptTpl = result;
                         me.currentNode.rptTpl[JV.NODE_MAIN_INFO][JV.NODE_MAIN_INFO_RPT_NAME] = me.currentNode.name;
+                        if (me.currentNode.rptTpl["GROUP_KEY"]) {
+                            let grp_keys = me.currentNode.rptTpl["GROUP_KEY"].split('_');
+                            if (grp_keys.length > 0) {
+                                grp_keys[1] = me.currentNode.name;
+                            }
+                            me.currentNode.rptTpl["GROUP_KEY"] = grp_keys.join("_");
+                        }
                         tplHelper.refreshTplView(me.currentNode.rptTpl);
                     }, null, null
                 );