可视化UI调整

web/maintain/report/html/rpt_tpl_main.html

@@ -42,7 +42,7 @@
             <div>
             <ul class="nav nav-tabs" role="tablist">
                 <li class="nav-item">
-                    <a class="nav-link px-3" ><select class="form-control form-control-sm" id="compilations" onchange="zTreeOprObj.getReportTemplateTree(this)"></select></a>
+                    <a class="nav-link px-3" ><select class="form-control form-control-sm" id="compilations" onchange="zTreeOprObj.getReportTemplateTreeEx(this)"></select></a>
                 </li>
                 <li class="nav-item" style="display:none">
                     <a class="nav-link px-3" ><select class="form-control form-control-sm" id="engineerIds"></select></a>

web/maintain/report/html/rpt_tpl_vis_jumbo.html

@@ -1,6 +1,6 @@
 <div class="tab-pane" id="rptvisual" role="tabpanel">
     <div class="main-data">
-        <div class="p-3">
+        <div class="p-1" style="height: 95%; width: 99%">
             <button class="btn btn-primary btn-sm" onclick="visualJumbo.applyBack()">应用</button>
             <button class="btn btn-primary btn-sm" onclick="visualJumbo.restoreTpl()">恢复</button>
             &nbsp&nbsp&nbsp&nbsp
@@ -20,7 +20,7 @@
             <button class="btn btn-primary btn-sm" onclick="visualJumbo.deleteColumn()">删除列</button>
             &nbsp&nbsp&nbsp&nbsp
             <button class="btn btn-primary btn-sm" onclick="visualJumbo.addRow()">新增行</button>
-            <div class="btn-group" role="group" style="display: none">
+            <div class="btn-group" role="group">
                 <button type="button" class="btn btn-outline-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">拆分</button>
                 <div class="dropdown-menu" aria-labelledby="btnGroupDrop1">
                     <a class="dropdown-item" style="cursor:pointer" onclick="visualJumbo.splitRows(2)">2行</a>
@@ -101,8 +101,12 @@
                 </div>
             </div>
             <label id="id_vis_setup_lbl" style="color:green;font-weight:bold">...</label>
+            <!--
             <div class="row p-3" style="height: 600px" id="ele_visual_div_main3">
             </div>
+            -->
+            <div style="height: 80%;" id="ele_visual_div_main3">
+            </div>
         </div>
     </div>
 </div>

web/maintain/report/js/rpt_tpl_field_location.js

@@ -91,8 +91,10 @@ let fieldLocationOprObj = {
                 });
                 for (let contentItemNode of contentParentNode.items) {
                     let idxCol = xPos.indexOf(visualCommonOprObj.getActPosEx(contentItemNode, contentItemNode[JV.PROP_AREA][JV.PROP_H_CALCULATION], JV.PROP_LEFT, bandW, xPos));
-                    sheet.getCell(iSelectedRow, idxCol).value(contentItemNode[JV.PROP_NAME]);
+                    let cell = sheet.getCell(iSelectedRow, idxCol);
+                    cell.value(contentItemNode[JV.PROP_NAME]);
                     me.private_merge_ctrl(rptTpl, idxCol, contentItemNode, null);
+                    visualCommonOprObj.setupCell(cell, contentItemNode);
                 }
                 for (let idx = 1; idx < xPos.length; idx++) {
                     sheet.setColumnWidth(idx - 1, xPos[idx] - xPos[idx - 1]);

web/maintain/report/js/rpt_tpl_main.js

@@ -43,7 +43,7 @@ let zTreeOprObj = {
                     }
                 }
                 // me.getReportTemplateTree($("#compilations").get(0));
-                me.getReportTemplateTreeFirstTime($("#compilations").get(0));
+                me.getReportTemplateTreeEx($("#compilations").get(0));
             }, null, null
         );
     },
@@ -497,84 +497,6 @@ let zTreeOprObj = {
             }
         }, null, null);
     },
-    getReportTemplateTree: function(compilationSelect) {
-        let me = zTreeOprObj, params = {};
-        params.compilationId = compilationSelect.value;
-        // params.userId = (userAccount ===  'admin')?("-100"):userID;
-        params.userId = ["-100"];
-        if (userListObj.foundedUserList.length > 0) {
-            for (let user of userListObj.foundedUserList) {
-                params.userId.push(user.userId);
-            }
-        }
-        let allEngIds = [];
-        for (let item of engineeringList) {
-            allEngIds.push(item.value);
-        }
-        params.engineerId = allEngIds;
-        CommonAjax.postEx("report_tpl_api/getRptTplTree", params, 20000, true, function(result){
-            result.sort(function(item1, item2){
-                let rst = 0;
-                if (item1.userId === item2.userId) {
-                    rst = (item1.engineerId > item2.engineerId)?1:((item1.engineerId < item2.engineerId)?-1:0);
-                } else {
-                    if (item1.userId === "-100") {
-                        rst = 1
-                    } else if (item2.userId === "-100") {
-                        rst = -1
-                    } else {
-                        let idx1 = -1, idx2 = -1;
-                        for (let uidx = 0; uidx < userListObj.foundedUserList.length; uidx++) {
-                            if (userListObj.foundedUserList[uidx].userId === item1.userId) idx1 = uidx;
-                            if (userListObj.foundedUserList[uidx].userId === item2.userId) idx2 = uidx;
-                            if (idx1 >= 0 && idx2 >= 0) {
-                                break;
-                            }
-                            rst = (idx1 > idx2)?1:((idx1 < idx2)?-1:0);
-                        }
-                    }
-                }
-                return rst;
-            });
-            let allTopUserIdNodes = ["-100"];
-            let allTopTplNodes = [{userId: "-100", name: "公共模板", items:[], isParent: true, refId: ""}];
-            for (let user of userListObj.foundedUserList) {
-                allTopUserIdNodes.push(user.userId);
-                allTopTplNodes.push({userId: user.userId, name: user.real_name, items: [], isParent: true, refId: ""});
-            }
-            for (let item of result) {
-                let uidx = allTopUserIdNodes.indexOf(item.userId);
-                item.isParent = true;
-                allTopTplNodes[uidx].items.push(item);
-            }
-            // zTreeHelper.createTreeDirectly(result, setting, "rptTplTree", me);
-            zTreeHelper.createTreeDirectly(allTopTplNodes, setting, "rptTplTree", me);
-            me.refreshNodes();
-            let private_setup_checked = function (itemNode) {
-                if (itemNode.nodeType === RT.NodeType.NODE) {
-                    me.treeObj.setChkDisabled(itemNode, true);
-                } else if (itemNode.nodeType === RT.NodeType.TEMPLATE) {
-                    me.treeObj.checkNode(itemNode, !!(itemNode.released));
-                }
-                if (itemNode.items && itemNode.items.length > 0) {
-                    for (let subItem of itemNode.items) {
-                        private_setup_checked(subItem);
-                    }
-                }
-            };
-            let topNodes = me.treeObj.getNodes();
-            me.treeObj.expandAll(true);
-            for (let node of topNodes) {
-                me.treeObj.setChkDisabled(node, true);
-                if (node.items && node.items.length > 0) {
-                    for (let item of node.items) {
-                        me.treeObj.setChkDisabled(item, true);
-                        private_setup_checked(item);
-                    }
-                }
-            }
-        }, null, null);
-    },
     chkAndSetDupRefTplIds: function (tplNodes, selectedRefId) {
         let me = zTreeOprObj, tmpRefIds = [];
         me.dupTplIds = [];
@@ -625,7 +547,7 @@ let zTreeOprObj = {
             me.hasRefreshedDupRefIds = false;
         }
     },
-    getReportTemplateTreeFirstTime: function (compilationSelect) {
+    getReportTemplateTreeEx: function (compilationSelect) {
         let me = zTreeOprObj, params = {};
         params.compilationId = compilationSelect.value;
         CommonAjax.postEx("report_tpl_api/getTplTreeByCompilation", params, 20000, true, function(result){

web/maintain/report/js/rpt_tpl_vis_jumbo.js

@@ -357,7 +357,7 @@ let visualJumbo = {
         if (selectedRanges.length > 0) {
             let firstCell = sheet.getCell(selectedRanges[0].row, selectedRanges[0].col);
             let isSameBand = true;
-            for (let iRow = 1; iRow < selectedRanges[0].rowCount; i++) {
+            for (let iRow = 1; iRow < selectedRanges[0].rowCount; iRow++) {
                 if (sheet.getCell(iRow + selectedRanges[0].row, 0).backColor() !== firstCell.backColor()) {
                     isSameBand = false;
                     break;
@@ -372,6 +372,7 @@ let visualJumbo = {
                         }
                         let avgH = Math.round(height / newRowAmt),
                             lastH = height - avgH * (newRowAmt - 1);
+                        sheet.suspendPaint();
                         sheet.addRows(selectedRanges[0].row + selectedRanges[0].rowCount, newRowAmt - selectedRanges[0].rowCount);
                         sheet.setRowHeight(selectedRanges[0].row, lastH);
                         for (let iRow = 1; iRow < newRowAmt; iRow++) {
@@ -383,6 +384,7 @@ let visualJumbo = {
                                 visualCommonOprObj.copyPropertiesForSplittedCell(cell, sheet.getCell(iRow + selectedRanges[0].row, iCol));
                             }
                         }
+                        sheet.resumePaint();
                     } else {
                         alert(`您选择的行数量比要拆分的数量还大！`);
                     }