lishihao 1 gadu atpakaļ
vecāks
revīzija
1d8f0f3c3f

+ 2 - 2
web/maintain/report/js/rpt_tpl_field_location.js

@@ -428,7 +428,7 @@ let fieldLocationOprObj = {
             for (let field of rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS]) {
                 if (field[JV.PROP_NAME] === cellValue) {
                     rst.FieldID = field[JV.PROP_ID];
-                    rst.Name = field.Name + "(" + field[JV.PROP_ID] + ")";
+                    // rst.Name = field.Name + "(" + field[JV.PROP_ID] + ")";
                     rst["Title"] = "ID: " + field[JV.PROP_ID];
                     hasChkField = true;
                     break;
@@ -439,7 +439,7 @@ let fieldLocationOprObj = {
             for (let field of rptTpl[JV.NODE_NO_MAPPING_FIELDS]) {
                 if (field[JV.PROP_NAME] === cellValue) {
                     rst.FieldID = field[JV.PROP_ID];
-                    rst.Name = field.Name + "(" + field[JV.PROP_ID] + ")";
+                    // rst.Name = field.Name + "(" + field[JV.PROP_ID] + ")";
                     rst["Title"] = "ID: " + field[JV.PROP_ID];
                     hasChkField = true;
                     break;

+ 13 - 1
web/maintain/report/js/rpt_tpl_field_map.js

@@ -27,7 +27,7 @@ let fieldMapTreeOprObj = {
                 if (field[JV.PROP_IS_ID]) {
                     field.checked = true;
                 }
-                field.Name = field.Name + "(" + field[JV.PROP_ID] + ")";
+                // field.Name = field.Name + "(" + field[JV.PROP_ID] + ")";
                 field.Title = "ID: " + field[JV.PROP_ID];
                 parent.items.push(field);
             }
@@ -189,6 +189,17 @@ let fieldMapTreeOprObj = {
     }
 };
 
+// const setNodeFieldID = (data) => {
+//     if (data.items && data.items.length > 0) {
+//         data.items.forEach(i => {
+//             setNodeFieldID(i);
+//         })
+
+//     } else {
+//         data.Name = data.Name + "(" + data.ID + ")";
+//     }
+// }
+
 let selectableFiledTreeOprObj = {
     treeObj: null,
     currentNode: null,
@@ -200,6 +211,7 @@ let selectableFiledTreeOprObj = {
             for (let item of result) {
                 me.decorateMappingFieldList(item);
                 if (item.items.length > 0) {
+                    // setNodeFieldID(item);
                     showRst.push(item);
                 }
             }

+ 2 - 2
web/maintain/report/js/rpt_tpl_vis_sum.js

@@ -336,7 +336,7 @@ let virtualSummaryOprObj = {
             for (let field of rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS]) {
                 if (field[JV.PROP_NAME] === cellValue) {
                     rst.FieldID = field[JV.PROP_ID];
-                    field.Name = field.Name + "(" + field[JV.PROP_ID] + ")";
+                    // field.Name = field.Name + "(" + field[JV.PROP_ID] + ")";
                     rst["Title"] = "ID: " + field[JV.PROP_ID];
                     hasChkField = true;
                     break;
@@ -347,7 +347,7 @@ let virtualSummaryOprObj = {
             for (let field of rptTpl[JV.NODE_NO_MAPPING_FIELDS]) {
                 if (field[JV.PROP_NAME] === cellValue) {
                     rst.FieldID = field[JV.PROP_ID];
-                    field.Name = field.Name + "(" + field[JV.PROP_ID] + ")";
+                    // field.Name = field.Name + "(" + field[JV.PROP_ID] + ")";
                     rst["Title"] = "ID: " + field[JV.PROP_ID];
                     hasChkField = true;
                     break;