amis-formula 1.3.9 → 1.3.10

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-formula v1.3.9
+ * amis-formula v1.3.10
  * Copyright 2021-2022 fex
  */
 
@@ -1585,22 +1585,26 @@ var filterDate = function (value, data, format, utc) {
         value = value.trim();
     }
     // todo
-    value = tokenize(value, data);
+    var date = new Date();
+    value = tokenize(value, createObject(data, {
+        now: mm().toDate(),
+        today: mm([date.getFullYear(), date.getMonth(), date.getDate()])
+    }), '| raw');
     if (value && typeof value === 'string' && (m = relativeValueRe.exec(value))) {
-        var date = new Date();
+        var date_1 = new Date();
         var step = parseInt(m[3], 10);
         var from = m[1]
             ? filterDate(m[1], data, format, utc)
             : mm(/(minute|min|hour|second)s?/.test(m[4])
                 ? [
-                    date.getFullYear(),
-                    date.getMonth(),
-                    date.getDate(),
-                    date.getHours(),
-                    date.getMinutes(),
-                    date.getSeconds()
+                    date_1.getFullYear(),
+                    date_1.getMonth(),
+                    date_1.getDate(),
+                    date_1.getHours(),
+                    date_1.getMinutes(),
+                    date_1.getSeconds()
                 ]
-                : [date.getFullYear(), date.getMonth(), date.getDate()]);
+                : [date_1.getFullYear(), date_1.getMonth(), date_1.getDate()]);
         return m[2] === '-'
             ? from.subtract(step, timeUnitMap[m[4]])
             : from.add(step, timeUnitMap[m[4]]);
@@ -1610,11 +1614,12 @@ var filterDate = function (value, data, format, utc) {
         return mm();
     }
     else if (value === 'today') {
-        var date = new Date();
-        return mm([date.getFullYear(), date.getMonth(), date.getDate()]);
+        var date_2 = new Date();
+        return mm([date_2.getFullYear(), date_2.getMonth(), date_2.getDate()]);
     }
     else {
-        return mm(value, format);
+        var result = mm(value);
+        return result.isValid() ? result : mm(value, format);
     }
 };
 function parseDuration(str) {

package/package.json

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