Merge pull request #346 from kdevilpf/master

修改了EVALUATE函数代码
dream-num · Dec 14, 2020 · 669ed2a · 669ed2a
2 parents 95e26c3 + 5c5f2cb
commit 669ed2a
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 15 deletions.
diff --git a/src/function/functionImplementation.js b/src/function/functionImplementation.js
@@ -27562,19 +27562,22 @@ const functionImplementation = {
         }
 
         try {
+            var cell_r = window.luckysheetCurrentRow;
+            var cell_c = window.luckysheetCurrentColumn;
+            var sheetindex_now = window.luckysheetCurrentIndex;
             //公式文本
             var strtext = func_methods.getFirstValue(arguments[0]).toString();
             if(valueIsError(strtext)){
                 return strtext;
             }
-
-            //if (!window.luckysheet_function.ISIDCARD.f(UUserCard)) {
-            //    return formula.error.v;
-            //}
-            //匹配简单公式，只能包含  空格 数字-+*/.()
-            var formulastr = /[ \d\+\*\-\/\(\)\.]+/;
-            var strtext2=strtext.match(formulastr)[0];
-            return eval(strtext2);
+            //在文本公式前面添加=
+            if(strtext.trim().indexOf('=')!=0)
+            {
+                strtext ='='+strtext;
+            }
+            //console.log(strtext);
+            var result_this = formula.execstringformula(strtext,cell_r,cell_c,sheetindex_now);
+            return result_this[1];
         }
         catch (e) {
             var err = e;

diff --git a/src/global/formula.js b/src/global/formula.js
@@ -5758,6 +5758,11 @@ const luckysheetformula = {
             return false;
         }
     },
+    //供function/functionImplementation.js的EVALUATE函数调用。
+    execstringformula: function (txt, r, c, index) {
+        let _this = this;
+        return this.execfunction(txt, r, c, index);
+    },
     functionResizeData: {},
     functionResizeStatus: false,
     functionResizeTimeout: null,

diff --git a/src/locale/en.js b/src/locale/en.js
@@ -8820,8 +8820,8 @@ export default {
         "m": [1, 1],
         "p": [{
             "name": "expression",
-            "example": '"5*6"',
-            "detail": "Formula or expression only supports numbers+-/*.()",
+            "example": '"A1+5*2^2"',
+            "detail": "Formula or expression",
             "require": "m",
             "repeat": "n",
             "type": "rangeall"

diff --git a/src/locale/es.js b/src/locale/es.js
@@ -8820,8 +8820,8 @@ export default {
         "m": [1, 1],
         "p": [{
             "name": "expression",
-            "example": '"5*6"',
-            "detail": "Formula or expression only supports numbers+-/*.()",
+            "example": '"A1+5*2^2"',
+            "detail": "Formula or expression",
             "require": "m",
             "repeat": "n",
             "type": "rangeall"

diff --git a/src/locale/zh.js b/src/locale/zh.js
@@ -9040,13 +9040,13 @@ export default {
     {
         "n": "EVALUATE",
         "t": "3",
-        "d": "对以文字表示的一个公式或者表达式求值，并返回结果",
+        "d": "对以文字表示的公式或者表达式求值，并返回结果。",
         "a": "根据文字公式或者表达式求值。",
         "m": [1, 1],
         "p": [{
             "name": "公式",
-            "example": '"5*6"',
-            "detail": "公式或表达式仅支持数字+-/*.()",
+            "example": '"A1+5*2^2"',
+            "detail": "公式或表达式",
             "require": "m",
             "repeat": "n",
             "type": "rangeall"

diff --git a/src/locale/zh_tw.js b/src/locale/zh_tw.js
@@ -9038,6 +9038,20 @@ export default {
             'repeat' : 'n',
             'type'   : 'rangenumber'
         }]
+    },{
+        'n': 'EVALUATE',
+        't': '3',
+        'd': '對以文字表示的公式或者表達式求值，並返回結果。',
+        'a': '根據文字公式或者表達式求值。',
+        'm': [1, 1],
+        "p": [{
+            "name": "公式",
+            "example": '"A1+5*2^2"',
+            "detail": "公式或表達式",
+            "require": "m",
+            "repeat": "n",
+            "type": "rangeall"
+        }]
     },
     ],
     toolbar: {