amis-core 2.8.0 → 3.0.0

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

@@ -1,5 +1,6 @@
 import { PlainObject } from '../types';
 export declare const valueMap: PlainObject;
+export declare const inheritValueMap: PlainObject;
 interface extra {
     pre?: string;
     suf?: string;
@@ -7,7 +8,7 @@ interface extra {
 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 +17,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 declare function insertCustomStyle(themeCss: any, classNames: {
     key: string;
     value?: string;
     weights?: {
@@ -32,5 +33,9 @@ export declare function insertCustomStyle(css: any, classNames: {
         active?: extra;
         disabled?: extra;
     };
-}[], id?: string): void;
+}[], id?: string, defaultData?: any): void;
+/**
+ * 根据路径获取默认值
+ */
+export declare function getValueByPath(path: string, data: any): any;
 export {};

package/lib/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -9,6 +9,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var helper = require('./helper.js');
+var cloneDeep = require('lodash/cloneDeep');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 
 var valueMap = {
     'marginTop': 'margin-top',
@@ -35,6 +40,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) {
@@ -54,10 +63,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 = [];
@@ -69,7 +115,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) {
@@ -77,7 +123,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', '')) || '')) {
                 classNameList.push(n);
             }
         });
@@ -112,6 +158,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 = [];
@@ -155,12 +202,13 @@ function formatStyle(css, classNames, id) {
                             className: cx + status2string[status_1],
                             content: ".".concat(cx + status2string[status_1], " {\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) {
@@ -194,17 +242,40 @@ function formatStyle(css, classNames, id) {
         origin: res
     };
 }
-function insertCustomStyle(css, classNames, id) {
-    if (!css) {
+function insertCustomStyle(themeCss, classNames, id, defaultData) {
+    if (!themeCss) {
         return;
     }
-    var value = formatStyle(css, classNames, id).value;
-    insertStyle(value, (id === null || id === void 0 ? void 0 : id.replace('u:', '')) || helper.uuid());
+    var value = formatStyle(themeCss, classNames, id, defaultData).value;
+    if (value) {
+        insertStyle(value, (id === null || id === void 0 ? void 0 : id.replace('u:', '')) || helper.uuid());
+    }
+}
+/**
+ * 根据路径获取默认值
+ */
+function getValueByPath(path, data) {
+    try {
+        if (!path || !data) {
+            return null;
+        }
+        var keys = path.split('.');
+        var value = cloneDeep__default["default"](data.component);
+        for (var i = 0; i < keys.length; i++) {
+            value = value[keys[i]];
+        }
+        return value;
+    }
+    catch (e) {
+        return null;
+    }
 }
 
 exports.addStyle = addStyle;
 exports.findOrCreactStyle = findOrCreactStyle;
 exports.formatStyle = formatStyle;
+exports.getValueByPath = getValueByPath;
+exports.inheritValueMap = inheritValueMap;
 exports.insertCustomStyle = insertCustomStyle;
 exports.insertStyle = insertStyle;
 exports.valueMap = valueMap;

package/lib/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -7,9 +7,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('tslib');
 require('amis-formula');
 require('moment');
-require('tslib');
 require('lodash/isPlainObject');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('./filter.js');

package/lib/utils/toNumber.js

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

package/lib/utils/tokenize.d.ts

@@ -1 +1,2 @@
 export declare const tokenize: (str: string, data: object, defaultFilter?: string) => string;
+export declare const asyncTokenize: (str: string, data: object, defaultFilter?: string) => Promise<string>;

package/lib/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -7,6 +7,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var amisFormula = require('amis-formula');
 
 var tokenize = function (str, data, defaultFilter) {
@@ -29,5 +30,36 @@ var tokenize = function (str, data, defaultFilter) {
         return str;
     }
 };
+var asyncTokenize = function (str, data, defaultFilter) {
+    if (defaultFilter === void 0) { defaultFilter = '| html'; }
+    return tslib.__awaiter(void 0, void 0, void 0, function () {
+        var ast, result, e_1;
+        return tslib.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!str || typeof str !== 'string') {
+                        return [2 /*return*/, str];
+                    }
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    ast = amisFormula.parse(str, {
+                        evalMode: false,
+                        allowFilter: true
+                    });
+                    return [4 /*yield*/, amisFormula.evaluateForAsync(ast, data, { defaultFilter: defaultFilter })];
+                case 2:
+                    result = _a.sent();
+                    return [2 /*return*/, "".concat(result == null ? '' : result)];
+                case 3:
+                    e_1 = _a.sent();
+                    console.warn(e_1);
+                    return [2 /*return*/, str];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+};
 
+exports.asyncTokenize = asyncTokenize;
 exports.tokenize = tokenize;

package/lib/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/lib/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -7,9 +7,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var amisFormula = require('amis-formula');
 require('moment');
-require('tslib');
 require('lodash/isPlainObject');
 var tokenize = require('./tokenize.js');
 require('./filter.js');
@@ -41,6 +41,7 @@ function matchSynatax(str) {
     return false;
 }
 function register() {
+    var _this = this;
     return {
         name: 'builtin',
         test: function (str) { return typeof str === 'string' && matchSynatax(str); },
@@ -55,6 +56,20 @@ function register() {
             catch (e) {
                 return "error: ".concat(e.message);
             }
+        },
+        asyncCompile: function (str, data, defaultFilter) {
+            if (defaultFilter === void 0) { defaultFilter = '| html'; }
+            return tslib.__awaiter(_this, void 0, void 0, function () {
+                return tslib.__generator(this, function (_a) {
+                    try {
+                        return [2 /*return*/, tokenize.asyncTokenize(str, data, defaultFilter)];
+                    }
+                    catch (e) {
+                        return [2 /*return*/, "error: ".concat(e.message)];
+                    }
+                    return [2 /*return*/];
+                });
+            });
         }
     };
 }

package/lib/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -64,7 +64,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/lib/utils/tpl.d.ts

@@ -2,10 +2,19 @@ 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;
+/**
+ * 解析表达式（支持condition-builder）
+ * @param expression 表达式 or condition-builder对象
+ * @param data 上下文
+ * @returns
+ */
+export declare function evalExpressionWithConditionBuilder(expression: any, data?: object, defaultResult?: boolean): Promise<boolean>;
 export declare function setCustomEvalJs(fn: (expression: string, data?: any) => any): void;
 export declare function evalJS(js: string, data: object): any;

package/lib/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -11,6 +11,7 @@ var tslib = require('tslib');
 var tplBuiltin = require('./tpl-builtin.js');
 var tplLodash = require('./tpl-lodash.js');
 var amisFormula = require('amis-formula');
+var resolveCondition = require('./resolveCondition.js');
 
 var enginers = {};
 function registerTplEnginer(name, enginer) {
@@ -37,6 +38,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, tslib.__spreadArray([tpl, data], tslib.__read(rest), false));
+        }
+        else if (enginer.removeEscapeToken) {
+            tpl = enginer.removeEscapeToken(tpl);
+        }
+    }
+    return tpl;
+}
 // 缓存一下提升性能
 var EVAL_CACHE = {};
 var customEvalExpressionFn;
@@ -83,6 +105,25 @@ function evalExpression(expression, data) {
         return false;
     }
 }
+/**
+ * 解析表达式（支持condition-builder）
+ * @param expression 表达式 or condition-builder对象
+ * @param data 上下文
+ * @returns
+ */
+function evalExpressionWithConditionBuilder(expression, data, defaultResult) {
+    return tslib.__awaiter(this, void 0, void 0, function () {
+        return tslib.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!(Object.prototype.toString.call(expression) === '[object Object]')) return [3 /*break*/, 2];
+                    return [4 /*yield*/, resolveCondition.resolveCondition(expression, data, defaultResult)];
+                case 1: return [2 /*return*/, _a.sent()];
+                case 2: return [2 /*return*/, evalExpression(String(expression), data)];
+            }
+        });
+    });
+}
 var AST_CACHE = {};
 function evalFormula(expression, data) {
     var ast = AST_CACHE[expression] ||
@@ -128,11 +169,14 @@ function evalJS(js, data) {
     registerTplEnginer(info.name, {
         test: info.test,
         compile: info.compile,
+        asyncCompile: info.asyncCompile,
         removeEscapeToken: info.removeEscapeToken
     });
 });
 
+exports.asyncFilter = asyncFilter;
 exports.evalExpression = evalExpression;
+exports.evalExpressionWithConditionBuilder = evalExpressionWithConditionBuilder;
 exports.evalJS = evalJS;
 exports.filter = filter;
 exports.registerTplEnginer = registerTplEnginer;

