amis-formula 1.3.7 → 1.3.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +31 -19
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-formula v1.3.
|
|
2
|
+
* amis-formula v1.3.8
|
|
3
3
|
* Copyright 2021-2022 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -1502,14 +1502,20 @@ var tokenize = function (str, data, defaultFilter) {
|
|
|
1502
1502
|
if (!str || typeof str !== 'string') {
|
|
1503
1503
|
return str;
|
|
1504
1504
|
}
|
|
1505
|
-
|
|
1506
|
-
|
|
1507
|
-
|
|
1508
|
-
|
|
1509
|
-
|
|
1510
|
-
|
|
1511
|
-
|
|
1512
|
-
|
|
1505
|
+
try {
|
|
1506
|
+
var ast = parse(str, {
|
|
1507
|
+
evalMode: false,
|
|
1508
|
+
allowFilter: true
|
|
1509
|
+
});
|
|
1510
|
+
var result = new Evaluator(data, {
|
|
1511
|
+
defaultFilter: defaultFilter
|
|
1512
|
+
}).evalute(ast);
|
|
1513
|
+
return "".concat(result == null ? '' : result);
|
|
1514
|
+
}
|
|
1515
|
+
catch (e) {
|
|
1516
|
+
console.warn(e);
|
|
1517
|
+
return str;
|
|
1518
|
+
}
|
|
1513
1519
|
};
|
|
1514
1520
|
var UNITS = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
|
|
1515
1521
|
var prettyBytes = function (num) {
|
|
@@ -1693,16 +1699,22 @@ var resolveVariableAndFilter = function (path, data, defaultFilter, fallbackValu
|
|
|
1693
1699
|
if (!path || typeof path !== 'string') {
|
|
1694
1700
|
return undefined;
|
|
1695
1701
|
}
|
|
1696
|
-
|
|
1697
|
-
|
|
1698
|
-
|
|
1699
|
-
|
|
1700
|
-
|
|
1701
|
-
|
|
1702
|
-
|
|
1703
|
-
|
|
1704
|
-
|
|
1705
|
-
|
|
1702
|
+
try {
|
|
1703
|
+
var ast = parse(path, {
|
|
1704
|
+
evalMode: false,
|
|
1705
|
+
allowFilter: true
|
|
1706
|
+
});
|
|
1707
|
+
var ret = new Evaluator(data, {
|
|
1708
|
+
defaultFilter: defaultFilter
|
|
1709
|
+
}).evalute(ast);
|
|
1710
|
+
return ret == null && !~path.indexOf('default') && !~path.indexOf('now')
|
|
1711
|
+
? fallbackValue(ret)
|
|
1712
|
+
: ret;
|
|
1713
|
+
}
|
|
1714
|
+
catch (e) {
|
|
1715
|
+
console.warn(e);
|
|
1716
|
+
return undefined;
|
|
1717
|
+
}
|
|
1706
1718
|
};
|
|
1707
1719
|
|
|
1708
1720
|
/**
|