amis-core 6.9.0-rc.0 → 6.9.0-rc.10

package/esm/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 

package/esm/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 
@@ -58,7 +58,7 @@ var RootRenderer = /** @class */ (function (_super) {
                     }
                 }
             });
-            return loadAsyncRenderersByType(types);
+            return loadAsyncRenderersByType(types, true);
         });
         return _this;
     }

package/esm/SchemaRenderer.d.ts

@@ -19,12 +19,23 @@ 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;
+    };
     reaction: any;
     unbindEvent: (() => 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;
@@ -35,6 +46,8 @@ 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/esm/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 
@@ -14,7 +14,7 @@ import { asFormItem } from './renderers/Item.js';
 import { ScopedContext } from './Scoped.js';
 import { DebugWrapper } from './utils/debug.js';
 import { getExprProperties } from './utils/filter-schema.js';
-import { anyChanged, chainEvents, TestIdBuilder, autobind } from './utils/helper.js';
+import { formateId, anyChanged, chainEvents, TestIdBuilder, autobind } from './utils/helper.js';
 import { SimpleMap } from './utils/SimpleMap.js';
 import { bindEvent, dispatchEvent } from './utils/renderer-event.js';
 import { isAlive } from 'mobx-state-tree';
@@ -29,6 +29,9 @@ import './utils/filter.js';
 import { buildStyle } from './utils/style.js';
 import { isExpression } from './utils/formula.js';
 import { filter, evalExpression } from './utils/tpl.js';
+import { CSSTransition } from 'react-transition-group';
+import { createAnimationStyle } from './utils/animations.js';
+import styleManager from './StyleManager.js';
 
 var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'type',
@@ -71,15 +74,39 @@ var componentCache = new SimpleMap();
 var SchemaRenderer = /** @class */ (function (_super) {
     __extends(SchemaRenderer, _super);
     function SchemaRenderer(props) {
-        var _this = _super.call(this, props) || this;
+        var _this = this;
+        var _a;
+        _this = _super.call(this, props) || this;
         _this.rendererKey = '';
+        _this.animationTimeout = {};
+        _this.animationClassNames = {};
         _this.unbindEvent = 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 = 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.reaction = reaction(function () {
             var _a, _b, _c;
@@ -89,10 +116,18 @@ 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 = _a.animations, id = _a.id;
+            id = formateId(id);
+            createAnimationStyle(id, animations);
+        }
+    };
     SchemaRenderer.prototype.componentWillUnmount = function () {
         var _a, _b;
         (_a = this.reaction) === null || _a === void 0 ? void 0 : _a.call(this);
         (_b = this.unbindEvent) === null || _b === void 0 ? void 0 : _b.call(this);
+        this.removeAnimationStyle();
     };
     // 限制：只有 schema 除外的 props 变化，或者 schema 里面的某个成员值发生变化才更新。
     SchemaRenderer.prototype.shouldComponentUpdate = function (nextProps) {
@@ -115,6 +150,13 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }
         return false;
     };
+    SchemaRenderer.prototype.removeAnimationStyle = function () {
+        if (this.props.schema.animations) {
+            var id = this.props.schema.id;
+            id = formateId(id);
+            styleManager.removeStyles(id);
+        }
+    };
     SchemaRenderer.prototype.resolveRenderer = function (props, force) {
         if (force === void 0) { force = false; }
         var schema = props.schema;
@@ -164,7 +206,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
     };
     SchemaRenderer.prototype.childRef = function (ref) {
         var _this = this;
-        var _a;
+        var _a, _b;
         // todo 这里有个问题，就是注意以下的这段注释
         // > // 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
         // > 而 visibleOn 和 hiddenOn 是无效的，
@@ -182,7 +224,8 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }
         if (ref) {
             // 这里无法区分监听的是不是广播，所以又bind一下，主要是为了绑广播
-            this.unbindEvent = bindEvent(this.ref);
+            (_b = this.unbindEvent) === null || _b === void 0 ? void 0 : _b.call(this);
+            this.unbindEvent = bindEvent(ref);
         }
         this.cRef = ref;
     };
@@ -219,6 +262,24 @@ 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 = 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 = formateId(id);
+            node.classList.remove("".concat(attention.type, "-").concat(id, "-attention"));
+        }
+    };
     SchemaRenderer.prototype.render = function () {
         var e_1, _a;
         var _this = this;
@@ -321,6 +382,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         schema = filterSchema(schema, renderer, rest);
         var defaultData = schema.data, defaultValue = schema.value, defaultActiveKey = schema.activeKey, restSchema = __rest(schema, ["data", "value", "activeKey"]);
         var Component = renderer.component;
+        var animationIn = true;
         // 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
         // 而 visibleOn 和 hiddenOn 是无效的，
         // 这个本来就是个bug，但是已经被广泛使用了
@@ -330,7 +392,12 @@ var SchemaRenderer = /** @class */ (function (_super) {
                 exprProps.visible === false ||
                 !renderer.isFormItem ||
                 (schema.visible !== false && !schema.hidden))) {
-            return null;
+            if (schema.animations) {
+                animationIn = false;
+            }
+            else {
+                return null;
+            }
         }
         // withStore 里面会处理，而且会实时处理
         // 这里处理反而导致了问题
@@ -380,6 +447,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
             }
         }
         var component = supportRef ? (React.createElement(Component, __assign({}, props, { ref: this.childRef }))) : (React.createElement(Component, __assign({}, props, { forwardedRef: this.childRef })));
+        if (schema.animations) {
+            component = (React.createElement(CSSTransition, { in: animationIn, timeout: this.animationTimeout, classNames: this.animationClassNames, onEntered: this.addAnimationAttention, onExit: this.removeAnimationAttention, appear: true, unmountOnExit: true }, component));
+        }
         return this.props.env.enableAMISDebug ? (React.createElement(DebugWrapper, { renderer: renderer }, component)) : (component);
     };
     SchemaRenderer.displayName = 'Renderer';

package/esm/Scoped.d.ts

@@ -39,7 +39,7 @@ export interface IScopedContext {
     getComponentById: (id: string) => ScopedComponentType | undefined;
     getComponentByIdUnderCurrentScope: (id: string, ignoreScope?: IScopedContext) => ScopedComponentType | undefined;
     getComponents: () => Array<ScopedComponentType>;
-    reload: (target: string, ctx: RendererData) => void;
+    reload: (target: string, ctx: RendererData) => void | Promise<void>;
     send: (target: string, ctx: RendererData) => void;
     close: (target: string) => void;
     closeById: (target: string) => void;

package/esm/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 

package/esm/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 

package/esm/StyleManager.d.ts

@@ -0,0 +1,18 @@
+interface Style {
+    [id: string]: {
+        [className: string]: {
+            [propName: string]: string | number;
+        };
+    };
+}
+declare class StyleManager {
+    styles: Style;
+    styleDom: HTMLStyleElement;
+    styleText: string;
+    constructor();
+    updateStyle(style: Style): void;
+    removeStyles(id: string): void;
+    updateStyleDom(): void;
+}
+declare const _default: StyleManager;
+export default _default;

package/esm/StyleManager.js

@@ -0,0 +1,55 @@
+/**
+ * amis-core v6.9.0-rc.10
+ * Copyright 2018-2024 fex
+ */
+
+import { __assign } from 'tslib';
+import kebabCase from 'lodash/kebabCase';
+
+var StyleManager = /** @class */ (function () {
+    function StyleManager() {
+        this.styles = {};
+        this.styleDom = document.createElement('style');
+        this.styleDom.id = 'amis-styles';
+        document.head.appendChild(this.styleDom);
+    }
+    StyleManager.prototype.updateStyle = function (style) {
+        var _this = this;
+        Object.keys(style).forEach(function (className) {
+            if (!_this.styles[className]) {
+                _this.styles[className] = style[className];
+            }
+            else {
+                _this.styles[className] = __assign(__assign({}, _this.styles[className]), style[className]);
+            }
+        });
+        this.updateStyleDom();
+    };
+    StyleManager.prototype.removeStyles = function (id) {
+        delete this.styles[id];
+        this.updateStyleDom();
+    };
+    StyleManager.prototype.updateStyleDom = function () {
+        var _this = this;
+        var styleText = Object.keys(this.styles)
+            .map(function (id) {
+            var style = _this.styles[id];
+            return Object.keys(style)
+                .map(function (className) {
+                return "".concat(className, " {").concat(Object.keys(style[className])
+                    .map(function (propName) {
+                    return "".concat(kebabCase(propName), ": ").concat(style[className][propName], ";");
+                })
+                    .join(''), "}");
+            })
+                .join('');
+        })
+            .join('');
+        this.styleDom.innerHTML = styleText;
+        this.styleText = styleText;
+    };
+    return StyleManager;
+}());
+var styleManager = new StyleManager();
+
+export { styleManager as default };

package/esm/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 

package/esm/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 
@@ -97,7 +97,7 @@ function HocStoreFactory(renderer) {
             };
             StoreFactory.prototype.componentDidUpdate = function (prevProps) {
                 var _this = this;
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
                 var props = this.props;
                 var store = this.store;
                 // dialog 场景下 schema 是显示的时候更新的，
@@ -131,7 +131,7 @@ function HocStoreFactory(renderer) {
                                 (props.data &&
                                     prevProps.data &&
                                     props.data.__super !== prevProps.data.__super))) {
-                        store.initData(extendObject(props.data, __assign(__assign(__assign(__assign({}, this.formatData(dataMapping(this.props.defaultData, this.props.data, ignoreSchemaProps))), (store.hasRemoteData ? store.data : null)), this.formatData(props.defaultData)), this.formatData(props.data))), ((_c = props.updatePristineAfterStoreDataReInit) !== null && _c !== void 0 ? _c : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
+                        store.initData(extendObject(props.data, __assign(__assign(__assign(__assign({}, this.formatData(dataMapping(this.props.defaultData, this.props.data, ignoreSchemaProps))), (store.hasRemoteData ? store.data : null)), this.formatData(props.defaultData)), this.formatData(props.data))), ((_c = props.updatePristineAfterStoreDataReInit) !== null && _c !== void 0 ? _c : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false, (_d = props.data) === null || _d === void 0 ? void 0 : _d.__changeReason);
                     }
                 }
                 else if (shouldSync === true ||
@@ -143,7 +143,7 @@ function HocStoreFactory(renderer) {
                                 isSuperDataModified(props.data, prevProps.data, store)))) {
                     if (props.store && props.scope === props.data) {
                         store.initData(createObject(props.store.data, __assign(__assign({}, this.formatData(dataMapping(this.props.defaultData, this.props.data, ignoreSchemaProps))), (props.syncSuperStore === false
-                            ? __assign({}, store.data) : syncDataFromSuper(store.data, props.store.data, prevProps.scope, store, props.syncSuperStore === true)))), ((_d = props.updatePristineAfterStoreDataReInit) !== null && _d !== void 0 ? _d : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
+                            ? __assign({}, store.data) : syncDataFromSuper(store.data, props.store.data, prevProps.scope, store, props.syncSuperStore === true)))), ((_e = props.updatePristineAfterStoreDataReInit) !== null && _e !== void 0 ? _e : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false, (_f = props.data) === null || _f === void 0 ? void 0 : _f.__changeReason);
                     }
                     else if (props.data && props.data.__super) {
                         store.initData(extendObject(props.data, __assign(__assign({}, this.formatData(dataMapping(this.props.defaultData, this.props.data, ignoreSchemaProps))), // 有远程数据
@@ -151,12 +151,12 @@ function HocStoreFactory(renderer) {
                         (store.hasRemoteData || !store.path.includes('/')
                             ? __assign(__assign({}, store.data), props.data) : // combo 不需要同步，如果要同步，在 Combo.tsx 里面已经实现了相关逻辑
                             // 目前主要的问题是，如果 combo 中表单项名字和 combo 本身的名字一样，会导致里面的值会被覆盖成数组
-                            ((_e = props.store) === null || _e === void 0 ? void 0 : _e.storeType) === 'ComboStore'
+                            ((_g = props.store) === null || _g === void 0 ? void 0 : _g.storeType) === 'ComboStore'
                                 ? undefined
-                                : syncDataFromSuper(__assign(__assign({}, store.pristineDiff), props.data), props.data.__super, prevProps.data.__super, store, false)))), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
+                                : syncDataFromSuper(__assign(__assign({}, store.pristineDiff), props.data), props.data.__super, prevProps.data.__super, store, false)))), ((_h = props.updatePristineAfterStoreDataReInit) !== null && _h !== void 0 ? _h : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false, (_j = props.data) === null || _j === void 0 ? void 0 : _j.__changeReason);
                     }
                     else {
-                        store.initData(createObject(props.scope, props.data), ((_g = props.updatePristineAfterStoreDataReInit) !== null && _g !== void 0 ? _g : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
+                        store.initData(createObject(props.scope, props.data), ((_k = props.updatePristineAfterStoreDataReInit) !== null && _k !== void 0 ? _k : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false, (_l = props.data) === null || _l === void 0 ? void 0 : _l.__changeReason);
                     }
                 }
                 else if (!props.trackExpression &&
@@ -166,9 +166,9 @@ function HocStoreFactory(renderer) {
                     // 这个用法很少，当 data.__super 值发生变化时，更新 store.data
                     if (!prevProps.data ||
                         isObjectShallowModified(props.data.__super, prevProps.data.__super, false)) {
-                        store.initData(createObject(props.data.__super, __assign(__assign({}, props.data), store.data)), ((_h = props.updatePristineAfterStoreDataReInit) !== null && _h !== void 0 ? _h : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false ||
+                        store.initData(createObject(props.data.__super, __assign(__assign({}, props.data), store.data)), ((_m = props.updatePristineAfterStoreDataReInit) !== null && _m !== void 0 ? _m : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false ||
                             (store.storeType === 'FormStore' &&
-                                ((_j = prevProps.store) === null || _j === void 0 ? void 0 : _j.storeType) === 'CRUDStore'));
+                                ((_o = prevProps.store) === null || _o === void 0 ? void 0 : _o.storeType) === 'CRUDStore'), (_p = props.data) === null || _p === void 0 ? void 0 : _p.__changeReason);
                     }
                     // nextProps.data.__super !== props.data.__super) &&
                 }
@@ -178,7 +178,7 @@ function HocStoreFactory(renderer) {
                     prevProps.data !== props.data) {
                     // 只有父级数据变动的时候才应该进来，
                     // 目前看来这个 case 很少有情况下能进来
-                    store.initData(createObject(props.scope, __assign({}, store.data)), ((_k = props.updatePristineAfterStoreDataReInit) !== null && _k !== void 0 ? _k : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
+                    store.initData(createObject(props.scope, __assign({}, store.data)), ((_q = props.updatePristineAfterStoreDataReInit) !== null && _q !== void 0 ? _q : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false, (_r = props.data) === null || _r === void 0 ? void 0 : _r.__changeReason);
                 }
             };
             StoreFactory.prototype.componentWillUnmount = function () {

package/esm/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/BreakAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/BroadcastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 
@@ -7,7 +7,7 @@ import { __awaiter, __generator } from 'tslib';
 import '../utils/helper.js';
 import { registerAction } from './Action.js';
 import { getRendererByName } from '../factory.js';
-import { createObject } from '../utils/object.js';
+import { createObject, extendObject } from '../utils/object.js';
 
 /**
  * 组件动作
@@ -22,10 +22,10 @@ var CmptAction = /** @class */ (function () {
     CmptAction.prototype.run = function (action, renderer, event) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
         return __awaiter(this, void 0, void 0, function () {
-            var key, dataMergeMode, path, beforeSetData, res, component, msg, _6, dispatchEvent_1, data, valid, _7, e_1, result, e_2;
-            var _8, _9, _10, _11, _12;
-            return __generator(this, function (_13) {
-                switch (_13.label) {
+            var key, dataMergeMode, path, beforeSetData, res, component, msg, result, _6, dispatchEvent_1, data, valid, _7, e_1, result, e_2;
+            var _8, _9, _10, _11, _12, _13;
+            return __generator(this, function (_14) {
+                switch (_14.label) {
                     case 0:
                         key = action.componentId || action.componentName;
                         dataMergeMode = action.dataMergeMode || 'merge';
@@ -35,11 +35,11 @@ var CmptAction = /** @class */ (function () {
                         if (!(beforeSetData && typeof beforeSetData === 'function')) return [3 /*break*/, 2];
                         return [4 /*yield*/, beforeSetData(renderer, action, event)];
                     case 1:
-                        res = _13.sent();
+                        res = _14.sent();
                         if (res === false) {
                             return [2 /*return*/];
                         }
-                        _13.label = 2;
+                        _14.label = 2;
                     case 2:
                         component = key
                             ? (_d = event.context.scoped) === null || _d === void 0 ? void 0 : _d[action.componentId ? 'getComponentById' : 'getComponentByName'](key)
@@ -62,82 +62,89 @@ var CmptAction = /** @class */ (function () {
                                 return [2 /*return*/, (_j = component === null || component === void 0 ? void 0 : (_h = component.props).onChange) === null || _j === void 0 ? void 0 : _j.call(_h, (_k = action.args) === null || _k === void 0 ? void 0 : _k.value)];
                             }
                         }
-                        // 刷新
-                        if (action.actionType === 'reload') {
-                            return [2 /*return*/, (_l = component === null || component === void 0 ? void 0 : component.reload) === null || _l === void 0 ? void 0 : _l.call(component, undefined, action.data, event.data, undefined, dataMergeMode === 'override', action.args)];
+                        if (!(action.actionType === 'reload')) return [3 /*break*/, 4];
+                        return [4 /*yield*/, ((_l = component === null || component === void 0 ? void 0 : component.reload) === null || _l === void 0 ? void 0 : _l.call(component, undefined, action.data, event.data, undefined, dataMergeMode === 'override', action.args))];
+                    case 3:
+                        result = _14.sent();
+                        if (result && action.outputVar) {
+                            event.setData(extendObject(event.data, (_8 = {},
+                                _8[action.outputVar] = result,
+                                _8)));
                         }
+                        return [2 /*return*/, result];
+                    case 4:
                         if (!(action.actionType === 'validateFormItem' &&
-                            ((_o = getRendererByName((_m = component === null || component === void 0 ? void 0 : component.props) === null || _m === void 0 ? void 0 : _m.type)) === null || _o === void 0 ? void 0 : _o.isFormItem))) return [3 /*break*/, 9];
+                            ((_o = getRendererByName((_m = component === null || component === void 0 ? void 0 : component.props) === null || _m === void 0 ? void 0 : _m.type)) === null || _o === void 0 ? void 0 : _o.isFormItem))) return [3 /*break*/, 11];
                         _6 = (component === null || component === void 0 ? void 0 : component.props) || {}, dispatchEvent_1 = _6.dispatchEvent, data = _6.data;
-                        _13.label = 3;
-                    case 3:
-                        _13.trys.push([3, 7, , 8]);
-                        return [4 /*yield*/, ((_q = component === null || component === void 0 ? void 0 : (_p = component.props).onValidate) === null || _q === void 0 ? void 0 : _q.call(_p))];
-                    case 4:
-                        _7 = (_13.sent());
-                        if (_7) return [3 /*break*/, 6];
-                        return [4 /*yield*/, ((_r = component === null || component === void 0 ? void 0 : component.validate) === null || _r === void 0 ? void 0 : _r.call(component))];
+                        _14.label = 5;
                     case 5:
-                        _7 = (_13.sent());
-                        _13.label = 6;
+                        _14.trys.push([5, 9, , 10]);
+                        return [4 /*yield*/, ((_q = component === null || component === void 0 ? void 0 : (_p = component.props).onValidate) === null || _q === void 0 ? void 0 : _q.call(_p))];
                     case 6:
+                        _7 = (_14.sent());
+                        if (_7) return [3 /*break*/, 8];
+                        return [4 /*yield*/, ((_r = component === null || component === void 0 ? void 0 : component.validate) === null || _r === void 0 ? void 0 : _r.call(component))];
+                    case 7:
+                        _7 = (_14.sent());
+                        _14.label = 8;
+                    case 8:
                         valid = _7;
                         if (valid) {
-                            event.setData(createObject(event.data, (_8 = {},
-                                _8[action.outputVar || "".concat(action.actionType, "Result")] = {
+                            event.setData(createObject(event.data, (_9 = {},
+                                _9[action.outputVar || "".concat(action.actionType, "Result")] = {
                                     error: '',
                                     value: (_t = (_s = component === null || component === void 0 ? void 0 : component.props) === null || _s === void 0 ? void 0 : _s.formItem) === null || _t === void 0 ? void 0 : _t.value
                                 },
-                                _8)));
+                                _9)));
                             dispatchEvent_1 && dispatchEvent_1('formItemValidateSucc', data);
                         }
                         else {
-                            event.setData(createObject(event.data, (_9 = {},
-                                _9[action.outputVar || "".concat(action.actionType, "Result")] = {
+                            event.setData(createObject(event.data, (_10 = {},
+                                _10[action.outputVar || "".concat(action.actionType, "Result")] = {
                                     error: (((_v = (_u = component === null || component === void 0 ? void 0 : component.props) === null || _u === void 0 ? void 0 : _u.formItem) === null || _v === void 0 ? void 0 : _v.errors) || []).join(','),
                                     value: (_x = (_w = component === null || component === void 0 ? void 0 : component.props) === null || _w === void 0 ? void 0 : _w.formItem) === null || _x === void 0 ? void 0 : _x.value
                                 },
-                                _9)));
+                                _10)));
                             dispatchEvent_1 && dispatchEvent_1('formItemValidateError', data);
                         }
-                        return [3 /*break*/, 8];
-                    case 7:
-                        e_1 = _13.sent();
-                        event.setData(createObject(event.data, (_10 = {},
-                            _10[action.outputVar || "".concat(action.actionType, "Result")] = {
+                        return [3 /*break*/, 10];
+                    case 9:
+                        e_1 = _14.sent();
+                        event.setData(createObject(event.data, (_11 = {},
+                            _11[action.outputVar || "".concat(action.actionType, "Result")] = {
                                 error: e_1.message || '未知错误',
                                 value: (_z = (_y = component === null || component === void 0 ? void 0 : component.props) === null || _y === void 0 ? void 0 : _y.formItem) === null || _z === void 0 ? void 0 : _z.value
                             },
-                            _10)));
+                            _11)));
                         dispatchEvent_1 && dispatchEvent_1('formItemValidateError', data);
-                        return [3 /*break*/, 8];
-                    case 8: return [2 /*return*/];
-                    case 9:
-                        _13.trys.push([9, 11, , 12]);
+                        return [3 /*break*/, 10];
+                    case 10: return [2 /*return*/];
+                    case 11:
+                        _14.trys.push([11, 13, , 14]);
                         return [4 /*yield*/, ((_0 = component === null || component === void 0 ? void 0 : component.doAction) === null || _0 === void 0 ? void 0 : _0.call(component, action, event.data, true, action.args))];
-                    case 10:
-                        result = _13.sent();
+                    case 12:
+                        result = _14.sent();
                         if (['validate', 'submit'].includes(action.actionType)) {
-                            event.setData(createObject(event.data, (_11 = {},
-                                _11[action.outputVar || "".concat(action.actionType, "Result")] = {
+                            event.setData(createObject(event.data, (_12 = {},
+                                _12[action.outputVar || "".concat(action.actionType, "Result")] = {
                                     error: '',
                                     payload: (_1 = result === null || result === void 0 ? void 0 : result.__payload) !== null && _1 !== void 0 ? _1 : (_3 = (_2 = component === null || component === void 0 ? void 0 : component.props) === null || _2 === void 0 ? void 0 : _2.store) === null || _3 === void 0 ? void 0 : _3.data,
                                     responseData: result === null || result === void 0 ? void 0 : result.__response
                                 },
-                                _11)));
+                                _12)));
                         }
                         return [2 /*return*/, result];
-                    case 11:
-                        e_2 = _13.sent();
-                        event.setData(createObject(event.data, (_12 = {},
-                            _12[action.outputVar || "".concat(action.actionType, "Result")] = {
+                    case 13:
+                        e_2 = _14.sent();
+                        event.setData(createObject(event.data, (_13 = {},
+                            _13[action.outputVar || "".concat(action.actionType, "Result")] = {
                                 error: e_2.message,
                                 errors: e_2.name === 'ValidateError' ? e_2.detail : e_2,
                                 payload: (_5 = (_4 = component === null || component === void 0 ? void 0 : component.props) === null || _4 === void 0 ? void 0 : _4.store) === null || _5 === void 0 ? void 0 : _5.data
                             },
-                            _12)));
-                        return [3 /*break*/, 12];
-                    case 12: return [2 /*return*/];
+                            _13)));
+                        return [3 /*break*/, 14];
+                    case 14: return [2 /*return*/];
                 }
             });
         });

package/esm/actions/ContinueAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/CopyAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */