amis-core 6.2.2 → 6.3.0

package/lib/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -142,12 +142,30 @@ var RootRenderer = /** @class */ (function (_super) {
             window.open(mailto);
         }
         else if (action.actionType === 'dialog') {
-            store.setCurrentAction(action);
-            store.openDialog(ctx, undefined, action.callback, delegate || this.context);
+            store.setCurrentAction(action, this.props.resolveDefinitions);
+            return new Promise(function (resolve) {
+                store.openDialog(ctx, undefined, function (confirmed, value) {
+                    var _a;
+                    (_a = action.callback) === null || _a === void 0 ? void 0 : _a.call(action, confirmed, value);
+                    resolve({
+                        confirmed: confirmed,
+                        value: value
+                    });
+                }, delegate || _this.context);
+            });
         }
         else if (action.actionType === 'drawer') {
-            store.setCurrentAction(action);
-            store.openDrawer(ctx, undefined, undefined, delegate);
+            store.setCurrentAction(action, this.props.resolveDefinitions);
+            return new Promise(function (resolve) {
+                store.openDrawer(ctx, undefined, function (confirmed, value) {
+                    var _a;
+                    (_a = action.callback) === null || _a === void 0 ? void 0 : _a.call(action, confirmed, value);
+                    resolve({
+                        confirmed: confirmed,
+                        value: value
+                    });
+                }, delegate);
+            });
         }
         else if (action.actionType === 'toast') {
             (_b = (_a = action.toast) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.forEach(function (item) {
@@ -159,7 +177,7 @@ var RootRenderer = /** @class */ (function (_super) {
             });
         }
         else if (action.actionType === 'ajax') {
-            store.setCurrentAction(action);
+            store.setCurrentAction(action, this.props.resolveDefinitions);
             store
                 .saveRemote(action.api, ctx, {
                 successMessage: (action.messages && action.messages.success) ||
@@ -231,7 +249,7 @@ var RootRenderer = /** @class */ (function (_super) {
         var dialogAction = store.action;
         var reload = (_a = action.reload) !== null && _a !== void 0 ? _a : dialogAction.reload;
         var scoped = store.getDialogScoped() || this.context;
-        store.closeDialog(true);
+        store.closeDialog(true, values);
         if (reload) {
             scoped.reload(reload, store.data);
         }
@@ -260,7 +278,7 @@ var RootRenderer = /** @class */ (function (_super) {
         var drawerAction = store.action;
         var reload = (_a = action.reload) !== null && _a !== void 0 ? _a : drawerAction.reload;
         var scoped = store.getDrawerScoped() || this.context;
-        store.closeDrawer();
+        store.closeDrawer(true, values);
         // 稍等会，等动画结束。
         setTimeout(function () {
             if (reload) {
@@ -270,7 +288,7 @@ var RootRenderer = /** @class */ (function (_super) {
     };
     RootRenderer.prototype.handleDrawerClose = function () {
         var store = this.store;
-        store.closeDrawer();
+        store.closeDrawer(false);
     };
     RootRenderer.prototype.openFeedback = function (dialog, ctx) {
         var _this = this;
@@ -280,7 +298,7 @@ var RootRenderer = /** @class */ (function (_super) {
                 type: 'button',
                 actionType: 'dialog',
                 dialog: dialog
-            });
+            }, _this.props.resolveDefinitions);
             store.openDialog(ctx, undefined, function (confirmed) {
                 resolve(confirmed);
             }, _this.context);

package/lib/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -11,6 +11,7 @@ var tslib = require('tslib');
 var difference = require('lodash/difference');
 var omit = require('lodash/omit');
 var React = require('react');
+var reactIs = require('react-is');
 var LazyComponent = require('./components/LazyComponent.js');
 var factory = require('./factory.js');
 var Item = require('./renderers/Item.js');
@@ -49,6 +50,7 @@ var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'children',
     'ref',
     'visible',
+    'loading',
     'visibleOn',
     'hidden',
     'hiddenOn',
@@ -71,7 +73,8 @@ var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'renderLabel',
     'trackExpression',
     'editorSetting',
-    'updatePristineAfterStoreDataReInit'
+    'updatePristineAfterStoreDataReInit',
+    'source'
 ];
 var componentCache = new SimpleMap.SimpleMap();
 var SchemaRenderer = /** @class */ (function (_super) {
@@ -260,7 +263,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
                     ? schema.children
                     : schema.children(tslib.__assign(tslib.__assign(tslib.__assign({}, rest), exprProps), { $path: $path, $schema: schema, render: this.renderChild, forwardedRef: this.refFn, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent }));
         }
-        else if (typeof schema.component === 'function') {
+        else if (schema.component && reactIs.isValidElementType(schema.component)) {
             var isSFC = !(schema.component.prototype instanceof React__default["default"].Component);
             var defaultData_1 = schema.data, defaultValue_1 = schema.value, // render时的value改放defaultValue中
             defaultActiveKey_1 = schema.activeKey, propKey_1 = schema.key, restSchema_1 = tslib.__rest(schema, ["data", "value", "activeKey", "key"]);
@@ -327,8 +330,14 @@ var SchemaRenderer = /** @class */ (function (_super) {
         if (isStatic !== undefined) {
             props.static = isStatic;
         }
-        if (rest.env.enableTestid && props.id && !props.testid) {
-            props.testid = props.id;
+        // 优先使用组件自己的testid或者id，这个解决不了table行内的一些子元素
+        // 每一行都会出现这个testid的元素，只在测试工具中直接使用nth拿序号
+        if (rest.env.enableTestid) {
+            if (props.testid || props.id || props.testIdBuilder == null) {
+                if (!(props.testIdBuilder instanceof helper.TestIdBuilder)) {
+                    props.testIdBuilder = new helper.TestIdBuilder(props.testid || props.id);
+                }
+            }
         }
         // 自动解析变量模式，主要是方便直接引入第三方组件库，无需为了支持变量封装一层
         if (renderer.autoVar) {

package/lib/Scoped.d.ts

@@ -22,7 +22,7 @@ export declare function filterTarget(target: string, data: Record<string, any>):
 export declare function splitTarget(target: string): Array<string>;
 export interface ScopedComponentType extends React.Component<RendererProps> {
     focus?: () => void;
-    doAction?: (action: ActionObject, data: RendererData, throwErrors?: boolean) => void;
+    doAction?: (action: ActionObject, data: RendererData, throwErrors?: boolean, args?: any) => void;
     receive?: (values: RendererData, subPath?: string, replace?: boolean) => void;
     reload?: (subPath?: string, query?: RendererData | null, ctx?: RendererData) => void;
     context: any;

package/lib/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -69,8 +69,10 @@ require('./actions/CopyAction.js');
 require('./actions/DialogAction.js');
 require('./actions/DrawerAction.js');
 require('./actions/EmailAction.js');
+require('./actions/EventAction.js');
 require('./actions/LinkAction.js');
 require('./actions/ToastAction.js');
+require('./actions/WaitAction.js');
 require('./actions/PageAction.js');
 require('./actions/PrintAction.js');
 var Action = require('./actions/Action.js');

package/lib/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -50,7 +50,9 @@ function StatusScoped(ComposedComponent) {
                 var injectedProps = {
                     statusStore: this.store
                 };
-                var refConfig = ((_a = ComposedComponent.prototype) === null || _a === void 0 ? void 0 : _a.isReactComponent)
+                var refConfig = ((_a = ComposedComponent.prototype) === null || _a === void 0 ? void 0 : _a.isReactComponent) ||
+                    ComposedComponent.$$typeof ===
+                        Symbol.for('react.forward_ref')
                     ? { ref: this.childRef }
                     : { forwardedRef: this.childRef };
                 return (_J$X_(ComposedComponent, tslib.__assign({}, this.props, injectedProps, refConfig)));

package/lib/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 

package/lib/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -31,6 +31,17 @@ 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;
+/**
+ * 忽略静态数据中的 schema 属性
+ *
+ * 比如 https://github.com/baidu/amis/issues/8972 中的用法
+ */
+function ignoreSchemaProps(key, value) {
+    if (['clickAction'].includes(key) && typeof value !== 'string') {
+        return true;
+    }
+    return false;
+}
 function HocStoreFactory(renderer) {
     return function (Component) {
         var StoreFactory = /** @class */ (function (_super) {
@@ -54,19 +65,19 @@ function HocStoreFactory(renderer) {
                 if (extendsData === false) {
                     store.initData(object.createObject(_this.props.data
                         ? _this.props.data.__super
-                        : null, tslib.__assign(tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data))), _this.formatData(_this.props.data))));
+                        : null, tslib.__assign(tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data, ignoreSchemaProps))), _this.formatData(_this.props.data))));
                 }
                 else if (_this.props.scope ||
                     (_this.props.data && _this.props.data.__super)) {
-                    if (_this.props.store && _this.props.data === _this.props.store.data) {
-                        store.initData(object.createObject(_this.props.store.data, tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data)))));
+                    if (_this.props.store && _this.props.data === _this.props.scope) {
+                        store.initData(object.createObject(_this.props.store.data, tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data, ignoreSchemaProps)))));
                     }
                     else {
-                        store.initData(object.createObject(_this.props.data.__super || _this.props.scope, tslib.__assign(tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data))), _this.formatData(_this.props.data))));
+                        store.initData(object.createObject(_this.props.data.__super || _this.props.scope, tslib.__assign(tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data, ignoreSchemaProps))), _this.formatData(_this.props.data))));
                     }
                 }
                 else {
-                    store.initData(tslib.__assign(tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data))), _this.formatData(_this.props.data)));
+                    store.initData(tslib.__assign(tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data, ignoreSchemaProps))), _this.formatData(_this.props.data)));
                 }
                 _this.state = {};
                 var detectField = props.detectField, rest = tslib.__rest(props, ["detectField"]);
@@ -96,7 +107,7 @@ function HocStoreFactory(renderer) {
             };
             StoreFactory.prototype.componentDidUpdate = function (prevProps) {
                 var _this = this;
-                var _a, _b, _c, _d;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
                 var props = this.props;
                 var store = this.store;
                 // dialog 场景下 schema 是显示的时候更新的，
@@ -130,7 +141,7 @@ function HocStoreFactory(renderer) {
                                 (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))), props.updatePristineAfterStoreDataReInit === false);
+                        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))), ((_c = props.updatePristineAfterStoreDataReInit) !== null && _c !== void 0 ? _c : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                     }
                 }
                 else if (shouldSync === true ||
@@ -140,9 +151,9 @@ function HocStoreFactory(renderer) {
                         : helper.isObjectShallowModified(prevProps.data, props.data) ||
                             (props.syncSuperStore !== false &&
                                 helper.isSuperDataModified(props.data, prevProps.data, store)))) {
-                    if (props.store && props.store.data === props.data) {
+                    if (props.store && props.scope === 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)), props.updatePristineAfterStoreDataReInit === false);
+                            ? tslib.__assign({}, store.data) : helper.syncDataFromSuper(store.data, props.store.data, prevProps.scope, store, props.syncSuperStore === true)), ((_d = props.updatePristineAfterStoreDataReInit) !== null && _d !== void 0 ? _d : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                     }
                     else if (props.data && props.data.__super) {
                         store.initData(object.extendObject(props.data, 
@@ -151,24 +162,24 @@ function HocStoreFactory(renderer) {
                         store.hasRemoteData || !store.path.includes('/')
                             ? tslib.__assign(tslib.__assign({}, store.data), props.data) : // combo 不需要同步，如果要同步，在 Combo.tsx 里面已经实现了相关逻辑
                             // 目前主要的问题是，如果 combo 中表单项名字和 combo 本身的名字一样，会导致里面的值会被覆盖成数组
-                            ((_c = props.store) === null || _c === void 0 ? void 0 : _c.storeType) === 'ComboStore'
+                            ((_e = props.store) === null || _e === void 0 ? void 0 : _e.storeType) === 'ComboStore'
                                 ? undefined
-                                : helper.syncDataFromSuper(tslib.__assign(tslib.__assign({}, store.data), props.data), props.data.__super, prevProps.data.__super, store, false)), props.updatePristineAfterStoreDataReInit === false);
+                                : helper.syncDataFromSuper(tslib.__assign(tslib.__assign({}, store.data), props.data), props.data.__super, prevProps.data.__super, store, false)), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                     }
                     else {
-                        store.initData(object.createObject(props.scope, props.data), props.updatePristineAfterStoreDataReInit === false);
+                        store.initData(object.createObject(props.scope, props.data), ((_g = props.updatePristineAfterStoreDataReInit) !== null && _g !== void 0 ? _g : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                     }
                 }
                 else if (!props.trackExpression &&
-                    (!props.store || props.data !== props.store.data) &&
+                    (!props.store || props.data !== props.scope) &&
                     props.data &&
                     props.data.__super) {
                     // 这个用法很少，当 data.__super 值发生变化时，更新 store.data
                     if (!prevProps.data ||
                         helper.isObjectShallowModified(props.data.__super, prevProps.data.__super, false)) {
-                        store.initData(object.createObject(props.data.__super, tslib.__assign(tslib.__assign({}, props.data), store.data)), props.updatePristineAfterStoreDataReInit === false ||
+                        store.initData(object.createObject(props.data.__super, tslib.__assign(tslib.__assign({}, props.data), store.data)), ((_h = props.updatePristineAfterStoreDataReInit) !== null && _h !== void 0 ? _h : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false ||
                             (store.storeType === 'FormStore' &&
-                                ((_d = prevProps.store) === null || _d === void 0 ? void 0 : _d.storeType) === 'CRUDStore'));
+                                ((_j = prevProps.store) === null || _j === void 0 ? void 0 : _j.storeType) === 'CRUDStore'));
                     }
                     // nextProps.data.__super !== props.data.__super) &&
                 }
@@ -178,7 +189,7 @@ function HocStoreFactory(renderer) {
                     prevProps.data !== props.data) {
                     // 只有父级数据变动的时候才应该进来，
                     // 目前看来这个 case 很少有情况下能进来
-                    store.initData(object.createObject(props.scope, tslib.__assign({}, store.data)), props.updatePristineAfterStoreDataReInit === false);
+                    store.initData(object.createObject(props.scope, tslib.__assign({}, store.data)), ((_k = props.updatePristineAfterStoreDataReInit) !== null && _k !== void 0 ? _k : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                 }
             };
             StoreFactory.prototype.componentWillUnmount = function () {

package/lib/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -281,7 +281,7 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 (_u = console.group) === null || _u === void 0 ? void 0 : _u.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)];
+                return [4 /*yield*/, actionInstrance.run(tslib.__assign(tslib.__assign(tslib.__assign({}, action), { args: args, rawData: actionConfig.data, data: action.actionType === 'reload' ? actionData : data }), key), renderer, event, mergeData)];
             case 5:
                 actionResult = _w.sent();
                 // 二次确认弹窗如果取消，则终止后续动作

package/lib/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/BreakAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/BroadcastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -111,7 +111,7 @@ var CmptAction = /** @class */ (function () {
                     case 6: return [2 /*return*/];
                     case 7:
                         _11.trys.push([7, 9, , 10]);
-                        return [4 /*yield*/, ((_z = component === null || component === void 0 ? void 0 : component.doAction) === null || _z === void 0 ? void 0 : _z.call(component, action, action.args, true))];
+                        return [4 /*yield*/, ((_z = component === null || component === void 0 ? void 0 : component.doAction) === null || _z === void 0 ? void 0 : _z.call(component, action, event.data, true, action.args))];
                     case 8:
                         result = _11.sent();
                         if (['validate', 'submit'].includes(action.actionType)) {

package/lib/actions/ContinueAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/CopyAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/DialogAction.d.ts

@@ -23,6 +23,14 @@ export interface IDialogAction extends ListenerAction {
         dialog: SchemaNode;
     };
     dialog?: SchemaNode;
+    /**
+     * 是否等待确认结果
+     */
+    waitForAction?: boolean;
+    /**
+     * 如果等待结果，将弹窗结果保存到此处变量
+     */
+    outputVar?: string;
 }
 export interface IConfirmDialogAction extends ListenerAction {
     actionType: 'confirmDialog';

package/lib/actions/DialogAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -8,8 +8,48 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
+require('../utils/api.js');
+require('../utils/browser.js');
+require('../utils/ColorScale.js');
+require('../utils/columnsSplit.js');
+var object = require('../utils/object.js');
+require('amis-formula');
+require('lodash/isPlainObject');
+require('../utils/DataSchema.js');
+require('../utils/DataScope.js');
+require('moment');
+require('../utils/debug.js');
+require('../utils/dom.js');
+require('../utils/errors.js');
 var tpl = require('../utils/tpl.js');
+require('../utils/helper.js');
+require('../utils/filter.js');
+require('lodash/isObject');
+require('lodash/isString');
+require('lodash/isBoolean');
+require('../utils/highlight.js');
+require('../utils/icon.js');
+require('../utils/image.js');
+require('lodash/isEqual');
 var Action = require('./Action.js');
+require('lodash/debounce');
+require('../utils/resize-sensor.js');
+require('react');
+require('react-overlays/useRootClose');
+require('react-dom');
+require('../utils/SimpleMap.js');
+require('lodash/mapValues');
+require('lodash/camelCase');
+require('lodash/cloneDeep');
+require('lodash/map');
+require('lodash/isEmpty');
+require('lodash/kebabCase');
+require('uncontrollable');
+require('hoist-non-react-statics');
+require('../utils/validations.js');
+require('../utils/resolveCondition.js');
+require('mobx');
+require('../utils/Animation.js');
 
 /**
  * 打开弹窗动作
@@ -24,17 +64,34 @@ var DialogAction = /** @class */ (function () {
     DialogAction.prototype.run = function (action, renderer, event) {
         var _a, _b;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            return tslib.__generator(this, function (_c) {
-                // 防止editor preview模式下执行
-                if (action.$$id !== undefined) {
-                    return [2 /*return*/];
+            var ret, _c, confirmed, value;
+            var _d;
+            return tslib.__generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        // 防止editor preview模式下执行
+                        if (action.$$id !== undefined) {
+                            return [2 /*return*/];
+                        }
+                        ret = (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
+                            actionType: 'dialog',
+                            dialog: action.dialog,
+                            reload: 'none',
+                            data: action.rawData
+                        }, action.data);
+                        if (!action.waitForAction) return [3 /*break*/, 2];
+                        return [4 /*yield*/, ret];
+                    case 1:
+                        _c = _e.sent(), confirmed = _c.confirmed, value = _c.value;
+                        event.setData(object.extendObject(event.data, (_d = {},
+                            _d[action.outputVar || 'dialogResponse'] = {
+                                confirmed: confirmed,
+                                value: value
+                            },
+                            _d)));
+                        _e.label = 2;
+                    case 2: return [2 /*return*/];
                 }
-                (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
-                    actionType: 'dialog',
-                    dialog: action.dialog,
-                    reload: 'none'
-                }, action.data);
-                return [2 /*return*/];
             });
         });
     };
@@ -75,10 +132,10 @@ var AlertAction = /** @class */ (function () {
     function AlertAction() {
     }
     AlertAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            return tslib.__generator(this, function (_j) {
-                (_b = (_a = event.context.env).alert) === null || _b === void 0 ? void 0 : _b.call(_a, (_d = tpl.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 = tpl.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 tslib.__generator(this, function (_l) {
+                (_b = (_a = event.context.env).alert) === null || _b === void 0 ? void 0 : _b.call(_a, (_d = tpl.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 = tpl.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, (_k = tpl.filter((_j = action.dialog) === null || _j === void 0 ? void 0 : _j.className, event.data)) !== null && _k !== void 0 ? _k : '');
                 return [2 /*return*/];
             });
         });
@@ -92,41 +149,47 @@ var ConfirmAction = /** @class */ (function () {
     function ConfirmAction() {
     }
     ConfirmAction.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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var type, confirmed_1, confirmed;
-            return tslib.__generator(this, function (_x) {
-                switch (_x.label) {
+            var modal, type, confirmed_1, confirmed;
+            return tslib.__generator(this, function (_v) {
+                switch (_v.label) {
                     case 0:
-                        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;
+                        modal = (_a = action.dialog) !== null && _a !== void 0 ? _a : action.args;
+                        if (modal.$ref && renderer.props.resolveDefinitions) {
+                            modal = tslib.__assign(tslib.__assign({}, renderer.props.resolveDefinitions(modal.$ref)), modal);
+                        }
+                        type = modal === null || modal === void 0 ? void 0 : modal.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, tpl.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), tpl.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: tpl.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: tpl.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: tpl.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: tpl.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: tpl.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: tpl.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)
+                        return [4 /*yield*/, ((_c = (_b = event.context.env).confirm) === null || _c === void 0 ? void 0 : _c.call(_b, tpl.filter(modal === null || modal === void 0 ? void 0 : modal.msg, event.data) || ((_d = action.args) === null || _d === void 0 ? void 0 : _d.msg), tpl.filter((_e = action.dialog) === null || _e === void 0 ? void 0 : _e.title, event.data) || ((_f = action.args) === null || _f === void 0 ? void 0 : _f.title), {
+                                closeOnEsc: tpl.filter((_g = action.dialog) === null || _g === void 0 ? void 0 : _g.closeOnEsc, event.data) ||
+                                    ((_h = action.args) === null || _h === void 0 ? void 0 : _h.closeOnEsc),
+                                size: tpl.filter((_j = action.dialog) === null || _j === void 0 ? void 0 : _j.size, event.data) || ((_k = action.args) === null || _k === void 0 ? void 0 : _k.size),
+                                confirmText: tpl.filter((_l = action.dialog) === null || _l === void 0 ? void 0 : _l.confirmText, event.data) ||
+                                    ((_m = action.args) === null || _m === void 0 ? void 0 : _m.confirmText),
+                                cancelText: tpl.filter((_o = action.dialog) === null || _o === void 0 ? void 0 : _o.cancelText, event.data) ||
+                                    ((_p = action.args) === null || _p === void 0 ? void 0 : _p.cancelText),
+                                confirmBtnLevel: tpl.filter((_q = action.dialog) === null || _q === void 0 ? void 0 : _q.confirmBtnLevel, event.data) ||
+                                    ((_r = action.args) === null || _r === void 0 ? void 0 : _r.confirmBtnLevel),
+                                cancelBtnLevel: tpl.filter((_s = action.dialog) === null || _s === void 0 ? void 0 : _s.cancelBtnLevel, event.data) ||
+                                    ((_t = action.args) === null || _t === void 0 ? void 0 : _t.cancelBtnLevel),
+                                className: tpl.filter((_u = action.dialog) === null || _u === void 0 ? void 0 : _u.className, event.data) || ''
                             }))];
                     case 1:
-                        confirmed_1 = _x.sent();
+                        confirmed_1 = _v.sent();
                         return [2 /*return*/, confirmed_1];
                     case 2: return [4 /*yield*/, new Promise(function (resolve, reject) {
-                            var _a, _b, _c;
+                            var _a, _b;
                             (_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,
+                                dialog: modal,
+                                data: action.rawData,
                                 reload: 'none',
                                 callback: function (result) { return resolve(result); }
                             }, action.data);
                         })];
                     case 3:
-                        confirmed = _x.sent();
+                        confirmed = _v.sent();
                         return [2 /*return*/, confirmed];
                 }
             });

package/lib/actions/DrawerAction.d.ts

@@ -7,6 +7,11 @@ export interface IDrawerAction extends ListenerAction {
         drawer: SchemaNode;
     };
     drawer?: SchemaNode;
+    /**
+     * 是否等待确认结果
+     */
+    waitForAction?: boolean;
+    outputVar?: string;
 }
 /**
  * 打开抽屉动作