Merge branch '1.0.0_online' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost into 1.0.0_online

web/building_saas/main/html/main.html

@@ -117,9 +117,9 @@
                           <li class="nav-item">
                               <a class="nav-link px-3" href="javascript:void(0)" id="stdRationTab" relaPanel="#de">定额库</a>
                           </li>
-                          <li class="nav-item">
+<!--                          <li class="nav-item">
                               <a class="nav-link px-3" href="javascript:void(0)" id="blockLibTab" relaPanel="#kmbk">块模板库</a>
-                          </li>
+                          </li>-->
                       </ul>
                   </div>
               </div>

web/building_saas/main/js/views/block_lib.js

@@ -249,14 +249,14 @@ var blockLibObj = {
             let sheet = hitInfo.sheet;
             let div = sheet.getParent().getHost();
             let canvasId = div.id + "vp_vp";
-            let canvas = $(`#${canvasId}`)[0];
+/*            let canvas = $(`#${canvasId}`)[0];
             //改变鼠标图案
             if (sheet && hitInfo.isReservedLocation) {
                 canvas.style.cursor='pointer';
                 return true;
             }else{
                 canvas.style.cursor='default';
-            }
+            }*/
             return false;
         };
         TreeCell.prototype.processMouseEnter = function (hitinfo) {
@@ -283,11 +283,35 @@ var blockLibObj = {
             TREE_SHEET_HELPER.tipDivCheck();//延时检查：当tips正在show的时候，就调用了hide方法，会导致tips一直存在，所以设置一个超时处理
         };
         return new TreeCell();
+    },
+    insert: function (insertType){    // 1 后兄弟； 2 孩子。
+        let tree = blockLibObj.mainTree;
+        let select = tree.selected;
+        if (!select) select = tree.items[0];
+        let pID = (insertType == 1) ? select.getParentID() : select.getID();
+        let nID = (insertType == 1) ? select.getNextSiblingID() : -1;
+        let newNode = tree.insert(pID, nID);
+        newNode.data.name = '新建';
+        if (!newNode.parent)
+            newNode.data.type = 0
+        else
+            newNode.data.type = 1;
+
+        let sheet = blockLibObj.mainSheet;
+        sheet.suspendPaint();
+        sheet.suspendEvent();
+
+        let idx = tree.items.indexOf(newNode);
+        sheet.addRows(idx, 1);
+        tree.selected = newNode;
+        sheet.setSelection(idx, 0, 1, 1);
+
+        sheet.resumeEvent();
+        sheet.resumePaint();
     }
 };
 
 $(document).ready(function(){
-    // tab 也有click事件
     $('#blockLibTab').on('click', function (){
         if ($("#kmbk").is(":visible")){
             if (!blockLibObj.mainSpread){
@@ -295,4 +319,12 @@ $(document).ready(function(){
             };
         }
     });
+    $('#btn_block_newFolder').on('click', function (){
+        blockLibObj.insert(1);
+    });
+
+    $('#btn_block_newSubFolder').on('click', function (){
+        blockLibObj.insert(2);
+    });
+
 });