amis-core 6.10.0 → 6.11.0-beta.1

package/esm/utils/labelToString.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 
@@ -9,6 +9,10 @@ import isPlainObject from 'lodash/isPlainObject';
 function labelToString(label) {
     var e_1, _a;
     var type = typeof label;
+    if (type === 'undefined' || label === null) {
+        // render placeholder
+        return '-';
+    }
     if (type === 'string') {
         return label;
     }

package/esm/utils/loopTooMuch.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/makeSorter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/math.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/memoryParse.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/offset.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/offsetParent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/prettyBytes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/printElement.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/renderer-event.d.ts

@@ -63,6 +63,7 @@ export declare const bindEvent: (renderer: any) => ((eventName?: string) => void
 export declare const bindGlobalEventForRenderer: (renderer: any) => (() => void) | undefined;
 export declare const bindGlobalEvent: (eventName: string, callback: (data: PlainObject) => void) => (() => void) | undefined;
 export declare function dispatchEvent(e: string | React.MouseEvent<any>, renderer: React.Component<RendererProps>, scoped: IScopedContext, data: any, broadcast?: RendererEvent<any>): Promise<RendererEvent<any> | void>;
+export declare function dispatchGlobalEventForRenderer(eventName: string, renderer: React.Component<RendererProps>, scoped: IScopedContext, data: any, broadcast: RendererEvent<any>): Promise<void>;
 export declare function dispatchGlobalEvent(eventName: string, data: any): Promise<void>;
 export declare const getRendererEventListeners: () => RendererEventListener[];
 /**

package/esm/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 
@@ -341,6 +341,20 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
         });
     });
 }
+function dispatchGlobalEventForRenderer(eventName, renderer, scoped, data, broadcast) {
+    var _a, _b, _c, _d, _e;
+    return __awaiter(this, void 0, void 0, function () {
+        var from;
+        return __generator(this, function (_f) {
+            from = (renderer === null || renderer === void 0 ? void 0 : renderer.props.id) || (renderer === null || renderer === void 0 ? void 0 : renderer.props.name) || '';
+            debug('event', "dispatch `".concat(eventName, "` from \u300C").concat((renderer === null || renderer === void 0 ? void 0 : renderer.props.type) || 'unknown').concat(from ? "#".concat(from) : '', "\u300D"), data);
+            (_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, eventName, renderer, scoped, data, broadcast);
+            (_e = (_d = renderer.props).onBroadcast) === null || _e === void 0 ? void 0 : _e.call(_d, eventName, broadcast, data);
+            dispatchGlobalEvent(eventName, data);
+            return [2 /*return*/];
+        });
+    });
+}
 function dispatchGlobalEvent(eventName, data) {
     return __awaiter(this, void 0, void 0, function () {
         var bc;
@@ -470,4 +484,4 @@ function getMatchedEventTargets(tree, ctx, index, condition, oldCondition) {
     });
 }
 
-export { bindEvent, bindGlobalEvent, bindGlobalEventForRenderer, createRendererEvent, dispatchEvent, dispatchGlobalEvent, getMatchedEventTargets, getRendererEventListeners, resolveEventData };
+export { bindEvent, bindGlobalEvent, bindGlobalEventForRenderer, createRendererEvent, dispatchEvent, dispatchGlobalEvent, dispatchGlobalEventForRenderer, getMatchedEventTargets, getRendererEventListeners, resolveEventData };

package/esm/utils/replaceText.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/resize-sensor.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/resolveVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/resolveVariableAndFilter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/toNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/uncontrollable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/validateId.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/visitedCache.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/lib/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/lib/RootRenderer.d.ts

@@ -30,5 +30,5 @@ export declare class RootRenderer extends React.Component<RootRendererProps> {
     renderError(): React.ReactNode;
     renderDialog(): React.ReactNode;
     renderDrawer(): React.ReactNode;
-    render(): string | number | boolean | React.JSX.Element | Iterable<React.ReactNode> | null | undefined;
+    render(): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
 }

package/lib/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/lib/SchemaRenderer.d.ts

@@ -19,24 +19,13 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
     cRef: any;
     schema: any;
     path: string;
-    animationTimeout: {
-        enter?: number;
-        exit?: number;
-    };
-    animationClassNames: {
-        appear?: string;
-        enter?: string;
-        exit?: string;
-    };
     toDispose: Array<() => any>;
     unbindEvent: (() => void) | undefined;
     unbindGlobalEvent: (() => void) | undefined;
     isStatic: any;
     constructor(props: SchemaRendererProps);
-    componentDidMount(): void;
     componentWillUnmount(): void;
     shouldComponentUpdate(nextProps: SchemaRendererProps): boolean;
-    removeAnimationStyle(): void;
     resolveRenderer(props: SchemaRendererProps, force?: boolean): any;
     getWrappedInstance(): any;
     refFn(ref: any): void;
@@ -47,8 +36,6 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
         [propName: string]: any;
     }): any;
     reRender(): void;
