amis-core 3.1.1 → 3.3.0

package/lib/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -22,30 +22,34 @@ require('./utils/filter.js');
 var helper = require('./utils/helper.js');
 require('./utils/api.js');
 require('./utils/ColorScale.js');
-require('lodash/chunk');
+require('./utils/columnsSplit.js');
 require('./utils/DataSchema.js');
 require('./utils/DataScope.js');
 require('./utils/debug.js');
-require('react-dom');
+require('./utils/dom.js');
 require('./utils/errors.js');
 var tpl = require('./utils/tpl.js');
 require('classnames');
 require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
-require('lodash');
+require('./utils/highlight.js');
+require('./utils/icon.js');
 require('./utils/image.js');
+require('lodash/isEqual');
 require('./actions/Action.js');
 require('lodash/debounce');
 require('lodash/cloneDeep');
 require('./utils/resize-sensor.js');
 require('react-overlays/useRootClose');
+require('react-dom');
 require('./utils/SimpleMap.js');
 require('lodash/mapValues');
 require('lodash/camelCase');
 require('uncontrollable');
 require('./utils/validations.js');
 require('./utils/resolveCondition.js');
+require('mobx');
 require('./utils/Animation.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -55,10 +59,9 @@ var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 var values__default = /*#__PURE__*/_interopDefaultLegacy(values);
 var hoistNonReactStatic__default = /*#__PURE__*/_interopDefaultLegacy(hoistNonReactStatic);
 
-/**
- * @file 用来创建一个域，在这个域里面会把里面的运行时实例注册进来，方便组件之间的通信。
- * @author fex
- */
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 /**
  * target 里面可能包含 ?xxx=xxx，这种情况下，需要把 ?xxx=xxx 保留下来，然后对前面的部分进行 filter
  * 因为后面会对 query 部分做不一样的处理。会保留原始的值。而不是会转成字符串。
@@ -75,13 +78,16 @@ function filterTarget(target, data) {
 }
 var rootScopedContext = createScopedTools('');
 var ScopedContext = React__default["default"].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)) {
@@ -345,12 +351,12 @@ function closeDialog(component) {
         .forEach(closeDialog);
     component.props.onClose && component.props.onClose();
 }
-function HocScoped(ComposedComponent) {
+function HocScoped(ComposedComponent, rendererType) {
     var ScopedComponent = /** @class */ (function (_super) {
         tslib.__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;
@@ -371,8 +377,8 @@ function HocScoped(ComposedComponent) {
         };
         ScopedComponent.prototype.render = function () {
             var _a = this.props; _a.scopeRef; var rest = tslib.__rest(_a, ["scopeRef"]);
-            return (React__default["default"].createElement(ScopedContext.Provider, { value: this.scoped },
-                React__default["default"].createElement(ComposedComponent, tslib.__assign({}, rest /* todo */, { ref: this.childRef }))));
+            return (_J$X_(ScopedContext.Provider, { value: this.scoped },
+                _J$X_(ComposedComponent, tslib.__assign({}, rest /* todo */, { ref: this.childRef }))));
         };
         ScopedComponent.displayName = "Scoped(".concat(ComposedComponent.displayName || ComposedComponent.name, ")");
         ScopedComponent.contextType = ScopedContext;

package/lib/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -18,6 +18,9 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var hoistNonReactStatic__default = /*#__PURE__*/_interopDefaultLegacy(hoistNonReactStatic);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 function StatusScoped(ComposedComponent) {
     var _a;
     var result = hoistNonReactStatic__default["default"]((_a = /** @class */ (function (_super) {
@@ -50,7 +53,7 @@ function StatusScoped(ComposedComponent) {
                 var refConfig = ((_a = ComposedComponent.prototype) === null || _a === void 0 ? void 0 : _a.isReactComponent)
                     ? { ref: this.childRef }
                     : { forwardedRef: this.childRef };
-                return (React__default["default"].createElement(ComposedComponent, tslib.__assign({}, this.props, injectedProps, refConfig)));
+                return (_J$X_(ComposedComponent, tslib.__assign({}, this.props, injectedProps, refConfig)));
             };
             return class_1;
         }(React__default["default"].Component)),

package/lib/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/lib/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -16,20 +16,31 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var hoistNonReactStatic__default = /*#__PURE__*/_interopDefaultLegacy(hoistNonReactStatic);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var RootStoreContext = React__default["default"].createContext(undefined);
 function withRootStore(ComposedComponent) {
     var _a;
     var result = hoistNonReactStatic__default["default"]((_a = /** @class */ (function (_super) {
             tslib.__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__default["default"].createElement(ComposedComponent, tslib.__assign({}, this.props, injectedProps)));
+                return (_J$X_(ComposedComponent, tslib.__assign({}, this.props, injectedProps, { ref: this.refFn })));
             };
             return class_1;
         }(React__default["default"].Component)),

package/lib/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -18,6 +18,7 @@ var helper = require('./utils/helper.js');
 require('amis-formula');
 require('moment');
 var object = require('./utils/object.js');
+var tokenize = require('./utils/tokenize.js');
 var dataMapping = require('./utils/dataMapping.js');
 require('./utils/filter.js');
 var WithRootStore = require('./WithRootStore.js');
@@ -27,6 +28,9 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var hoistNonReactStatic__default = /*#__PURE__*/_interopDefaultLegacy(hoistNonReactStatic);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 function HocStoreFactory(renderer) {
     return function (Component) {
         var StoreFactory = /** @class */ (function (_super) {
@@ -106,20 +110,26 @@ function HocStoreFactory(renderer) {
                 if (extendsData === false) {
                     if (shouldSync === true ||
                         prevProps.defaultData !== props.defaultData ||
-                        helper.isObjectShallowModified(prevProps.data, props.data) ||
-                        //
-                        // 特殊处理 CRUD。
-                        // CRUD 中 toolbar 里面的 data 是空对象，但是 __super 会不一样
-                        (props.data &&
-                            prevProps.data &&
-                            props.data.__super !== prevProps.data.__super)) {
+                        (props.trackExpression
+                            ? tokenize.tokenize(props.trackExpression, props.data) !==
+                                tokenize.tokenize(props.trackExpression, prevProps.data)
+                            : helper.isObjectShallowModified(prevProps.data, props.data) ||
+                                //
+                                // 特殊处理 CRUD。
+                                // CRUD 中 toolbar 里面的 data 是空对象，但是 __super 会不一样
+                                (props.data &&
+                                    prevProps.data &&
+                                    props.data.__super !== prevProps.data.__super))) {
                         store.initData(object.extendObject(props.data, tslib.__assign(tslib.__assign(tslib.__assign({}, (store.hasRemoteData ? store.data : null)), this.formatData(props.defaultData)), this.formatData(props.data))));
                     }
                 }
                 else if (shouldSync === true ||
-                    helper.isObjectShallowModified(prevProps.data, props.data) ||
-                    (props.syncSuperStore !== false &&
-                        helper.isSuperDataModified(props.data, prevProps.data, store))) {
+                    (props.trackExpression
+                        ? tokenize.tokenize(props.trackExpression, props.data) !==
+                            tokenize.tokenize(props.trackExpression, prevProps.data)
+                        : helper.isObjectShallowModified(prevProps.data, props.data) ||
+                            (props.syncSuperStore !== false &&
+                                helper.isSuperDataModified(props.data, prevProps.data, store)))) {
                     if (props.store && props.store.data === props.data) {
                         store.initData(object.createObject(props.store.data, props.syncSuperStore === false
                             ? tslib.__assign({}, store.data) : helper.syncDataFromSuper(store.data, props.store.data, prevProps.scope, store, props.syncSuperStore === true)));
@@ -132,9 +142,8 @@ function HocStoreFactory(renderer) {
                         store.initData(object.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
@@ -145,9 +154,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(object.createObject(props.scope, tslib.__assign({}, store.data)));
@@ -175,7 +185,7 @@ function HocStoreFactory(renderer) {
                 if (this.state.hidden || this.state.visible === false) {
                     return null;
                 }
-                return (React__default["default"].createElement(Component, tslib.__assign({}, rest /* todo */, this.state, { ref: this.refFn, data: this.store.data, dataUpdatedAt: this.store.updatedAt, store: this.store, scope: this.store.data, render: this.renderChild })));
+                return (_J$X_(Component, tslib.__assign({}, rest /* todo */, this.state, { ref: this.refFn, data: this.store.data, dataUpdatedAt: this.store.updatedAt, store: this.store, scope: this.store.data, render: this.renderChild })));
             };
             StoreFactory.displayName = "WithStore(".concat(Component.displayName || Component.name, ")");
             StoreFactory.ComposedComponent = Component;

package/lib/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/lib/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -96,7 +96,7 @@ var getOmitActionProp = function (type) {
             omitList = ['drawer'];
             break;
         case 'confirmDialog':
-            omitList = ['confirmDialog'];
+            omitList = ['dialog'];
             break;
         case 'reload':
             omitList = ['resetPage'];
@@ -125,11 +125,20 @@ var runActions = function (actions, renderer, event) { return tslib.__awaiter(vo
                 // 如果存在指定组件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');
                 }
@@ -166,14 +175,16 @@ var runActions = function (actions, renderer, event) { return tslib.__awaiter(vo
 }); };
 // 执行动作，与原有动作处理打通
 var runAction = function (actionInstrance, actionConfig, renderer, event) { return tslib.__awaiter(void 0, void 0, void 0, function () {
-    var additional, mergeData, expression, isStop, preventDefault, stopPropagation, key, args, afterMappingData, actionData, data, stoped, actionResult;
-    var _a, _b, _c;
-    return tslib.__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 tslib.__generator(this, function (_u) {
+        switch (_u.label) {
             case 0:
                 additional = {
                     event: event
                 };
+                action = tslib.__assign({}, actionConfig);
+                action.args = tslib.__assign({}, actionConfig.args);
                 // __rendererData默认为renderer.props.data，兼容表单项值变化时的data读取
                 if (!event.data.__rendererData) {
                     additional = {
@@ -184,36 +195,47 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 mergeData = object.createObject(object.createObject(renderer.props.data.__super
                     ? object.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*/, tpl.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*/, tpl.evalExpressionWithConditionBuilder(actionConfig.preventDefault, mergeData, false)];
+                if (!action.preventDefault) return [3 /*break*/, 4];
+                return [4 /*yield*/, tpl.evalExpressionWithConditionBuilder(action.preventDefault, mergeData, false)];
             case 3:
-                preventDefault = _d.sent();
-                _d.label = 4;
+                preventDefault = _u.sent();
+                _u.label = 4;
             case 4:
-                stopPropagation = false;
-                if (!actionConfig.stopPropagation) return [3 /*break*/, 6];
-                return [4 /*yield*/, tpl.evalExpressionWithConditionBuilder(actionConfig.stopPropagation, mergeData, false)];
-            case 5:
-                stopPropagation = _d.sent();
-                _d.label = 6;
-            case 6:
                 key = {
-                    componentId: dataMapping.dataMapping(actionConfig.componentId, mergeData),
-                    componentName: dataMapping.dataMapping(actionConfig.componentName, mergeData)
+                    componentId: dataMapping.dataMapping(action.componentId, mergeData),
+                    componentName: dataMapping.dataMapping(action.componentName, mergeData)
                 };
-                args = dataMapping.dataMapping(actionConfig.args, mergeData, function (key) {
+                // 兼容args包裹的用法
+                if (action.actionType === 'dialog') {
+                    action.dialog = tslib.__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 = tslib.__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 : tslib.__assign({}, api);
+                    action.options = tslib.__assign({}, ((_k = action.options) !== null && _k !== void 0 ? _k : (_l = action.args) === null || _l === void 0 ? void 0 : _l.options));
+                    action.messages = tslib.__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.dataMapping(action.args, mergeData, function (key) {
                     return [
                         'adaptor',
                         'responseAdaptor',
@@ -222,31 +244,34 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                         'condition'
                     ].includes(key);
                 });
-                afterMappingData = dataMapping.dataMapping(actionConfig.data, mergeData);
+                afterMappingData = dataMapping.dataMapping(action.data, mergeData);
                 actionData = args && Object.keys(args).length
-                    ? omit__default["default"](tslib.__assign(tslib.__assign({}, args), (afterMappingData !== null && afterMappingData !== void 0 ? afterMappingData : {})), getOmitActionProp(actionConfig.actionType))
+                    ? omit__default["default"](tslib.__assign(tslib.__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);
-                stoped = false;
-                return [4 /*yield*/, actionInstrance.run(tslib.__assign(tslib.__assign(tslib.__assign({}, actionConfig), { args: args, data: data }), key), renderer, event, mergeData)];
-            case 7:
-                actionResult = _d.sent();
+                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(tslib.__assign(tslib.__assign(tslib.__assign({}, action), { args: args, data: action.actionType === 'reload' ? actionData : data }), key), renderer, event, mergeData)];
+            case 5:
+                actionResult = _u.sent();
                 // 二次确认弹窗如果取消，则终止后续动作
-                if ((actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType) === 'confirmDialog' && !actionResult) {
-                    stoped = true;
+                if ((action === null || action === void 0 ? void 0 : action.actionType) === 'confirmDialog' && !actionResult) {
+                    stopped = true;
                 }
-                console.debug("[".concat(actionConfig.actionType, "] action end event"), event);
-                (_c = console.groupEnd) === null || _c === void 0 ? void 0 : _c.call(console);
+                stopPropagation = false;
+                if (!action.stopPropagation) return [3 /*break*/, 7];
+                return [4 /*yield*/, tpl.evalExpressionWithConditionBuilder(action.stopPropagation, mergeData, false)];
+            case 6:
+                stopPropagation = _u.sent();
+                _u.label = 7;
+            case 7:
+                console.debug("[".concat(action.actionType, "] action end event"), event);
+                (_t = console.groupEnd) === null || _t === void 0 ? void 0 : _t.call(console);
                 // 阻止原有动作执行
                 preventDefault && event.preventDefault();
                 // 阻止后续动作执行
-                (stopPropagation || stoped) && event.stopPropagation();
+                (stopPropagation || stopped) && event.stopPropagation();
                 return [2 /*return*/];
         }
     });

package/lib/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/lib/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -27,39 +27,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 tslib.__awaiter(this, void 0, void 0, function () {
-            var env, result, responseData, msg, e_1, result;
-            var _1;
-            return tslib.__generator(this, function (_2) {
-                switch (_2.label) {
+            var env, silent, messages, result, responseData, msg, e_1, result;
+            var _o;
+            return tslib.__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 = !helper.isEmpty(result.data) || result.ok
                             ? api.normalizeApiResponseData(result.data)
                             : null;
                         // 记录请求返回的数据
-                        event.setData(object.createObject(event.data, tslib.__assign(tslib.__assign({}, responseData), (_1 = { responseData: responseData }, _1[action.outputVar || 'responseResult'] = tslib.__assign(tslib.__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(object.createObject(event.data, tslib.__assign(tslib.__assign({}, responseData), (_o = { responseData: responseData }, _o[action.outputVar || 'responseResult'] = tslib.__assign(tslib.__assign({}, responseData), { responseData: responseData, responseStatus: result.status, responseMsg: result.msg }), _o))));
+                        if (!silent) {
                             if (!result.ok) {
-                                throw new errors.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 errors.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
                                         ? {
@@ -71,8 +73,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/lib/actions/BreakAction.js

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

package/lib/actions/BroadcastAction.js

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

package/lib/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;