chenshilong 6 年之前
父节点
当前提交
cde022ab5e
共有 2 个文件被更改,包括 19 次插入7 次删除
  1. 8 6
      web/building_saas/main/js/views/block_lib.js
  2. 11 1
      web/building_saas/main/js/views/project_view.js

+ 8 - 6
web/building_saas/main/js/views/block_lib.js

@@ -65,6 +65,7 @@ var blockLibObj = {
             lockColumns: [0, 1, 2, 3, 4, 5, 6]
         }
     },
+    cloneType: null,
 
     buildSheet: function () {
         $.bootstrapLoading.start();
@@ -473,7 +474,8 @@ var blockLibObj = {
                         return true;
                     },
                     callback: function (key, opt) {
-                        me.onCellDoubleClick();
+                        blockLibObj.cloneType = 1;
+                        $("#div_cloneOptions").modal({show: true});
                     }
                 },
                 "oneToMoreClone": {
@@ -487,7 +489,8 @@ var blockLibObj = {
                         return true;
                     },
                     callback: function (key, opt) {
-
+                        blockLibObj.cloneType = 2;
+                        $("#div_cloneOptions").modal({show: true});
                     }
                 },
                 "moreToMoreClone": {
@@ -501,7 +504,8 @@ var blockLibObj = {
                         return true;
                     },
                     callback: function (key, opt) {
-
+                        blockLibObj.cloneType = 3;
+                        $("#div_cloneOptions").modal({show: true});
                     }
                 },
                 "delete": {
@@ -544,6 +548,7 @@ var blockLibObj = {
     onCellDoubleClick: function (sender, args) {
         let projectNode = projectObj.project.mainTree.selected;
         if (!calcTools.isLeafBill(projectNode)) return;
+        blockLibObj.cloneType = 1;
         $("#div_cloneOptions").modal({show: true});
     },
     oneToOneClone: function (projectNode, block, options) {
@@ -571,9 +576,6 @@ var blockLibObj = {
         };
         vBlock_WC = JSON.parse(JSON.stringify(vBlock_WC));
         BlockController.confirmPaste(vBlock_WC, projectNode, 'sub');
-    },
-    oneToMoreCloneXX: function () {
-        //
     }
 };
 

+ 11 - 1
web/building_saas/main/js/views/project_view.js

@@ -3021,7 +3021,17 @@ $(function () {
         if ($('#clone_option_zeroQuantity').prop("checked")) options.zeroQuantity = true;
         if ($('#clone_option_cover').prop("checked")) options.overwriteRations = true;
 
-        blockLibObj.oneToOneClone(projectNode, block, options);
+        switch (blockLibObj.cloneType) {
+            case 1:
+                blockLibObj.oneToOneClone(projectNode, block, options);
+                break;
+            case 2:
+
+                break;
+            case 3:
+
+                break;
+        }
     });