-    addAnimationAttention(node: HTMLElement): void;
-    removeAnimationAttention(node: HTMLElement): void;
     render(): JSX.Element | null;
 }
 export {};

package/lib/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 
@@ -33,9 +33,7 @@ require('./utils/filter.js');
 var style = require('./utils/style.js');
 var formula = require('./utils/formula.js');
 var tpl = require('./utils/tpl.js');
-var reactTransitionGroup = require('react-transition-group');
-var animations = require('./utils/animations.js');
-var StyleManager = require('./StyleManager.js');
+var Animations = require('./components/Animations.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -87,41 +85,17 @@ var componentCache = new SimpleMap.SimpleMap();
 var SchemaRenderer = /** @class */ (function (_super) {
     tslib.__extends(SchemaRenderer, _super);
     function SchemaRenderer(props) {
-        var _this = this;
-        var _a;
-        _this = _super.call(this, props) || this;
+        var _this = _super.call(this, props) || this;
         _this.rendererKey = '';
-        _this.animationTimeout = {};
-        _this.animationClassNames = {};
         _this.toDispose = [];
         _this.unbindEvent = undefined;
         _this.unbindGlobalEvent = undefined;
         _this.isStatic = undefined;
-        var animations = (_a = props === null || props === void 0 ? void 0 : props.schema) === null || _a === void 0 ? void 0 : _a.animations;
-        if (animations) {
-            var id = props === null || props === void 0 ? void 0 : props.schema.id;
-            id = helper.formateId(id);
-            if (animations.enter) {
-                _this.animationTimeout.enter =
-                    ((animations.enter.duration || 1) + (animations.enter.delay || 0)) *
-                        1000;
-                _this.animationClassNames.enter = "".concat(animations.enter.type, "-").concat(id, "-enter");
-                _this.animationClassNames.appear = _this.animationClassNames.enter;
-            }
-            if (animations.exit) {
-                _this.animationTimeout.exit =
-                    ((animations.exit.duration || 1) + (animations.exit.delay || 0)) *
-                        1000;
-                _this.animationClassNames.exit = "".concat(animations.exit.type, "-").concat(id, "-exit");
-            }
-        }
         _this.refFn = _this.refFn.bind(_this);
         _this.renderChild = _this.renderChild.bind(_this);
         _this.reRender = _this.reRender.bind(_this);
         _this.resolveRenderer(_this.props);
         _this.dispatchEvent = _this.dispatchEvent.bind(_this);
-        _this.addAnimationAttention = _this.addAnimationAttention.bind(_this);
-        _this.removeAnimationAttention = _this.removeAnimationAttention.bind(_this);
         // 监听statusStore更新
         _this.toDispose.push(mobx.reaction(function () {
             var _a, _b, _c;
@@ -131,20 +105,12 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }, function () { return _this.forceUpdate(); }));
         return _this;
     }
-    SchemaRenderer.prototype.componentDidMount = function () {
-        if (this.props.schema.animations) {
-            var _a = this.props.schema, animations$1 = _a.animations, id = _a.id;
-            id = helper.formateId(id);
-            animations.createAnimationStyle(id, animations$1);
-        }
-    };
     SchemaRenderer.prototype.componentWillUnmount = function () {
         var _a, _b;
         this.toDispose.forEach(function (fn) { return fn(); });
         this.toDispose = [];
         (_a = this.unbindEvent) === null || _a === void 0 ? void 0 : _a.call(this);
         (_b = this.unbindGlobalEvent) === null || _b === void 0 ? void 0 : _b.call(this);
-        this.removeAnimationStyle();
     };
     // 限制：只有 schema 除外的 props 变化，或者 schema 里面的某个成员值发生变化才更新。
     SchemaRenderer.prototype.shouldComponentUpdate = function (nextProps) {
@@ -167,13 +133,6 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }
         return false;
     };
-    SchemaRenderer.prototype.removeAnimationStyle = function () {
-        if (this.props.schema.animations) {
-            var id = this.props.schema.id;
-            id = helper.formateId(id);
-            StyleManager["default"].removeStyles(id);
-        }
-    };
     SchemaRenderer.prototype.resolveRenderer = function (props, force) {
         if (force === void 0) { force = false; }
         var schema = props.schema;
@@ -281,24 +240,6 @@ var SchemaRenderer = /** @class */ (function (_super) {
         this.resolveRenderer(this.props, true);
         this.forceUpdate();
     };
-    SchemaRenderer.prototype.addAnimationAttention = function (node) {
-        var schema = (this.props || {}).schema;
-        var attention = ((schema === null || schema === void 0 ? void 0 : schema.animations) || {}).attention;
-        if (attention) {
-            var id = schema.id;
-            id = helper.formateId(id);
-            node.classList.add("".concat(attention.type, "-").concat(id, "-attention"));
-        }
-    };
-    SchemaRenderer.prototype.removeAnimationAttention = function (node) {
-        var schema = (this.props || {}).schema;
-        var attention = ((schema === null || schema === void 0 ? void 0 : schema.animations) || {}).attention;
-        if (attention) {
-            var id = schema.id;
-            id = helper.formateId(id);
-            node.classList.remove("".concat(attention.type, "-").concat(id, "-attention"));
-        }
-    };
     SchemaRenderer.prototype.render = function () {
         var e_1, _a;
         var _this = this;
@@ -401,7 +342,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         schema = factory.filterSchema(schema, renderer, rest);
         var defaultData = schema.data, defaultValue = schema.value, defaultActiveKey = schema.activeKey, restSchema = tslib.__rest(schema, ["data", "value", "activeKey"]);
         var Component = renderer.component;
-        var animationIn = true;
+        var animationShow = true;
         // 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
         // 而 visibleOn 和 hiddenOn 是无效的，
         // 这个本来就是个bug，但是已经被广泛使用了
@@ -412,7 +353,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
                 !renderer.isFormItem ||
                 (schema.visible !== false && !schema.hidden))) {
             if (schema.animations) {
-                animationIn = false;
+                animationShow = false;
             }
             else {
                 return null;
@@ -467,7 +408,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }
         var component = supportRef ? (_J$X_(Component, tslib.__assign({}, props, { ref: this.childRef }))) : (_J$X_(Component, tslib.__assign({}, props, { forwardedRef: this.childRef })));
         if (schema.animations) {
-            component = (_J$X_(reactTransitionGroup.CSSTransition, { in: animationIn, timeout: this.animationTimeout, classNames: this.animationClassNames, onEntered: this.addAnimationAttention, onExit: this.removeAnimationAttention, appear: true, unmountOnExit: true }, component));
+            component = (_J$X_(Animations["default"], { schema: schema, component: component, show: animationShow }));
         }
         return this.props.env.enableAMISDebug ? (_J$X_(debug.DebugWrapper, { renderer: renderer }, component)) : (component);
     };

package/lib/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/lib/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/lib/StyleManager.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/lib/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/lib/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/BreakAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/BroadcastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 
@@ -37,8 +37,10 @@ var BroadcastAction = /** @class */ (function () {
                         // 作为一个新的事件，需要把广播动作的args参数追加到事件数据中
                         event.setData(object.createObject(event.data, (_b = action.data) !== null && _b !== void 0 ? _b : {}));
                         eventName = ((_c = action.args) === null || _c === void 0 ? void 0 : _c.eventName) || action.eventName;
-                        return [4 /*yield*/, rendererEvent.dispatchGlobalEvent(eventName, action.data)];
-                    case 1: return [2 /*return*/, _d.sent()];
+                        return [4 /*yield*/, rendererEvent.dispatchGlobalEventForRenderer(eventName, renderer, event.context.scoped, action.data, event)];
+                    case 1: 
+                    // 直接触发对应的动作
+                    return [2 /*return*/, _d.sent()];
                 }
             });
         });

package/lib/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/ContinueAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/CopyAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.10.0
+ * amis-core v6.11.0-beta.1
  * Copyright 2018-2024 fex
  */