报表编辑器：指标映射优化 + code sync

modules/reports/util/rpt_construct_data_util.js

@@ -7,6 +7,7 @@ let $JE = require('../rpt_component/jpc_rte');
 let consts = require('../../../modules/main/models/project_consts');
 
 let fsUtil = require("../../../public/fsUtil");
+let stringUtil = require("../../../public/stringUtil");
 
 let treeUtil = require('../../../public/treeUtil');
 let projectConst = consts.projectConst;
@@ -102,6 +103,13 @@ class Rpt_Common{
         }
         return rst;
     };
+    FormatString(arrVal, formatStr){
+        let rst = [];
+        for (let val of arrVal) {
+            rst.push(stringUtil.replaceAll(formatStr, '%S', val));
+        }
+        return rst;
+    };
 }
 
 class Rpt_Data_Extractor {
@@ -191,6 +199,9 @@ class Rpt_Data_Extractor {
         $PROJECT.MAIN["myOwnRawDataObj"] = rawDataObj.prj._doc;
         $PROJECT.MAIN.getProperty = ext_mainGetPropety;
         $PROJECT.MAIN.getFee = ext_mainGetFee;
+        for (let item of rawDataObj.prjData) {
+            setupFunc($PROJECT.DETAIL, item.moduleName, item);
+        }
         if (tpl[JV.NODE_MAP_DATA_HANDLE_INFO]) {
             for (let preHandle of tpl[JV.NODE_MAP_DATA_HANDLE_INFO]) {
                 let srcData = getModuleDataByKey(rawDataObj.prjData, preHandle[JV.PROP_DATA_KEY]);
@@ -220,9 +231,6 @@ class Rpt_Data_Extractor {
                 }
             }
         }
-        for (let item of rawDataObj.prjData) {
-            setupFunc($PROJECT.DETAIL, item.moduleName, item);
-        }
         let rptDataObj = {};
         rptDataObj[JV.DATA_DISCRETE_DATA] = [];
         rptDataObj[JV.DATA_MASTER_DATA] = [];
@@ -823,7 +831,9 @@ function sortData(sourceData, sortCfg, prjData) {
 function setupFunc(obj, prop, ownRawObj) {
     obj[prop] = {};
     obj[prop]["myOwnRawDataObj"] = ownRawObj;
+    obj[prop]["myOwnOrgRawDataObj"] = ownRawObj.data;
     obj[prop].getProperty = ext_getPropety;
+    obj[prop].getPropertyByRefId = ext_getPropertyByRefId;
     obj[prop].getFee = ext_getFee;
     obj[prop].getPropertyByForeignId = ext_getPropertyByForeignId;
     obj[prop].getArrayValues = ext_getArrayValues;
@@ -943,6 +953,36 @@ function ext_getPropety(propKey) {
     return rst;
 }
 
+function ext_getPropertyByRefId(baseKey, refIDKey, propertyKey){
+    let rst = [], parentObj = this;
+    let dtObj = parentObj["myOwnRawDataObj"];
+    let orgDtObj = parentObj["myOwnOrgRawDataObj"];
+    if (baseKey && refIDKey && propertyKey && dtObj) {
+        for (let dItem of dtObj.data) {
+            let doc = (dItem._doc === null || dItem._doc === undefined)?dItem:dItem._doc;
+            let tmpRst = doc[baseKey];
+            if (typeof tmpRst === "string" && tmpRst[0] === "@") {
+                let refKey = tmpRst.slice(1);
+                let hasGetRef = false;
+                for (let orgDItem of orgDtObj) {
+                    let oDoc = (orgDItem._doc === null || orgDItem._doc === undefined)?orgDItem:orgDItem._doc;
+                    if (oDoc[refIDKey] === refKey) {
+                        rst.push(oDoc[propertyKey]);
+                        hasGetRef = true;
+                        break;
+                    }
+                }
+                if (!hasGetRef) {
+                    rst.push(tmpRst);
+                }
+            } else {
+                rst.push(tmpRst);
+            }
+        }
+    }
+    return rst;
+}
+
 function ext_mainGetFee(feeKey, dtlFeeKey) {
     let rst = [];
     let parentObj = this;

web/maintain/report/js/rpt_tpl_band.js

@@ -202,8 +202,8 @@ let bandTreeOprObj = {
             if (bandNode[JV.BAND_PROP_MERGE_BORDER] != null && bandNode[JV.BAND_PROP_MERGE_BORDER] != undefined) {
                 bandNode[JV.BAND_PROP_MERGE_BORDER] = 'F';
             }
-            if (bandNode.items && bandNode.items.length > 0) {
-                for (let subBandNode of bandNode.items) {
+            if (bandNode[JV.BAND_PROP_SUB_BANDS] && bandNode[JV.BAND_PROP_SUB_BANDS].length > 0) {
+                for (let subBandNode of bandNode[JV.BAND_PROP_SUB_BANDS]) {
                     unCheckMergeBorder(subBandNode)
                 }
             }

web/maintain/report/js/rpt_tpl_field_map.js

@@ -163,7 +163,11 @@ let selectableFiledTreeOprObj = {
                     }
                 }
                 me.treeObj = $.fn.zTree.init($("#selectable_field_tree_reversed"), selectableFieldSetting, showRst);
-                me.treeObj.expandAll(true);
+                let nodes = me.treeObj.getNodes();
+                for (let node of nodes) {
+                    me.treeObj.expandNode(node, true, false);
+                }
+                // me.treeObj.expandAll(true);
                 showRst = null;
             }, null, null
         );

web/maintain/report/rpt_tpl_detail_mapping_fields.html

@@ -1,15 +1,18 @@
 <div class="tab-pane" id="rpttplfieldmap" role="tabpanel">
     <div class="main-data">
         <div class="p-3">
-            <label>报表映射指标(勾选表示：主从关系的ID关联指标)</label>
-            <div class="tab-content">
-                <ul id="field_map_tree_reversed" class="ztree"></ul>
-            </div>
-            <p/>
-            <div class="tab-content">
-                <label>可映射指标</label>
-                <div class="tab-content">
-                    <ul id="selectable_field_tree_reversed" class="ztree"></ul>
+            <div class="row">
+                <div class="form-group col-md-6">
+                    <label>报表映射指标(勾选表示：主从关系的ID关联指标)</label>
+                    <div style="max-height: 750px; overflow: auto">
+                        <ul id="field_map_tree_reversed" class="ztree"></ul>
+                    </div>
+                </div>
+                <div class="form-group col-md-6">
+                    <label>可映射指标</label>
+                    <div style="max-height: 750px; overflow: auto">
+                        <ul id="selectable_field_tree_reversed" class="ztree"></ul>
+                    </div>
                 </div>
             </div>
         </div>