添加更多标签以及相关事件

web/building_saas/main/html/main.html

@@ -119,22 +119,30 @@
                   </div>
                   <div class="side-tabs">
                       <ul class="nav nav-tabs" role="tablist">
+                          <!--<li class="nav-item">
+                              <a class="nav-link px-3 right-nav-link"  href="javascript:void(0)" id = 'locateTab' relaPanel="#locate">查找定位</a>
+                          </li>-->
                           <li class="nav-item">
-                              <a class="nav-link px-3" href="javascript:void(0)" id = 'locateTab' relaPanel="#locate">查找定位</a>
-                          </li>
-                          <li class="nav-item">
-                              <a class="nav-link px-3" href="javascript:void(0)" id = 'stdBillsGuidanceTab' relaPanel="#zy">清单指引</a>
+                              <a class="nav-link px-3 right-nav-link" href="javascript:void(0)" id = 'stdBillsGuidanceTab' relaPanel="#zy">清单指引</a>
                           </li>
                          <!-- <li class="nav-item">
                               <a class="nav-link px-3" href="javascript:void(0)" id = 'stdBillsTab' relaPanel="#qd">清单规则</a>
                           </li>-->
                           <li class="nav-item" id = "li_stdRationTab">
-                              <a class="nav-link px-3" href="javascript:void(0)" id="stdRationTab" relaPanel="#de">定额库</a>
+                              <a class="nav-link px-3 right-nav-link" href="javascript:void(0)" id="stdRationTab" relaPanel="#de">定额库</a>
+                          </li>
+                          <li class="nav-item dropdown">
+                              <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">更多</a>
+                              <div class="dropdown-menu">
+                                  <a class="dropdown-item  right-nav-link"  href="javascript:void(0)" id = 'locateTab' relaPanel="#locate">查找定位</a>
+                                 <!-- <a class="dropdown-item" data-toggle="tab" href="#sqpz" role="tab">书签批注</a>-->
+                              </div>
                           </li>
                           <script>
+                              //2018-11-23  zhang 模板库移动到更多下拉框
                               if (G_SHOW_BLOCK_LIB){
-                                  $("#li_stdRationTab").after('<li class="nav-item"> <a class="nav-link px-3" href="javascript:void(0)" ' +
-                                      'id="blockLibTab" relaPanel="#kmbk">块模板库</a></li>');
+                                  $("#locateTab").after('<a class="dropdown-item right-nav-link" href="javascript:void(0)" ' +
+                                      'id="blockLibTab" relaPanel="#kmbk">块模板库</a>');
                               }
                           </script>
                       </ul>

web/building_saas/main/js/controllers/material_controller.js

@@ -164,6 +164,9 @@ let MaterialController = {
     sheet:null,
     datas:[],
     showReplaceDiv:function (node) {
+        if(!($('#linkGLJ').hasClass('active'))){
+            return;
+        }
         $("#subSpread").addClass("ration_glj_spread");
         $("#replaceM").show();
         $("#rgResize").show();// 拖动调整大小功能添加

web/building_saas/main/js/views/side_tools.js

@@ -19,6 +19,7 @@ sideResizeEles.farSpread = $('.main-side');
 sideResizeEles.nav = null;
 slideResize(sideResizeEles, {min: 250, max: $('#zaojiashu').width()-260}, 'width', function(){
     adaptiveTzjnrWidth();
+    MaterialController.showReplaceDiv();
     pageCCOprObj.resizeWidth();
     projectObj.refreshMainSpread();
     refreshSubSpread();
@@ -132,27 +133,30 @@ var sideToolsObj = {
         }
         adaptiveTzjnrWidth();
         autoFlashHeight();
+        MaterialController.showReplaceDiv();
         pageCCOprObj.resizeWidth();
         billsGuidance.refreshWorkBook();
         billsLibObj.refreshBillsSpread();
         refreshSubSpread();
         billsLibObj.refreshBillsRelaSpread();
-        rationLibObj.refreshSpread();;//subSpread、jobSpread、itemSpread显示问题
+        rationLibObj.refreshSpread();//subSpread、jobSpread、itemSpread显示问题
     }
 };
 
-$('.side-tabs ul li a').bind('click', function () {
+
+$('.right-nav-link').bind('click', function () {//$('.side-tabs ul li a').bind   2018-11-23  使用更多标签，所以不能这样绑定事件了
     var tab = $(this), tabPanel = $(tab.attr('relaPanel'));
     if(tab.hasClass('disabled')){
         return;
     }
-    if (!tab.hasClass('active')) {
+    let setActiveTab = tab.hasClass("dropdown-item")?tab.parent().prev('.nav-link'):tab;//如果是点击了更多下拉菜单的子项，则需设置成active 的tab是“更多”
+    if (!(setActiveTab.hasClass('active')&&tabPanel.is(":visible"))) {
         $('.side-tabs ul li a').removeClass('active');
-        tab.addClass('active');
-        sideToolsObj.showSideTools(tabPanel, tab.hasClass('active'), tab.attr('id'));
+        setActiveTab.addClass('active');
+        sideToolsObj.showSideTools(tabPanel, true, tab.attr('id'));
     } else {
-        tab.removeClass('active');
-        sideToolsObj.showSideTools(tabPanel, tab.hasClass('active'), tab.attr('id'));
+        setActiveTab.removeClass('active');
+        sideToolsObj.showSideTools(tabPanel, false, tab.attr('id'));
     }
     projectObj.refreshMainSpread();
 });