amis 2.0.1 → 2.1.1-beta.2

package/lib/renderers/Dialog.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 
@@ -265,9 +265,9 @@ 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, size = _a.size, 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, 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 Wrapper = wrapperComponent || amisUi.Modal;
-        return (React__default["default"].createElement(Wrapper, { classPrefix: classPrefix, className: cx(className), size: size, 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 },
+        return (React__default["default"].createElement(Wrapper, { classPrefix: classPrefix, className: cx(className), 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) },
                 showCloseButton !== false && !store.loading ? (React__default["default"].createElement("a", { "data-tooltip": __('Dialog.close'), "data-position": "left", onClick: this.handleSelfClose, className: cx('Modal-close') },
                     React__default["default"].createElement(amisUi.Icon, { icon: "close", className: "icon" }))) : null,

package/lib/renderers/Divider.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/DropDownButton.d.ts

@@ -103,7 +103,7 @@ export default class DropDownButton extends React.Component<DropDownButtonProps,
     componentDidMount(): void;
     domRef(ref: any): void;
     toogle(e: React.MouseEvent<any>): void;
-    open(): void;
+    open(): Promise<void>;
     close(): void;
     keepOpen(): void;
     renderButton(button: DropdownButton, index: number | string): React.ReactNode;

package/lib/renderers/DropDownButton.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 
@@ -47,13 +47,24 @@ var DropDownButton = /** @class */ (function (_super) {
         });
     };
     DropDownButton.prototype.open = function () {
-        this.setState({
-            isOpened: true
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.props.dispatchEvent('mouseenter', { data: this.props.buttons })];
+                    case 1:
+                        _a.sent();
+                        this.setState({
+                            isOpened: true
+                        });
+                        return [2 /*return*/];
+                }
+            });
         });
     };
     DropDownButton.prototype.close = function () {
         var _this = this;
         this.timer = setTimeout(function () {
+            _this.props.dispatchEvent('mouseleave', { data: _this.props.buttons });
             _this.setState({
                 isOpened: false
             });
@@ -111,8 +122,6 @@ var DropDownButton = /** @class */ (function (_super) {
     };
     DropDownButton.prototype.render = function () {
         var _a = this.props, tooltip = _a.tooltip, placement = _a.placement, tooltipContainer = _a.tooltipContainer, tooltipTrigger = _a.tooltipTrigger, tooltipRootClose = _a.tooltipRootClose, disabledTip = _a.disabledTip, block = _a.block, disabled = _a.disabled, btnDisabled = _a.btnDisabled, btnClassName = _a.btnClassName, size = _a.size, label = _a.label, level = _a.level, primary = _a.primary, className = _a.className, cx = _a.classnames, align = _a.align, iconOnly = _a.iconOnly, icon = _a.icon, rightIcon = _a.rightIcon, isActived = _a.isActived, trigger = _a.trigger, data = _a.data, hideCaret = _a.hideCaret;
-        var iconElement = amisCore.generateIcon(cx, icon, 'm-r-xs');
-        var rightIconElement = amisCore.generateIcon(cx, rightIcon, 'm-l-xs');
         return (React__default["default"].createElement("div", { className: cx('DropDown ', {
                 'DropDown--block': block,
                 'DropDown--alignRight': align === 'right',
@@ -129,9 +138,13 @@ var DropDownButton = /** @class */ (function (_super) {
                         'Button--primary': primary,
                         'Button--iconOnly': iconOnly
                     }, size ? "Button--".concat(size) : '') },
-                    iconElement,
+                    amisUi.hasIcon(icon)
+                        ? React__default["default"].createElement(amisUi.Icon, { icon: icon, className: "icon" })
+                        : amisCore.generateIcon(cx, icon, 'm-r-xs'),
                     typeof label === 'string' ? amisCore.filter(label, data) : label,
-                    rightIconElement,
+                    rightIcon && amisUi.hasIcon(rightIcon)
+                        ? React__default["default"].createElement(amisUi.Icon, { icon: icon, className: "icon" })
+                        : amisCore.generateIcon(cx, rightIcon, 'm-l-xs'),
                     !hideCaret ? (React__default["default"].createElement("span", { className: cx('DropDown-caret') },
                         React__default["default"].createElement(amisUi.Icon, { icon: "caret", className: "icon" }))) : null)),
             this.state.isOpened ? this.renderOuter() : null));

package/lib/renderers/Each.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Flex.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ButtonGroupSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ButtonToolbar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ChainedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ChartRadios.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Checkbox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

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

@@ -1,6 +1,5 @@
 import React from 'react';
-import { OptionsControlProps, Option } from 'amis-core';
-import { ActionObject, Api } from 'amis-core';
+import type { ActionObject, Api, OptionsControlProps, Option } from 'amis-core';
 import { FormOptionsSchema } from '../../Schema';
 /**
  * 复选框

package/lib/renderers/Form/Checkboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 
@@ -9,12 +9,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
+var inRange = require('lodash/inRange');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var inRange__default = /*#__PURE__*/_interopDefaultLegacy(inRange);
 
 var CheckboxesControl = /** @class */ (function (_super) {
     tslib.__extends(CheckboxesControl, _super);
@@ -173,8 +175,7 @@ var CheckboxesControl = /** @class */ (function (_super) {
             body = options.map(function (option, key) { return _this.renderItem(option, key); });
         }
         if (checkAll && body.length && optionType === 'default') {
-            body.unshift(React__default["default"].createElement(amisUi.Checkbox, { key: "checkall", className: itemClassName, onChange: onToggleAll, checked: !!selectedOptions.length, partial: !!(selectedOptions.length &&
-                    selectedOptions.length !== options.length), disabled: disabled, inline: inline, labelClassName: labelClassName }, __('Checkboxes.selectAll')));
+            body.unshift(React__default["default"].createElement(amisUi.Checkbox, { key: "checkall", className: itemClassName, onChange: onToggleAll, checked: !!selectedOptions.length, partial: inRange__default["default"](selectedOptions.length, 0, amisCore.flattenTreeWithLeafNodes(options).length), disabled: disabled, inline: inline, labelClassName: labelClassName }, __('Checkboxes.selectAll')));
         }
         body = amisCore.columnsSplit(body, cx, columnsCount);
         return (React__default["default"].createElement("div", { className: cx("CheckboxesControl", className), ref: "checkboxRef" },

package/lib/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ConditionBuilder.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Control.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

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

@@ -3809,12 +3809,12 @@ 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" | "inline" | "normal" | "row" | "default" | undefined;
+        formMode?: "normal" | "horizontal" | "default" | "row" | "inline" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
-        defaultSize?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
-        size?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
+        defaultSize?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
+        size?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         labelWidth?: string | number | undefined;
         disabled?: boolean | undefined;
@@ -3850,20 +3850,26 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         error?: string | undefined;
         showErrorMsg?: 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;
+        label?: string | false | undefined;
         remark?: import("../Remark").SchemaRemark | undefined;
+        desc?: string | undefined;
+        mode?: "normal" | "horizontal" | "inline" | undefined;
+        horizontal?: import("amis-core").FormHorizontal | undefined;
         labelRemark?: import("../Remark").SchemaRemark | undefined;
-        options?: any;
-        label?: string | false | undefined;
         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;
-        placeholder?: string | undefined;
         required?: boolean | undefined;
         validationErrors?: {
             [propName: string]: any;
@@ -3912,14 +3918,8 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         clearValueOnHidden?: boolean | undefined;
         validateApi?: string | import("amis-core").BaseApiObject | undefined;
-        $ref?: string | undefined;
-        disabledOn?: string | undefined;
-        hidden?: boolean | undefined;
-        hiddenOn?: string | undefined;
-        visible?: boolean | undefined;
-        visibleOn?: string | undefined;
-        id?: string | undefined;
-        diffValue?: string | undefined;
+        options?: any;
         language?: string | undefined;
+        diffValue?: string | undefined;
     };
 }

package/lib/renderers/Form/DiffEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

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

@@ -3811,12 +3811,12 @@ 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" | "inline" | "normal" | "row" | "default" | undefined;
+        formMode?: "normal" | "horizontal" | "default" | "row" | "inline" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
-        defaultSize?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
-        size?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
+        defaultSize?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
+        size?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         labelWidth?: string | number | undefined;
         disabled?: boolean | undefined;

package/lib/renderers/Form/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/FieldSet.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Formula.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 
@@ -66,8 +66,9 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
                 return null;
             }
             var controlMode = (control === null || control === void 0 ? void 0 : control.mode) || formMode;
-            if (controlMode === 'inline' ||
-                (control && control.type === 'formula')) {
+            if (controlMode === 'inline'
+                // hidden 直接渲染，否则会有个空 Form-groupColumn 层
+                || (control === null || control === void 0 ? void 0 : control.type) && ['formula', 'hidden'].includes(control.type)) {
                 return _this.renderControl(control, index, {
                     key: index,
                     className: cx(control.className, control.columnClassName)

package/lib/renderers/Form/Hidden.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/IconPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/IconPickerIcons.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputArray.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */