sync before change directory

web/maintain/report/js/rpt_tpl_cfg_helper.js

@@ -138,20 +138,21 @@ let rpt_tpl_cfg_helper = {
             $("#element_area_1")[0].style.display = "none";
             // $("#element_area_2")[0].style.display = "none";
             $("#element_pre_suff")[0].style.display = "none";
-            if (treeNode[JV.PROP_NAME] === JV.NODE_FLOW_COLUMN) {
+            if (treeNode[JV.PROP_NAME] === JV.NODE_FLOW_COLUMN || treeNode[JV.PROP_NAME] === JV.NODE_FLOW_CONTENT) {
                 //一些可视化操作
                 $("#element_visual_div")[0].style.display = "";
-                let nextNode = treeNode.getNextNode();
-                while (nextNode !== null && nextNode !== undefined) {
-                    if (nextNode[JV.PROP_NAME] === JV.NODE_FLOW_CONTENT) {
-                        break;
-                    } else {
-                        nextNode = nextNode.getNextNode();
-                    }
+                let columnParentNode = null;
+                let contentParentNode = null;
+                if (treeNode[JV.PROP_NAME] === JV.NODE_FLOW_CONTENT) {
+                    contentParentNode = treeNode;
+                    columnParentNode = treeNode.getPreNode();
+                } else {
+                    columnParentNode = treeNode;
+                    contentParentNode = treeNode.getNextNode();
                 }
                 let rptTpl = (zTreeOprObj.currentNode)?zTreeOprObj.currentNode.rptTpl:null;
-                fieldLocationOprObj.iniSpreadJs(treeNode, treeNode.getNextNode());
-                fieldLocationOprObj.setupColumn(rptTpl, treeNode, treeNode.getNextNode());
+                fieldLocationOprObj.iniSpreadJs(columnParentNode, contentParentNode);
+                fieldLocationOprObj.setupColumn(rptTpl, columnParentNode, contentParentNode);
             } else {
                 $("#element_visual_div")[0].style.display = "none";
             }

web/maintain/report/js/rpt_tpl_field_location.js

@@ -28,7 +28,7 @@ let fieldLocationOprObj = {
         me.columnParentNode = columnParentNode;
         me.contentParentNode = contentParentNode;
     },
-    restore: function () {
+    restoreColumn: function () {
         let me = this;
         let rptTpl = (zTreeOprObj.currentNode)?zTreeOprObj.currentNode.rptTpl:null;
         me.setupColumn(rptTpl, me.columnParentNode, me.contentParentNode);
@@ -170,11 +170,9 @@ let fieldLocationOprObj = {
             sheet = me.columnWorkBook.getActiveSheet();
         sheet.addRows(sheet.getRowCount() - 1, 1);
         let rc = sheet.getRowCount();
-        // let node = me.columnParentNode.items[0]
         for (let cc = 0; cc < sheet.getColumnCount(); cc++) {
             me.private_setupCellDft(sheet.getCell(rc - 2, cc));
         }
-        // columnParentNode.items
     },
     deleteRow: function () {
         let me = fieldLocationOprObj,
@@ -617,7 +615,7 @@ let fieldLocationOprObj = {
         return rst;
     },
 
-    applyBack: function () {
+    applyColumnBack: function () {
         let me = this;
         let rptTpl = (zTreeOprObj.currentNode)?zTreeOprObj.currentNode.rptTpl:null;
         if (rptTpl && me.columnParentNode && me.contentParentNode && confirm(`请确认提交应用！`)) {

web/maintain/report/rpt_tpl_detail_field_location.html

@@ -7,19 +7,6 @@
                         <ul id="tpl_data_info_reversed" class="ztree"></ul>
                     </div>
                 </div>
-                <!--
-                    <div class="tab-bar">
-                        <div class="form-group">
-                            <div class="ztree-warp" style="height: 130px;">
-                                <ul id="tpl_discrete_fields_params_reversed" class="ztree"></ul>
-                            </div>
-                            <br/>
-                            <div class="ztree-warp" style="height: 240px;">
-                                <ul id="tpl_data_selected_field_map_reversed" class="ztree"></ul>
-                            </div>
-                        </div>
-                    </div>
-                -->
                 <div class="form-group col-md-4" style="max-height: 410px;">
                     <div class="ztree-warp" style="height: 300px;">
                         <ul id="tpl_data_selected_field_map_reversed" class="ztree"></ul>
@@ -180,8 +167,8 @@
                 <div class="input-group col-12">
                     <div style="width:97%; height: 300px;">
                         <h5>表栏</h5>
-                        <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.applyBack()">应用</button>
-                        <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.restore()">恢复</button>
+                        <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.applyColumnBack()">应用</button>
+                        <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.restoreColumn()">恢复</button>
                         <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.addCol((zTreeOprObj.currentNode)?zTreeOprObj.currentNode.rptTpl:null)">新增列</button>
                         <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.deleteCol()">删除列</button>
                         <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.addRow()">新增行</button>