amis 2.5.3-beta.1 → 2.5.3-beta.3

package/lib/renderers/Dialog.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -299,7 +299,7 @@ var Dialog = /** @class */ (function (_super) {
     };
     Dialog.prototype.render = function () {
         var store = this.props.store;
-        var _a = tslib.__assign(tslib.__assign({}, this.props), store.schema), className = _a.className, style = _a.style, size = _a.size, height = _a.height, width = _a.width, closeOnEsc = _a.closeOnEsc, closeOnOutside = _a.closeOnOutside, title = _a.title, render = _a.render, header = _a.header, body = _a.body, bodyClassName = _a.bodyClassName, headerClassName = _a.headerClassName, show = _a.show, lazyRender = _a.lazyRender, lazySchema = _a.lazySchema, wrapperComponent = _a.wrapperComponent, showCloseButton = _a.showCloseButton, env = _a.env, cx = _a.classnames, classPrefix = _a.classPrefix, __ = _a.translate;
+        var _a = tslib.__assign(tslib.__assign({}, this.props), store.schema), className = _a.className, style = _a.style, size = _a.size, height = _a.height, width = _a.width, closeOnEsc = _a.closeOnEsc, closeOnOutside = _a.closeOnOutside, title = _a.title, render = _a.render, header = _a.header, body = _a.body, bodyClassName = _a.bodyClassName, headerClassName = _a.headerClassName, show = _a.show, lazyRender = _a.lazyRender, lazySchema = _a.lazySchema, wrapperComponent = _a.wrapperComponent, showCloseButton = _a.showCloseButton, env = _a.env, cx = _a.classnames, classPrefix = _a.classPrefix, __ = _a.translate, loadingConfig = _a.loadingConfig;
         var Wrapper = wrapperComponent || amisUi.Modal;
         return (React__default["default"].createElement(Wrapper, { classPrefix: classPrefix, className: cx(className), style: style, size: size, height: height, width: width, backdrop: "static", onHide: this.handleSelfClose, keyboard: closeOnEsc && !store.loading, closeOnEsc: closeOnEsc, closeOnOutside: !store.dialogOpen && closeOnOutside, show: show, onEntered: this.handleEntered, onExited: this.handleExited, container: env && env.getModalContainer ? env.getModalContainer : undefined, enforceFocus: false, disabled: store.loading },
             title && typeof title === 'string' ? (React__default["default"].createElement("div", { className: cx('Modal-header', headerClassName) },
@@ -319,8 +319,10 @@ var Dialog = /** @class */ (function (_super) {
                     onAction: this.handleAction
                 })
                 : null,
-            (!store.entered && lazyRender) || (lazySchema && !body) ? (React__default["default"].createElement("div", { className: cx('Modal-body', bodyClassName) },
-                React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: true, size: "lg" }))) : body ? (React__default["default"].createElement("div", { className: cx('Modal-body', bodyClassName) }, this.renderBody(body, 'body'))) : null,
+            (!store.entered && lazyRender) || (lazySchema && !body) ? (React__default["default"].createElement("div", { className: cx('Modal-body', bodyClassName), role: "dialog-body" },
+                React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: true, size: "lg", loadingConfig: loadingConfig }))) : body ? (
+            // dialog-body 用于在 editor 中定位元素
+            React__default["default"].createElement("div", { className: cx('Modal-body', bodyClassName), role: "dialog-body" }, this.renderBody(body, 'body'))) : null,
             this.renderFooter(),
             body
                 ? render('drawer', tslib.__assign(tslib.__assign({}, (store.action &&
@@ -663,6 +665,10 @@ var Dialog = /** @class */ (function (_super) {
     DialogRenderer.prototype.setData = function (values) {
         return this.props.store.updateData(values);
     };
+    DialogRenderer.prototype.getData = function () {
+        var store = this.props.store;
+        return store.data;
+    };
     DialogRenderer.contextType = amisCore.ScopedContext;
     DialogRenderer = tslib.__decorate([
         amisCore.Renderer({

package/lib/renderers/Divider.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Drawer.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { IScopedContext } from 'amis-core';
 import { RendererProps } from 'amis-core';
 import { SchemaNode, ActionObject } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { IModalStore } from 'amis-core';
 import { BaseSchema, SchemaClassName, SchemaCollection, SchemaName } from '../Schema';
 import { ActionSchema } from './Action';
@@ -95,7 +96,7 @@ export interface DrawerSchema extends BaseSchema {
     showErrorMsg?: boolean;
 }
 export type DrawerSchemaBase = Omit<DrawerSchema, 'type'>;
-export interface DrawerProps extends RendererProps, Omit<DrawerSchema, 'className'> {
+export interface DrawerProps extends RendererProps, Omit<DrawerSchema, 'className'>, SpinnerExtraProps {
     onClose: () => void;
     onConfirm: (values: Array<object>, action: ActionObject, ctx: object, targets: Array<any>) => void;
     children?: React.ReactNode | ((props?: any) => React.ReactNode);
@@ -151,4 +152,5 @@ export declare class DrawerRenderer extends Drawer {
     reloadTarget(target: string, data?: any): void;
     closeTarget(target: string): void;
     setData(values: object): void;
+    getData(): any;
 }

package/lib/renderers/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -281,7 +281,7 @@ var Drawer = /** @class */ (function (_super) {
     };
     Drawer.prototype.render = function () {
         var store = this.props.store;
-        var _a = tslib.__assign(tslib.__assign({}, this.props), store.schema), className = _a.className, style = _a.style, size = _a.size, closeOnEsc = _a.closeOnEsc, position = _a.position, title = _a.title, render = _a.render, header = _a.header, body = _a.body, bodyClassName = _a.bodyClassName, headerClassName = _a.headerClassName, show = _a.show, showCloseButton = _a.showCloseButton, width = _a.width, height = _a.height, wrapperComponent = _a.wrapperComponent, env = _a.env, resizable = _a.resizable, overlay = _a.overlay, closeOnOutside = _a.closeOnOutside, ns = _a.classPrefix, cx = _a.classnames, drawerContainer = _a.drawerContainer;
+        var _a = tslib.__assign(tslib.__assign({}, this.props), store.schema), className = _a.className, style = _a.style, size = _a.size, closeOnEsc = _a.closeOnEsc, position = _a.position, title = _a.title, render = _a.render, header = _a.header, body = _a.body, bodyClassName = _a.bodyClassName, headerClassName = _a.headerClassName, show = _a.show, showCloseButton = _a.showCloseButton, width = _a.width, height = _a.height, wrapperComponent = _a.wrapperComponent, env = _a.env, resizable = _a.resizable, overlay = _a.overlay, closeOnOutside = _a.closeOnOutside, ns = _a.classPrefix, cx = _a.classnames, drawerContainer = _a.drawerContainer, loadingConfig = _a.loadingConfig;
         var Container = wrapperComponent || amisUi.Drawer;
         return (React__default["default"].createElement(Container, { resizable: resizable, classPrefix: ns, className: className, style: style, size: size, onHide: this.handleSelfClose, disabled: store.loading, show: show, showCloseButton: showCloseButton, width: width, height: height, position: position, overlay: overlay, onEntered: this.handleEntered, onExited: this.handleExited, closeOnEsc: closeOnEsc, closeOnOutside: !store.drawerOpen && !store.dialogOpen && closeOnOutside, container: drawerContainer
                 ? drawerContainer
@@ -304,7 +304,9 @@ var Drawer = /** @class */ (function (_super) {
                     })
                     : null),
             !store.entered ? (React__default["default"].createElement("div", { className: cx('Drawer-body', bodyClassName) },
-                React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: true, size: "lg" }))) : body ? (React__default["default"].createElement("div", { className: cx('Drawer-body', bodyClassName) }, this.renderBody(body, 'body'))) : null,
+                React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: true, size: "lg", loadingConfig: loadingConfig }))) : body ? (
+            // dialog-body 用于在 editor 中定位元素
+            React__default["default"].createElement("div", { className: cx('Drawer-body', bodyClassName), role: "dialog-body" }, this.renderBody(body, 'body'))) : null,
             this.renderFooter(),
             body
                 ? render('dialog', tslib.__assign(tslib.__assign({}, (store.action &&
@@ -625,6 +627,10 @@ var Drawer = /** @class */ (function (_super) {
     DrawerRenderer.prototype.setData = function (values) {
         return this.props.store.updateData(values);
     };
+    DrawerRenderer.prototype.getData = function () {
+        var store = this.props.store;
+        return store.data;
+    };
     DrawerRenderer.contextType = amisCore.ScopedContext;
     DrawerRenderer = tslib.__decorate([
         amisCore.Renderer({

package/lib/renderers/DropDownButton.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Each.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Flex.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ButtonGroupSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -43,7 +43,7 @@ var ButtonGroupControl = /** @class */ (function (_super) {
         var _a;
         var _this = this;
         if (props === void 0) { props = this.props; }
-        var render = props.render, ns = props.classPrefix, cx = props.classnames, className = props.className, style = props.style, disabled = props.disabled, options = props.options; props.value; var labelField = props.labelField, placeholder = props.placeholder, btnClassName = props.btnClassName, btnActiveClassName = props.btnActiveClassName, selectedOptions = props.selectedOptions, buttons = props.buttons, size = props.size, block = props.block, vertical = props.vertical, tiled = props.tiled, __ = props.translate;
+        var render = props.render, ns = props.classPrefix, cx = props.classnames, className = props.className; props.style; var disabled = props.disabled, options = props.options; props.value; var labelField = props.labelField, placeholder = props.placeholder, btnClassName = props.btnClassName, btnActiveClassName = props.btnActiveClassName, selectedOptions = props.selectedOptions, buttons = props.buttons, size = props.size, block = props.block, vertical = props.vertical, tiled = props.tiled, __ = props.translate;
         var body = [];
         var btnLevel = props.btnLevel;
         var btnActiveLevel = props.btnActiveLevel;
@@ -89,7 +89,7 @@ var ButtonGroupControl = /** @class */ (function (_super) {
                     'ButtonGroup--tiled': tiled
                 },
                 _a["ButtonGroup--".concat(size)] = size,
-                _a), className), style: style }, body.length ? (body) : (React__default["default"].createElement("span", { className: "".concat(ns, "ButtonGroup-placeholder") }, __(placeholder)))));
+                _a), className) }, body.length ? (body) : (React__default["default"].createElement("span", { className: "".concat(ns, "ButtonGroup-placeholder") }, __(placeholder)))));
     };
     ButtonGroupControl.defaultProps = {
         btnLevel: 'default',

package/lib/renderers/Form/ButtonToolbar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ChainedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ChartRadios.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Checkbox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Checkboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ConditionBuilder.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Control.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/DiffEditor.d.ts

@@ -3833,7 +3833,7 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "default" | "inline" | "normal" | "row" | undefined;
+        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
@@ -3851,8 +3851,8 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         onBulkChange?: ((values: {
             [propName: string]: any;
         }, submitOnChange?: boolean | undefined) => void) | undefined;
-        addHook?: ((fn: Function, mode?: "validate" | "init" | "flush" | undefined) => () => void) | undefined;
-        removeHook?: ((fn: Function, mode?: "validate" | "init" | "flush" | undefined) => void) | undefined;
+        addHook?: ((fn: Function, mode?: "init" | "validate" | "flush" | undefined) => () => void) | undefined;
+        removeHook?: ((fn: Function, mode?: "init" | "validate" | "flush" | undefined) => void) | undefined;
         renderFormItems?: ((schema: Partial<import("amis-core/lib/renderers/Form").FormSchemaBase>, region: string, props: any) => JSX.Element) | undefined;
         onFocus?: ((e: any) => void) | undefined;
         onBlur?: ((e: any) => void) | undefined;
@@ -3874,15 +3874,16 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         error?: string | undefined;
         showErrorMsg?: boolean | undefined;
+        remark?: import("../Remark").SchemaRemark | undefined;
+        hidden?: boolean | undefined;
+        static?: boolean | undefined;
         placeholder?: string | undefined;
         $ref?: string | undefined;
         disabledOn?: string | undefined;
-        hidden?: boolean | undefined;
         hiddenOn?: string | undefined;
         visible?: boolean | undefined;
         visibleOn?: string | undefined;
         id?: string | undefined;
-        static?: boolean | undefined;
         staticOn?: string | undefined;
         staticPlaceholder?: string | undefined;
         staticClassName?: import("amis-core").SchemaClassName | undefined;
@@ -3890,18 +3891,17 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         staticInputClassName?: import("amis-core").SchemaClassName | undefined;
         staticSchema?: any;
         label?: string | false | undefined;
-        remark?: import("../Remark").SchemaRemark | undefined;
-        desc?: string | undefined;
-        mode?: "horizontal" | "inline" | "normal" | undefined;
-        horizontal?: import("amis-core").FormHorizontal | undefined;
-        labelClassName?: string | undefined;
-        inline?: boolean | undefined;
-        readOnly?: boolean | undefined;
         labelRemark?: import("../Remark").SchemaRemark | undefined;
         options?: any;
+        labelClassName?: string | undefined;
         submitOnChange?: boolean | undefined;
+        readOnly?: boolean | undefined;
         readOnlyOn?: string | undefined;
         validateOnChange?: boolean | undefined;
+        desc?: string | undefined;
+        mode?: "horizontal" | "inline" | "normal" | undefined;
+        horizontal?: import("amis-core").FormHorizontal | undefined;
+        inline?: boolean | undefined;
         required?: boolean | undefined;
         validationErrors?: {
             [propName: string]: any;

package/lib/renderers/Form/DiffEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Editor.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="lodash" />
 import React from 'react';
 import { FormControlProps, FormBaseControl } from 'amis-core';
 import type { ListenerAction } from 'amis-core';
@@ -3833,7 +3832,7 @@ export declare class EditorControlRenderer extends EditorControl {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "default" | "inline" | "normal" | "row" | undefined;
+        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
@@ -3851,8 +3850,8 @@ export declare class EditorControlRenderer extends EditorControl {
         onBulkChange?: ((values: {
             [propName: string]: any;
         }, submitOnChange?: boolean | undefined) => void) | undefined;
-        addHook?: ((fn: Function, mode?: "validate" | "init" | "flush" | undefined) => () => void) | undefined;
-        removeHook?: ((fn: Function, mode?: "validate" | "init" | "flush" | undefined) => void) | undefined;
+        addHook?: ((fn: Function, mode?: "init" | "validate" | "flush" | undefined) => () => void) | undefined;
+        removeHook?: ((fn: Function, mode?: "init" | "validate" | "flush" | undefined) => void) | undefined;
         renderFormItems?: ((schema: Partial<import("amis-core/lib/renderers/Form").FormSchemaBase>, region: string, props: any) => JSX.Element) | undefined;
         onFocus?: ((e: any) => void) | undefined;
         onBlur?: ((e: any) => void) | undefined;

package/lib/renderers/Form/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/FieldSet.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Formula.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Hidden.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/IconPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/IconPickerIcons.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/IconSelect.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { FormControlProps } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { FormBaseControlSchema } from '../../Schema';
 import * as IconSelectStore from './IconSelectStore';
 export interface IconSelectControlSchema extends FormBaseControlSchema {
@@ -9,7 +10,7 @@ export interface IconSelectControlSchema extends FormBaseControlSchema {
     noDataTip?: string;
     clearable?: boolean;
 }
-export interface IconSelectProps extends FormControlProps {
+export interface IconSelectProps extends FormControlProps, SpinnerExtraProps {
     placeholder?: string;
     disabled?: boolean;
     noDataTip?: string;

package/lib/renderers/Form/IconSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -149,7 +149,7 @@ var IconSelectControl = /** @class */ (function (_super) {
         });
     };
     IconSelectControl.prototype.renderModalContent = function () {
-        var _a = this.props, render = _a.render, ns = _a.classPrefix;
+        var _a = this.props, render = _a.render, ns = _a.classPrefix, loadingConfig = _a.loadingConfig;
         var icons = this.getIconsByType();
         var inputValue = this.state.searchValue;
         var filteredIcons = inputValue
@@ -167,7 +167,7 @@ var IconSelectControl = /** @class */ (function (_super) {
                 })) ||
                 null,
             React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "IconSelectControl-Modal-content")) },
-                React__default["default"].createElement(amisUi.Spinner, { size: "lg", overlay: true, key: "info", show: this.state.isRefreshLoading }),
+                React__default["default"].createElement(amisUi.Spinner, { size: "lg", loadingConfig: loadingConfig, overlay: true, key: "info", show: this.state.isRefreshLoading }),
                 React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "IconSelectControl-Modal-content-aside")) }, this.renderIconTypes()),
                 React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "IconSelectControl-Modal-content-main")) }, this.renderIconList(filteredIcons)))));
     };

package/lib/renderers/Form/IconSelectStore.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputArray.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.1
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */