amis-formula 2.2.0 → 2.3.1

package/lib/doc.js

@@ -65,7 +65,7 @@ exports.doc = [
   },
   {
     name: "XOR",
-    description: "异或处理，两个表达式同时为「真」，或者同时为「假」，则结果返回为「真」",
+    description: "异或处理，多个表达式组中存在奇数个真时认为真。",
     example: "XOR(condition1, condition2)",
     params: [
       {

package/lib/doc.md

@@ -57,7 +57,7 @@
 
 返回：`boolean` 
 
-异或处理，两个表达式同时为「真」，或者同时为「假」，则结果返回为「真」
+异或处理，多个表达式组中存在奇数个真时认为真。
 
 ### IFS
 

package/lib/evalutor.d.ts

@@ -227,7 +227,7 @@ export declare class Evaluator {
      */
     fnOR(...condtions: Array<() => any>): boolean;
     /**
-     * 异或处理，两个表达式同时为「真」，或者同时为「假」，则结果返回为「真」
+     * 异或处理，多个表达式组中存在奇数个真时认为真。
      *
      * @example XOR(condition1, condition2)
      * @param {expression} condition1 - 条件表达式1
@@ -236,7 +236,7 @@ export declare class Evaluator {
      *
      * @returns {boolean}
      */
-    fnXOR(c1: () => any, c2: () => any): boolean;
+    fnXOR(...condtions: Array<() => any>): boolean;
     /**
      * 判断函数集合，相当于多个 else if 合并成一个。
      *

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-formula v2.2.0
+ * amis-formula v2.3.1
  * Copyright 2021-2022 fex
  */
 
@@ -96,7 +96,7 @@ var Evaluator = /** @class */ (function () {
             var filter = filters.shift();
             var fn = this.filters[filter.name];
             if (!fn) {
-                throw new Error("filter `".concat(filter.name, "` not exits"));
+                throw new Error("filter `".concat(filter.name, "` not exists."));
             }
             context.filter = filter;
             input = fn.apply(context, [input].concat(filter.args.map(function (item) {
@@ -467,7 +467,7 @@ var Evaluator = /** @class */ (function () {
         return condtions.some(function (c) { return c(); });
     };
     /**
-     * 异或处理，两个表达式同时为「真」，或者同时为「假」，则结果返回为「真」
+     * 异或处理，多个表达式组中存在奇数个真时认为真。
      *
      * @example XOR(condition1, condition2)
      * @param {expression} condition1 - 条件表达式1
@@ -476,8 +476,12 @@ var Evaluator = /** @class */ (function () {
      *
      * @returns {boolean}
      */
-    Evaluator.prototype.fnXOR = function (c1, c2) {
-        return !!c1() === !!c2();
+    Evaluator.prototype.fnXOR = function () {
+        var condtions = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            condtions[_i] = arguments[_i];
+        }
+        return !!(condtions.filter(function (c) { return c(); }).length % 2);
     };
     /**
      * 判断函数集合，相当于多个 else if 合并成一个。
@@ -828,11 +832,16 @@ var Evaluator = /** @class */ (function () {
      * @returns {string} 数值中文大写字符
      */
     Evaluator.prototype.fnUPPERMONEY = function (n) {
+        var _a;
         n = this.formatNumber(n);
+        var maxLen = 14;
+        if (((_a = n.toString().split('.')[0]) === null || _a === void 0 ? void 0 : _a.length) > maxLen) {
+            return "\u6700\u5927\u6570\u989D\u53EA\u652F\u6301\u5230\u5146(\u65E2\u5C0F\u6570\u70B9\u524D".concat(maxLen, "\u4F4D)");
+        }
         var fraction = ['角', '分'];
         var digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
         var unit = [
-            ['元', '万', '亿'],
+            ['元', '万', '亿', '兆'],
             ['', '拾', '佰', '仟']
         ];
         var head = n < 0 ? '欠' : '';
@@ -1781,7 +1790,7 @@ function parseJson(str, defaultValue) {
 }
 function stripNumber(number) {
     if (typeof number === 'number' && !Number.isInteger(number)) {
-        return parseFloat(number.toPrecision(12));
+        return parseFloat(number.toPrecision(16));
     }
     else {
         return number;
@@ -2051,7 +2060,8 @@ function lexer(input, options) {
         return tokenCache.length ? tokenCache.shift() : null;
     }
     function openScript() {
-        if (mainState === mainStates.Template) {
+        if (mainState === mainStates.Template ||
+            mainState === mainStates.EXPRESSION) {
             return null;
         }
         var ch = input[index];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-formula",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "负责 amis 里面的表达式实现，内置公式，编辑器等",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -41,26 +41,26 @@
   "devDependencies": {
     "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-node-resolve": "^14.1.0",
     "@rollup/plugin-typescript": "^8.3.4",
     "@types/doctrine": "0.0.5",
     "@types/jest": "^28.1.0",
     "@types/lodash": "^4.14.175",
     "doctrine": "^3.0.0",
-    "jest": "^28.1.0",
+    "jest": "^29.0.3",
     "jest-canvas-mock": "^2.3.0",
-    "jest-environment-jsdom": "^28.1.0",
+    "jest-environment-jsdom": "^29.0.3",
     "mini-css-extract-plugin": "^2.4.5",
     "moment-timezone": "^0.5.33",
     "rimraf": "^3.0.2",
     "rollup": "^2.60.2",
     "rollup-plugin-license": "^2.6.0",
     "rollup-plugin-terser": "^7.0.2",
-    "sass": "^1.54.0",
+    "sass": "^1.54.9",
     "sass-loader": "^12.1.0",
     "style-loader": "^3.2.1",
     "stylelint": "^13.0.0",
-    "ts-jest": "^28.0.3",
+    "ts-jest": "^29.0.2",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.4.0",
     "typescript": "^4.3.5"
@@ -77,7 +77,12 @@
       "js"
     ],
     "transform": {
-      "\\.(ts|tsx)$": "ts-jest"
+      "\\.(ts|tsx)$": [
+        "ts-jest",
+        {
+          "diagnostics": false
+        }
+      ]
     },
     "setupFiles": [
       "jest-canvas-mock"
@@ -90,11 +95,10 @@
     "setupFilesAfterEnv": [
       "<rootDir>/__tests__/jest.setup.js"
     ],
-    "globals": {
-      "ts-jest": {
-        "diagnostics": false
-      }
+    "snapshotFormat": {
+      "escapeString": false,
+      "printBasicPrototype": false
     }
   },
-  "gitHead": "8e92bd5c8ec412e9730ac424ab38d248aa122c8b"
+  "gitHead": "af69249562f9de5efbd47fd5553bcdb73b2eab4f"
 }