Browse Source

fix(fix): fix byg

master
liuyang 5 years ago
parent
commit
d9fb5fe4c4
  1. 2
      src/controllers/sheetMove.js
  2. 18
      src/global/formula.js

2
src/controllers/sheetMove.js

@ -1786,7 +1786,7 @@ function getNextIndex(direction, focusIndex, strIndex, endIndex) {
}
if(cellNull.length == 1 && stNull && cellNull[i] == false){
index = strIndex + i + 1;
index = strIndex + i;
break;
}
else if(cellNull.length > 1){

18
src/global/formula.js

@ -20,7 +20,7 @@ import { luckysheetRangeLast } from './cursorPos';
import { jfrefreshgrid } from './refresh';
// import luckysheet_function from '../function/luckysheet_function';
// import functionlist from '../function/functionlist';
import { luckysheet_compareWith, luckysheet_getcelldata, luckysheet_indirect_check, luckysheet_indirect_check_return, luckysheet_offset_check } from '../function/func';
import { luckysheet_compareWith, luckysheet_getarraydata, luckysheet_getcelldata, luckysheet_parseData, luckysheet_getValue, luckysheet_indirect_check, luckysheet_indirect_check_return, luckysheet_offset_check } from '../function/func';
import Store from '../store';
import locale from '../locale/locale';
@ -4369,11 +4369,6 @@ const luckysheetformula = {
}
},
checkSpecialFunctionRange: function (function_str, r, c, dynamicArray_compute) {
if (!window.luckysheet_indirect_check) {
window.luckysheet_indirect_check = luckysheet_indirect_check;
window.luckysheet_indirect_check_return = luckysheet_indirect_check_return;
window.luckysheet_offset_check = luckysheet_offset_check;
}
if (function_str.substr(0, 20) == "luckysheet_function.") {
let funcName = function_str.split(".")[1];
if (funcName != null) {
@ -4430,6 +4425,17 @@ const luckysheetformula = {
data = Store.flowdata;
}
if (!window.luckysheet_compareWith) {
window.luckysheet_compareWith = luckysheet_compareWith;
window.luckysheet_getarraydata = luckysheet_getarraydata;
window.luckysheet_getcelldata = luckysheet_getcelldata;
window.luckysheet_parseData = luckysheet_parseData;
window.luckysheet_getValue = luckysheet_getValue;
window.luckysheet_indirect_check = luckysheet_indirect_check;
window.luckysheet_indirect_check_return = luckysheet_indirect_check_return;
window.luckysheet_offset_check = luckysheet_offset_check;
}
_this.execFunctionGroupData = $.extend(true, [], data);
if (value != null) {

Loading…
Cancel
Save