amis-core 6.7.0 → 6.9.0-beta.0

package/esm/Root.js

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

package/esm/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 | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
+    render(): string | number | boolean | React.JSX.Element | Iterable<React.ReactNode> | null | undefined;
 }

package/esm/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -8,7 +8,7 @@ import { observer } from 'mobx-react';
 import React from 'react';
 import { filterTarget, ScopedContext } from './Scoped.js';
 import { RootStore } from './store/root.js';
-import { guid, bulkBindFunctions, isVisible } from './utils/helper.js';
+import { guid, bulkBindFunctions, JSONTraverse, isVisible } from './utils/helper.js';
 import { filter } from './utils/tpl.js';
 import qs from 'qs';
 import pick from 'lodash/pick';
@@ -16,6 +16,8 @@ import mapValues from 'lodash/mapValues';
 import { saveAs } from 'file-saver';
 import { normalizeApi } from './utils/api.js';
 import { findDOMNode } from 'react-dom';
+import themedLazyComponent from './components/LazyComponent.js';
+import { hasAsyncRenderers, loadAsyncRenderersByType } from './factory.js';
 
 var RootRenderer = /** @class */ (function (_super) {
     __extends(RootRenderer, _super);
@@ -41,6 +43,23 @@ var RootRenderer = /** @class */ (function (_super) {
             'handleDrawerClose',
             'handlePageVisibilityChange'
         ]);
+        _this.store.init(function () {
+            if (!hasAsyncRenderers()) {
+                return;
+            }
+            var schema = props.schema;
+            var types = ['tpl', 'dialog', 'drawer'];
+            JSONTraverse(schema, function (value, key) {
+                if (key === 'type') {
+                    types.push(value);
+                    // form 依赖 panel
+                    if (value === 'form') {
+                        types.push('panel');
+                    }
+                }
+            });
+            return loadAsyncRenderersByType(types, true);
+        });
         return _this;
     }
     RootRenderer.prototype.componentDidMount = function () {
@@ -339,6 +358,9 @@ var RootRenderer = /** @class */ (function (_super) {
         if (store.runtimeError) {
             return this.renderRuntimeError();
         }
+        else if (!store.ready) {
+            return React.createElement(themedLazyComponent, { className: "RootLoader" });
+        }
         return (React.createElement(React.Fragment, null,
             render(pathPrefix, schema, __assign(__assign({}, rest), { topStore: this.store, data: this.store.downStream, context: store.context, onAction: this.handleAction })),
             this.renderSpinner(),

package/esm/SchemaRenderer.d.ts

@@ -23,7 +23,6 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
     unbindEvent: (() => void) | undefined;
     isStatic: any;
     constructor(props: SchemaRendererProps);
-    componentDidMount(): void;
     componentWillUnmount(): void;
     shouldComponentUpdate(nextProps: SchemaRendererProps): boolean;
     resolveRenderer(props: SchemaRendererProps, force?: boolean): any;

package/esm/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -8,8 +8,8 @@ import difference from 'lodash/difference';
 import omit from 'lodash/omit';
 import React from 'react';
 import { isValidElementType } from 'react-is';
-import LazyComponent from './components/LazyComponent.js';
-import { resolveRenderer, loadRenderer, filterSchema } from './factory.js';
+import themedLazyComponent from './components/LazyComponent.js';
+import { resolveRenderer, loadRendererError, loadAsyncRenderer, filterSchema } from './factory.js';
 import { asFormItem } from './renderers/Item.js';
 import { ScopedContext } from './Scoped.js';
 import { DebugWrapper } from './utils/debug.js';
@@ -22,6 +22,7 @@ import { reaction } from 'mobx';
 import 'amis-formula';
 import 'moment';
 import 'lodash/isPlainObject';
+import './utils/memoryParse.js';
 import '@rc-component/mini-decimal';
 import { resolveVariableAndFilter } from './utils/resolveVariableAndFilter.js';
 import './utils/filter.js';
@@ -88,10 +89,6 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }, function () { return _this.forceUpdate(); });
         return _this;
     }
-    SchemaRenderer.prototype.componentDidMount = function () {
-        // 这里无法区分监听的是不是广播，所以又bind一下，主要是为了绑广播
-        this.unbindEvent = bindEvent(this.cRef);
-    };
     SchemaRenderer.prototype.componentWillUnmount = function () {
         var _a, _b;
         (_a = this.reaction) === null || _a === void 0 ? void 0 : _a.call(this);
@@ -167,7 +164,15 @@ var SchemaRenderer = /** @class */ (function (_super) {
     };
     SchemaRenderer.prototype.childRef = function (ref) {
         var _this = this;
-        while (ref && ref.getWrappedInstance) {
+        var _a, _b;
+        // todo 这里有个问题，就是注意以下的这段注释
+        // > // 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
+        // > 而 visibleOn 和 hiddenOn 是无效的，
+        // > 这个本来就是个bug，但是已经被广泛使用了
+        // > 我只能继续实现这个bug了
+        // 这样会让子组件去根据是 hidden 的情况去渲染个 null，这样会导致这里 ref 有值，但是 ref.getWrappedInstance() 为 null
+        // 这样会和直接渲染的组件时有些区别，至少 cRef 的指向是不一样的
+        while ((_a = ref === null || ref === void 0 ? void 0 : ref.getWrappedInstance) === null || _a === void 0 ? void 0 : _a.call(ref)) {
             ref = ref.getWrappedInstance();
         }
         if (ref && !ref.props) {
@@ -175,6 +180,11 @@ var SchemaRenderer = /** @class */ (function (_super) {
                 get: function () { return _this.props; }
             });
         }
+        if (ref) {
+            // 这里无法区分监听的是不是广播，所以又bind一下，主要是为了绑广播
+            (_b = this.unbindEvent) === null || _b === void 0 ? void 0 : _b.call(this);
+            this.unbindEvent = bindEvent(ref);
+        }
         this.cRef = ref;
     };
     SchemaRenderer.prototype.dispatchEvent = function (e, data, renderer // for didmount
@@ -196,7 +206,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         var omitList = RENDERER_TRANSMISSION_OMIT_PROPS.concat();
         if (this.renderer) {
             var Component = this.renderer.component;
-            Component.propsList &&
+            (Component === null || Component === void 0 ? void 0 : Component.propsList) &&
                 omitList.push.apply(omitList, Component.propsList);
         }
         return render("".concat($path).concat(region ? "/".concat(region) : ''), node || '', __assign(__assign(__assign(__assign({}, omit(rest, omitList)), { defaultStatic: (_c = (_b = (((_a = this.renderer) === null || _a === void 0 ? void 0 : _a.type) &&
@@ -213,12 +223,12 @@ var SchemaRenderer = /** @class */ (function (_super) {
     SchemaRenderer.prototype.render = function () {
         var e_1, _a;
         var _this = this;
-        var _b, _c, _d, _e, _f, _g;
-        var _h = this.props; _h.$path; var __ = _h.schema, rootStore = _h.rootStore, statusStore = _h.statusStore, render = _h.render, propKey = _h.key, rest = __rest(_h, ["$path", "schema", "rootStore", "statusStore", "render", "key"]);
+        var _b, _c, _d, _e, _f, _g, _h;
+        var _j = this.props; _j.$path; var __ = _j.schema, rootStore = _j.rootStore, statusStore = _j.statusStore, render = _j.render, propKey = _j.key, rest = __rest(_j, ["$path", "schema", "rootStore", "statusStore", "render", "key"]);
         if (__ == null) {
             return null;
         }
-        var _j = this.resolveRenderer(this.props), $path = _j.path, schema = _j.schema;
+        var _k = this.resolveRenderer(this.props), $path = _k.path, schema = _k.schema;
         var theme = this.props.env.theme;
         if (Array.isArray(schema)) {
             return render($path, schema, rest);
@@ -275,7 +285,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
             return null;
         }
         else if (!this.renderer) {
-            return rest.invisible ? null : (React.createElement(LazyComponent, __assign({}, rest, exprProps, { getComponent: function () { return __awaiter(_this, void 0, void 0, function () {
+            return rest.invisible ? null : (React.createElement(themedLazyComponent, { defaultVisible: true, getComponent: function () { return __awaiter(_this, void 0, void 0, function () {
                     var result;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
@@ -289,10 +299,24 @@ var SchemaRenderer = /** @class */ (function (_super) {
                                     return [2 /*return*/, function () { return result; }];
                                 }
                                 this.reRender();
-                                return [2 /*return*/, function () { return loadRenderer(schema, $path); }];
+                                return [2 /*return*/, function () { return loadRendererError(schema, $path); }];
+                        }
+                    });
+                }); } }));
+        }
+        else if (this.renderer.getComponent && !this.renderer.component) {
+            // 处理异步渲染器
+            return rest.invisible ? null : (React.createElement(themedLazyComponent, { defaultVisible: true, getComponent: function () { return __awaiter(_this, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0: return [4 /*yield*/, loadAsyncRenderer(this.renderer)];
+                            case 1:
+                                _a.sent();
+                                this.reRender();
+                                return [2 /*return*/, function () { return null; }];
                         }
                     });
-                }); }, "$path": $path, "$schema": schema, retry: this.reRender, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent })));
+                }); } }));
         }
         var renderer = this.renderer;
         schema = filterSchema(schema, renderer, rest);
@@ -316,9 +340,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }
         var supportRef = ((_e = Component.prototype) === null || _e === void 0 ? void 0 : _e.isReactComponent) ||
             Component.$$typeof === Symbol.for('react.forward_ref');
-        var props = __assign(__assign(__assign(__assign(__assign({}, theme.getRendererConfig(renderer.name)), restSchema), chainEvents(rest, restSchema)), exprProps), { 
+        var props = __assign(__assign(__assign(__assign(__assign(__assign({}, (_f = renderer.defaultProps) === null || _f === void 0 ? void 0 : _f.call(renderer, schema.type, schema)), theme.getRendererConfig(renderer.name)), restSchema), chainEvents(rest, restSchema)), exprProps), { 
             // value: defaultValue, // 备注: 此处并没有将value传递给渲染器
-            defaultData: (_f = restSchema.defaultData) !== null && _f !== void 0 ? _f : defaultData, defaultValue: (_g = restSchema.defaultValue) !== null && _g !== void 0 ? _g : defaultValue, defaultActiveKey: defaultActiveKey, propKey: propKey, $path: $path, $schema: schema, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent, mobileUI: schema.useMobileUI === false ? false : rest.mobileUI });
+            defaultData: (_g = restSchema.defaultData) !== null && _g !== void 0 ? _g : defaultData, defaultValue: (_h = restSchema.defaultValue) !== null && _h !== void 0 ? _h : defaultValue, defaultActiveKey: defaultActiveKey, propKey: propKey, $path: $path, $schema: schema, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent, mobileUI: schema.useMobileUI === false ? false : rest.mobileUI });
         // style 支持公式
         if (schema.style) {
             props.style = buildStyle(schema.style, detectData);
@@ -341,8 +365,8 @@ var SchemaRenderer = /** @class */ (function (_super) {
         // 自动解析变量模式，主要是方便直接引入第三方组件库，无需为了支持变量封装一层
         if (renderer.autoVar) {
             try {
-                for (var _k = __values(Object.keys(schema)), _l = _k.next(); !_l.done; _l = _k.next()) {
-                    var key = _l.value;
+                for (var _l = __values(Object.keys(schema)), _m = _l.next(); !_m.done; _m = _l.next()) {
+                    var key = _m.value;
                     if (typeof props[key] === 'string' && isExpression(props[key])) {
                         props[key] = resolveVariableAndFilter(props[key], props.data, '| raw');
                     }
@@ -351,7 +375,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_l && !_l.done && (_a = _k.return)) _a.call(_k);
+                    if (_m && !_m.done && (_a = _l.return)) _a.call(_l);
                 }
                 finally { if (e_1) throw e_1.error; }
             }

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.7.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -15,6 +15,7 @@ import { memoParse } from './utils/tokenize.js';
 import { isPureVariable } from './utils/isPureVariable.js';
 import '@rc-component/mini-decimal';
 import { getVariable } from './utils/getVariable.js';
+import './utils/memoryParse.js';
 import { dataMapping } from './utils/dataMapping.js';
 import './utils/filter.js';
 import { findTree, eachTree, qsparse, qsstringify, parseQuery, autobind } from './utils/helper.js';

package/esm/StatusScoped.js

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

package/esm/WithRootStore.js

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

package/esm/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -15,6 +15,7 @@ import 'amis-formula';
 import 'moment';
 import { createObject, extendObject } from './utils/object.js';
 import { tokenize } from './utils/tokenize.js';
+import './utils/memoryParse.js';
 import '@rc-component/mini-decimal';
 import { dataMapping } from './utils/dataMapping.js';
 import './utils/filter.js';
@@ -96,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 是显示的时候更新的，
@@ -130,7 +131,7 @@ function HocStoreFactory(renderer) {
                                 (props.data &&
                                     prevProps.data &&
                                     props.data.__super !== prevProps.data.__super))) {
-                        store.initData(extendObject(props.data, __assign(__assign(__assign({}, (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 ||
@@ -141,22 +142,21 @@ function HocStoreFactory(renderer) {
                             (props.syncSuperStore !== false &&
                                 isSuperDataModified(props.data, prevProps.data, store)))) {
                     if (props.store && props.scope === props.data) {
-                        store.initData(createObject(props.store.data, 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);
+                        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)))), ((_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, 
-                        // 有远程数据
+                        store.initData(extendObject(props.data, __assign(__assign({}, this.formatData(dataMapping(this.props.defaultData, this.props.data, ignoreSchemaProps))), // 有远程数据
                         // 或者顶级 store
-                        store.hasRemoteData || !store.path.includes('/')
+                        (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.7.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -10,6 +10,7 @@ import { evalExpressionWithConditionBuilderAsync } from '../utils/tpl.js';
 import 'amis-formula';
 import 'moment';
 import { createObject } from '../utils/object.js';
+import '../utils/memoryParse.js';
 import '@rc-component/mini-decimal';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/filter.js';

package/esm/actions/AjaxAction.js

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

package/esm/actions/BreakAction.js

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

package/esm/actions/BroadcastAction.js

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

package/esm/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.0
  * 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.7.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/CopyAction.js

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

package/esm/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -11,6 +11,7 @@ import 'react';
 import 'lodash/chunk';
 import 'lodash/isPlainObject';
 import 'amis-formula';
+import '../utils/memoryParse.js';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
 import 'moment';