amis-core 3.2.0 → 3.3.0

package/esm/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/RootRenderer.d.ts

@@ -25,5 +25,5 @@ export declare class RootRenderer extends React.Component<RootRendererProps> {
     handleDrawerClose(): void;
     openFeedback(dialog: any, ctx: any): Promise<unknown>;
     reloadTarget(scoped: IScopedContext, target: string, data?: any): void;
-    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/esm/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -117,7 +117,7 @@ var RootRenderer = /** @class */ (function (_super) {
         }
         else if (action.actionType === 'dialog') {
             store.setCurrentAction(action);
-            store.openDialog(ctx, undefined, action.callback, delegate);
+            store.openDialog(ctx, undefined, action.callback, delegate || this.context);
         }
         else if (action.actionType === 'drawer') {
             store.setCurrentAction(action);
@@ -257,7 +257,7 @@ var RootRenderer = /** @class */ (function (_super) {
             });
             store.openDialog(ctx, undefined, function (confirmed) {
                 resolve(confirmed);
-            });
+            }, _this.context);
         });
     };
     RootRenderer.prototype.reloadTarget = function (scoped, target, data) {

package/esm/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -41,6 +41,8 @@ var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'hiddenOn',
     'disabled',
     'disabledOn',
+    'static',
+    'staticOn',
     'component',
     'detectField',
     'defaultValue',
@@ -54,7 +56,8 @@ var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'inputOnly',
     'label',
     'renderLabel',
-    'trackExpression'
+    'trackExpression',
+    'editorSetting'
 ];
 var componentCache = new SimpleMap();
 var SchemaRenderer = /** @class */ (function (_super) {

package/esm/Scoped.d.ts

@@ -22,6 +22,8 @@ export interface ScopedComponentType extends React.Component<RendererProps> {
     setData?: (value?: object, replace?: boolean, index?: number) => void;
 }
 export interface IScopedContext {
+    rendererType?: string;
+    component?: ScopedComponentType;
     parent?: AliasIScopedContext;
     children?: AliasIScopedContext[];
     registerComponent: (component: ScopedComponentType) => void;
@@ -33,13 +35,14 @@ export interface IScopedContext {
     send: (target: string, ctx: RendererData) => void;
     close: (target: string) => void;
     closeById: (target: string) => void;
+    getComponentsByRefPath: (session: string, path: string) => ScopedComponentType[];
 }
 type AliasIScopedContext = IScopedContext;
 export declare const ScopedContext: React.Context<IScopedContext>;
 export declare function HocScoped<T extends {
     $path?: string;
     env: RendererEnv;
-}>(ComposedComponent: React.ComponentType<T>): React.ComponentType<T & {
+}>(ComposedComponent: React.ComponentType<T>, rendererType?: string): React.ComponentType<T & {
     scopeRef?: (ref: any) => void;
 }> & {
     ComposedComponent: React.ComponentType<T>;

package/esm/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -29,8 +29,8 @@ import 'classnames';
 import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
-import 'lodash';
 import './utils/image.js';
+import 'lodash/isEqual';
 import './actions/Action.js';
 import 'lodash/debounce';
 import 'lodash/cloneDeep';
@@ -65,13 +65,16 @@ function filterTarget(target, data) {
 }
 var rootScopedContext = createScopedTools('');
 var ScopedContext = React.createContext(rootScopedContext);
-function createScopedTools(path, parent, env) {
+function createScopedTools(path, parent, env, rendererType) {
     var components = [];
     var self = {
+        rendererType: rendererType,
+        component: undefined,
         parent: parent,
         registerComponent: function (component) {
             // 不要把自己注册在自己的 Scoped 上，自己的 Scoped 是给子节点们注册的。
             if (component.props.$path === path && parent) {
+                self.component = component;
                 return parent.registerComponent(component);
             }
             if (!~components.indexOf(component)) {
@@ -335,12 +338,12 @@ function closeDialog(component) {
         .forEach(closeDialog);
     component.props.onClose && component.props.onClose();
 }
-function HocScoped(ComposedComponent) {
+function HocScoped(ComposedComponent, rendererType) {
     var ScopedComponent = /** @class */ (function (_super) {
         __extends(ScopedComponent, _super);
         function ScopedComponent(props, context) {
             var _this = _super.call(this, props) || this;
-            _this.scoped = createScopedTools(_this.props.$path, context, _this.props.env);
+            _this.scoped = createScopedTools(_this.props.$path, context, _this.props.env, rendererType);
             var scopeRef = props.scopeRef;
             scopeRef && scopeRef(_this.scoped);
             return _this;

package/esm/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/Action.d.ts

@@ -25,6 +25,7 @@ export interface ListenerAction {
     stopPropagation?: boolean;
     expression?: string | ConditionGroupValue;
     execOn?: string;
+    [propName: string]: any;
 }
 export interface ILogicAction extends ListenerAction {
     children?: ListenerAction[];

package/esm/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -117,11 +117,20 @@ var runActions = function (actions, renderer, event) { return __awaiter(void 0,
                 // 如果存在指定组件ID，说明是组件专有动作
                 if (!actionInstrance &&
                     (actionConfig.componentId || actionConfig.componentName)) {
-                    actionInstrance = getActionByType('component');
+                    actionInstrance = [
+                        'static',
+                        'nonstatic',
+                        'show',
+                        'visibility',
+                        'hidden',
+                        'enabled',
+                        'disabled',
+                        'usability'
+                    ].includes(actionConfig.actionType)
+                        ? getActionByType('status')
+                        : getActionByType('component');
                 }
-                else if (actionConfig.actionType === 'url' ||
-                    actionConfig.actionType === 'link' ||
-                    actionConfig.actionType === 'jump') {
+                else if (['url', 'link', 'jump'].includes(actionConfig.actionType)) {
                     // 打开页面动作
                     actionInstrance = getActionByType('openlink');
                 }
@@ -158,14 +167,16 @@ var runActions = function (actions, renderer, event) { return __awaiter(void 0,
 }); };
 // 执行动作，与原有动作处理打通
 var runAction = function (actionInstrance, actionConfig, renderer, event) { return __awaiter(void 0, void 0, void 0, function () {
-    var additional, mergeData, expression, isStop, preventDefault, key, args, afterMappingData, actionData, data, stopped, actionResult, stopPropagation;
-    var _a, _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var additional, action, mergeData, expression, isStop, preventDefault, key, api, args, afterMappingData, actionData, data, stopped, actionResult, stopPropagation;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+    return __generator(this, function (_u) {
+        switch (_u.label) {
             case 0:
                 additional = {
                     event: event
                 };
+                action = __assign({}, actionConfig);
+                action.args = __assign({}, actionConfig.args);
                 // __rendererData默认为renderer.props.data，兼容表单项值变化时的data读取
                 if (!event.data.__rendererData) {
                     additional = {
@@ -176,29 +187,47 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 mergeData = createObject(createObject(renderer.props.data.__super
                     ? createObject(renderer.props.data.__super, additional)
                     : additional, renderer.props.data), event.data);
-                expression = (_a = actionConfig.expression) !== null && _a !== void 0 ? _a : actionConfig.execOn;
+                expression = (_a = action.expression) !== null && _a !== void 0 ? _a : action.execOn;
                 isStop = false;
                 if (!expression) return [3 /*break*/, 2];
                 return [4 /*yield*/, evalExpressionWithConditionBuilder(expression, mergeData, true)];
             case 1:
-                isStop = !(_d.sent());
-                _d.label = 2;
+                isStop = !(_u.sent());
+                _u.label = 2;
             case 2:
                 if (isStop) {
                     return [2 /*return*/];
                 }
                 preventDefault = false;
-                if (!actionConfig.preventDefault) return [3 /*break*/, 4];
-                return [4 /*yield*/, evalExpressionWithConditionBuilder(actionConfig.preventDefault, mergeData, false)];
+                if (!action.preventDefault) return [3 /*break*/, 4];
+                return [4 /*yield*/, evalExpressionWithConditionBuilder(action.preventDefault, mergeData, false)];
             case 3:
-                preventDefault = _d.sent();
-                _d.label = 4;
+                preventDefault = _u.sent();
+                _u.label = 4;
             case 4:
                 key = {
-                    componentId: dataMapping(actionConfig.componentId, mergeData),
-                    componentName: dataMapping(actionConfig.componentName, mergeData)
+                    componentId: dataMapping(action.componentId, mergeData),
+                    componentName: dataMapping(action.componentName, mergeData)
                 };
-                args = dataMapping(actionConfig.args, mergeData, function (key) {
+                // 兼容args包裹的用法
+                if (action.actionType === 'dialog') {
+                    action.dialog = __assign({}, ((_b = action.dialog) !== null && _b !== void 0 ? _b : (_c = action.args) === null || _c === void 0 ? void 0 : _c.dialog));
+                    (_d = action.args) === null || _d === void 0 ? true : delete _d.dialog;
+                }
+                else if (action.actionType === 'drawer') {
+                    action.drawer = __assign({}, ((_e = action.drawer) !== null && _e !== void 0 ? _e : (_f = action.args) === null || _f === void 0 ? void 0 : _f.drawer));
+                    (_g = action.args) === null || _g === void 0 ? true : delete _g.drawer;
+                }
+                else if (action.actionType === 'ajax') {
+                    api = (_h = action.api) !== null && _h !== void 0 ? _h : (_j = action.args) === null || _j === void 0 ? void 0 : _j.api;
+                    action.api = typeof api === 'string' ? api : __assign({}, api);
+                    action.options = __assign({}, ((_k = action.options) !== null && _k !== void 0 ? _k : (_l = action.args) === null || _l === void 0 ? void 0 : _l.options));
+                    action.messages = __assign({}, ((_m = action.messages) !== null && _m !== void 0 ? _m : (_o = action.args) === null || _o === void 0 ? void 0 : _o.messages));
+                    (_p = action.args) === null || _p === void 0 ? true : delete _p.api;
+                    (_q = action.args) === null || _q === void 0 ? true : delete _q.options;
+                    (_r = action.args) === null || _r === void 0 ? true : delete _r.messages;
+                }
+                args = dataMapping(action.args, mergeData, function (key) {
                     return [
                         'adaptor',
                         'responseAdaptor',
@@ -207,34 +236,30 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                         'condition'
                     ].includes(key);
                 });
-                afterMappingData = dataMapping(actionConfig.data, mergeData);
+                afterMappingData = dataMapping(action.data, mergeData);
                 actionData = args && Object.keys(args).length
-                    ? omit(__assign(__assign({}, args), (afterMappingData !== null && afterMappingData !== void 0 ? afterMappingData : {})), getOmitActionProp(actionConfig.actionType))
+                    ? omit(__assign(__assign({}, args), (afterMappingData !== null && afterMappingData !== void 0 ? afterMappingData : {})), getOmitActionProp(action.actionType))
                     : afterMappingData;
-                data = args && !Object.keys(args).length && actionConfig.data === undefined // 兼容历史
-                    ? {}
-                    : actionData !== undefined
-                        ? actionData
-                        : event.data;
-                (_b = console.group) === null || _b === void 0 ? void 0 : _b.call(console, "run action ".concat(actionConfig.actionType));
-                console.debug("[".concat(actionConfig.actionType, "] action args, data"), args, data);
+                data = actionData !== undefined ? actionData : mergeData;
+                (_s = console.group) === null || _s === void 0 ? void 0 : _s.call(console, "run action ".concat(action.actionType));
+                console.debug("[".concat(action.actionType, "] action args, data"), args, data);
                 stopped = false;
-                return [4 /*yield*/, actionInstrance.run(__assign(__assign(__assign({}, actionConfig), { args: args, data: data }), key), renderer, event, mergeData)];
+                return [4 /*yield*/, actionInstrance.run(__assign(__assign(__assign({}, action), { args: args, data: action.actionType === 'reload' ? actionData : data }), key), renderer, event, mergeData)];
             case 5:
-                actionResult = _d.sent();
+                actionResult = _u.sent();
                 // 二次确认弹窗如果取消，则终止后续动作
-                if ((actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType) === 'confirmDialog' && !actionResult) {
+                if ((action === null || action === void 0 ? void 0 : action.actionType) === 'confirmDialog' && !actionResult) {
                     stopped = true;
                 }
                 stopPropagation = false;
-                if (!actionConfig.stopPropagation) return [3 /*break*/, 7];
-                return [4 /*yield*/, evalExpressionWithConditionBuilder(actionConfig.stopPropagation, mergeData, false)];
+                if (!action.stopPropagation) return [3 /*break*/, 7];
+                return [4 /*yield*/, evalExpressionWithConditionBuilder(action.stopPropagation, mergeData, false)];
             case 6:
-                stopPropagation = _d.sent();
-                _d.label = 7;
+                stopPropagation = _u.sent();
+                _u.label = 7;
             case 7:
-                console.debug("[".concat(actionConfig.actionType, "] action end event"), event);
-                (_c = console.groupEnd) === null || _c === void 0 ? void 0 : _c.call(console);
+                console.debug("[".concat(action.actionType, "] action end event"), event);
+                (_t = console.groupEnd) === null || _t === void 0 ? void 0 : _t.call(console);
                 // 阻止原有动作执行
                 preventDefault && event.preventDefault();
                 // 阻止后续动作执行

package/esm/actions/AjaxAction.d.ts

@@ -3,15 +3,13 @@ import { RendererEvent } from '../utils/renderer-event';
 import { RendererAction, ListenerAction, ListenerContext } from './Action';
 export interface IAjaxAction extends ListenerAction {
     action: 'ajax';
-    args: {
-        api: Api;
-        messages?: {
-            success: string;
-            failed: string;
-        };
-        options?: Record<string, any>;
-        [propName: string]: any;
+    api: Api;
+    messages?: {
+        success: string;
+        failed: string;
     };
+    options?: Record<string, any>;
+    [propName: string]: any;
 }
 /**
  * 发送请求动作

package/esm/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -23,39 +23,41 @@ var AjaxAction = /** @class */ (function () {
         this.fetcherType = fetcherType;
     }
     AjaxAction.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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         return __awaiter(this, void 0, void 0, function () {
-            var env, result, responseData, msg, e_1, result;
-            var _1;
-            return __generator(this, function (_2) {
-                switch (_2.label) {
+            var env, silent, messages, result, responseData, msg, e_1, result;
+            var _o;
+            return __generator(this, function (_p) {
+                switch (_p.label) {
                     case 0:
                         if (!((_a = renderer.props.env) === null || _a === void 0 ? void 0 : _a.fetcher)) {
                             throw new Error('env.fetcher is required!');
                         }
                         if (this.fetcherType === 'download' && action.actionType === 'download') {
-                            if ((_b = action.args) === null || _b === void 0 ? void 0 : _b.api) {
-                                action.args.api.responseType = 'blob';
+                            if (action.api) {
+                                action.api.responseType = 'blob';
                             }
                         }
                         env = event.context.env;
-                        _2.label = 1;
+                        silent = (_b = action === null || action === void 0 ? void 0 : action.options) === null || _b === void 0 ? void 0 : _b.silent;
+                        messages = (_c = action === null || action === void 0 ? void 0 : action.api) === null || _c === void 0 ? void 0 : _c.messages;
+                        _p.label = 1;
                     case 1:
-                        _2.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, env.fetcher((_c = action.args) === null || _c === void 0 ? void 0 : _c.api, (_d = action.data) !== null && _d !== void 0 ? _d : {}, (_f = (_e = action.args) === null || _e === void 0 ? void 0 : _e.options) !== null && _f !== void 0 ? _f : {})];
+                        _p.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, env.fetcher(action === null || action === void 0 ? void 0 : action.api, (_d = action.data) !== null && _d !== void 0 ? _d : {}, (_e = action === null || action === void 0 ? void 0 : action.options) !== null && _e !== void 0 ? _e : {})];
                     case 2:
-                        result = _2.sent();
+                        result = _p.sent();
                         responseData = !isEmpty(result.data) || result.ok
                             ? normalizeApiResponseData(result.data)
                             : null;
                         // 记录请求返回的数据
-                        event.setData(createObject(event.data, __assign(__assign({}, responseData), (_1 = { responseData: responseData }, _1[action.outputVar || 'responseResult'] = __assign(__assign({}, responseData), { responseData: responseData, responseStatus: result.status, responseMsg: result.msg }), _1))));
-                        if (!((_h = (_g = action.args) === null || _g === void 0 ? void 0 : _g.options) === null || _h === void 0 ? void 0 : _h.silent)) {
+                        event.setData(createObject(event.data, __assign(__assign({}, responseData), (_o = { responseData: responseData }, _o[action.outputVar || 'responseResult'] = __assign(__assign({}, responseData), { responseData: responseData, responseStatus: result.status, responseMsg: result.msg }), _o))));
+                        if (!silent) {
                             if (!result.ok) {
-                                throw new ServerError((_q = (_m = (_l = (_k = (_j = action.args) === null || _j === void 0 ? void 0 : _j.api) === null || _k === void 0 ? void 0 : _k.messages) === null || _l === void 0 ? void 0 : _l.failed) !== null && _m !== void 0 ? _m : (_p = (_o = action.args) === null || _o === void 0 ? void 0 : _o.messages) === null || _p === void 0 ? void 0 : _p.failed) !== null && _q !== void 0 ? _q : result.msg, result);
+                                throw new ServerError((_h = (_f = messages === null || messages === void 0 ? void 0 : messages.failed) !== null && _f !== void 0 ? _f : (_g = action.messages) === null || _g === void 0 ? void 0 : _g.failed) !== null && _h !== void 0 ? _h : result.msg, result);
                             }
                             else {
-                                msg = (_y = (_x = (_u = (_t = (_s = (_r = action.args) === null || _r === void 0 ? void 0 : _r.api) === null || _s === void 0 ? void 0 : _s.messages) === null || _t === void 0 ? void 0 : _t.success) !== null && _u !== void 0 ? _u : (_w = (_v = action.args) === null || _v === void 0 ? void 0 : _v.messages) === null || _w === void 0 ? void 0 : _w.success) !== null && _x !== void 0 ? _x : result.msg) !== null && _y !== void 0 ? _y : result.defaultMsg;
+                                msg = (_m = (_l = (_j = messages === null || messages === void 0 ? void 0 : messages.success) !== null && _j !== void 0 ? _j : (_k = action.messages) === null || _k === void 0 ? void 0 : _k.success) !== null && _l !== void 0 ? _l : result.msg) !== null && _m !== void 0 ? _m : result.defaultMsg;
                                 msg &&
                                     env.notify('success', msg, result.msgTimeout !== undefined
                                         ? {
@@ -67,8 +69,8 @@ var AjaxAction = /** @class */ (function () {
                         }
                         return [2 /*return*/, result.data];
                     case 3:
-                        e_1 = _2.sent();
-                        if (!((_0 = (_z = action.args) === null || _z === void 0 ? void 0 : _z.options) === null || _0 === void 0 ? void 0 : _0.silent)) {
+                        e_1 = _p.sent();
+                        if (!silent) {
                             if (e_1.type === 'ServerError') {
                                 result = e_1.response;
                                 env.notify('error', e_1.message, result.msgTimeout !== undefined

package/esm/actions/BreakAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/BroadcastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/CmptAction.d.ts

@@ -1,9 +1,8 @@
 import { RendererEvent } from '../utils/renderer-event';
 import { RendererAction, ListenerAction, ListenerContext } from './Action';
 export interface ICmptAction extends ListenerAction {
-    actionType: 'setValue' | 'static' | 'nonstatic' | 'show' | 'visibility' | 'hidden' | 'enabled' | 'disabled' | 'usability' | 'reload';
+    actionType: string;
     args: {
-        /** actionType为setValue时，目标变量的path */
         path?: string;
         value?: string | {
             [key: string]: string;

package/esm/actions/CmptAction.js

@@ -1,10 +1,12 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
 import { __awaiter, __generator } from 'tslib';
+import '../utils/helper.js';
 import { registerAction } from './Action.js';
+import { createObject } from '../utils/object.js';
 
 /**
  * 组件动作
@@ -17,61 +19,74 @@ var CmptAction = /** @class */ (function () {
     function CmptAction() {
     }
     CmptAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         return __awaiter(this, void 0, void 0, function () {
-            var key, component, dataMergeMode, visibility, usability, beforeSetData, path, res;
-            return __generator(this, function (_p) {
-                switch (_p.label) {
+            var key, dataMergeMode, component, beforeSetData, path, res, result, e_1;
+            var _s, _t;
+            return __generator(this, function (_u) {
+                switch (_u.label) {
                     case 0:
                         key = action.componentId || action.componentName;
+                        dataMergeMode = action.dataMergeMode || 'merge';
                         component = key
                             ? (_a = event.context.scoped) === null || _a === void 0 ? void 0 : _a[action.componentId ? 'getComponentById' : 'getComponentByName'](key)
-                            : renderer;
-                        dataMergeMode = action.dataMergeMode || 'merge';
-                        // 显隐&状态控制
-                        if (['show', 'hidden', 'visibility'].includes(action.actionType)) {
-                            visibility = action.actionType === 'visibility'
-                                ? (_b = action.args) === null || _b === void 0 ? void 0 : _b.value
-                                : action.actionType === 'show';
-                            return [2 /*return*/, renderer.props.statusStore.setVisible(key, visibility)];
-                        }
-                        else if (['static', 'nonstatic'].includes(action.actionType)) {
-                            return [2 /*return*/, renderer.props.statusStore.setStatic(key, action.actionType === 'static')];
-                        }
-                        else if (['enabled', 'disabled', 'usability'].includes(action.actionType)) {
-                            usability = action.actionType === 'usability'
-                                ? !((_c = action.args) === null || _c === void 0 ? void 0 : _c.value)
-                                : action.actionType === 'disabled';
-                            return [2 /*return*/, renderer.props.statusStore.setDisable(key, usability)];
+                            : null;
+                        if (key && !component) {
+                            throw Error('目标组件没有找到，请检查componentId或componentName是否正确');
                         }
                         if (!(action.actionType === 'setValue')) return [3 /*break*/, 3];
-                        beforeSetData = (_e = (_d = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _d === void 0 ? void 0 : _d.env) === null || _e === void 0 ? void 0 : _e.beforeSetData;
-                        path = (_f = action.args) === null || _f === void 0 ? void 0 : _f.path;
+                        beforeSetData = (_c = (_b = renderer === null || renderer === void 0 ? void 0 : renderer.props) === null || _b === void 0 ? void 0 : _b.env) === null || _c === void 0 ? void 0 : _c.beforeSetData;
+                        path = (_d = action.args) === null || _d === void 0 ? void 0 : _d.path;
                         if (!(path &&
                             typeof path === 'string' &&
                             beforeSetData &&
                             typeof beforeSetData === 'function')) return [3 /*break*/, 2];
                         return [4 /*yield*/, beforeSetData(renderer, action, event)];
                     case 1:
-                        res = _p.sent();
+                        res = _u.sent();
                         if (res === false) {
                             return [2 /*return*/];
                         }
-                        _p.label = 2;
+                        _u.label = 2;
                     case 2:
                         if (component === null || component === void 0 ? void 0 : component.setData) {
-                            return [2 /*return*/, component === null || component === void 0 ? void 0 : component.setData((_g = action.args) === null || _g === void 0 ? void 0 : _g.value, dataMergeMode === 'override', (_h = action.args) === null || _h === void 0 ? void 0 : _h.index)];
+                            return [2 /*return*/, component === null || component === void 0 ? void 0 : component.setData((_e = action.args) === null || _e === void 0 ? void 0 : _e.value, dataMergeMode === 'override', (_f = action.args) === null || _f === void 0 ? void 0 : _f.index)];
                         }
                         else {
-                            return [2 /*return*/, (_k = component === null || component === void 0 ? void 0 : (_j = component.props).onChange) === null || _k === void 0 ? void 0 : _k.call(_j, (_l = action.args) === null || _l === void 0 ? void 0 : _l.value)];
+                            return [2 /*return*/, (_h = component === null || component === void 0 ? void 0 : (_g = component.props).onChange) === null || _h === void 0 ? void 0 : _h.call(_g, (_j = action.args) === null || _j === void 0 ? void 0 : _j.value)];
                         }
                     case 3:
                         // 刷新
                         if (action.actionType === 'reload') {
-                            return [2 /*return*/, (_m = component === null || component === void 0 ? void 0 : component.reload) === null || _m === void 0 ? void 0 : _m.call(component, undefined, action.data, undefined, undefined, dataMergeMode === 'override', action.args)];
+                            return [2 /*return*/, (_k = component === null || component === void 0 ? void 0 : component.reload) === null || _k === void 0 ? void 0 : _k.call(component, undefined, action.data, undefined, undefined, dataMergeMode === 'override', action.args)];
+                        }
+                        _u.label = 4;
+                    case 4:
+                        _u.trys.push([4, 6, , 7]);
+                        return [4 /*yield*/, ((_l = component === null || component === void 0 ? void 0 : component.doAction) === null || _l === void 0 ? void 0 : _l.call(component, action, action.args, true))];
+                    case 5:
+                        result = _u.sent();
+                        if (['validate', 'submit'].includes(action.actionType)) {
+                            event.setData(createObject(event.data, (_s = {},
+                                _s[action.outputVar || "".concat(action.actionType, "Result")] = {
+                                    error: '',
+                                    payload: (_m = result === null || result === void 0 ? void 0 : result.__payload) !== null && _m !== void 0 ? _m : (_p = (_o = component === null || component === void 0 ? void 0 : component.props) === null || _o === void 0 ? void 0 : _o.store) === null || _p === void 0 ? void 0 : _p.data,
+                                    responseData: result === null || result === void 0 ? void 0 : result.__response
+                                },
+                                _s)));
                         }
-                        // 执行组件动作
-                        return [2 /*return*/, (_o = component === null || component === void 0 ? void 0 : component.doAction) === null || _o === void 0 ? void 0 : _o.call(component, action, action.args)];
+                        return [2 /*return*/, result];
+                    case 6:
+                        e_1 = _u.sent();
+                        event.setData(createObject(event.data, (_t = {},
+                            _t[action.outputVar || "".concat(action.actionType, "Result")] = {
+                                error: e_1.message,
+                                errors: e_1.name === 'ValidateError' ? e_1.detail : e_1,
+                                payload: (_r = (_q = component === null || component === void 0 ? void 0 : component.props) === null || _q === void 0 ? void 0 : _q.store) === null || _r === void 0 ? void 0 : _r.data
+                            },
+                            _t)));
+                        return [3 /*break*/, 7];
+                    case 7: return [2 /*return*/];
                 }
             });
         });

package/esm/actions/ContinueAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/CopyAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -23,8 +23,8 @@ import '../utils/filter.js';
 import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
-import 'lodash';
 import '../utils/image.js';
+import 'lodash/isEqual';
 import { registerAction, runActions } from './Action.js';
 import 'lodash/debounce';
 import 'lodash/cloneDeep';