Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuOperation

web/maintain/report/js/cfg_const.js

@@ -171,7 +171,8 @@ let fieldMapSetting = {
         },
         key: {
             children: 'items',
-            name: "Name"
+            name: "Name",
+            title: "Title"
         },
         simpleData: {
             enable: true
@@ -330,7 +331,8 @@ let selectableFieldSetting = {
         },
         key: {
             children: 'items',
-            name: "Name"
+            name: "Name",
+            title: "Title"
         },
         simpleData: {
             enable: true

web/maintain/report/js/rpt_tpl_field_map.js

@@ -27,6 +27,7 @@ let fieldMapTreeOprObj = {
                 if (field[JV.PROP_IS_ID]) {
                     field.checked = true;
                 }
+                field.Title = "ID: " + field[JV.PROP_ID];
                 parent.items.push(field);
             }
         }
@@ -196,6 +197,7 @@ let selectableFiledTreeOprObj = {
         CommonAjax.postEx("report_tpl_api/getMappingFields", params, 20000, true, function(result){
                 let showRst = [];
                 for (let item of result) {
+                    me.decorateMappingFieldList(item);
                     if (item.items.length > 0) {
                         showRst.push(item);
                     }
@@ -210,6 +212,16 @@ let selectableFiledTreeOprObj = {
             }, null, null
         );
     },
+    decorateMappingFieldList: function (rawMappingField) {
+        let me = this;
+        if (rawMappingField.items && rawMappingField.items.length > 0) {
+            for (const subMappingField of rawMappingField.items) {
+                me.decorateMappingFieldList(subMappingField);
+            }
+        } else {
+            rawMappingField.Title = "ID: " + rawMappingField[JV.PROP_ID];
+        }
+    },
     onClick: function (event,treeId,treeNode) {
         let me = fieldMapTreeOprObj;
         me.currentNode = treeNode;