bug修改

src/css/luckysheet-core.css

@@ -2662,12 +2662,12 @@ fieldset[disabled] a.btn {
     }
 
 .btn-primary, .label-default, .list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus {
-    background: #8C89FE;
+    background: #0188FB;
     border-color: #726EFE;
 }
 
     .btn-primary:hover, .btn-primary:focus {
-        background: #7C79FE;
+        background: #388cf5;
         border-color: #6864FE;
     }
 
@@ -4323,14 +4323,14 @@ fieldset[disabled] a.btn {
     height: 19px;
     line-height: 19px;
     font-size: 12px;
-    border: 1px solid #FDB8B8;
-    background: #FDD7D7;
+    border: 1px solid #88adfd;
+    background: #aac1fe;
     margin: 2px;
 }
 
     .jfgrid-modal-dialog-slider-config-list .jfgrid-modal-dialog-slider-config-item:hover {
-        border: 1px solid #FB8686;
-        background: #FDCDCD;
+        border: 1px solid #0188fb;
+        background: #5f9afc;
     }
 
 .jfgrid-modal-dialog-slider-config-item-txt {

src/luckysheet-core.js

@@ -5017,7 +5017,7 @@
         screenshot: function (title, content, imgurl) {
             $("#jfgrid-modal-dialog-mask").show();
             $("#jfgrid-confirm").remove();
-            $("body").append(jfgrid.replaceHtml(modelHTML, { "id": "jfgrid-confirm", "addclass": "", "style": "z-index:100003", "title": title, "content": content, "botton": '<a style="text-decoration:none;color:#fff;" class="download btn btn-primary jfgrid-model-conform-btn">&nbsp;&nbsp;下载&nbsp;&nbsp;</a>&nbsp;&nbsp;<button class="btn btn-danger jfgrid-model-copy-btn">&nbsp;&nbsp;复制到剪切板&nbsp;&nbsp;</button><button class="btn btn-default jfgrid-model-cancel-btn">&nbsp;&nbsp;关闭&nbsp;&nbsp;</button>' }));
+            $("body").append(jfgrid.replaceHtml(modelHTML, { "id": "jfgrid-confirm", "addclass": "", "style": "z-index:100003", "title": title, "content": content, "botton": '<a style="text-decoration:none;color:#fff;" class="download btn btn-primary jfgrid-model-conform-btn">&nbsp;&nbsp;下载&nbsp;&nbsp;</a>&nbsp;&nbsp;<button class="btn btn-primary jfgrid-model-copy-btn">&nbsp;&nbsp;复制到剪切板&nbsp;&nbsp;</button><button class="btn btn-default jfgrid-model-cancel-btn">&nbsp;&nbsp;关闭&nbsp;&nbsp;</button>' }));
             var $t = $("#jfgrid-confirm").find(".jfgrid-modal-dialog-content").css("min-width", 300).end(), myh = $t.outerHeight(), myw = $t.outerWidth();
             var winw = $(window).width(), winh = $(window).height();
             var scrollLeft = $(document).scrollLeft(), scrollTop = $(document).scrollTop();
@@ -32391,6 +32391,12 @@
                 jfgrid_shiftkeydown = false;
                 jfgrid.jfgrid_shiftpositon = null;
             }
+
+            //输入框中文输入后 shift 和 空格 处理
+            if(parseInt($("#jfgrid-input-box").css("top")) > 0 && (kcode == 13 || kcode == 16 || kcode == 32)){
+                jfgrid.formula.functionInputHanddler($("#jfgrid-functionbox-cell"), $("#jfgrid-rich-text-editor"), kcode);
+            }
+
             e.preventDefault();
         });
 

src/luckysheet-function.js

@@ -4693,6 +4693,7 @@
             return null;
         },
         setCaretPosition: function(textDom, children, pos) {
+            try{
                 var el = textDom;
                 var range = document.createRange();
                 var sel = window.getSelection();
@@ -4714,6 +4715,10 @@
                 //    range.moveStart('character', pos);
                 //    range.select();
                 //}
+            }
+            catch(err) {
+                jfgrid.jfgridRangeLast(jfgrid.formula.rangeResizeTo[0]);
+            }
         },
         functionRange: function(obj, v, vp) {
             // console.log(v, vp);
@@ -4753,9 +4758,7 @@
             setTimeout(function() {
                 var value = $editer.text(),
                     valuetxt = value;
-                    console.log(value, value1)
-                if (value.length > 0 && value.substr(0, 1) == "=" && kcode != 229) {
-                // if (value.length > 0 && value.substr(0, 1) == "=") {
+                if (value.length > 0 && value.substr(0, 1) == "=" && (kcode != 229 || value.length == 1)) {
                     value = jfgrid.formula.functionHTMLGenerate(value);
                     value1 = jfgrid.formula.functionHTMLGenerate(value1txt);
 
@@ -4776,6 +4779,7 @@
 
                     $editer.html(value);
                     jfgrid.formula.functionRange($editer, value, value1);
+                    
                     // if (jfgrid.formula.functionRangeIndex != null) {
                     //     jfgrid.formula.functionRange($("#jfgrid-functionbox-cell"), value, value1);
                     // }
@@ -4785,13 +4789,11 @@
                     jfgrid.formula.canceFunctionrangeSelected();
                     jfgrid.formula.createRangeHightlight();
                 }
-                
                 jfgrid.formula.rangestart = false;
                 jfgrid.formula.rangedrag_column_start = false;
                 jfgrid.formula.rangedrag_row_start = false;
 
                 $functionbox.html(value);
-
                 jfgrid.formula.rangeHightlightselected($editer, kcode);
             }, 1);
         },