可视化 - 账单式‘应用’处理逻辑问题(重复创建)

web/maintain/report/html/rpt_tpl_dtl_calc.html

@@ -1,4 +1,5 @@
 <div class="tab-pane" id="rpttplformula" role="tabpanel">
+    <!--
     <div class="main-data">
         <div class="p-3">
             <label>计算式</label>
@@ -26,7 +27,53 @@
                 </div>
             </div>
             <div class="form-group">
-                <textarea rows="16" cols="106" id="exprContent" onkeyup="calculationTreeOprObj.changeExpression(this)"></textarea>
+                <textarea rows="20" cols="50" style="width: 100%; height: 100%; overflow: auto; work-break: break-all;" id="exprContent" onkeyup="calculationTreeOprObj.changeExpression(this)"></textarea>
+            </div>
+        </div>
+    </div>
+    -->
+    <!--
+    -->
+    <div class="main">
+        <div class="content">
+            <div class="container-fluid">
+                <div class="row">
+                    <div class="main-side col-lg-6 p-3">
+                        <div class="row">
+                            <div class="form-group col-md-12">
+                                <label>计算式</label>
+                                <div>
+                                    <ul id="rpt_tpl_formulas" class="ztree"></ul>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="form-group col-md-5">
+                                <select class="form-control" id="exprTemplatesSelect"></select>
+                            </div>
+                            <div class="form-group col-md-1">
+                                <button class="btn btn-primary" id="expr_tpl_select_btn" onclick="calculationTreeOprObj.setTemplateExpression(this)">套用</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="main-content col-lg-6 p-0">
+                        <div class="p-3" id="exprDetail">
+                            <div class="row">
+                                <div class="form-group col-md-3">
+                                    <label>计算式执行点</label>
+                                    <select class="form-control" id="exprRunType" onchange="calculationTreeOprObj.changeRunType(this)"></select>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <label>格式串(format)</label>
+                                    <input class="form-control" id="exprFormat" value="" onkeyup="calculationTreeOprObj.changeFormat(this)">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <textarea rows="20" cols="50" style="width: 100%; height: 100%; overflow: auto; work-break: break-all;" id="exprContent" onkeyup="calculationTreeOprObj.changeExpression(this)"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>

web/maintain/report/js/rpt_tpl_vis_jumbo.js

@@ -1045,7 +1045,9 @@ let visualJumbo = {
         let contentNodes = [];
         for (let field of textFldArr) {
             let node = me.private_create_field_param_node(sheet, field, startRow, colWidthArr, rowHeightArr, rptTpl);
-            contentNodes.push(node);
+            if (field.isField) {
+                contentNodes.push(node);
+            }
         }
         //2. 其他就归类到离散去了
         let discreteNodesArr = [];
@@ -1056,6 +1058,9 @@ let visualJumbo = {
                 if (sBand) {
                     me.private_setup_bandHeight(sBand[JV.PROP_NAME], sBand, sheet);
                     me.private_build_txt_fld_nodes(sBand, sheet, rptTpl, sArr.items);
+                    if (sBand[JV.PROP_NAME] === cotentBand[JV.PROP_NAME]) {
+                        sArr.items[0] = []; //清除指标集合(因与步骤1的结果有重叠了)
+                    }
                 }
                 if (sArr.items[0].length > 0 || sArr.items[1].length > 0) {
                     discreteNodesArr.push(sArr);