elink-star
/
luckysheet
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug修改

master
wpxp123456 5 years ago
parent
58dc003ba8
commit
c3951f5fc1
3 changed files with 43 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/css/luckysheet-core.css
  2. 12
      src/luckysheet-core.js
  3. 54
      src/luckysheet-function.js

12
src/css/luckysheet-core.css
View File

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

12
src/luckysheet-core.js
View File

@ -5017,7 +5017,7 @@
screenshot: function (title, content, imgurl) { screenshot: function (title, content, imgurl) {
$("#jfgrid-modal-dialog-mask").show(); $("#jfgrid-modal-dialog-mask").show();
$("#jfgrid-confirm").remove(); $("#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 $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 winw = $(window).width(), winh = $(window).height();
var scrollLeft = $(document).scrollLeft(), scrollTop = $(document).scrollTop(); var scrollLeft = $(document).scrollLeft(), scrollTop = $(document).scrollTop();
@ -28760,7 +28760,7 @@
var kcode = event.keyCode; var kcode = event.keyCode;
if ($("#jfgrid-modal-dialog-mask").is(":visible") || $(event.target).hasClass("jfgrid-mousedown-cancel") || $(event.target).hasClass("sp-input") || (parseInt($("#jfgrid-input-box").css("top")) > 0 && $(event.target).closest(".jfgrid-input-box").length > 0 && kcode != keycode.ENTER && kcode != keycode.TAB && kcode != keycode.UP && kcode != keycode.DOWN && kcode != keycode.LEFT && kcode != keycode.RIGHT)) { if ($("#jfgrid-modal-dialog-mask").is(":visible") || $(event.target).hasClass("jfgrid-mousedown-cancel") || $(event.target).hasClass("sp-input") || (parseInt($("#jfgrid-input-box").css("top")) > 0 && $(event.target).closest(".jfgrid-input-box").length > 0 && kcode != keycode.ENTER && kcode != keycode.TAB && kcode != keycode.UP && kcode != keycode.DOWN && kcode != keycode.LEFT && kcode != keycode.RIGHT)) {
var anchor = $(window.getSelection().anchorNode); var anchor = $(window.getSelection().anchorNode);
if(anchor.parent().is("#jfgrid-helpbox-cell") || anchor.is("#jfgrid-helpbox-cell")){ if(anchor.parent().is("#jfgrid-helpbox-cell") || anchor.is("#jfgrid-helpbox-cell")){
if(kcode == keycode.ENTER){ if(kcode == keycode.ENTER){
var helpboxValue = $("#jfgrid-helpbox-cell").text(); var helpboxValue = $("#jfgrid-helpbox-cell").text();
@ -32391,6 +32391,12 @@
jfgrid_shiftkeydown = false; jfgrid_shiftkeydown = false;
jfgrid.jfgrid_shiftpositon = null; 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(); e.preventDefault();
}); });
@ -40901,7 +40907,7 @@
// mouseclickposition($("#jfgrid-user-menu"), menuleft, $(this).offset().top+20, "lefttop"); // mouseclickposition($("#jfgrid-user-menu"), menuleft, $(this).offset().top+20, "lefttop");
// }); // });
if(jfgridConfigsetting.userMenuItem.length>0){ if(jfgridConfigsetting.userMenuItem.length>0){
$("body").append('<div class="jfgrid-cols-menu jfgrid-rightgclick-menu jfgrid-mousedown-cancel" id="jfgrid-user-menu">${item}</div>'); $("body").append('<div class="jfgrid-cols-menu jfgrid-rightgclick-menu jfgrid-mousedown-cancel" id="jfgrid-user-menu">${item}</div>');
var itemset = ""; var itemset = "";

54
src/luckysheet-function.js
View File

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

Write Preview
Loading…
Cancel
Save