amis-formula 1.2.9 → 1.3.0

package/dist/evalutor.d.ts

@@ -9,6 +9,10 @@ export interface FunctionMap {
 }
 export interface FilterContext {
     data: Object;
+    filter?: {
+        name: string;
+        args: Array<any>;
+    };
     restFilters: Array<{
         name: string;
         args: Array<any>;

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-formula v1.2.9
+ * amis-formula v1.3.0
  * Copyright 2021 fex
  */
 
@@ -1236,6 +1236,7 @@ var Evaluator = /** @class */ (function () {
         var input = this.evalute(ast.input);
         var filters = ast.filters.concat();
         var context = {
+            filter: undefined,
             data: this.context,
             restFilters: filters
         };
@@ -1245,6 +1246,7 @@ var Evaluator = /** @class */ (function () {
             if (!fn) {
                 throw new Error("filter `".concat(filter.name, "` not exits"));
             }
+            context.filter = filter;
             input = fn.apply(context, [input].concat(filter.args.map(function (item) {
                 if ((item === null || item === void 0 ? void 0 : item.type) === 'mixed') {
                     return item.body
@@ -4669,20 +4671,28 @@ var filters = {
     },
     last: function (input) { return input && (input.length ? input[input.length - 1] : null); },
     minus: function (input, step) {
+        var _a;
         if (step === void 0) { step = 1; }
-        return stripNumber((Number(input) || 0) - Number(getStrOrVariable(step, this.data)));
+        return stripNumber((Number(input) || 0) -
+            Number(getStrOrVariable(step, this.data, (_a = this.filter) === null || _a === void 0 ? void 0 : _a.args[0])));
     },
     plus: function (input, step) {
+        var _a;
         if (step === void 0) { step = 1; }
-        return stripNumber((Number(input) || 0) + Number(getStrOrVariable(step, this.data)));
+        return stripNumber((Number(input) || 0) +
+            Number(getStrOrVariable(step, this.data, (_a = this.filter) === null || _a === void 0 ? void 0 : _a.args[0])));
     },
     times: function (input, step) {
+        var _a;
         if (step === void 0) { step = 1; }
-        return stripNumber((Number(input) || 0) * Number(getStrOrVariable(step, this.data)));
+        return stripNumber((Number(input) || 0) *
+            Number(getStrOrVariable(step, this.data, (_a = this.filter) === null || _a === void 0 ? void 0 : _a.args[0])));
     },
     division: function (input, step) {
+        var _a;
         if (step === void 0) { step = 1; }
-        return stripNumber((Number(input) || 0) / Number(getStrOrVariable(step, this.data)));
+        return stripNumber((Number(input) || 0) /
+            Number(getStrOrVariable(step, this.data, (_a = this.filter) === null || _a === void 0 ? void 0 : _a.args[0])));
     },
     count: function (input) {
         return Array.isArray(input) || typeof input === 'string' ? input.length : 0;
@@ -4726,9 +4736,10 @@ var filters = {
             args[_i - 1] = arguments[_i];
         }
         return Array.isArray(input)
-            ? input.concat.apply(input, args.map(function (arg) { return getStrOrVariable(arg, _this.data); })) : input;
+            ? input.concat.apply(input, args.map(function (arg, index) { var _a; return getStrOrVariable(arg, _this.data, (_a = _this.filter) === null || _a === void 0 ? void 0 : _a.args[index]); })) : input;
     },
     filter: function (input, keys, expOrDirective, arg1) {
+        var _a, _b, _c, _d;
         if (!Array.isArray(input) || !keys || !expOrDirective) {
             return input;
         }
@@ -4744,17 +4755,23 @@ var filters = {
             fn = function (value) { return typeof value !== 'undefined'; };
         }
         else if (directive === 'equals' || directive === 'equal') {
-            arg1 = arg1 ? getStrOrVariable(arg1, this.data) : '';
+            arg1 = arg1
+                ? getStrOrVariable(arg1, this.data, (_a = this.filter) === null || _a === void 0 ? void 0 : _a.args[2])
+                : '';
             fn = function (value) { return arg1 == value; };
         }
         else if (directive === 'isIn') {
-            var list_1 = arg1 ? getStrOrVariable(arg1, this.data) : [];
+            var list_1 = arg1
+                ? getStrOrVariable(arg1, this.data, (_b = this.filter) === null || _b === void 0 ? void 0 : _b.args[2])
+                : [];
             list_1 = str2array(list_1);
             list_1 = Array.isArray(list_1) ? list_1 : list_1 ? [list_1] : [];
             fn = function (value) { return (list_1.length ? !!~list_1.indexOf(value) : true); };
         }
         else if (directive === 'notIn') {
-            var list_2 = arg1 ? getStrOrVariable(arg1, this.data) : [];
+            var list_2 = arg1
+                ? getStrOrVariable(arg1, this.data, (_c = this.filter) === null || _c === void 0 ? void 0 : _c.args[2])
+                : [];
             list_2 = str2array(list_2);
             list_2 = Array.isArray(list_2) ? list_2 : list_2 ? [list_2] : [];
             fn = function (value) { return !~list_2.indexOf(value); };
@@ -4764,7 +4781,9 @@ var filters = {
                 directive = 'match';
                 arg1 = expOrDirective;
             }
-            arg1 = arg1 ? getStrOrVariable(arg1, this.data) : '';
+            arg1 = arg1
+                ? getStrOrVariable(arg1, this.data, (_d = this.filter) === null || _d === void 0 ? void 0 : _d.args[2])
+                : '';
             // 比对的值是空时直接返回。
             if (!arg1) {
                 return input;
@@ -4815,38 +4834,43 @@ var filters = {
         return conditionalFilter(input, hasAlternate, this, !input, trueValue, falseValue);
     },
     isMatch: function (input, matchArg, trueValue, falseValue) {
-        var _a;
+        var _a, _b;
         var hasAlternate = arguments.length > 3;
-        matchArg = (_a = getStrOrVariable(matchArg, this.data)) !== null && _a !== void 0 ? _a : matchArg;
+        matchArg =
+            (_b = getStrOrVariable(matchArg, this.data, (_a = this.filter) === null || _a === void 0 ? void 0 : _a.args[0])) !== null && _b !== void 0 ? _b : matchArg;
         return conditionalFilter(input, hasAlternate, this, matchArg && string2regExp("".concat(matchArg), false).test(String(input)), trueValue, falseValue);
     },
     notMatch: function (input, matchArg, trueValue, falseValue) {
-        var _a;
+        var _a, _b;
         var hasAlternate = arguments.length > 3;
-        matchArg = (_a = getStrOrVariable(matchArg, this.data)) !== null && _a !== void 0 ? _a : matchArg;
+        matchArg =
+            (_b = getStrOrVariable(matchArg, this.data, (_a = this.filter) === null || _a === void 0 ? void 0 : _a.args[0])) !== null && _b !== void 0 ? _b : matchArg;
         return conditionalFilter(input, hasAlternate, this, matchArg && !string2regExp("".concat(matchArg), false).test(String(input)), trueValue, falseValue);
     },
     isEquals: function (input, equalsValue, trueValue, falseValue) {
-        var _a;
+        var _a, _b;
         equalsValue =
-            (_a = getStrOrVariable(equalsValue, this.data)) !== null && _a !== void 0 ? _a : equalsValue;
+            (_b = getStrOrVariable(equalsValue, this.data, (_a = this.filter) === null || _a === void 0 ? void 0 : _a.args[0])) !== null && _b !== void 0 ? _b : equalsValue;
         var hasAlternate = arguments.length > 3;
         return conditionalFilter(input, hasAlternate, this, input === equalsValue, trueValue, falseValue);
     },
     notEquals: function (input, equalsValue, trueValue, falseValue) {
-        var _a;
+        var _a, _b;
         equalsValue =
-            (_a = getStrOrVariable(equalsValue, this.data)) !== null && _a !== void 0 ? _a : equalsValue;
+            (_b = getStrOrVariable(equalsValue, this.data, (_a = this.filter) === null || _a === void 0 ? void 0 : _a.args[0])) !== null && _b !== void 0 ? _b : equalsValue;
         var hasAlternate = arguments.length > 3;
         return conditionalFilter(input, hasAlternate, this, input !== equalsValue, trueValue, falseValue);
     }
 };
 function conditionalFilter(input, hasAlternate, filterContext, test, trueValue, falseValue) {
-    var _a;
+    var _a, _b, _c;
     (hasAlternate || test) && skipRestTest(filterContext.restFilters);
     var result = test ? trueValue : falseValue;
+    var ast = test
+        ? (_a = filterContext.filter) === null || _a === void 0 ? void 0 : _a.args[1]
+        : (_b = filterContext.filter) === null || _b === void 0 ? void 0 : _b.args[2];
     return test || hasAlternate
-        ? (_a = getStrOrVariable(result, filterContext.data)) !== null && _a !== void 0 ? _a : result
+        ? (_c = getStrOrVariable(result, filterContext.data, ast)) !== null && _c !== void 0 ? _c : result
         : input;
 }
 /**
@@ -4856,7 +4880,12 @@ function conditionalFilter(input, hasAlternate, filterContext, test, trueValue,
  * @param value 传入字符
  * @param data 数据域
  */
-function getStrOrVariable(value, data) {
+function getStrOrVariable(value, data, ast) {
+    // 通过读取 ast 来判断，只有 literal 才可能是变量，也可能是字符串
+    // 其他的直接返回值即可。
+    if ((ast === null || ast === void 0 ? void 0 : ast.type) && ast.type !== 'literal') {
+        return value;
+    }
     return typeof value === 'string' && /,/.test(value)
         ? value.split(/\s*,\s*/).filter(function (item) { return item; })
         : typeof value === 'string'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-formula",
-  "version": "1.2.9",
+  "version": "1.3.0",
   "description": "负责 amis 里面的表达式实现，内置公式，编辑器等",
   "main": "dist/index.js",
   "scripts": {