amis-core 2.9.0 → 3.0.0

package/lib/utils/highlight.js

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

package/lib/utils/icon.d.ts

@@ -6,6 +6,11 @@ import { ClassNamesFn } from '../theme';
 export interface IconCheckedSchema {
     id: string;
     name?: string;
+    svg?: string;
+}
+export interface IconCheckedSchemaNew {
+    type: 'icon';
+    icon: IconCheckedSchema;
 }
 /**
  * 判断字符串来生成 i 或 img
@@ -13,4 +18,4 @@ export interface IconCheckedSchema {
  * @param className 内部用的 className
  * @param classNameProp amis 配置里设置的 className
  */
-export declare const generateIcon: (cx: ClassNamesFn, icon?: string | IconCheckedSchema | React.ReactNode, className?: string, classNameProp?: string) => JSX.Element | null | undefined;
+export declare const generateIcon: (cx: ClassNamesFn, icon?: string | IconCheckedSchema | React.ReactNode | IconCheckedSchemaNew, className?: string, classNameProp?: string) => JSX.Element | null | undefined;

package/lib/utils/icon.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -24,6 +24,11 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
  * @param classNameProp amis 配置里设置的 className
  */
 var generateIcon = function (cx, icon, className, classNameProp) {
+    if (lodash.isObject(icon) &&
+        icon.type === 'icon' &&
+        icon.icon) {
+        icon = icon.icon;
+    }
     if (React__default["default"].isValidElement(icon)) {
         return icon;
     }

package/lib/utils/image.js

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

package/lib/utils/isPureVariable.js

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

package/lib/utils/json-schema-2-amis-schema.js

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

package/lib/utils/keyToPath.js

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

package/lib/utils/makeSorter.js

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

package/lib/utils/normalizeLink.js

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

package/lib/utils/normalizeOptions.js

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

package/lib/utils/object.js

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

package/lib/utils/offset.js

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

package/lib/utils/offsetParent.js

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

package/lib/utils/optionValueCompare.js

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

package/lib/utils/position.js

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

package/lib/utils/prettyBytes.js

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

package/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -42,7 +42,7 @@ function createRendererEvent(type, context) {
 // 绑定事件
 var bindEvent = function (renderer) {
     var e_1, _a;
-    var _b, _c;
+    var _b, _c, _d;
     if (!renderer) {
         return undefined;
     }
@@ -57,15 +57,16 @@ var bindEvent = function (renderer) {
                 rendererEventListeners = rendererEventListeners.filter(function (item) {
                     return !(item.renderer === listener.renderer && item.type === listener.type);
                 });
-                rendererEventListeners.push({
-                    renderer: renderer,
-                    type: key,
-                    debounce: listener.debounce || null,
-                    weight: listener.weight || 0,
-                    actions: listener.actions
-                });
+                listener.actions.length &&
+                    rendererEventListeners.push({
+                        renderer: renderer,
+                        type: key,
+                        debounce: listener.debounce || null,
+                        weight: listener.weight || 0,
+                        actions: listener.actions
+                    });
             }
-            if (!listener) {
+            if (!listener && ((_d = listeners[key].actions) === null || _d === void 0 ? void 0 : _d.length)) {
                 rendererEventListeners.push({
                     renderer: renderer,
                     type: key,
@@ -77,15 +78,15 @@ var bindEvent = function (renderer) {
         };
         try {
             // 暂存
-            for (var _d = tslib.__values(Object.keys(listeners)), _e = _d.next(); !_e.done; _e = _d.next()) {
-                var key = _e.value;
+            for (var _e = tslib.__values(Object.keys(listeners)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                var key = _f.value;
                 _loop_1(key);
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+                if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -97,19 +98,20 @@ var bindEvent = function (renderer) {
 };
 // 触发事件
 function dispatchEvent(e, renderer, scoped, data, broadcast) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     return tslib.__awaiter(this, void 0, void 0, function () {
         var unbindEvent, eventName, eventConfig, rendererEvent, listeners, executedCount, checkExecuted, _loop_2, listeners_1, listeners_1_1, listener, state_1, e_2_1;
-        var e_2, _g;
+        var e_2, _j;
         var _this = this;
-        return tslib.__generator(this, function (_h) {
-            switch (_h.label) {
+        return tslib.__generator(this, function (_k) {
+            switch (_k.label) {
                 case 0:
                     unbindEvent = null;
                     eventName = typeof e === 'string' ? e : e.type;
                     (_c = (_b = (_a = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _a === void 0 ? void 0 : _a.env) === null || _b === void 0 ? void 0 : _b.beforeDispatchEvent) === null || _c === void 0 ? void 0 : _c.call(_b, e, renderer, scoped, data, broadcast);
+                    broadcast && ((_e = (_d = renderer.props).onBroadcast) === null || _e === void 0 ? void 0 : _e.call(_d, e, broadcast, data));
                     if (!broadcast) {
-                        eventConfig = (_e = (_d = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _d === void 0 ? void 0 : _d.onEvent) === null || _e === void 0 ? void 0 : _e[eventName];
+                        eventConfig = (_g = (_f = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _f === void 0 ? void 0 : _f.onEvent) === null || _g === void 0 ? void 0 : _g[eventName];
                         if (!eventConfig) {
                             // 没命中也没关系
                             return [2 /*return*/, Promise.resolve()];
@@ -122,7 +124,7 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                     }
                     rendererEvent = broadcast ||
                         createRendererEvent(eventName, {
-                            env: (_f = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _f === void 0 ? void 0 : _f.env,
+                            env: (_h = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _h === void 0 ? void 0 : _h.env,
                             nativeEvent: e,
                             data: data,
                             scoped: scoped
@@ -143,11 +145,11 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                         }
                     };
                     _loop_2 = function (listener) {
-                        var _j, _k, wait, _l, trailing, _m, leading, _o, maxWait, debounced_1;
-                        return tslib.__generator(this, function (_p) {
-                            switch (_p.label) {
+                        var _l, _m, wait, _o, trailing, _p, leading, _q, maxWait, debounced_1;
+                        return tslib.__generator(this, function (_r) {
+                            switch (_r.label) {
                                 case 0:
-                                    _j = (listener === null || listener === void 0 ? void 0 : listener.debounce) || {}, _k = _j.wait, wait = _k === void 0 ? 100 : _k, _l = _j.trailing, trailing = _l === void 0 ? true : _l, _m = _j.leading, leading = _m === void 0 ? false : _m, _o = _j.maxWait, maxWait = _o === void 0 ? 10000 : _o;
+                                    _l = (listener === null || listener === void 0 ? void 0 : listener.debounce) || {}, _m = _l.wait, wait = _m === void 0 ? 100 : _m, _o = _l.trailing, trailing = _o === void 0 ? true : _o, _p = _l.leading, leading = _p === void 0 ? false : _p, _q = _l.maxWait, maxWait = _q === void 0 ? 10000 : _q;
                                     if (!(listener === null || listener === void 0 ? void 0 : listener.debounce)) return [3 /*break*/, 1];
                                     debounced_1 = debounce__default["default"](function () { return tslib.__awaiter(_this, void 0, void 0, function () {
                                         return tslib.__generator(this, function (_a) {
@@ -176,9 +178,9 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                                     return [3 /*break*/, 3];
                                 case 1: return [4 /*yield*/, Action.runActions(listener.actions, listener.renderer, rendererEvent)];
                                 case 2:
-                                    _p.sent();
+                                    _r.sent();
                                     checkExecuted();
-                                    _p.label = 3;
+                                    _r.label = 3;
                                 case 3:
                                     // 停止后续监听器执行
                                     if (rendererEvent.stoped) {
@@ -188,31 +190,31 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                             }
                         });
                     };
-                    _h.label = 1;
+                    _k.label = 1;
                 case 1:
-                    _h.trys.push([1, 6, 7, 8]);
+                    _k.trys.push([1, 6, 7, 8]);
                     listeners_1 = tslib.__values(listeners), listeners_1_1 = listeners_1.next();
-                    _h.label = 2;
+                    _k.label = 2;
                 case 2:
                     if (!!listeners_1_1.done) return [3 /*break*/, 5];
                     listener = listeners_1_1.value;
                     return [5 /*yield**/, _loop_2(listener)];
                 case 3:
-                    state_1 = _h.sent();
+                    state_1 = _k.sent();
                     if (state_1 === "break")
                         return [3 /*break*/, 5];
-                    _h.label = 4;
+                    _k.label = 4;
                 case 4:
                     listeners_1_1 = listeners_1.next();
                     return [3 /*break*/, 2];
                 case 5: return [3 /*break*/, 8];
                 case 6:
-                    e_2_1 = _h.sent();
+                    e_2_1 = _k.sent();
                     e_2 = { error: e_2_1 };
                     return [3 /*break*/, 8];
                 case 7:
                     try {
-                        if (listeners_1_1 && !listeners_1_1.done && (_g = listeners_1.return)) _g.call(listeners_1);
+                        if (listeners_1_1 && !listeners_1_1.done && (_j = listeners_1.return)) _j.call(listeners_1);
                     }
                     finally { if (e_2) throw e_2.error; }
                     return [7 /*endfinally*/];
@@ -232,6 +234,7 @@ var getRendererEventListeners = function () {
  */
 var resolveEventData = function (props, data, valueKey) {
     var _a, _b;
+    if (valueKey === void 0) { valueKey = 'value'; }
     return object.createObject(props.data, props.name && valueKey
         ? tslib.__assign(tslib.__assign({}, data), (_a = {}, _a[props.name] = data[valueKey], _a.__rendererData = tslib.__assign(tslib.__assign({}, props.data), (_b = {}, _b[props.name] = data[valueKey], _b)), _a)) : data);
 };

package/lib/utils/replaceText.js

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

package/lib/utils/resize-sensor.js

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

package/lib/utils/resolveCondition.d.ts

@@ -3,3 +3,4 @@ export declare function registerConditionComputer(op: string, func: (left: any,
 export declare function getConditionComputers(): {
     [op: string]: (left: any, right: any, fieldType?: string | undefined) => boolean;
 };
+export declare function setConditionComputeErrorHandler(fn: (conditions: any, data: any, defaultResult: boolean) => boolean | Promise<boolean>): void;

package/lib/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -29,9 +29,11 @@ var capitalize__default = /*#__PURE__*/_interopDefaultLegacy(capitalize);
 
 var conditionResolverMap = {};
 var DEFAULT_RESULT = true;
+var conditionComputeErrorHandler;
 function resolveCondition(conditions, data, defaultResult) {
     if (defaultResult === void 0) { defaultResult = true; }
     return tslib.__awaiter(this, void 0, void 0, function () {
+        var e_1;
         return tslib.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -41,8 +43,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*/];
             }
         });
     });
@@ -93,7 +105,7 @@ function computeCondition(rule, index, data) {
             switch (_b.label) {
                 case 0:
                     leftValue = get__default["default"](data, rule.left.field);
-                    return [4 /*yield*/, resolveVariableAndFilterForAsync.resolveVariableAndFilterForAsync(rule.right, data)];
+                    return [4 /*yield*/, resolveVariableAndFilterForAsync.resolveVariableAndFilterForAsync(rule.right, data, undefined, undefined, true)];
                 case 1:
                     rightValue = _b.sent();
                     func = (_a = conditionResolverMap["".concat(rule.op, "For").concat(capitalize__default["default"](rule.left.type))]) !== null && _a !== void 0 ? _a : conditionResolverMap[rule.op];
@@ -282,6 +294,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');
@@ -320,3 +335,4 @@ registerConditionComputer('ends_with', endsWithFunc);
 exports.getConditionComputers = getConditionComputers;
 exports.registerConditionComputer = registerConditionComputer;
 exports.resolveCondition = resolveCondition;
+exports.setConditionComputeErrorHandler = setConditionComputeErrorHandler;

package/lib/utils/resolveVariable.js

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

package/lib/utils/resolveVariableAndFilter.js

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

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

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -10,10 +10,19 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var amisFormula = require('amis-formula');
 
-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 tslib.__awaiter(void 0, void 0, void 0, function () {
         var ast, ret, e_1;
         return tslib.__generator(this, function (_a) {
@@ -40,6 +49,14 @@ var resolveVariableAndFilterForAsync = function (path, data, defaultFilter, fall
                 case 3:
                     e_1 = _a.sent();
                     console.warn(e_1);
+                    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;
+                    }
                     return [2 /*return*/, undefined];
                 case 4: return [2 /*return*/];
             }
@@ -48,3 +65,4 @@ var resolveVariableAndFilterForAsync = function (path, data, defaultFilter, fall
 };
 
 exports.resolveVariableAndFilterForAsync = resolveVariableAndFilterForAsync;
+exports.setFormulaEvalErrorHandler = setFormulaEvalErrorHandler;

package/lib/utils/scrollPosition.js

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

package/lib/utils/string2regExp.js

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

package/lib/utils/stripNumber.js

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

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 {};