amis 2.0.1 → 2.1.1-beta.2

package/esm/renderers/Dialog.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 
@@ -257,9 +257,9 @@ var Dialog = /** @class */ (function (_super) {
     };
     Dialog.prototype.render = function () {
         var store = this.props.store;
-        var _a = __assign(__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 = __assign(__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 || Modal;
-        return (React.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.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.createElement("div", { className: cx('Modal-header', headerClassName) },
                 showCloseButton !== false && !store.loading ? (React.createElement("a", { "data-tooltip": __('Dialog.close'), "data-position": "left", onClick: this.handleSelfClose, className: cx('Modal-close') },
                     React.createElement(Icon, { icon: "close", className: "icon" }))) : null,

package/esm/renderers/Divider.js

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

package/esm/renderers/Drawer.js

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

package/esm/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/esm/renderers/DropDownButton.js

@@ -1,12 +1,12 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 
-import { __extends, __assign, __decorate } from 'tslib';
+import { __extends, __awaiter, __generator, __assign, __decorate } from 'tslib';
 import React from 'react';
 import { generateIcon, isVisible, isDisabled, RootClose, noop, Overlay, PopOver, filter, Renderer } from 'amis-core';
-import { TooltipWrapper, Icon } from 'amis-ui';
+import { TooltipWrapper, hasIcon, Icon } from 'amis-ui';
 
 var DropDownButton = /** @class */ (function (_super) {
     __extends(DropDownButton, _super);
@@ -39,13 +39,24 @@ var DropDownButton = /** @class */ (function (_super) {
         });
     };
     DropDownButton.prototype.open = function () {
-        this.setState({
-            isOpened: true
+        return __awaiter(this, void 0, void 0, function () {
+            return __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
             });
@@ -103,8 +114,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 = generateIcon(cx, icon, 'm-r-xs');
-        var rightIconElement = generateIcon(cx, rightIcon, 'm-l-xs');
         return (React.createElement("div", { className: cx('DropDown ', {
                 'DropDown--block': block,
                 'DropDown--alignRight': align === 'right',
@@ -121,9 +130,13 @@ var DropDownButton = /** @class */ (function (_super) {
                         'Button--primary': primary,
                         'Button--iconOnly': iconOnly
                     }, size ? "Button--".concat(size) : '') },
-                    iconElement,
+                    hasIcon(icon)
+                        ? React.createElement(Icon, { icon: icon, className: "icon" })
+                        : generateIcon(cx, icon, 'm-r-xs'),
                     typeof label === 'string' ? filter(label, data) : label,
-                    rightIconElement,
+                    rightIcon && hasIcon(rightIcon)
+                        ? React.createElement(Icon, { icon: icon, className: "icon" })
+                        : generateIcon(cx, rightIcon, 'm-l-xs'),
                     !hideCaret ? (React.createElement("span", { className: cx('DropDown-caret') },
                         React.createElement(Icon, { icon: "caret", className: "icon" }))) : null)),
             this.state.isOpened ? this.renderOuter() : null));

package/esm/renderers/Each.js

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

package/esm/renderers/Flex.js

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

package/esm/renderers/Form/ButtonGroupSelect.js

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

package/esm/renderers/Form/ButtonToolbar.js

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

package/esm/renderers/Form/ChainedSelect.js

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

package/esm/renderers/Form/ChartRadios.js

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

package/esm/renderers/Form/Checkbox.js

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

package/esm/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/esm/renderers/Form/Checkboxes.js

@@ -1,11 +1,12 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { createObject, hasAbility, columnsSplit, autobind, OptionsControl } from 'amis-core';
+import inRange from 'lodash/inRange';
+import { createObject, hasAbility, flattenTreeWithLeafNodes, columnsSplit, autobind, OptionsControl } from 'amis-core';
 import { Checkbox, Icon } from 'amis-ui';
 
 var CheckboxesControl = /** @class */ (function (_super) {
@@ -165,8 +166,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.createElement(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.createElement(Checkbox, { key: "checkall", className: itemClassName, onChange: onToggleAll, checked: !!selectedOptions.length, partial: inRange(selectedOptions.length, 0, flattenTreeWithLeafNodes(options).length), disabled: disabled, inline: inline, labelClassName: labelClassName }, __('Checkboxes.selectAll')));
         }
         body = columnsSplit(body, cx, columnsCount);
         return (React.createElement("div", { className: cx("CheckboxesControl", className), ref: "checkboxRef" },

package/esm/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 
@@ -7,7 +7,7 @@ import { __extends, __assign, __awaiter, __generator, __decorate, __metadata, __
 import React from 'react';
 import { findDOMNode } from 'react-dom';
 import cloneDeep from 'lodash/cloneDeep';
-import { guid, createObject, extendObject, resolveVariable, anyChanged, isEffectiveApi, isObjectShallowModified, evalExpression, dataMapping, filter, isObject, str2AsyncFunction, autobind, FormItem, ComboStore } from 'amis-core';
+import { guid, createObject, extendObject, anyChanged, isEffectiveApi, isObjectShallowModified, evalExpression, dataMapping, filter, isObject, str2AsyncFunction, autobind, FormItem, ComboStore, resolveVariable } from 'amis-core';
 import { Tabs, Icon, Tab, Select, Alert2, Button } from 'amis-ui';
 import Sortable from 'sortablejs';
 import find from 'lodash/find';

package/esm/renderers/Form/ConditionBuilder.js

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

package/esm/renderers/Form/Control.js

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

package/esm/renderers/Form/DiffEditor.js

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

package/esm/renderers/Form/Editor.js

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

package/esm/renderers/Form/FieldSet.js

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

package/esm/renderers/Form/Formula.js

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

package/esm/renderers/Form/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 
@@ -60,8 +60,9 @@ import { isVisible, makeHorizontalDeeper, getWidthRate, FormItemWrap, Renderer }
                 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/esm/renderers/Form/Hidden.js

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

package/esm/renderers/Form/IconPicker.js

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

package/esm/renderers/Form/IconPickerIcons.js

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

package/esm/renderers/Form/InputArray.js

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