amis-core 6.2.2 → 6.3.0

package/lib/actions/DrawerAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -8,7 +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');
+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');
 
 /**
  * 打开抽屉动作
@@ -23,17 +64,34 @@ var DrawerAction = /** @class */ (function () {
     DrawerAction.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: 'drawer',
+                            drawer: action.drawer,
+                            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 || 'drawerResponse'] = {
+                                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: 'drawer',
-                    drawer: action.drawer,
-                    reload: 'none'
-                }, action.data);
-                return [2 /*return*/];
             });
         });
     };

package/lib/actions/EmailAction.js

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

package/lib/actions/EventAction.d.ts

@@ -0,0 +1,20 @@
+import { RendererEvent } from '../utils/renderer-event';
+import { RendererAction, ListenerContext, ListenerAction } from './Action';
+export interface IEventAction extends ListenerAction {
+    actionType: 'setEventData' | 'preventDefault' | 'stopPropagation';
+    args: {
+        key?: string;
+        value?: any;
+        [propName: string]: any;
+    };
+}
+/**
+ * 事件本身相关动作
+ *
+ * @export
+ * @class EventAction
+ * @implements {Action}
+ */
+export declare class EventAction implements RendererAction {
+    run(action: IEventAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
+}

package/lib/actions/EventAction.js

@@ -0,0 +1,109 @@
+/**
+ * amis-core v6.3.0
+ * Copyright 2018-2024 fex
+ */
+
+'use strict';
+
+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');
+require('../utils/tpl.js');
+require('../utils/helper.js');
+require('../utils/filter.js');
+var formula = require('../utils/formula.js');
+require('../utils/highlight.js');
+require('../utils/icon.js');
+require('../utils/image.js');
+require('lodash/isEqual');
+var Action = require('./Action.js');
+require('lodash/debounce');
+var resolveVariableAndFilterForAsync = require('../utils/resolveVariableAndFilterForAsync.js');
+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/isObject');
+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');
+
+/**
+ * 事件本身相关动作
+ *
+ * @export
+ * @class EventAction
+ * @implements {Action}
+ */
+var EventAction = /** @class */ (function () {
+    function EventAction() {
+    }
+    EventAction.prototype.run = function (action, renderer, event) {
+        var _a;
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _b, data, value;
+            return tslib.__generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        _b = action.actionType;
+                        switch (_b) {
+                            case 'setEventData': return [3 /*break*/, 1];
+                            case 'preventDefault': return [3 /*break*/, 5];
+                            case 'stopPropagation': return [3 /*break*/, 6];
+                        }
+                        return [3 /*break*/, 7];
+                    case 1:
+                        if (!(typeof ((_a = action.args) === null || _a === void 0 ? void 0 : _a.key) === 'string')) return [3 /*break*/, 4];
+                        data = object.cloneObject(event.data);
+                        value = action.args.value;
+                        if (!formula.isExpression(value)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, resolveVariableAndFilterForAsync.resolveVariableAndFilterForAsync(value, event.data, '| raw')];
+                    case 2:
+                        value = _c.sent();
+                        _c.label = 3;
+                    case 3:
+                        object.setVariable(data, action.args.key, value);
+                        event.setData(data);
+                        _c.label = 4;
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        event.preventDefault();
+                        return [3 /*break*/, 7];
+                    case 6:
+                        event.stopPropagation();
+                        return [3 /*break*/, 7];
+                    case 7: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return EventAction;
+}());
+Action.registerAction('setEventData', new EventAction());
+Action.registerAction('preventDefault', new EventAction());
+Action.registerAction('stopPropagation', new EventAction());
+
+exports.EventAction = EventAction;

package/lib/actions/LinkAction.js

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

package/lib/actions/LoopAction.js

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

package/lib/actions/PageAction.js

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

package/lib/actions/ParallelAction.js

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

package/lib/actions/PrintAction.js

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

package/lib/actions/StatusAction.js

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

package/lib/actions/SwitchAction.js

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

package/lib/actions/ToastAction.js

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

package/lib/actions/WaitAction.d.ts

@@ -0,0 +1,18 @@
+import { RendererEvent } from '../utils/renderer-event';
+import { RendererAction, ListenerContext, ListenerAction } from './Action';
+export interface IWaitAction extends ListenerAction {
+    actionType: 'wait';
+    args: {
+        time: number;
+    };
+}
+/**
+ * 事件本身相关动作
+ *
+ * @export
+ * @class EventAction
+ * @implements {Action}
+ */
+export declare class WaitAction implements RendererAction {
+    run(action: IWaitAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
+}

package/lib/actions/WaitAction.js

@@ -0,0 +1,45 @@
+/**
+ * amis-core v6.3.0
+ * Copyright 2018-2024 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var Action = require('./Action.js');
+
+/**
+ * 事件本身相关动作
+ *
+ * @export
+ * @class EventAction
+ * @implements {Action}
+ */
+var WaitAction = /** @class */ (function () {
+    function WaitAction() {
+    }
+    WaitAction.prototype.run = function (action, renderer, event) {
+        var _a;
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var time;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        time = (_a = action.args) === null || _a === void 0 ? void 0 : _a.time;
+                        if (!(typeof time === 'number')) return [3 /*break*/, 2];
+                        return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, time); })];
+                    case 1:
+                        _b.sent();
+                        _b.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return WaitAction;
+}());
+Action.registerAction('wait', new WaitAction());
+
+exports.WaitAction = WaitAction;

