Browse Source

fix(add button bug): fix

master
liuyang 5 years ago
parent
commit
3250ef6960
  1. 3
      src/function/func.js
  2. 6
      src/function/functionImplementation.js
  3. 2
      src/global/extend.js
  4. 1
      src/global/refresh.js

3
src/function/func.js

@ -93,6 +93,9 @@ function luckysheet_compareWith() {
else if(sp == "-" && fp == null){
fp = 0;
}
else if(sp == "/" && (tp == 0 || tp == null)){
return error.d;
}
//计算result
function booleanOperation(a, operator, b){

6
src/function/functionImplementation.js

@ -7,7 +7,7 @@ import formula from '../global/formula';
import func_methods from '../global/func_methods';
import editor from '../global/editor';
import { isdatetime, diff, isdatatype } from '../global/datecontroll';
import { isRealNum, isRealNull, valueIsError } from '../global/validate';
import { isRealNum, isRealNull, valueIsError,error } from '../global/validate';
import { jfrefreshgrid } from '../global/refresh';
import { genarate, update } from '../global/format';
import { orderbydata } from '../global/sort';
@ -19496,7 +19496,7 @@ const functionImplementation = {
//结果为 TRUE
var value_if_true = func_methods.getFirstValue(arguments[1], "text");
if(valueIsError(value_if_true)){
if(valueIsError(value_if_true) && value_if_false!=error.d){
return value_if_true;
}
@ -19504,7 +19504,7 @@ const functionImplementation = {
var value_if_false = "";
if(arguments.length == 3){
value_if_false = func_methods.getFirstValue(arguments[2], "text");
if(valueIsError(value_if_false)){
if(valueIsError(value_if_false) && value_if_false!=error.d){
return value_if_false;
}
}

2
src/global/extend.js

@ -1,7 +1,7 @@
import editor from './editor';
import formula from './formula';
import { jfrefreshgrid_adRC, jfrefreshgrid_deleteCell, jfrefreshgrid_rhcw } from './refresh';
import { datagridgrowth } from './getdata';
import { datagridgrowth, getcellFormula } from './getdata';
import { setcellvalue } from './setdata';
import conditionformat from '../controllers/conditionformat';
import luckysheetFreezen from '../controllers/freezen';

1
src/global/refresh.js

@ -2,6 +2,7 @@ import rhchInit from './rhchInit';
import formula from './formula';
import editor from './editor';
import { setcellvalue } from './setdata';
import { getcellFormula } from './getdata';
import { computeRowlenArr } from './getRowlen';
import {
luckysheetDrawMain,

Loading…
Cancel
Save