amis-core 3.1.1 → 3.3.0-beta.4

package/esm/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0-beta.4
  * 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 | React.ReactFragment | null | undefined;
+    render(): string | number | boolean | React.JSX.Element | Iterable<React.ReactNode> | null | undefined;
 }

package/esm/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0-beta.4
  * 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, undefined, delegate);
+            store.openDialog(ctx, undefined, action.callback, delegate);
         }
         else if (action.actionType === 'drawer') {
             store.setCurrentAction(action);

package/esm/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0-beta.4
  * Copyright 2018-2023 fex
  */
 
@@ -53,7 +53,8 @@ var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'id',
     'inputOnly',
     'label',
-    'renderLabel'
+    'renderLabel',
+    'trackExpression'
 ];
 var componentCache = new SimpleMap();
 var SchemaRenderer = /** @class */ (function (_super) {

package/esm/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0-beta.4
  * Copyright 2018-2023 fex
  */
 
@@ -42,6 +42,7 @@ import 'lodash/camelCase';
 import 'uncontrollable';
 import './utils/validations.js';
 import './utils/resolveCondition.js';
+import 'mobx';
 import './utils/Animation.js';
 
 /**

package/esm/StatusScoped.js

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

package/esm/WithRootStore.d.ts

@@ -333,30 +333,10 @@ export declare const RootStoreContext: React.Context<{
 export declare function withRootStore<T extends React.ComponentType<React.ComponentProps<T> & {
     rootStore: IRendererStore;
 }>>(ComposedComponent: T): {
-    new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">> | Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>): {
-        render(): React.JSX.Element;
-        context: unknown;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
-        forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>;
-        state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
-        componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, nextState: Readonly<{}>, nextContext: any): boolean;
-        componentWillUnmount?(): void;
-        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, prevState: Readonly<{}>, snapshot?: any): void;
-        componentWillMount?(): void;
-        UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>, nextState: Readonly<{}>, nextContext: any): void;
-    };
-    new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>, context: any): {
+    new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>): {
+        ref: any;
+        getWrappedInstance(): any;
+        refFn(ref: any): void;
         render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;

package/esm/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0-beta.4
  * Copyright 2018-2023 fex
  */
 
@@ -12,15 +12,23 @@ function withRootStore(ComposedComponent) {
     var _a;
     var result = hoistNonReactStatic((_a = /** @class */ (function (_super) {
             __extends(class_1, _super);
-            function class_1() {
-                return _super !== null && _super.apply(this, arguments) || this;
+            function class_1(props) {
+                var _this = _super.call(this, props) || this;
+                _this.refFn = _this.refFn.bind(_this);
+                return _this;
             }
+            class_1.prototype.getWrappedInstance = function () {
+                return this.ref.control;
+            };
+            class_1.prototype.refFn = function (ref) {
+                this.ref = ref;
+            };
             class_1.prototype.render = function () {
                 var rootStore = this.context;
                 var injectedProps = {
                     rootStore: rootStore
                 };
-                return (React.createElement(ComposedComponent, __assign({}, this.props, injectedProps)));
+                return (React.createElement(ComposedComponent, __assign({}, this.props, injectedProps, { ref: this.refFn })));
             };
             return class_1;
         }(React.Component)),

package/esm/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0-beta.4
  * Copyright 2018-2023 fex
  */
 
@@ -14,6 +14,7 @@ import { guid, isObjectShallowModified, isSuperDataModified, syncDataFromSuper }
 import 'amis-formula';
 import 'moment';
 import { createObject, extendObject } from './utils/object.js';
+import { tokenize } from './utils/tokenize.js';
 import { dataMapping } from './utils/dataMapping.js';
 import './utils/filter.js';
 import { RootStoreContext } from './WithRootStore.js';
@@ -97,20 +98,26 @@ function HocStoreFactory(renderer) {
                 if (extendsData === false) {
                     if (shouldSync === true ||
                         prevProps.defaultData !== props.defaultData ||
-                        isObjectShallowModified(prevProps.data, props.data) ||
-                        //
-                        // 特殊处理 CRUD。
-                        // CRUD 中 toolbar 里面的 data 是空对象，但是 __super 会不一样
-                        (props.data &&
-                            prevProps.data &&
-                            props.data.__super !== prevProps.data.__super)) {
+                        (props.trackExpression
+                            ? tokenize(props.trackExpression, props.data) !==
+                                tokenize(props.trackExpression, prevProps.data)
+                            : isObjectShallowModified(prevProps.data, props.data) ||
+                                //
+                                // 特殊处理 CRUD。
+                                // CRUD 中 toolbar 里面的 data 是空对象，但是 __super 会不一样
+                                (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))));
                     }
                 }
                 else if (shouldSync === true ||
-                    isObjectShallowModified(prevProps.data, props.data) ||
-                    (props.syncSuperStore !== false &&
-                        isSuperDataModified(props.data, prevProps.data, store))) {
+                    (props.trackExpression
+                        ? tokenize(props.trackExpression, props.data) !==
+                            tokenize(props.trackExpression, prevProps.data)
+                        : isObjectShallowModified(prevProps.data, props.data) ||
+                            (props.syncSuperStore !== false &&
+                                isSuperDataModified(props.data, prevProps.data, store)))) {
                     if (props.store && props.store.data === 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)));
@@ -123,9 +130,8 @@ function HocStoreFactory(renderer) {
                         store.initData(createObject(props.scope, props.data));
                     }
                 }
-                else if ((shouldSync === true ||
-                    !props.store ||
-                    props.data !== props.store.data) &&
+                else if (!props.trackExpression &&
+                    (!props.store || props.data !== props.store.data) &&
                     props.data &&
                     props.data.__super) {
                     // 这个用法很少，当 data.__super 值发生变化时，更新 store.data
@@ -136,9 +142,10 @@ function HocStoreFactory(renderer) {
                     }
                     // nextProps.data.__super !== props.data.__super) &&
                 }
-                else if (props.scope &&
+                else if (!props.trackExpression &&
+                    props.scope &&
                     props.data === props.store.data &&
-                    (shouldSync === true || prevProps.data !== props.data)) {
+                    prevProps.data !== props.data) {
                     // 只有父级数据变动的时候才应该进来，
                     // 目前看来这个 case 很少有情况下能进来
                     store.initData(createObject(props.scope, __assign({}, store.data)));

package/esm/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0-beta.4
  * Copyright 2018-2023 fex
  */
 
@@ -88,7 +88,7 @@ var getOmitActionProp = function (type) {
             omitList = ['drawer'];
             break;
         case 'confirmDialog':
-            omitList = ['confirmDialog'];
+            omitList = ['dialog'];
             break;
         case 'reload':
             omitList = ['resetPage'];
@@ -158,7 +158,7 @@ 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, stopPropagation, key, args, afterMappingData, actionData, data, stoped, actionResult;
+    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) {
@@ -194,13 +194,6 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 preventDefault = _d.sent();
                 _d.label = 4;
             case 4:
-                stopPropagation = false;
-                if (!actionConfig.stopPropagation) return [3 /*break*/, 6];
-                return [4 /*yield*/, evalExpressionWithConditionBuilder(actionConfig.stopPropagation, mergeData, false)];
-            case 5:
-                stopPropagation = _d.sent();
-                _d.label = 6;
-            case 6:
                 key = {
                     componentId: dataMapping(actionConfig.componentId, mergeData),
                     componentName: dataMapping(actionConfig.componentName, mergeData)
@@ -225,20 +218,27 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                         : 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);
-                stoped = false;
+                stopped = false;
                 return [4 /*yield*/, actionInstrance.run(__assign(__assign(__assign({}, actionConfig), { args: args, data: data }), key), renderer, event, mergeData)];
-            case 7:
+            case 5:
                 actionResult = _d.sent();
                 // 二次确认弹窗如果取消，则终止后续动作
                 if ((actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType) === 'confirmDialog' && !actionResult) {
-                    stoped = true;
+                    stopped = true;
                 }
+                stopPropagation = false;
+                if (!actionConfig.stopPropagation) return [3 /*break*/, 7];
+                return [4 /*yield*/, evalExpressionWithConditionBuilder(actionConfig.stopPropagation, mergeData, false)];
+            case 6:
+                stopPropagation = _d.sent();
+                _d.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);
                 // 阻止原有动作执行
                 preventDefault && event.preventDefault();
                 // 阻止后续动作执行
-                (stopPropagation || stoped) && event.stopPropagation();
+                (stopPropagation || stopped) && event.stopPropagation();
                 return [2 /*return*/];
         }
     });

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.1.1
+ * amis-core v3.3.0-beta.4
  * Copyright 2018-2023 fex
  */
 
@@ -25,7 +25,7 @@ var AjaxAction = /** @class */ (function () {
     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;
         return __awaiter(this, void 0, void 0, function () {
-            var env, result, responseData, msg, e_1, result;
+            var env, silent, messages, result, responseData, msg, e_1, result;
             var _1;
             return __generator(this, function (_2) {
                 switch (_2.label) {
@@ -34,15 +34,21 @@ var AjaxAction = /** @class */ (function () {
                             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 === null || action === void 0 ? void 0 : action.api) {
+                                action.api.responseType = 'blob';
+                            }
                         }
                         env = event.context.env;
+                        silent = (_d = (_c = action === null || action === void 0 ? void 0 : action.options) === null || _c === void 0 ? void 0 : _c.silent) !== null && _d !== void 0 ? _d : (_f = (_e = action.args) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.silent;
+                        messages = (_h = (_g = action === null || action === void 0 ? void 0 : action.api) === null || _g === void 0 ? void 0 : _g.messages) !== null && _h !== void 0 ? _h : (_k = (_j = action.args) === null || _j === void 0 ? void 0 : _j.api) === null || _k === void 0 ? void 0 : _k.messages;
                         _2.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 : {})];
+                        return [4 /*yield*/, env.fetcher((_l = action === null || action === void 0 ? void 0 : action.api) !== null && _l !== void 0 ? _l : (_m = action.args) === null || _m === void 0 ? void 0 : _m.api, (_o = action.data) !== null && _o !== void 0 ? _o : {}, (_r = (_p = action === null || action === void 0 ? void 0 : action.options) !== null && _p !== void 0 ? _p : (_q = action.args) === null || _q === void 0 ? void 0 : _q.options) !== null && _r !== void 0 ? _r : {})];
                     case 2:
                         result = _2.sent();
                         responseData = !isEmpty(result.data) || result.ok
@@ -50,12 +56,12 @@ var AjaxAction = /** @class */ (function () {
                             : 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)) {
+                        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((_v = (_s = messages === null || messages === void 0 ? void 0 : messages.failed) !== null && _s !== void 0 ? _s : (_u = (_t = action.args) === null || _t === void 0 ? void 0 : _t.messages) === null || _u === void 0 ? void 0 : _u.failed) !== null && _v !== void 0 ? _v : 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 = (_0 = (_z = (_w = messages === null || messages === void 0 ? void 0 : messages.success) !== null && _w !== void 0 ? _w : (_y = (_x = action.args) === null || _x === void 0 ? void 0 : _x.messages) === null || _y === void 0 ? void 0 : _y.success) !== null && _z !== void 0 ? _z : result.msg) !== null && _0 !== void 0 ? _0 : result.defaultMsg;
                                 msg &&
                                     env.notify('success', msg, result.msgTimeout !== undefined
                                         ? {
@@ -68,7 +74,7 @@ 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)) {
+                        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.1.1
+ * amis-core v3.3.0-beta.4
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/BroadcastAction.js

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

package/esm/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0-beta.4
  * Copyright 2018-2023 fex
  */
 
@@ -24,7 +24,7 @@ var CmptAction = /** @class */ (function () {
                 switch (_p.label) {
                     case 0:
                         key = action.componentId || action.componentName;
-                        component = key && renderer.props.$schema[action.componentId ? 'id' : 'name'] !== key
+                        component = key
                             ? (_a = event.context.scoped) === null || _a === void 0 ? void 0 : _a[action.componentId ? 'getComponentById' : 'getComponentByName'](key)
                             : renderer;
                         dataMergeMode = action.dataMergeMode || 'merge';

package/esm/actions/ContinueAction.js

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

package/esm/actions/CopyAction.js

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

package/esm/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0-beta.4
  * Copyright 2018-2023 fex
  */
 
@@ -37,6 +37,7 @@ import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';
 import '../utils/resolveCondition.js';
+import 'mobx';
 import '../utils/Animation.js';
 
 /**

package/esm/actions/DialogAction.d.ts

@@ -3,6 +3,7 @@ import { RendererEvent } from '../utils/renderer-event';
 import { RendererAction, ListenerAction, ListenerContext } from './Action';
 export interface IAlertAction extends ListenerAction {
     actionType: 'alert';
+    dialog?: Schema;
     args: {
         msg: string;
         [propName: string]: any;
@@ -25,6 +26,7 @@ export interface IDialogAction extends ListenerAction {
 }
 export interface IConfirmDialogAction extends ListenerAction {
     actionType: 'confirmDialog';
+    dialog?: Schema;
     args: {
         msg: string;
         title: string;

package/esm/actions/DialogAction.js

@@ -1,11 +1,12 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0-beta.4
  * Copyright 2018-2023 fex
  */
 
 import { __awaiter, __generator, __assign } from 'tslib';
 import { registerAction } from './Action.js';
-import { render } from '../index.js';
+import '../index.js';
+import { filter } from '../utils/tpl.js';
 
 /**
  * 打开弹窗动作
@@ -18,16 +19,16 @@ var DialogAction = /** @class */ (function () {
     function DialogAction() {
     }
     DialogAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_d) {
+            return __generator(this, function (_e) {
                 // 防止editor preview模式下执行
                 if (action.$$id !== undefined) {
                     return [2 /*return*/];
                 }
                 (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
                     actionType: 'dialog',
-                    dialog: ((_c = action.args) === null || _c === void 0 ? void 0 : _c.dialog) || action.dialog,
+                    dialog: (_c = action.dialog) !== null && _c !== void 0 ? _c : (_d = action.args) === null || _d === void 0 ? void 0 : _d.dialog,
                     reload: 'none'
                 }, action.data);
                 return [2 /*return*/];
@@ -71,10 +72,10 @@ var AlertAction = /** @class */ (function () {
     function AlertAction() {
     }
     AlertAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_e) {
-                (_b = (_a = event.context.env).alert) === null || _b === void 0 ? void 0 : _b.call(_a, (_c = action.args) === null || _c === void 0 ? void 0 : _c.msg, (_d = action.args) === null || _d === void 0 ? void 0 : _d.title);
+            return __generator(this, function (_j) {
+                (_b = (_a = event.context.env).alert) === null || _b === void 0 ? void 0 : _b.call(_a, (_d = filter((_c = action.dialog) === null || _c === void 0 ? void 0 : _c.msg, event.data)) !== null && _d !== void 0 ? _d : (_e = action.args) === null || _e === void 0 ? void 0 : _e.msg, (_g = filter((_f = action.dialog) === null || _f === void 0 ? void 0 : _f.title, event.data)) !== null && _g !== void 0 ? _g : (_h = action.args) === null || _h === void 0 ? void 0 : _h.title);
                 return [2 /*return*/];
             });
         });
@@ -88,25 +89,41 @@ var ConfirmAction = /** @class */ (function () {
     function ConfirmAction() {
     }
     ConfirmAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         return __awaiter(this, void 0, void 0, function () {
-            var content, confirmed;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var type, confirmed_1, confirmed;
+            return __generator(this, function (_x) {
+                switch (_x.label) {
                     case 0:
-                        content = ((_a = action.args) === null || _a === void 0 ? void 0 : _a.body)
-                            ? render(action.args.body)
-                            : action.args.msg;
-                        return [4 /*yield*/, ((_c = (_b = event.context.env).confirm) === null || _c === void 0 ? void 0 : _c.call(_b, content, action.args.title, {
-                                closeOnEsc: action.args.closeOnEsc,
-                                size: action.args.size,
-                                confirmText: action.args.confirmText,
-                                cancelText: action.args.cancelText,
-                                confirmBtnLevel: action.args.confirmBtnLevel,
-                                cancelBtnLevel: action.args.cancelBtnLevel
+                        type = (_b = (_a = action.dialog) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : (_c = action.args) === null || _c === void 0 ? void 0 : _c.type;
+                        if (!!type) return [3 /*break*/, 2];
+                        return [4 /*yield*/, ((_e = (_d = event.context.env).confirm) === null || _e === void 0 ? void 0 : _e.call(_d, filter((_f = action.dialog) === null || _f === void 0 ? void 0 : _f.msg, event.data) || ((_g = action.args) === null || _g === void 0 ? void 0 : _g.msg), filter((_h = action.dialog) === null || _h === void 0 ? void 0 : _h.title, event.data) || ((_j = action.args) === null || _j === void 0 ? void 0 : _j.title), {
+                                closeOnEsc: filter((_k = action.dialog) === null || _k === void 0 ? void 0 : _k.closeOnEsc, event.data) ||
+                                    ((_l = action.args) === null || _l === void 0 ? void 0 : _l.closeOnEsc),
+                                size: filter((_m = action.dialog) === null || _m === void 0 ? void 0 : _m.size, event.data) || ((_o = action.args) === null || _o === void 0 ? void 0 : _o.size),
+                                confirmText: filter((_p = action.dialog) === null || _p === void 0 ? void 0 : _p.confirmText, event.data) ||
+                                    ((_q = action.args) === null || _q === void 0 ? void 0 : _q.confirmText),
+                                cancelText: filter((_r = action.dialog) === null || _r === void 0 ? void 0 : _r.cancelText, event.data) ||
+                                    ((_s = action.args) === null || _s === void 0 ? void 0 : _s.cancelText),
+                                confirmBtnLevel: filter((_t = action.dialog) === null || _t === void 0 ? void 0 : _t.confirmBtnLevel, event.data) ||
+                                    ((_u = action.args) === null || _u === void 0 ? void 0 : _u.confirmBtnLevel),
+                                cancelBtnLevel: filter((_v = action.dialog) === null || _v === void 0 ? void 0 : _v.cancelBtnLevel, event.data) ||
+                                    ((_w = action.args) === null || _w === void 0 ? void 0 : _w.cancelBtnLevel)
                             }))];
                     case 1:
-                        confirmed = _d.sent();
+                        confirmed_1 = _x.sent();
+                        return [2 /*return*/, confirmed_1];
+                    case 2: return [4 /*yield*/, new Promise(function (resolve, reject) {
+                            var _a, _b, _c;
+                            (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
+                                actionType: 'dialog',
+                                dialog: (_c = action.dialog) !== null && _c !== void 0 ? _c : action.args,
+                                reload: 'none',
+                                callback: function (result) { return resolve(result); }
+                            }, action.data);
+                        })];
+                    case 3:
+                        confirmed = _x.sent();
                         return [2 /*return*/, confirmed];
                 }
             });

package/esm/actions/DrawerAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0-beta.4
  * Copyright 2018-2023 fex
  */
 
@@ -17,12 +17,12 @@ var DrawerAction = /** @class */ (function () {
     function DrawerAction() {
     }
     DrawerAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_d) {
+            return __generator(this, function (_e) {
                 (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
                     actionType: 'drawer',
-                    drawer: ((_c = action.args) === null || _c === void 0 ? void 0 : _c.drawer) || action.drawer,
+                    drawer: (_c = action.drawer) !== null && _c !== void 0 ? _c : (_d = action.args) === null || _d === void 0 ? void 0 : _d.drawer,
                     reload: 'none'
                 }, action.data);
                 return [2 /*return*/];

package/esm/actions/EmailAction.js

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

package/esm/actions/LinkAction.js

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

package/esm/actions/LoopAction.js

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

package/esm/actions/PageAction.js

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