amis-core 2.0.2 → 2.1.0

package/lib/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -32,12 +32,12 @@ 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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         return tslib.__awaiter(this, void 0, void 0, function () {
             var env, result, responseData, msg, e_1, result;
-            var _o;
-            return tslib.__generator(this, function (_p) {
-                switch (_p.label) {
+            var _s;
+            return tslib.__generator(this, function (_t) {
+                switch (_t.label) {
                     case 0:
                         if (!((_a = renderer.props.env) === null || _a === void 0 ? void 0 : _a.fetcher)) {
                             throw new Error('env.fetcher is required!');
@@ -48,47 +48,48 @@ var AjaxAction = /** @class */ (function () {
                             }
                         }
                         env = event.context.env;
-                        _p.label = 1;
+                        _t.label = 1;
                     case 1:
-                        _p.trys.push([1, 3, , 4]);
+                        _t.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, env.fetcher((_c = action.args) === null || _c === void 0 ? void 0 : _c.api, omit__default["default"]((_d = action.args) !== null && _d !== void 0 ? _d : {}, ['api', 'options', 'messages']), (_f = (_e = action.args) === null || _e === void 0 ? void 0 : _e.options) !== null && _f !== void 0 ? _f : {})];
                     case 2:
-                        result = _p.sent();
-                        if (!helper.isEmpty(result.data) || result.ok) {
-                            responseData = api.normalizeApiResponseData(result.data);
-                            // 记录请求返回的数据
-                            event.setData(object.createObject(event.data, action.outputVar
-                                ? (_o = {},
-                                    _o["".concat(action.outputVar)] = responseData,
-                                    _o) : responseData));
-                        }
-                        if (!result.ok) {
-                            throw new errors.ServerError((_j = (_h = (_g = action.args) === null || _g === void 0 ? void 0 : _g.messages) === null || _h === void 0 ? void 0 : _h.failed) !== null && _j !== void 0 ? _j : result.msg, result);
+                        result = _t.sent();
+                        responseData = !helper.isEmpty(result.data) || result.ok
+                            ? api.normalizeApiResponseData(result.data)
+                            : null;
+                        // 记录请求返回的数据
+                        event.setData(object.createObject(event.data, tslib.__assign(tslib.__assign({}, responseData), (_s = { responseData: responseData }, _s[action.outputVar || 'responseResult'] = tslib.__assign(tslib.__assign({}, responseData), { responseData: responseData, responseStatus: result.status, responseMsg: result.msg }), _s))));
+                        if (!((_h = (_g = action.args) === null || _g === void 0 ? void 0 : _g.options) === null || _h === void 0 ? void 0 : _h.silent)) {
+                            if (!result.ok) {
+                                throw new errors.ServerError((_l = (_k = (_j = action.args) === null || _j === void 0 ? void 0 : _j.messages) === null || _k === void 0 ? void 0 : _k.failed) !== null && _l !== void 0 ? _l : result.msg, result);
+                            }
+                            else {
+                                msg = (_p = (_o = (_m = action.args) === null || _m === void 0 ? void 0 : _m.messages) === null || _o === void 0 ? void 0 : _o.success) !== null && _p !== void 0 ? _p : result.msg;
+                                msg &&
+                                    env.notify('success', msg, result.msgTimeout !== undefined
+                                        ? {
+                                            closeButton: true,
+                                            timeout: result.msgTimeout
+                                        }
+                                        : undefined);
+                            }
                         }
-                        else {
-                            msg = (_m = (_l = (_k = action.args) === null || _k === void 0 ? void 0 : _k.messages) === null || _l === void 0 ? void 0 : _l.success) !== null && _m !== void 0 ? _m : result.msg;
-                            msg &&
-                                env.notify('success', msg, result.msgTimeout !== undefined
+                        return [2 /*return*/, result.data];
+                    case 3:
+                        e_1 = _t.sent();
+                        if (!((_r = (_q = action.args) === null || _q === void 0 ? void 0 : _q.options) === null || _r === void 0 ? void 0 : _r.silent)) {
+                            if (e_1.type === 'ServerError') {
+                                result = e_1.response;
+                                env.notify('error', e_1.message, result.msgTimeout !== undefined
                                     ? {
                                         closeButton: true,
                                         timeout: result.msgTimeout
                                     }
                                     : undefined);
-                        }
-                        return [2 /*return*/, result.data];
-                    case 3:
-                        e_1 = _p.sent();
-                        if (e_1.type === 'ServerError') {
-                            result = e_1.response;
-                            env.notify('error', e_1.message, result.msgTimeout !== undefined
-                                ? {
-                                    closeButton: true,
-                                    timeout: result.msgTimeout
-                                }
-                                : undefined);
-                        }
-                        else {
-                            env.notify('error', e_1.message);
+                            }
+                            else {
+                                env.notify('error', e_1.message);
+                            }
                         }
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/];

package/lib/actions/BreakAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/BroadcastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/ContinueAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/CopyAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/Decorators.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/DialogAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/DrawerAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/EmailAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/LinkAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/LoopAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/PageAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/ParallelAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/SwitchAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Overlay.d.ts

@@ -13,6 +13,7 @@ interface OverlayProps {
     rootClose?: boolean;
     onHide?(props: any, ...args: any[]): any;
     container?: React.ReactNode | Function;
+    containerSelector?: string;
     target?: React.ReactNode | Function;
     watchTargetSizeChange?: boolean;
     offset?: [number, number];
@@ -36,6 +37,7 @@ export default class Overlay extends React.Component<OverlayProps, OverlayState>
     updatePosition(): void;
     componentDidUpdate(prevProps: OverlayProps): void;
     onHiddenListener(node: HTMLElement): void;
+    getContainerSelector(): Element | null;
     render(): JSX.Element | null;
 }
 export {};

package/lib/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -186,8 +186,19 @@ var Overlay = /** @class */ (function (_super) {
             this.props.onExited(node);
         }
     };
+    Overlay.prototype.getContainerSelector = function () {
+        var containerSelector = this.props.containerSelector;
+        var container = null;
+        if (typeof containerSelector === 'string') {
+            container = document.querySelector(containerSelector);
+        }
+        return container;
+    };
     Overlay.prototype.render = function () {
-        var _a = this.props, container = _a.container, 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, ["container", "containerPadding", "target", "placement", "shouldUpdatePosition", "rootClose", "children", "watchTargetSizeChange", "transition", "offset"]);
+        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()
+            ? this.getContainerSelector
+            : this.props.container;
         var mountOverlay = props.show || (Transition && !this.state.exited);
         if (!mountOverlay) {
             // Don't bother showing anything if we don't have to.
@@ -238,6 +249,12 @@ var Overlay = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [HTMLElement]),
         tslib.__metadata("design:returntype", void 0)
     ], Overlay.prototype, "onHiddenListener", null);
+    tslib.__decorate([
+        helper.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], Overlay.prototype, "getContainerSelector", null);
     return Overlay;
 }(React__default["default"].Component));
 

package/lib/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/factory.d.ts

@@ -56,7 +56,7 @@ export interface RenderOptions extends Partial<Omit<RendererEnv, 'fetcher' | 'th
 }
 export interface fetcherConfig {
     url: string;
-    method?: 'get' | 'post' | 'put' | 'patch' | 'delete' | 'jsonp';
+    method?: 'get' | 'post' | 'put' | 'patch' | 'delete' | 'jsonp' | 'js';
     data?: any;
     config?: any;
 }

package/lib/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -101,9 +101,11 @@ exports.buildApi = api.buildApi;
 exports.clearApiCache = api.clearApiCache;
 exports.getApiCache = api.getApiCache;
 exports.isApiOutdated = api.isApiOutdated;
+exports.isApiOutdatedWithData = api.isApiOutdatedWithData;
 exports.isEffectiveApi = api.isEffectiveApi;
 exports.isSameApi = api.isSameApi;
 exports.isValidApi = api.isValidApi;
+exports.jsFetcher = api.jsFetcher;
 exports.jsonpFetcher = api.jsonpFetcher;
 exports.normalizeApi = api.normalizeApi;
 exports.normalizeApiResponseData = api.normalizeApiResponseData;
@@ -120,6 +122,7 @@ exports.ColorScale = ColorScale.ColorScale;
 exports.columnsSplit = columnsSplit.columnsSplit;
 exports.dataMapping = dataMapping.dataMapping;
 exports.resolveMapping = dataMapping.resolveMapping;
+exports.resolveMappingObject = dataMapping.resolveMappingObject;
 exports.DataSchema = DataSchema.DataSchema;
 exports.DataScope = DataScope.DataScope;
 exports.filterDate = date.filterDate;
@@ -175,6 +178,7 @@ exports.findObjectsWithKey = helper.findObjectsWithKey;
 exports.findTree = helper.findTree;
 exports.findTreeIndex = helper.findTreeIndex;
 exports.flattenTree = helper.flattenTree;
+exports.flattenTreeWithLeafNodes = helper.flattenTreeWithLeafNodes;
 exports.getLevelFromClassName = helper.getLevelFromClassName;
 exports.getPropValue = helper.getPropValue;
 exports.getRange = helper.getRange;

package/lib/index2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -66,7 +66,6 @@ require('./actions/PageAction.js');
 var Item = require('./renderers/Item.js');
 require('mobx');
 require('lodash/findIndex');
-require('lodash/merge');
 var Root = require('./Root.js');
 var envOverwrite = require('./envOverwrite.js');
 var env = require('./env.js');
@@ -142,9 +141,11 @@ exports.buildApi = api.buildApi;
 exports.clearApiCache = api.clearApiCache;
 exports.getApiCache = api.getApiCache;
 exports.isApiOutdated = api.isApiOutdated;
+exports.isApiOutdatedWithData = api.isApiOutdatedWithData;
 exports.isEffectiveApi = api.isEffectiveApi;
 exports.isSameApi = api.isSameApi;
 exports.isValidApi = api.isValidApi;
+exports.jsFetcher = api.jsFetcher;
 exports.jsonpFetcher = api.jsonpFetcher;
 exports.normalizeApi = api.normalizeApi;
 exports.normalizeApiResponseData = api.normalizeApiResponseData;
@@ -220,6 +221,7 @@ exports.findObjectsWithKey = helper.findObjectsWithKey;
 exports.findTree = helper.findTree;
 exports.findTreeIndex = helper.findTreeIndex;
 exports.flattenTree = helper.flattenTree;
+exports.flattenTreeWithLeafNodes = helper.flattenTreeWithLeafNodes;
 exports.getLevelFromClassName = helper.getLevelFromClassName;
 exports.getPropValue = helper.getPropValue;
 exports.getRange = helper.getRange;

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/@restart/hooks/esm/useCommittedRef.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/@restart/hooks/esm/useEventCallback.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/dom-helpers/esm/addEventListener.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/dom-helpers/esm/canUseDOM.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/dom-helpers/esm/contains.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/dom-helpers/esm/listen.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/dom-helpers/esm/ownerDocument.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/dom-helpers/esm/removeEventListener.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/object-assign/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/checkPropTypes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/factoryWithThrowingShims.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/factoryWithTypeCheckers.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/lib/ReactPropTypesSecret.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/lib/has.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/node_modules/react-is/cjs/react-is.development.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/node_modules/react-is/cjs/react-is.production.min.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/prop-types/node_modules/react-is/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/react-overlays/esm/Portal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/react-overlays/esm/ownerDocument.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/react-overlays/esm/safeFindDOMNode.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/react-overlays/esm/useRootClose.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/react-overlays/esm/useWaitForDOMRef.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/node_modules/warning/warning.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/renderers/Form.d.ts

@@ -220,7 +220,7 @@ export interface FormProps extends RendererProps, Omit<FormSchemaBase, 'mode' |
     lazyLoad?: boolean;
     simpleMode?: boolean;
     onInit?: (values: object, props: any) => any;
-    onReset?: (values: object) => void;
+    onReset?: (values: object, action?: any) => void;
     onSubmit?: (values: object, action: any) => any;
     onChange?: (values: object, diff: object, props: any) => any;
     onFailed?: (reason: string, errors: any) => any;
@@ -305,6 +305,7 @@ export default class Form extends React.Component<FormProps, object> {
     emitChange(submit: boolean): Promise<void>;
     handleBulkChange(values: Object, submit: boolean): void;
     handleFormSubmit(e: React.UIEvent<any>): false | Promise<any>;
+    handleReset(action: any): (data: any) => void;
     handleAction(e: React.UIEvent<any> | void, action: ActionObject, data: object, throwErrors?: boolean, delegate?: IScopedContext): Promise<any>;
     handleQuery(query: any): void;
     handleDialogConfirm(values: object[], action: ActionObject, ctx: any, targets: Array<any>): void;