amis-core 2.9.0 → 3.1.0

package/esm/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -15,9 +15,11 @@ import capitalize from 'lodash/capitalize';
 
 var conditionResolverMap = {};
 var DEFAULT_RESULT = true;
+var conditionComputeErrorHandler;
 function resolveCondition(conditions, data, defaultResult) {
     if (defaultResult === void 0) { defaultResult = true; }
     return __awaiter(this, void 0, void 0, function () {
+        var e_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -27,8 +29,18 @@ function resolveCondition(conditions, data, defaultResult) {
                         !conditions.children.length) {
                         return [2 /*return*/, defaultResult];
                     }
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 6]);
                     return [4 /*yield*/, computeConditions(conditions.children, conditions.conjunction, data)];
-                case 1: return [2 /*return*/, _a.sent()];
+                case 2: return [2 /*return*/, _a.sent()];
+                case 3:
+                    e_1 = _a.sent();
+                    if (!(e_1.name === 'FormulaEvalError')) return [3 /*break*/, 5];
+                    return [4 /*yield*/, (conditionComputeErrorHandler === null || conditionComputeErrorHandler === void 0 ? void 0 : conditionComputeErrorHandler(conditions.children, conditions.conjunction, data))];
+                case 4: return [2 /*return*/, _a.sent()];
+                case 5: return [2 /*return*/, defaultResult];
+                case 6: return [2 /*return*/];
             }
         });
     });