package/lib/utils/uncontrollable.js

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

package/lib/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;

package/lib/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -358,12 +358,16 @@ var validateMessages = {
     isVariableName: 'validate.isVariableName'
 };
 function validate(value, values, rules, messages, __) {
+    var _a;
     if (__ === void 0) { __ = function (str) { return str; }; }
     var errors = [];
-    rules &&
-        Object.keys(rules).forEach(function (ruleName) {
+    if (rules) {
+        var ruleNames = Object.keys(rules);
+        var length_1 = ruleNames.length;
+        for (var index = 0; index < length_1; index++) {
+            var ruleName = ruleNames[index];
             if (!rules[ruleName] && rules[ruleName] !== 0) {
-                return;
+                continue;
             }
             else if (typeof validations[ruleName] !== 'function') {
                 throw new Error('Validation `' + ruleName + '` not exists!');
@@ -375,19 +379,30 @@ function validate(value, values, rules, messages, __) {
                 }
                 return item;
             });
-            if (!fn.apply(void 0, tslib.__spreadArray([values, value], tslib.__read(args), false))) {
+            var validateRes = fn.apply(void 0, tslib.__spreadArray([values, value], tslib.__read(args), false));
+            // addRule 允许返回
+            //   {error: true, msg: '错误提示'}
+            // 格式的信息来灵活展示错误
+            var fnResErrorMsg = '';
+            if (typeof validateRes === 'object' &&
+                validateRes.error === true) {
+                fnResErrorMsg = (_a = validateRes === null || validateRes === void 0 ? void 0 : validateRes.msg) !== null && _a !== void 0 ? _a : '';
+            }
+            if (!validateRes || fnResErrorMsg) {
                 var msgRuleName = ruleName;
                 if (Array.isArray(value)) {
                     msgRuleName = "".concat(ruleName, "Array");
                 }
-                errors.push({
-                    rule: ruleName,
-                    msg: tpl.filter(__((messages && messages[ruleName]) ||
-                        validateMessages[msgRuleName] ||
-                        validateMessages[ruleName]), tslib.__assign({}, [''].concat(args)))
-                });
+                return [{
+                        rule: ruleName,
+                        msg: tpl.filter(__((messages && messages[ruleName]) ||
+                            fnResErrorMsg ||
+                            validateMessages[msgRuleName] ||
+                            validateMessages[ruleName]), tslib.__assign({}, [''].concat(args)))
+                    }];
             }
-        });
+        }
+    }
     return errors;
 }
 function validateObject(values, rules, messages, __) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-core",
-  "version": "2.8.0",
+  "version": "3.0.0",
   "description": "amis-core",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -17,8 +17,8 @@
     "@types/file-saver": "^2.0.1",
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/jest": "^28.1.0",
-    "@types/react": "^17.0.39",
-    "@types/react-dom": "^17.0.11",
+    "@types/react": "^18.0.24",
+    "@types/react-dom": "^18.0.8",
     "immutable": "^4.1.0",
     "jest": "^29.0.3",
     "jest-environment-jsdom": "^29.0.3",
@@ -45,7 +45,7 @@
     "esm"
   ],
   "dependencies": {
-    "amis-formula": "^2.8.0",
+    "amis-formula": "^3.0.0",
     "classnames": "2.3.1",
     "file-saver": "^2.0.2",
     "hoist-non-react-statics": "^3.3.2",
@@ -101,5 +101,5 @@
       "/.rollup.cache/"
     ]
   },
-  "gitHead": "b92b6ca54eb2bbe0029d79b9d185ff2ee6d8d7d5"
+  "gitHead": "9220b4c13f4d042ebf2bf1dd8ee8e24d11e39141"
 }