Browse Source

fix(function array value error): fix it

master
wbfsa 5 years ago
parent
commit
31e4b3d9e4
  1. 6
      src/global/formula.js
  2. 20
      src/global/func_methods.js
  3. 2
      src/index.html

6
src/global/formula.js

@ -4067,7 +4067,7 @@ const luckysheetformula = {
i++; i++;
} }
// console.log(function_str); console.log(function_str);
return function_str; return function_str;
}, },
insertUpdateDynamicArray: function(dynamicArrayItem) { insertUpdateDynamicArray: function(dynamicArrayItem) {
@ -5081,7 +5081,7 @@ const luckysheetformula = {
let ukey ="r" + u.r + "c" + u.c + "i" + u.index; let ukey ="r" + u.r + "c" + u.c + "i" + u.index;
// if ((u.r == item.r && u.c == item.c && u.index == item.index) || name in _this.execvertex[ukey].chidren ) { // if ((u.r == item.r && u.c == item.c && u.index == item.index) ) {
// continue; // continue;
// } // }
@ -5430,6 +5430,8 @@ const luckysheetformula = {
return [true, result, txt, {type: "dynamicArrayItem", data: dynamicArrayItem}]; return [true, result, txt, {type: "dynamicArrayItem", data: dynamicArrayItem}];
} }
console.log(result, txt);
return [true, result, txt]; return [true, result, txt];
}, },
testFunction: function(txt, fp) { testFunction: function(txt, fp) {

20
src/global/func_methods.js

@ -33,8 +33,14 @@ const func_methods = {
if(getObjType(rangeObj.data) == "array"){ if(getObjType(rangeObj.data) == "array"){
for(let i = 0; i < rangeObj.data.length; i++){ for(let i = 0; i < rangeObj.data.length; i++){
for(let j = 0; j < rangeObj.data[i].length; j++){ for(let j = 0; j < rangeObj.data[i].length; j++){
if(rangeObj.data[i][j] != null && !isRealNull(rangeObj.data[i][j].v)){ if(rangeObj.data[i][j] != null){
dataArr.push(rangeObj.data[i][j].v); let datav = rangeObj.data[i][j];
if(datav instanceof Object){
dataArr.push(datav.v);
}
else{
dataArr.push(datav);
}
} }
else{ else{
if(!isNeglectNullCell){ if(!isNeglectNullCell){
@ -92,8 +98,14 @@ const func_methods = {
for(let j = 0; j < rangeObj.data[i].length; j++){ for(let j = 0; j < rangeObj.data[i].length; j++){
let value; let value;
if(rangeObj.data[i][j] != null && !isRealNull(rangeObj.data[i][j].v)){ if(rangeObj.data[i][j] != null){
value = rangeObj.data[i][j].v; let datav = rangeObj.data[i][j];
if(datav instanceof Object){
value = datav.v;
}
else{
value = datav;
}
} }
else{ else{
if(nullCellType == "number"){ if(nullCellType == "number"){

2
src/index.html

@ -54,7 +54,7 @@
} }
], ],
data: data:
[sheetCell,sheetFormula,sheetConditionFormat,sheetSparkline,sheetTable,sheetComment,sheetPivotTableData,sheetPivotTable,sheetChart,sheetPicture,sheetDataVerification] [sheetCell,sheetFormula,sheetConditionFormat,sheetTable,sheetComment,sheetPivotTableData,sheetPivotTable,sheetChart,sheetPicture,sheetDataVerification]
/*[{"name":"Sheet1","config":{"columnlen":{"0":241},"rowlen":{"0":81}},"index":"1","status":"1","order":"0","luckysheet_select_save":[{"row":[0,0],"column":[4,4],"sheetIndex":1}],"zoomRatio":1,"showGridLines":"1","defaultColWidth":72,"defaultRowHeight":18,"celldata":[ /*[{"name":"Sheet1","config":{"columnlen":{"0":241},"rowlen":{"0":81}},"index":"1","status":"1","order":"0","luckysheet_select_save":[{"row":[0,0],"column":[4,4],"sheetIndex":1}],"zoomRatio":1,"showGridLines":"1","defaultColWidth":72,"defaultRowHeight":18,"celldata":[
{"r":0,"c":0, {"r":0,"c":0,
"v":{ "v":{

Loading…
Cancel
Save