From 4c168477273056ce2e01fe78dead1aa2da95e75f Mon Sep 17 00:00:00 2001
From: liuyang <qwbfsa@gmail.com>
Date: Fri, 18 Sep 2020 18:15:44 +0800
Subject: [PATCH] refactor: fix

inline string
---
 src/controllers/handler.js    |  1 +
 src/controllers/menuButton.js | 32 ++++++++++++++++++++++++--------
 src/global/cursorPos.js       | 13 +++++++++++++
 src/global/getdata.js         |  5 ++++-
 4 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/src/controllers/handler.js b/src/controllers/handler.js
index 13b9241..6b30af3 100644
--- a/src/controllers/handler.js
+++ b/src/controllers/handler.js
@@ -4410,6 +4410,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");
         }
diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js
index 5da5402..2c8a993 100644
--- a/src/controllers/menuButton.js
+++ b/src/controllers/menuButton.js
@@ -456,7 +456,9 @@ const menuButton = {
         });
 
         //字体设置
-        $("#luckysheet-icon-font-family").click(function(){
+        $("#luckysheet-icon-font-family").mousedown(function(e){
+            e.stopPropagation();
+        }).click(function(){
             let menuButtonId = $(this).attr("id")+"-menuButton";
             let $menuButton = $("#"+menuButtonId);
             if($menuButton.length == 0){
@@ -505,7 +507,9 @@ const menuButton = {
         });
 
         //字体颜色
-        $("#luckysheet-icon-text-color").click(function(){
+        $("#luckysheet-icon-text-color").mousedown(function(e){
+            e.stopPropagation();
+        }).click(function(){
             let d = editor.deepCopyFlowData(Store.flowdata);
             let color =  $(this).attr("color");
             if(color == null){
@@ -514,7 +518,9 @@ const menuButton = {
             _this.updateFormat(d, "fc", color);
         });
 
-        $("#luckysheet-icon-text-color-menu").click(function(){
+        $("#luckysheet-icon-text-color-menu").mousedown(function(e){
+            e.stopPropagation();
+        }).click(function(){
             let menuButtonId = $(this).attr("id") + "-menuButton";
             let $menuButton = $("#"+menuButtonId);
 
@@ -786,7 +792,9 @@ const menuButton = {
 
         //字体大小
         let luckysheet_fs_setTimeout = null;
-        $("#luckysheet-icon-font-size").click(function(){
+        $("#luckysheet-icon-font-size").mousedown(function(e){
+            e.stopPropagation();
+        }).click(function(){
             let menuButtonId = $(this).attr("id") + "-menuButton";
             let $menuButton = $("#" + menuButtonId);
             
@@ -848,7 +856,9 @@ const menuButton = {
             }
             mouseclickposition($menuButton, menuleft, $(this).offset().top + 25, "lefttop");
         })
-        .find("input.luckysheet-toolbar-textinput").keyup(function(e){
+        .find("input.luckysheet-toolbar-textinput").keydown(function(e){
+            e.stopPropagation();
+        }).keyup(function(e){
             if(e.keyCode != 13){//Enter
                 return;
             }
@@ -2069,7 +2079,9 @@ const menuButton = {
         });
 
         //加粗
-        $("#luckysheet-icon-bold").click(function(){
+        $("#luckysheet-icon-bold").mousedown(function(e){
+            e.stopPropagation();
+        }).click(function(e){
             let d = editor.deepCopyFlowData(Store.flowdata);
             let row_index = Store.luckysheet_select_save[0]["row_focus"], 
                 col_index = Store.luckysheet_select_save[0]["column_focus"];
@@ -2087,7 +2099,9 @@ const menuButton = {
         });
 
         //斜体
-        $("#luckysheet-icon-italic").click(function(){
+        $("#luckysheet-icon-italic").mousedown(function(e){
+            e.stopPropagation();
+        }).click(function(){
             let d = editor.deepCopyFlowData(Store.flowdata);
             let row_index = Store.luckysheet_select_save[0]["row_focus"], 
                 col_index = Store.luckysheet_select_save[0]["column_focus"];
@@ -2105,7 +2119,9 @@ const menuButton = {
         });
 
         //删除线
-        $("#luckysheet-icon-strikethrough").click(function(){
+        $("#luckysheet-icon-strikethrough").mousedown(function(e){
+            e.stopPropagation();
+        }).click(function(){
             let d = editor.deepCopyFlowData(Store.flowdata);
             let row_index = Store.luckysheet_select_save[0]["row_focus"], 
                 col_index = Store.luckysheet_select_save[0]["column_focus"];
diff --git a/src/global/cursorPos.js b/src/global/cursorPos.js
index 12eb63e..ff8c30e 100644
--- a/src/global/cursorPos.js
+++ b/src/global/cursorPos.js
@@ -45,6 +45,19 @@ function getCursortPosition(textDom){
     return cursorPos;
 }
 
+function hideMenuByCancel(event){
+    if (!$(event.target).hasClass("luckysheet-mousedown-cancel") && $(event.target).filter("[class*='sp-palette']").length == 0 && $(event.target).filter("[class*='sp-thumb']").length == 0 && $(event.target).filter("[class*='sp-']").length == 0) {
+        $("#luckysheet-rightclick-menu").hide();
+        $("#luckysheet-cols-h-hover").hide();
+        $("#luckysheet-cols-menu-btn").hide();
+        $("#luckysheet-rightclick-menu").hide();
+        $("#luckysheet-sheet-list, #luckysheet-rightclick-sheet-menu, #luckysheet-user-menu").hide();
+        $("body > .luckysheet-filter-menu, body > .luckysheet-filter-submenu, body > .luckysheet-cols-menu").hide();
+        //$("body > luckysheet-menuButton").hide();
+        Store.luckysheet_cols_menu_status = false;
+    }
+}
+
 export {
     luckysheetRangeLast,
     getCursortPosition,
diff --git a/src/global/getdata.js b/src/global/getdata.js
index 29b94a7..d396cc4 100644
--- a/src/global/getdata.js
+++ b/src/global/getdata.js
@@ -333,11 +333,14 @@ export function getFontStyleByCell(cell,checksAF,checksCF){
             style += "font-style:italic;";
         }
 
-        if(key == "ff" && value != "0"){
+        if(key == "ff"){
             let f = value;
             if(!isNaN(parseInt(value))){
                 f = locale_fontarray[parseInt(value)];
             }
+            else{
+                f = value;
+            }
             style += "font-family: " + f + ";";
         }