amis-formula 2.0.2 → 2.1.0

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-formula v2.0.2
+ * amis-formula v2.1.0
  * Copyright 2021-2022 fex
  */
 
@@ -532,10 +532,7 @@ var Evaluator = /** @class */ (function () {
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
-        var arr = args;
-        if (args.length === 1 && Array.isArray(args[0])) {
-            arr = args[0];
-        }
+        var arr = normalizeArgs(args);
         return Math.max.apply(Math, arr.map(function (item) { return _this.formatNumber(item); }));
     };
     /**
@@ -553,10 +550,7 @@ var Evaluator = /** @class */ (function () {
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
-        var arr = args;
-        if (args.length === 1 && Array.isArray(args[0])) {
-            arr = args[0];
-        }
+        var arr = normalizeArgs(args);
         return Math.min.apply(Math, arr.map(function (item) { return _this.formatNumber(item); }));
     };
     /**
@@ -574,10 +568,7 @@ var Evaluator = /** @class */ (function () {
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
-        var arr = args;
-        if (args.length === 1 && Array.isArray(args[0])) {
-            arr = args[0];
-        }
+        var arr = normalizeArgs(args);
         return arr.reduce(function (sum, a) { return sum + _this.formatNumber(a) || 0; }, 0);
     };
     /**
@@ -703,10 +694,7 @@ var Evaluator = /** @class */ (function () {
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
-        var arr = args;
-        if (args.length === 1 && Array.isArray(args[0])) {
-            arr = args[0];
-        }
+        var arr = normalizeArgs(args);
         return (this.fnSUM.apply(this, arr.map(function (item) { return _this.formatNumber(item); })) / arr.length);
     };
     /**
@@ -727,10 +715,7 @@ var Evaluator = /** @class */ (function () {
         if (args.length === 0) {
             return null;
         }
-        var arr = args;
-        if (args.length === 1 && Array.isArray(args[0])) {
-            arr = args[0];
-        }
+        var arr = normalizeArgs(args);
         var nums = arr.map(function (item) { return _this.formatNumber(item); });
         var sum = nums.reduce(function (sum, a) { return sum + a || 0; }, 0);
         var mean = sum / nums.length;
@@ -1795,6 +1780,14 @@ function stripNumber(number) {
         return number;
     }
 }
+// 如果只有一个成员，同时第一个成员为 args
+// 则把它展开，当成是多个参数，毕竟公式里面还不支持 ...args 语法，
+function normalizeArgs(args) {
+    if (args.length === 1 && Array.isArray(args[0])) {
+        args = args[0];
+    }
+    return args;
+}
 function createObject(superProps, props, properties) {
     var obj = superProps
         ? Object.create(superProps, tslib.__assign(tslib.__assign({}, properties), { __super: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-formula",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "负责 amis 里面的表达式实现，内置公式，编辑器等",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -35,7 +35,7 @@
   "homepage": "https://github.com/aisuda/amis-tpl#readme",
   "dependencies": {
     "lodash": "^4.17.15",
-    "moment": "^2.29.1",
+    "moment": "^2.29.4",
     "tslib": "^2.3.1"
   },
   "devDependencies": {
@@ -56,7 +56,7 @@
     "rollup": "^2.60.2",
     "rollup-plugin-license": "^2.6.0",
     "rollup-plugin-terser": "^7.0.2",
-    "sass": "^1.36.0",
+    "sass": "^1.54.0",
     "sass-loader": "^12.1.0",
     "style-loader": "^3.2.1",
     "stylelint": "^13.0.0",
@@ -96,5 +96,5 @@
       }
     }
   },
-  "gitHead": "248d7661db0a703388301b9aacae720e06ed5a25"
+  "gitHead": "0c57e9936e83d55b75fb162667e15c84c09fc4ff"
 }