隐藏插入工料机，定额编号自定义单元格不能ctrl + c 复制的bug

public/web/tree_sheet/tree_sheet_helper.js

@@ -537,9 +537,9 @@ var TREE_SHEET_HELPER = {
                 $editor.css("background", 'white');
                 $editor.css("width", cellRect.width);
                 $editor.css("height", cellRect.height);
-                $editor.attr("gcUIElement", "gcEditingInput");//padding:0  //value="${context.sheet.getValue(context.row,context.col)}"
+                //$editor.attr("gcUIElement", "gcEditingInput");//padding:0  //value="${context.sheet.getValue(context.row,context.col)}"
                 $editor.html(` <div class="input-group input-group-sm">
-                                <input type="text" id="esInput" class="form-control" aria-label="Text input with dropdown button" autocomplete="off"   style=" background-color:${cellStyle.backColor}">
+                                <input type="text" id="esInput" class="form-control"  autocomplete="off"  style=" background-color:${cellStyle.backColor}">
                                 <div class="">                           
                                     <div class="triangle-border_dropdown tb-border_dropdown" id="esBtn" style="z-index:10; left: ${cellRect.width - 15+"px"};top:${cellRect.height/2-2+"px"}"></div>
                                 </div>
@@ -578,23 +578,30 @@ var TREE_SHEET_HELPER = {
                     },function(){
                         $(this).css("background-color","");
                     });
-
-
                     $("#esBtn").bind('click',function(e){
                         $(".es-list").toggle();
                     });
                     if( $('#esInput').val()) setCursor( $("#esInput")[0], $('#esInput').val().length)
                 });
+
+            };
+
+            TreeNodeCellType.prototype.processKeyDown = function (e, context){ //当用isReservedKey 不拦截编辑模式时的input框ctrl + c时，在非编辑模式的ctrl + c事件也需要自已处理，所以在这里再调用一下复制命令
+                //console.log(tree)
+                if(e.keyCode === GC.Spread.Commands.Key.c && e.ctrlKey)  context.sheet.getParent().commandManager().execute({cmd:"copy",sheetName:context.sheet.name()});
+            };
+            TreeNodeCellType.prototype.isReservedKey = function (e, context) {
+                return e.keyCode === GC.Spread.Commands.Key.c && e.ctrlKey && !e.shiftKey && !e.altKey;//不拦截ctrl + c事件。
             };
             TreeNodeCellType.prototype.setEditorValue = function (editor, value, context) {
 
                  $('#esInput').val(value);
             };
             TreeNodeCellType.prototype.getEditorValue = function (editor, context) {
-                this.isEscKey = false;
                 console.log($('#esInput').val());
                 return  $('#esInput').val()!==''? $('#esInput').val():null;
             };
+
         }
         return new TreeNodeCellType();
 
@@ -758,4 +765,4 @@ var TREE_SHEET_HELPER = {
         };
         return new QuestionCellType();
     }
-};
+};

web/building_saas/main/html/main.html

@@ -142,7 +142,7 @@
                           <div class="resize"></div>
                           <div class="bottom-content">
                               <ul class="nav nav-tabs" role="tablist">
-                                  <li class="nav-item">
+                                  <li class="nav-item" id="GLJ_div">
                                       <a class="nav-link active" id="linkGLJ" data-toggle="tab" href="#subSpread" role="tab">人材机</a>
                                   </li>
                               <!--    <li class="nav-item">
@@ -151,7 +151,7 @@
                                   <li class="nav-item">
                                       <a class="nav-link" id="linkFZDE" data-toggle="tab" href="#subSpread" role="tab">辅助定额</a>
                                   </li>-->
-                                  <li class="nav-item">
+                                  <li class="nav-item" id = "ZMHS_div">
                                       <a class="nav-link" id="linkZMHS" data-toggle="tab" href="#subSpread" role="tab">子目换算</a>
                                   </li>
                                   <li class="nav-item" id="AZZJF_div" style="display: none">
@@ -163,10 +163,10 @@
                                   <li class="nav-item">
                                       <a class="nav-link" id="linkJSCX" data-toggle="tab" href="#subSpread" role="tab">计算程序</a>
                                   </li>
-                                  <li class="nav-item">
+                                 <!-- <li class="nav-item">   2018-11-08  新需求，隐藏说明信息
                                       <a class="nav-link" data-toggle="tab" href="#comments" role="tab" id="linkComments">说明信息</a>
-                                  </li>
-                                  <li class="nav-item">
+                                  </li>-->
+                                  <li class="nav-item" id = "TZJNR_div">
                                       <a class="nav-link" id="linkTZJNR" data-toggle="tab" href="#subSpread" role="tab">特征及内容</a>
                                   </li>
                               </ul>

web/building_saas/main/js/views/project_view.js

@@ -1324,14 +1324,10 @@ var projectObj = {
                             }
                         }
                         getGLJData('insert');// ProjectController.addRation(project, controller, rationType.volumePrice);
-                    }/*,
-                    visible: function(key, opt){
-                        var selected = project.mainTree.selected;
-                        if(selected){
-                          return canInsertRationNode(selected);
-                        }
+                    },
+                    visible: function(key, opt){//2018-11-08  新需求，这个按钮先隐藏，有需要再放开
                         return false;
-                    }*/
+                    }
                 },
                 "spr2": '--------',
                 "calc_installation_fee": {
@@ -1466,7 +1462,7 @@ var projectObj = {
     // 计算node及node的所有父项
     converseCalculateBills: function (node) {
         projectObj.project.calcProgram.calcAndSave(node);
-},
+    },
 
     // 获取上次退出时的焦点位置
     loadFocusLocation: function() {

web/building_saas/main/js/views/sub_view.js

@@ -57,6 +57,14 @@ let subObj = {
             disableSpread(contentOprObj.workBook);
             disableSpread(characterOprObj.workBook);
         }
+    },
+    initNavItem:function (node) {
+     /*   1、造价书选中行类别是“大项费用”、“分部”、“分项”、“清单”时，显示按钮“工程量明细”、“计算程序”、“特征及内容”，默认打开“计算程序”。
+          2、选中行类别是“定额”、“量价”、“人材机”时，显示按钮“人材机”、“子目换算”、“工程量明细”、“计算程序”，默认打开“人材机”。
+     */
+
+
+
     }
 };