update

public/web/sheet/sheet_data_helper.js

@@ -52,6 +52,7 @@ var SheetDataHelper = {
         spread.options.cutCopyIndicatorVisible = false;
         spread.options.allowCopyPasteExcelStyle = false;
         spread.options.allowUserDragDrop = false;
+        spread.options.allowUndo = false;//that.mainSpread.commandManager().setShortcutKey(undefined, GC.Spread.Commands.Key.z, true, false, false, false); 屏蔽undo
         spread.getActiveSheet().setRowCount(3);
         return spread;
     },

web/building_saas/css/main.css

@@ -352,10 +352,4 @@ body {
 }
 .custom-file-input:lang(zh) ~ .custom-file-label::after {
     content: "浏览";
-}
-div.resize{
-    height: 4px;
-    background: #f7f7f9;
-    width: 100%;
-    cursor: s-resize;
 }

web/building_saas/main/js/views/glj_view.js

@@ -357,7 +357,7 @@ var gljOprObj = {
 
     onClipboardPasting: function (sender, args) {
         var me = gljOprObj;
-        if (!me.ration) {
+        if(args.cellRange.rowCount!=1||args.cellRange.colCount!=1){
             args.cancel = true;
         }
     },
@@ -725,13 +725,18 @@ var gljOprObj = {
         var me = gljOprObj;
         if (args.action == GC.Spread.Sheets.RangeChangedAction.clear) {
             args.editingText = null;
-            if (args.sheetName == 'ration_glj') {
-                me.onEditGLJSheet(args);
-            }
-            if (args.sheetName == 'ration_ass') {
-                me.updateRationAss(args);
-            }
+        }else if(args.action == GC.Spread.Sheets.RangeChangedAction.paste){
+            args.editingText = args.sheet.getCell(args.row,args.col).value();
+        }else {
+            return;
+        }
+        if (args.sheetName == 'ration_glj') {
+            me.onEditGLJSheet(args);
         }
+        if (args.sheetName == 'ration_ass') {
+            me.updateRationAss(args);
+        }
+
     },
     generateHtmlString: function () {
 //        return "<div id='edit'><div>";

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

@@ -648,7 +648,6 @@ var projectObj = {
                 that.mainSpread.bind(GC.Spread.Sheets.Events.ClipboardChanged, that.msClipboardChanged);
                 that.mainSpread.bind(GC.Spread.Sheets.Events.ButtonClicked, that.onButtonClick);
                 that.mainSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, that.onCellDoubleClick);
-                that.mainSpread.commandManager().setShortcutKey(undefined, GC.Spread.Commands.Key.z, true, false, false, false);
                 //let loadOtherStartTime = +new Date();
                 that.loadMainSpreadContextMenu();
                 that.loadFocusLocation();
@@ -1222,6 +1221,7 @@ var projectObj = {
     }
 
 };
+
 // 点击合计框中的复制
 $("body").on("click", "#total-tips a", function() {
     const totalElement = $(this).parent().siblings("p").find("#total");
@@ -1800,4 +1800,26 @@ function doAfterImport(resData){
             });
         });
     }
-}
+}
+
+
+$(function () {
+
+    $("#billsSpread").mouseover(function(){
+        spreadAutoFocus(projectObj.mainSpread,subSpread);
+    });
+
+    $("#subSpread").mouseover(function(){
+        spreadAutoFocus(subSpread,projectObj.mainSpread);
+    });
+
+    function spreadAutoFocus(spread,relateSpread) {
+        if(relateSpread&&relateSpread.getActiveSheet().isEditing()){//关联的spread不在编辑状态的情况下，才自动获得焦点;
+            return;
+        }else {
+            spread?spread.focus():'';
+        }
+    }
+
+
+});