update

web/building_saas/main/html/main.html

@@ -153,19 +153,24 @@
                          <!-- <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-1 right-nav-link" href="javascript:void(0)" id="stdRationTab" relaPanel="#de">定额库</a>
+                          <li class="nav-item" id="li_stdRationTab">
+                              <a class="nav-link px-1 right-nav-link" href="javascript:void(0)" id="stdRationTab"
+                                 relaPanel="#de">定额库</a>
                           </li>
-                  <!--   <li class="nav-item dropdown show">
-                <a class="nav-link dropdown-toggle more" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="true">更多</a>
-                <div class="dropdown-menu show" x-placement="bottom-start" style="position: absolute; transform: translate3d(-107px, 32px, 0px); top: 0px; left: 0px; will-change: transform;">
-                <a class="dropdown-item right-nav-link" href="javascript:void(0)" id="locateTab" relapanel="#locate">查找定位</a><a class="dropdown-item right-nav-link" href="javascript:void(0)" id="blockLibTab" relapanel="#kmbk">块模板库</a>
-                &lt;!&ndash; <a class="dropdown-item" data-toggle="tab" href="#sqpz" role="tab">书签批注</a>&ndash;&gt;
-                </div>
-                </li>-->
+
+                          <li class="nav-item dropdown show">
+                              <a class="nav-link dropdown-toggle more" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="true">更多</a>
+                              <div class="dropdown-menu show" x-placement="bottom-start"
+                                   style="position: absolute; transform: translate3d(-107px, 32px, 0px); top: 0px; left: 0px; will-change: transform;">
+                                  <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){
+                              if (G_SHOW_BLOCK_LIB) {
                                   $("#locateTab").after('<a class="dropdown-item right-nav-link" href="javascript:void(0)" ' +
                                       'id="blockLibTab" relaPanel="#kmbk">块模板库</a>');
                               }

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

@@ -455,10 +455,11 @@ var blockLibObj = {
                     name: '一对一克隆',
                     icon: "fa-battery-empty",
                     disabled: function () {
-
+                        let ok = me.curIsBlock() && calcTools.isLeafBill(projectObj.project.mainTree.selected);
+                        return !ok;
                     },
                     visible: function(key, opt){
-                        return me.curIsBlock();
+                        return true;
                     },
                     callback: function (key, opt) {
                         me.onCellDoubleClick();
@@ -468,10 +469,11 @@ var blockLibObj = {
                     name: '一对多克隆',
                     icon: "fa-battery-half",
                     disabled: function () {
-
+                        let ok = me.curIsBlock() && calcTools.isParentBill(projectObj.project.mainTree.selected);
+                        return !ok;
                     },
                     visible: function(key, opt){
-                        return me.curIsBlock();
+                        return true;
                     },
                     callback: function (key, opt) {
 
@@ -481,10 +483,11 @@ var blockLibObj = {
                     name: '多对多克隆',
                     icon: "fa-battery-full",
                     disabled: function () {
-
+                        let ok = me.curIsCategory() && calcTools.isParentBill(projectObj.project.mainTree.selected);
+                        return !ok;
                     },
                     visible: function(key, opt){
-                        return me.curIsCategory();
+                        return true;
                     },
                     callback: function (key, opt) {