package/lib/actions/index.d.ts

@@ -15,8 +15,10 @@ import './CopyAction';
 import './DialogAction';
 import './DrawerAction';
 import './EmailAction';
+import './EventAction';
 import './LinkAction';
 import './ToastAction';
+import './WaitAction';
 import './PageAction';
 import './PrintAction';
 export * from './Action';

package/lib/components/CustomStyle.js

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

package/lib/components/ErrorBoundary.js

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

package/lib/components/LazyComponent.js

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

package/lib/components/Overlay.d.ts

@@ -4,6 +4,7 @@
  * @author fex
  */
 import React from 'react';
+import { EnvContext } from '../env';
 export declare const SubPopoverDisplayedID = "data-sub-popover-displayed";
 interface OverlayProps {
     placement?: string;
@@ -33,6 +34,8 @@ export default class Overlay extends React.Component<OverlayProps, OverlayState>
     static defaultProps: {
         placement: string;
     };
+    static contextType: React.Context<void | import("../env").RendererEnv>;
+    context: React.ContextType<typeof EnvContext>;
     constructor(props: OverlayProps);
     position: any;
     positionRef: (position: any) => void;

package/lib/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -51,6 +51,7 @@ require('../utils/validations.js');
 require('../utils/resolveCondition.js');
 require('mobx');
 require('../utils/Animation.js');
+var env = require('../env.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -222,10 +223,11 @@ var Overlay = /** @class */ (function (_super) {
         return container;
     };
     Overlay.prototype.render = function () {
-        var _a = this.props, containerPadding = _a.containerPadding, target = _a.target, placement = _a.placement, shouldUpdatePosition = _a.shouldUpdatePosition, rootClose = _a.rootClose, children = _a.children; _a.watchTargetSizeChange; var Transition = _a.transition, offset = _a.offset, props = tslib.__rest(_a, ["containerPadding", "target", "placement", "shouldUpdatePosition", "rootClose", "children", "watchTargetSizeChange", "transition", "offset"]);
-        var container = this.getContainerSelector()
+        var _a;
+        var _b = this.props, containerPadding = _b.containerPadding, target = _b.target, placement = _b.placement, shouldUpdatePosition = _b.shouldUpdatePosition, rootClose = _b.rootClose, children = _b.children; _b.watchTargetSizeChange; var Transition = _b.transition, offset = _b.offset, props = tslib.__rest(_b, ["containerPadding", "target", "placement", "shouldUpdatePosition", "rootClose", "children", "watchTargetSizeChange", "transition", "offset"]);
+        var container = (this.getContainerSelector()
             ? this.getContainerSelector
-            : this.props.container;
+            : this.props.container) || ((_a = this.context) === null || _a === void 0 ? void 0 : _a.getModalContainer);
         var mountOverlay = props.show || (Transition && !this.state.exited);
         if (!mountOverlay) {
             // Don't bother showing anything if we don't have to.
@@ -270,6 +272,7 @@ var Overlay = /** @class */ (function (_super) {
     Overlay.defaultProps = {
         placement: 'auto'
     };
+    Overlay.contextType = env.EnvContext;
     tslib.__decorate([
         helper.autobind,
         tslib.__metadata("design:type", Function),

package/lib/components/PopOver.js

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

package/lib/env.js

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

package/lib/envOverwrite.js

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

package/lib/factory.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { IRendererStore, IIRendererStore } from './store/index';
+import { TestIdBuilder } from './utils/helper';
 import { fetcherResult, SchemaNode, Schema, PlainObject } from './types';
 import { ThemeProps } from './theme';
 import { LocaleProps } from './locale';
@@ -26,6 +27,7 @@ export interface RendererProps extends ThemeProps, LocaleProps, OnEventProps, St
     env: RendererEnv;
     $path: string;
     $schema: any;
+    testIdBuilder?: TestIdBuilder;
     store?: IIRendererStore;
     syncSuperStore?: boolean;
     data: {

package/lib/factory.js

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

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -93,8 +93,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');
@@ -137,7 +139,7 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '6.2.2';
+var version = '6.3.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -285,11 +287,11 @@ exports.JSONTraverse = helper.JSONTraverse;
 exports.JSONValueMap = helper.JSONValueMap;
 exports.SkipOperation = helper.SkipOperation;
 exports.TEST_ID_KEY = helper.TEST_ID_KEY;
+exports.TestIdBuilder = helper.TestIdBuilder;
 exports.ValidateError = helper.ValidateError;
 exports.__uri = helper.__uri;
 exports.anyChanged = helper.anyChanged;
 exports.autobind = helper.autobind;
-exports.buildTestId = helper.buildTestId;
 exports.buildTrackExpression = helper.buildTrackExpression;
 exports.bulkBindFunctions = helper.bulkBindFunctions;
 exports.camel = helper.camel;
@@ -317,7 +319,6 @@ exports.getPropValue = helper.getPropValue;
 exports.getRange = helper.getRange;
 exports.getScrollParent = helper.getScrollParent;
 exports.getScrollbarWidth = helper.getScrollbarWidth;
-exports.getTestId = helper.getTestId;
 exports.getTree = helper.getTree;
 exports.getTreeAncestors = helper.getTreeAncestors;
 exports.getTreeDepth = helper.getTreeDepth;
@@ -409,6 +410,7 @@ exports.prettyBytes = prettyBytes.prettyBytes;
 exports.bindEvent = rendererEvent.bindEvent;
 exports.createRendererEvent = rendererEvent.createRendererEvent;
 exports.dispatchEvent = rendererEvent.dispatchEvent;
+exports.getMatchedEventTargets = rendererEvent.getMatchedEventTargets;
 exports.getRendererEventListeners = rendererEvent.getRendererEventListeners;
 exports.resolveEventData = rendererEvent.resolveEventData;
 exports.replaceText = replaceText.replaceText;

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -125,7 +125,9 @@ function localeable(ComposedComponent) {
                     translate: translate
                 };
                 moment__default["default"].locale((_a = momentLocaleMap === null || momentLocaleMap === void 0 ? void 0 : momentLocaleMap[locale]) !== null && _a !== void 0 ? _a : locale);
-                var refConfig = ((_b = ComposedComponent.prototype) === null || _b === void 0 ? void 0 : _b.isReactComponent)
+                var refConfig = ((_b = ComposedComponent.prototype) === null || _b === void 0 ? void 0 : _b.isReactComponent) ||
+                    ComposedComponent.$$typeof ===
+                        Symbol.for('react.forward_ref')
                     ? { ref: this.childRef }
                     : { forwardedRef: this.childRef };
                 var body = (_J$X_(ComposedComponent, tslib.__assign({}, this.props, injectedProps, refConfig)));

package/lib/polyfills.js

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

package/lib/renderers/Form.d.ts

@@ -313,7 +313,7 @@ export default class Form extends React.Component<FormProps, object> {
     };
     static propsList: Array<string>;
     hooks: {
-        [propName: string]: Array<() => Promise<any>>;
+        [propName: string]: Array<(...args: any) => Promise<any>>;
     };
     asyncCancel: () => void;
     toDispose: Array<() => void>;
@@ -352,10 +352,11 @@ export default class Form extends React.Component<FormProps, object> {
     flushing: boolean;
     flush(): Promise<void>;
     reset(): void;
-    addHook(fn: () => any, type?: 'validate' | 'init' | 'flush'): () => void;
+    addHook(fn: () => any, type?: 'validate' | 'init' | 'flush', enforce?: 'prev' | 'post'): () => void;
     removeHook(fn: () => any, type?: string): void;
     handleChange(value: any, name: string, submit: boolean, changePristine?: boolean): void;
     formItemDispatchEvent(type: string, data: any): any;
+    emittedData: any;
     emitChange(submit: boolean, skipIfNothingChanges?: boolean): Promise<void>;
     handleBulkChange(values: Object, submit: boolean): void;
     handleFormSubmit(e: React.UIEvent<any>): any;