amis-formula 2.0.2 → 2.2.0

package/lib/doc.js

@@ -1486,7 +1486,7 @@ exports.doc = [
   },
   {
     name: "JOIN",
-    description: "数组转成字符串\n\n示例：\n\nJOIN(['a', 'b', 'c'], '~') 得到 'a~b~c'",
+    description: "数组转成字符串\n\n示例：\n\nJOIN(['a', 'b', 'c'], '=') 得到 'a=b=c'",
     example: "JOIN(arr, string)",
     params: [
       {

package/lib/doc.md

@@ -878,7 +878,7 @@ COMPACT([0, 1, false, 2, '', 3]) 得到 [1, 2, 3]
 
 示例：
 
-JOIN(['a', 'b', 'c'], '~') 得到 'a~b~c'
+JOIN(['a', 'b', 'c'], '=') 得到 'a=b=c'
 
 ### CONCAT
 

package/lib/evalutor.d.ts

@@ -76,7 +76,7 @@ export declare class Evaluator {
     add(ast: {
         left: any;
         right: any;
-    }): number;
+    }): any;
     minus(ast: {
         left: any;
         right: any;
@@ -330,7 +330,7 @@ export declare class Evaluator {
      *
      * @returns {number} 传入数值四舍五入后的结果
      */
-    fnROUND(a: number, b: number): number;
+    fnROUND(a: number, b?: number): number;
     /**
      * 将数字向下取整到指定的位数，可以设置小数位。
      *
@@ -341,7 +341,7 @@ export declare class Evaluator {
      *
      * @returns {number} 传入数值向下取整后的结果
      */
-    fnFLOOR(a: number, b: number): number;
+    fnFLOOR(a: number, b?: number): number;
     /**
      * 将数字向上取整到指定的位数，可以设置小数位。
      *
@@ -352,7 +352,7 @@ export declare class Evaluator {
      *
      * @returns {number} 传入数值向上取整后的结果
      */
-    fnCEIL(a: number, b: number): number;
+    fnCEIL(a: number, b?: number): number;
     /**
      * 开平方，参数 number 为非负数
      *
@@ -1028,7 +1028,7 @@ export declare class Evaluator {
      *
      * 示例：
      *
-     * JOIN(['a', 'b', 'c'], '~') 得到 'a~b~c'
+     * JOIN(['a', 'b', 'c'], '=') 得到 'a=b=c'
      *
      * @param {Array<any>} arr 数组
      * @param { String} separator 分隔符

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-formula v2.0.2
+ * amis-formula v2.2.0
  * Copyright 2021-2022 fex
  */
 
@@ -205,6 +205,10 @@ var Evaluator = /** @class */ (function () {
     Evaluator.prototype.add = function (ast) {
         var left = this.evalute(ast.left);
         var right = this.evalute(ast.right);
+        // 如果有一个不是数字就变成字符串拼接
+        if (isNaN(left) || isNaN(right)) {
+            return left + right;
+        }
         return stripNumber(this.formatNumber(left) + this.formatNumber(right));
     };
     Evaluator.prototype.minus = function (ast) {
@@ -532,10 +536,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 +554,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 +572,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);
     };
     /**
@@ -627,6 +622,7 @@ var Evaluator = /** @class */ (function () {
      * @returns {number} 传入数值四舍五入后的结果
      */
     Evaluator.prototype.fnROUND = function (a, b) {
+        if (b === void 0) { b = 2; }
         a = this.formatNumber(a);
         b = this.formatNumber(b);
         var bResult = Math.round(b);
@@ -647,6 +643,7 @@ var Evaluator = /** @class */ (function () {
      * @returns {number} 传入数值向下取整后的结果
      */
     Evaluator.prototype.fnFLOOR = function (a, b) {
+        if (b === void 0) { b = 2; }
         a = this.formatNumber(a);
         b = this.formatNumber(b);
         var bResult = Math.round(b);
@@ -667,6 +664,7 @@ var Evaluator = /** @class */ (function () {
      * @returns {number} 传入数值向上取整后的结果
      */
     Evaluator.prototype.fnCEIL = function (a, b) {
+        if (b === void 0) { b = 2; }
         a = this.formatNumber(a);
         b = this.formatNumber(b);
         var bResult = Math.round(b);
@@ -703,10 +701,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 +722,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;
@@ -1417,8 +1409,11 @@ var Evaluator = /** @class */ (function () {
             .toDate();
     };
     Evaluator.prototype.normalizeDate = function (raw) {
+        if (typeof raw === 'number' || !isNaN(raw)) {
+            return new Date(Number(raw));
+        }
         if (typeof raw === 'string') {
-            var formats = ['', 'YYYY-MM-DD HH:mm:ss'];
+            var formats = ['', 'YYYY-MM-DD HH:mm:ss', 'X'];
             while (formats.length) {
                 var format = formats.shift();
                 var date = moment__default["default"](raw, format);
@@ -1427,9 +1422,6 @@ var Evaluator = /** @class */ (function () {
                 }
             }
         }
-        else if (typeof raw === 'number') {
-            return new Date(raw);
-        }
         return raw;
     };
     /**
@@ -1712,7 +1704,7 @@ var Evaluator = /** @class */ (function () {
      *
      * 示例：
      *
-     * JOIN(['a', 'b', 'c'], '~') 得到 'a~b~c'
+     * JOIN(['a', 'b', 'c'], '=') 得到 'a=b=c'
      *
      * @param {Array<any>} arr 数组
      * @param { String} separator 分隔符
@@ -1788,13 +1780,21 @@ function parseJson(str, defaultValue) {
     }
 }
 function stripNumber(number) {
-    if (typeof number === 'number') {
+    if (typeof number === 'number' && !Number.isInteger(number)) {
         return parseFloat(number.toPrecision(12));
     }
     else {
         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,12 +1,12 @@
 {
   "name": "amis-formula",
-  "version": "2.0.2",
+  "version": "2.2.0",
   "description": "负责 amis 里面的表达式实现，内置公式，编辑器等",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
     "build": "npm run clean-dist && NODE_ENV=production rollup -c && npm run genDoc && npm run declaration ",
-    "lib": "npm run clean-dist && NODE_ENV=lib rollup -c",
+    "lib": "npm run clean-dist && NODE_ENV=production IS_LIB=1 rollup -c",
     "clean-dist": "rimraf lib/*",
     "declaration": "tsc --project tsconfig-for-declaration.json --allowJs --declaration --emitDeclarationOnly --declarationDir ./lib --rootDir ./src",
     "test": "jest",
@@ -35,14 +35,14 @@
   "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": {
-    "@rollup/plugin-commonjs": "^22.0.0",
+    "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
-    "@rollup/plugin-typescript": "^8.3.2",
+    "@rollup/plugin-typescript": "^8.3.4",
     "@types/doctrine": "0.0.5",
     "@types/jest": "^28.1.0",
     "@types/lodash": "^4.14.175",
@@ -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": "8e92bd5c8ec412e9730ac424ab38d248aa122c8b"
 }