diff --git a/src/controllers/handler.js b/src/controllers/handler.js index a56f224..0c96b6b 100644 --- a/src/controllers/handler.js +++ b/src/controllers/handler.js @@ -5016,7 +5016,7 @@ export default function luckysheetHandler() { //点击功能栏时 如果是单元格编辑模式 则退出编辑模式 if ($(event.target).closest("#luckysheet-wa-editor").length > 0 && parseInt($("#luckysheet-input-box").css("top")) > 0) { - console.log(event); + formula.updatecell(Store.luckysheetCellUpdate[0], Store.luckysheetCellUpdate[1]); luckysheetMoveHighlightCell("down", 0, "rangeOfSelect"); } @@ -5092,14 +5092,11 @@ export default function luckysheetHandler() { luckysheetContainerFocus(); }); - - //左上角返回按钮 $("#luckysheet_info_detail_title").click(function () { window.open(luckysheetConfigsetting.myFolderUrl, "_self"); }); - //图表选区mousedown $("#luckysheet-chart-rangeShow").on("mousedown.chartRangeShowMove", ".luckysheet-chart-rangeShow-move", function (event) { Store.chart_selection.rangeMove = true; @@ -5686,6 +5683,13 @@ export default function luckysheetHandler() { }).mousedown(function (e) { e.stopPropagation(); }); + + $('#luckysheet-wa-editor,#luckysheet-icon-morebtn-div,.luckysheet-toolbar-button').click(function(e){ + // 取消格式刷状态 + if(menuButton.luckysheetPaintModelOn){ + menuButton.cancelPaintModel(); + } + }) } // 协同编辑其他用户不在操作的时候,且已经展示了用户名10秒,则用户名框隐藏