@@ -79,7 +91,7 @@ function computeCondition(rule, index, data) {
             switch (_b.label) {
                 case 0:
                     leftValue = get(data, rule.left.field);
-                    return [4 /*yield*/, resolveVariableAndFilterForAsync(rule.right, data)];
+                    return [4 /*yield*/, resolveVariableAndFilterForAsync(rule.right, data, undefined, undefined, true)];
                 case 1:
                     rightValue = _b.sent();
                     func = (_a = conditionResolverMap["".concat(rule.op, "For").concat(capitalize(rule.left.type))]) !== null && _a !== void 0 ? _a : conditionResolverMap[rule.op];
@@ -268,6 +280,9 @@ function registerConditionComputer(op, func, fieldType) {
 function getConditionComputers() {
     return conditionResolverMap;
 }
+function setConditionComputeErrorHandler(fn) {
+    conditionComputeErrorHandler = fn;
+}
 registerConditionComputer('greater', greaterFunc);
 registerConditionComputer('greater', greaterForDateFunc, 'date');
 registerConditionComputer('greater', greaterForDateFunc, 'time');
@@ -303,4 +318,4 @@ registerConditionComputer('select_not_any_in', selectNotAnyInFunc);
 registerConditionComputer('starts_with', startsWithFunc);
 registerConditionComputer('ends_with', endsWithFunc);
 
-export { getConditionComputers, registerConditionComputer, resolveCondition };
+export { getConditionComputers, registerConditionComputer, resolveCondition, setConditionComputeErrorHandler };

package/esm/utils/resolveVariable.js

@@ -1,10 +1,11 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
-import { Evaluator, parse } from 'amis-formula';
+import { Evaluator } from 'amis-formula';
 import { getVariable } from './getVariable.js';
+import { memoryParse } from './memoryParse.js';
 
 function resolveVariable(path, data, canAccessSuper) {
     if (data === void 0) { data = {}; }
@@ -22,7 +23,7 @@ function resolveVariable(path, data, canAccessSuper) {
     // 带 namespace 的用公式
     // 主要是用公式会严格点，不能出现奇怪的变量名
     try {
-        return new Evaluator(data).evalute(parse(path, {
+        return new Evaluator(data).evalute(memoryParse(path, {
             variableMode: true,
             allowFilter: false
         }));

package/esm/utils/resolveVariableAndFilter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/resolveVariableAndFilterForAsync.d.ts

@@ -1 +1,6 @@
-export declare const resolveVariableAndFilterForAsync: (path?: string, data?: object, defaultFilter?: string, fallbackValue?: (value: any) => any) => Promise<any>;
+/**
+ * 设置自定义函数，functions中找不到处理的函数时执行
+ * @param fn
+ */
+export declare function setFormulaEvalErrorHandler(fn: (path: string, data?: object, ...args: any[]) => any): void;
+export declare const resolveVariableAndFilterForAsync: (path?: string, data?: object, defaultFilter?: string, fallbackValue?: (value: any) => any, skipFormulaEvalErrorHandler?: boolean) => Promise<any>;

package/esm/utils/resolveVariableAndFilterForAsync.js

@@ -1,15 +1,25 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
 import { __awaiter, __generator } from 'tslib';
-import { parse, AsyncEvaluator } from 'amis-formula';
+import { AsyncEvaluator } from 'amis-formula';
+import { memoryParse } from './memoryParse.js';
 
-var resolveVariableAndFilterForAsync = function (path, data, defaultFilter, fallbackValue) {
+var formulaEvalErrorHandler;
+/**
+ * 设置自定义函数，functions中找不到处理的函数时执行
+ * @param fn
+ */
+function setFormulaEvalErrorHandler(fn) {
+    formulaEvalErrorHandler = fn;
+}
+var resolveVariableAndFilterForAsync = function (path, data, defaultFilter, fallbackValue, skipFormulaEvalErrorHandler) {
     if (data === void 0) { data = {}; }
     if (defaultFilter === void 0) { defaultFilter = '| html'; }
     if (fallbackValue === void 0) { fallbackValue = function (value) { return value; }; }
+    if (skipFormulaEvalErrorHandler === void 0) { skipFormulaEvalErrorHandler = false; }
     return __awaiter(void 0, void 0, void 0, function () {
         var ast, ret, e_1;
         return __generator(this, function (_a) {
@@ -21,7 +31,7 @@ var resolveVariableAndFilterForAsync = function (path, data, defaultFilter, fall
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
-                    ast = parse(path, {
+                    ast = memoryParse(path, {
                         evalMode: false,
                         allowFilter: true
                     });
@@ -35,6 +45,14 @@ var resolveVariableAndFilterForAsync = function (path, data, defaultFilter, fall
                             : ret];
                 case 3:
                     e_1 = _a.sent();
+                    if (e_1.name === 'FormulaEvalError') {
+                        if (!skipFormulaEvalErrorHandler) {
+                            // 无法解析时，执行handler自定义解析逻辑
+                            return [2 /*return*/, formulaEvalErrorHandler === null || formulaEvalErrorHandler === void 0 ? void 0 : formulaEvalErrorHandler(path, data, defaultFilter, fallbackValue)];
+                        }
+                        // 跳过自定义解析逻辑，则直接抛异常
+                        throw e_1;
+                    }
                     console.warn(e_1);
                     return [2 /*return*/, undefined];
                 case 4: return [2 /*return*/];
@@ -43,4 +61,4 @@ var resolveVariableAndFilterForAsync = function (path, data, defaultFilter, fall
     });
 };
 
-export { resolveVariableAndFilterForAsync };
+export { resolveVariableAndFilterForAsync, setFormulaEvalErrorHandler };

package/esm/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/style-helper.d.ts

@@ -1,13 +1,16 @@
 import { PlainObject } from '../types';
 export declare const valueMap: PlainObject;
+export declare const inheritValueMap: PlainObject;
 interface extra {
+    important?: boolean;
+    inner?: string;
     pre?: string;
     suf?: string;
 }
 export declare function findOrCreactStyle(id: string): HTMLElement;
 export declare function insertStyle(style: string, id: string): void;
 export declare function addStyle(style: string, id: string): void;
-export declare function formatStyle(css: any, classNames: {
+export declare function formatStyle(themeCss: any, classNames: {
     key: string;
     value?: string;
     weights?: {
@@ -16,14 +19,14 @@ export declare function formatStyle(css: any, classNames: {
         active?: extra;
         disabled?: extra;
     };
-}[], id?: string): {
+}[], id?: string, defaultData?: any): {
     value: string;
     origin: {
         className: string;
         content: string;
     }[];
 };
-export declare function insertCustomStyle(css: any, classNames: {
+export interface CustomStyleClassName {
     key: string;
     value?: string;
     weights?: {
@@ -32,5 +35,10 @@ export declare function insertCustomStyle(css: any, classNames: {
         active?: extra;
         disabled?: extra;
     };
-}[], id?: string): void;
+}
+export declare function insertCustomStyle(themeCss: any, classNames: CustomStyleClassName[], id?: string, defaultData?: any, customStyleClassPrefix?: string): void;
+/**
+ * 根据路径获取默认值
+ */
+export declare function getValueByPath(path: string, data: any): any;
 export {};

package/esm/utils/style-helper.js

@@ -1,10 +1,11 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
 import { __values } from 'tslib';
 import { uuid } from './helper.js';
+import cloneDeep from 'lodash/cloneDeep';
 
 var valueMap = {
     'marginTop': 'margin-top',
@@ -31,6 +32,10 @@ var valueMap = {
     'fontWeight': 'font-weight',
     'lineHeight': 'line-height'
 };
+var inheritValueMap = {
+    background: 'bg-color',
+    radius: 'border'
+};
 function findOrCreactStyle(id) {
     var varStyleTag = document.getElementById(id);
     if (!varStyleTag) {
@@ -50,10 +55,47 @@ function addStyle(style, id) {
     // bca-disable-line
     varStyleTag.innerHTML += style;
 }
-function formatStyle(css, classNames, id) {
+// 继承数据处理
+function handleInheritData(statusMap, data) {
+    if (!data) {
+        return;
+    }
+    // 检查是否存在inherit
+    ['hover', 'active'].forEach(function (status) {
+        for (var key in statusMap[status]) {
+            if (typeof statusMap[status][key] === 'object') {
+                for (var style in statusMap[status][key]) {
+                    if (statusMap[status][key][style] === 'inherit') {
+                        // 值为inherit时设置为default的值或者主题中的default值
+                        if (statusMap['default'][key] && statusMap['default'][key][style]) {
+                            statusMap[status][key][style] = statusMap.default[key][style];
+                        }
+                        else {
+                            var value = inheritValueMap[key] || key;
+                            statusMap[status][key][style] =
+                                data['default'].body[value][style];
+                        }
+                    }
+                }
+            }
+            else {
+                if (statusMap[status][key] === 'inherit') {
+                    if (statusMap['default'][key] && statusMap['default'][key]) {
+                        statusMap[status][key] = statusMap.default[key];
+                    }
+                    else {
+                        var value = inheritValueMap[key] || key;
+                        statusMap[status][key] = data['default'].body[value];
+                    }
+                }
+            }
+        }
+    });
+}
+function formatStyle(themeCss, classNames, id, defaultData) {
     var e_1, _a;
     var _b;
-    if (!css) {
+    if (!themeCss) {
         return { value: '', origin: [] };
     }
     var res = [];
@@ -65,7 +107,7 @@ function formatStyle(css, classNames, id) {
     };
     var _loop_1 = function (item) {
         var e_2, _c;
-        var body = css[item.key];
+        var body = themeCss[item.key];
         var list = (_b = item.value) === null || _b === void 0 ? void 0 : _b.split(' ');
         var classNameList = [];
         if (!body) {
@@ -73,7 +115,7 @@ function formatStyle(css, classNames, id) {
         }
         list === null || list === void 0 ? void 0 : list.forEach(function (n) {
             if (/(\S*[C|c]lassName-\S*)/.test(n) &&
-                !!~n.indexOf((id === null || id === void 0 ? void 0 : id.replace('u:', '').replace('-label', '').replace('-description', '').replace('-addOn', '')) || '')) {
+                !!~n.indexOf((id === null || id === void 0 ? void 0 : id.replace('u:', '').replace('-label', '').replace('-description', '').replace('-addOn', '').replace('-icon', '').replace('-inner', '')) || '')) {
                 classNameList.push(n);
             }
         });
@@ -108,6 +150,7 @@ function formatStyle(css, classNames, id) {
                         statusMap.default[key] = body[key];
                     }
                 }
+                handleInheritData(statusMap, defaultData);
                 var _loop_2 = function (status_1) {
                     var weights = weightsList[status_1];
                     var styles = [];
@@ -142,21 +185,31 @@ function formatStyle(css, classNames, id) {
                         }
                         else {
                             var value = style;
-                            value && fn(key, value);
+                            if (key === 'iconSize') {
+                                fn('width', value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
+                                fn('height', value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
+                                fn('font-size', value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
+                            }
+                            else {
+                                value &&
+                                    fn(key, value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
+                            }
                         }
                     }
                     if (styles.length > 0) {
                         var cx = ((weights === null || weights === void 0 ? void 0 : weights.pre) || '') + className + ((weights === null || weights === void 0 ? void 0 : weights.suf) || '');
+                        var inner = (weights === null || weights === void 0 ? void 0 : weights.inner) || '';
                         res.push({
-                            className: cx + status2string[status_1],
-                            content: ".".concat(cx + status2string[status_1], " {\n  ").concat(styles.join('\n  '), "\n}")
+                            className: cx + status2string[status_1] + inner,
+                            content: ".".concat(cx + status2string[status_1], " ").concat(inner, "{\n  ").concat(styles.join('\n  '), "\n}")
                         });
-                        if (['hover', 'active', 'disabled'].includes(status_1)) {
-                            res.push({
-                                className: cx + '.' + status_1,
-                                content: ".".concat(cx, ".").concat(status_1, " {\n  ").concat(styles.join('\n  '), "\n}")
-                            });
-                        }
+                        // TODO:切换状态暂时先不改变组件的样式
+                        // if (['hover', 'active', 'disabled'].includes(status)) {
+                        //   res.push({
+                        //     className: cx + '.' + status,
+                        //     content: `.${cx}.${status} {\n  ${styles.join('\n  ')}\n}`
+                        //   });
+                        // }
                     }
                 };
                 for (var status_1 in statusMap) {
@@ -190,12 +243,36 @@ function formatStyle(css, classNames, id) {
         origin: res
     };
 }
-function insertCustomStyle(css, classNames, id) {
-    if (!css) {
+function insertCustomStyle(themeCss, classNames, id, defaultData, customStyleClassPrefix) {
+    if (!themeCss) {
         return;
     }
-    var value = formatStyle(css, classNames, id).value;
-    insertStyle(value, (id === null || id === void 0 ? void 0 : id.replace('u:', '')) || uuid());
+    var value = formatStyle(themeCss, classNames, id, defaultData).value;
+    if (value) {
+        value = customStyleClassPrefix
+            ? "".concat(customStyleClassPrefix, " ").concat(value)
+            : value;
+        insertStyle(value, (id === null || id === void 0 ? void 0 : id.replace('u:', '')) || uuid());
+    }
+}
+/**
+ * 根据路径获取默认值
+ */
+function getValueByPath(path, data) {
+    try {
+        if (!path || !data) {
+            return null;
+        }
+        var keys = path.split('.');
+        var value = cloneDeep(data.component);
+        for (var i = 0; i < keys.length; i++) {
+            value = value[keys[i]];
+        }
+        return value;
+    }
+    catch (e) {
+        return null;
+    }
 }
 
-export { addStyle, findOrCreactStyle, formatStyle, insertCustomStyle, insertStyle, valueMap };
+export { addStyle, findOrCreactStyle, formatStyle, getValueByPath, inheritValueMap, insertCustomStyle, insertStyle, valueMap };

package/esm/utils/style.js

@@ -1,11 +1,11 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
+import 'tslib';
 import 'amis-formula';
 import 'moment';
-import 'tslib';
 import 'lodash/isPlainObject';
 import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
 import './filter.js';

package/esm/utils/toNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/tpl-builtin.d.ts

@@ -10,9 +10,10 @@ import { stripNumber } from './stripNumber';
 import { tokenize } from './tokenize';
 import { resolveVariable } from './resolveVariable';
 import { resolveVariableAndFilter } from './resolveVariableAndFilter';
+import { resolveVariableAndFilterForAsync } from './resolveVariableAndFilterForAsync';
 import { dataMapping, resolveMapping, resolveMappingObject } from './dataMapping';
 import './filter';
-export { prettyBytes, escapeHtml, formatDuration, filterDate, relativeValueRe, parseDuration, getFilters, registerFilter, registerFunction, pickValues, isPureVariable, stripNumber, tokenize, resolveVariable, resolveVariableAndFilter, resolveMapping, resolveMappingObject, dataMapping };
+export { prettyBytes, escapeHtml, formatDuration, filterDate, relativeValueRe, parseDuration, getFilters, registerFilter, registerFunction, pickValues, isPureVariable, stripNumber, tokenize, resolveVariable, resolveVariableAndFilter, resolveVariableAndFilterForAsync, resolveMapping, resolveMappingObject, dataMapping };
 export declare function register(): Enginer & {
     name: string;
 };

package/esm/utils/tpl-builtin.js

@@ -1,14 +1,16 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
+import { __awaiter, __generator } from 'tslib';
 export { getFilters, registerFilter, registerFunction } from 'amis-formula';
 import 'moment';
-import 'tslib';
 import 'lodash/isPlainObject';
 import { tokenize } from './tokenize.js';
 export { tokenize } from './tokenize.js';
+import { resolveVariableAndFilterForAsync } from './resolveVariableAndFilterForAsync.js';
+export { resolveVariableAndFilterForAsync } from './resolveVariableAndFilterForAsync.js';
 import './filter.js';
 
 function matchSynatax(str) {
@@ -38,6 +40,7 @@ function matchSynatax(str) {
     return false;
 }
 function register() {
+    var _this = this;
     return {
         name: 'builtin',
         test: function (str) { return typeof str === 'string' && matchSynatax(str); },
@@ -52,6 +55,20 @@ function register() {
             catch (e) {
                 return "error: ".concat(e.message);
             }
+        },
+        asyncCompile: function (str, data, defaultFilter) {
+            if (defaultFilter === void 0) { defaultFilter = '| html'; }
+            return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    try {
+                        return [2 /*return*/, resolveVariableAndFilterForAsync(str, data, defaultFilter)];
+                    }
+                    catch (e) {
+                        return [2 /*return*/, "error: ".concat(e.message)];
+                    }
+                    return [2 /*return*/];
+                });
+            });
         }
     };
 }

package/esm/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -55,7 +55,8 @@ function register() {
     return {
         name: 'lodash',
         test: function (str) { return !!~str.indexOf('<%'); },
-        compile: function (str, data) { return lodashCompile(str, data); }
+        compile: function (str, data) { return lodashCompile(str, data); },
+        asyncCompile: function (str, data) { return lodashCompile(str, data); }
     };
 }
 

package/esm/utils/tpl.d.ts

@@ -2,9 +2,11 @@ export interface Enginer {
     test: (tpl: string) => boolean;
     removeEscapeToken?: (tpl: string) => string;
     compile: (tpl: string, data: object, ...rest: Array<any>) => string;
+    asyncCompile: (tpl: string, data: object, ...rest: Array<any>) => Promise<string>;
 }
 export declare function registerTplEnginer(name: string, enginer: Enginer): void;
 export declare function filter(tpl?: any, data?: object, ...rest: Array<any>): string;
+export declare function asyncFilter(tpl?: any, data?: object, ...rest: Array<any>): Promise<string>;
 export declare function setCustomEvalExpression(fn: (expression: string, data?: any) => boolean): void;
 export declare function evalExpression(expression: string, data?: object): boolean;
 /**

package/esm/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -34,6 +34,27 @@ function filter(tpl, data) {
     }
     return tpl;
 }
+function asyncFilter(tpl, data) {
+    if (data === void 0) { data = {}; }
+    var rest = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+        rest[_i - 2] = arguments[_i];
+    }
+    if (!tpl || typeof tpl !== 'string') {
+        return Promise.resolve('');
+    }
+    var keys = Object.keys(enginers);
+    for (var i = 0, len = keys.length; i < len; i++) {
+        var enginer = enginers[keys[i]];
+        if (enginer.test(tpl)) {
+            return enginer.asyncCompile.apply(enginer, __spreadArray([tpl, data], __read(rest), false));
+        }
+        else if (enginer.removeEscapeToken) {
+            tpl = enginer.removeEscapeToken(tpl);
+        }
+    }
+    return tpl;
+}
 // 缓存一下提升性能
 var EVAL_CACHE = {};
 var customEvalExpressionFn;
@@ -144,8 +165,9 @@ function evalJS(js, data) {
     registerTplEnginer(info.name, {
         test: info.test,
         compile: info.compile,
+        asyncCompile: info.asyncCompile,
         removeEscapeToken: info.removeEscapeToken
     });
 });
 
-export { evalExpression, evalExpressionWithConditionBuilder, evalJS, filter, registerTplEnginer, setCustomEvalExpression, setCustomEvalJs };
+export { asyncFilter, evalExpression, evalExpressionWithConditionBuilder, evalJS, filter, registerTplEnginer, setCustomEvalExpression, setCustomEvalJs };

package/esm/utils/uncontrollable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/validations.d.ts

@@ -1,7 +1,10 @@
 export interface ValidateFn {
     (values: {
         [propsName: string]: any;
-    }, value: any, arg1?: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any): boolean;
+    }, value: any, arg1?: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any): boolean | {
+        error: boolean;
+        msg?: string;
+    };
 }
 export declare const validations: {
     [propsName: string]: ValidateFn;