amis 2.1.1-beta.2 → 2.3.0

package/lib/renderers/Dialog.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -28,6 +28,7 @@ var Dialog = /** @class */ (function (_super) {
         props.store.setEntered(!!props.show);
         _this.handleSelfClose = _this.handleSelfClose.bind(_this);
         _this.handleAction = _this.handleAction.bind(_this);
+        _this.handleActionSensor = _this.handleActionSensor.bind(_this);
         _this.handleDialogConfirm = _this.handleDialogConfirm.bind(_this);
         _this.handleDialogClose = _this.handleDialogClose.bind(_this);
         _this.handleDrawerConfirm = _this.handleDrawerConfirm.bind(_this);
@@ -77,10 +78,42 @@ var Dialog = /** @class */ (function (_super) {
         return ret;
     };
     Dialog.prototype.handleSelfClose = function (e, confirmed) {
-        var _a = this.props, onClose = _a.onClose, store = _a.store;
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, onClose, store, dispatchEvent, rendererEvent;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, onClose = _a.onClose, store = _a.store, dispatchEvent = _a.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent('cancel', this.props.data)];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        // clear error
+                        store.updateMessage();
+                        onClose(confirmed);
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Dialog.prototype.handleActionSensor = function (p) {
+        var _this = this;
+        var store = this.props.store;
+        var origin = store.busying;
+        store.markBusying(true);
         // clear error
         store.updateMessage();
-        onClose(confirmed);
+        p.then(function () {
+            store.markBusying(origin);
+        }).catch(function (e) {
+            if (_this.isDead) {
+                return;
+            }
+            store.updateMessage(e.message, true);
+            store.markBusying(origin);
+        });
     };
     Dialog.prototype.handleAction = function (e, action, data) {
         var _a = this.props, store = _a.store, onAction = _a.onAction;
@@ -231,6 +264,7 @@ var Dialog = /** @class */ (function (_super) {
             onChange: this.handleFormChange,
             onInit: this.handleFormInit,
             onSaved: this.handleFormSaved,
+            onActionSensor: this.handleActionSensor,
             syncLocation: false // 弹框中的 crud 一般不需要同步地址栏
         };
         if (!body.type) {
@@ -248,7 +282,7 @@ var Dialog = /** @class */ (function (_super) {
         if (!actions || !actions.length) {
             return null;
         }
-        var _a = this.props, store = _a.store, render = _a.render, cx = _a.classnames, showErrorMsg = _a.showErrorMsg, showLoading = _a.showLoading;
+        var _a = this.props, store = _a.store, render = _a.render, cx = _a.classnames, showErrorMsg = _a.showErrorMsg, showLoading = _a.showLoading, show = _a.show;
         return (React__default["default"].createElement("div", { className: cx('Modal-footer') },
             (showLoading !== false && store.loading) ||
                 (showErrorMsg !== false && store.error) ? (React__default["default"].createElement("div", { className: cx('Dialog-info'), key: "info" },
@@ -259,7 +293,7 @@ var Dialog = /** @class */ (function (_super) {
                     data: store.formData,
                     onAction: _this.handleAction,
                     key: key,
-                    disabled: action.disabled || store.loading
+                    disabled: action.disabled || store.loading || !show
                 });
             })));
     };
@@ -551,7 +585,9 @@ var Dialog = /** @class */ (function (_super) {
         var scoped = this.context;
         var components = scoped
             .getComponents()
-            .filter(function (item) { return !~['drawer', 'dialog'].indexOf(item.props.type); });
+            .filter(function (item) {
+            return !~['drawer', 'dialog', 'action', 'button', 'submit', 'reset'].indexOf(item.props.type);
+        });
         var onConfirm = this.props.onConfirm;
         var onClose = this.props.onClose;
         if (components.length === 1 &&

package/lib/renderers/Divider.js

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

package/lib/renderers/Drawer.d.ts

@@ -119,7 +119,8 @@ export default class Drawer extends React.Component<DrawerProps> {
     constructor(props: DrawerProps);
     componentWillUnmount(): void;
     buildActions(): Array<ActionSchema>;
-    handleSelfClose(): void;
+    handleSelfClose(): Promise<void>;
+    handleActionSensor(p: Promise<any>): void;
     handleAction(e: React.UIEvent<any>, action: ActionObject, data: object): void;
     handleDrawerConfirm(values: object[], action: ActionObject, ...args: Array<any>): void;
     handleDrawerClose(...args: Array<any>): void;

package/lib/renderers/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -27,6 +27,7 @@ var Drawer = /** @class */ (function (_super) {
         props.store.setEntered(!!props.show);
         _this.handleSelfClose = _this.handleSelfClose.bind(_this);
         _this.handleAction = _this.handleAction.bind(_this);
+        _this.handleActionSensor = _this.handleActionSensor.bind(_this);
         _this.handleDrawerConfirm = _this.handleDrawerConfirm.bind(_this);
         _this.handleDrawerClose = _this.handleDrawerClose.bind(_this);
         _this.handleDialogConfirm = _this.handleDialogConfirm.bind(_this);
@@ -73,14 +74,42 @@ var Drawer = /** @class */ (function (_super) {
         return ret;
     };
     Drawer.prototype.handleSelfClose = function () {
-        var _a = this.props, onClose = _a.onClose, store = _a.store;
-        // 如果有子弹框，那么就先不隐藏自己
-        if (store.dialogOpen !== false || store.drawerOpen !== false) {
-            return;
-        }
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, onClose, store, dispatchEvent, rendererEvent;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, onClose = _a.onClose, store = _a.store, dispatchEvent = _a.dispatchEvent;
+                        // 如果有子弹框，那么就先不隐藏自己
+                        if (store.dialogOpen !== false || store.drawerOpen !== false) {
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, dispatchEvent('cancel', this.props.data)];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        // clear error
+                        store.updateMessage();
+                        onClose();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Drawer.prototype.handleActionSensor = function (p) {
+        var store = this.props.store;
+        var origin = store.busying;
+        store.markBusying(true);
         // clear error
         store.updateMessage();
-        onClose();
+        p.then(function () {
+            store.markBusying(origin);
+        }).catch(function (e) {
+            store.updateMessage(e.message, true);
+            store.markBusying(origin);
+        });
     };
     Drawer.prototype.handleAction = function (e, action, data) {
         var _a = this.props, onClose = _a.onClose, onAction = _a.onAction;
@@ -208,6 +237,7 @@ var Drawer = /** @class */ (function (_super) {
             onChange: this.handleFormChange,
             onInit: this.handleFormInit,
             onSaved: this.handleFormSaved,
+            onActionSensor: this.handleActionSensor,
             syncLocation: false
         };
         if (schema.type === 'form') {
@@ -253,9 +283,7 @@ var Drawer = /** @class */ (function (_super) {
         var store = this.props.store;
         var _a = tslib.__assign(tslib.__assign({}, this.props), store.schema), className = _a.className, 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 Container = wrapperComponent || amisUi.Drawer;
-        return (React__default["default"].createElement(Container, { resizable: resizable, classPrefix: ns, className: className, 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 || !showCloseButton), container: drawerContainer
+        return (React__default["default"].createElement(Container, { resizable: resizable, classPrefix: ns, className: className, 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
                 : env && env.getModalContainer
                     ? env.getModalContainer
@@ -532,7 +560,9 @@ var Drawer = /** @class */ (function (_super) {
         var scoped = this.context;
         var components = scoped
             .getComponents()
-            .filter(function (item) { return !~['drawer', 'dialog'].indexOf(item.props.type); });
+            .filter(function (item) {
+            return !~['drawer', 'dialog', 'action', 'button', 'submit', 'reset'].indexOf(item.props.type);
+        });
         var onConfirm = this.props.onConfirm;
         if (components.length === 1 &&
             (components[0].props.type === 'form' ||

package/lib/renderers/DropDownButton.js

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

package/lib/renderers/Each.js

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

package/lib/renderers/Flex.js

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

package/lib/renderers/Form/ButtonGroupSelect.js

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

package/lib/renderers/Form/ButtonToolbar.js

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

package/lib/renderers/Form/ChainedSelect.js

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

package/lib/renderers/Form/ChartRadios.js

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

package/lib/renderers/Form/Checkbox.js

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

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

@@ -54,10 +54,11 @@ export default class CheckboxesControl extends React.Component<CheckboxesProps,
     handleEditClick(e: Event, item: any): void;
     handleDeleteClick(e: Event, item: any): void;
     componentDidMount(): void;
-    componentWillMount(): void;
+    componentWillUnmount(): void;
     updateBorderStyle(): void;
     renderGroup(option: Option, index: number): JSX.Element | null;
     renderItem(option: Option, index: number): JSX.Element | null;
+    columnsSplit(body: React.ReactNode[]): any[];
     render(): JSX.Element;
 }
 export declare class CheckboxesControlRenderer extends CheckboxesControl {

package/lib/renderers/Form/Checkboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -57,7 +57,7 @@ var CheckboxesControl = /** @class */ (function (_super) {
         this.updateBorderStyle();
         window.addEventListener('resize', this.updateBorderStyle);
     };
-    CheckboxesControl.prototype.componentWillMount = function () {
+    CheckboxesControl.prototype.componentWillUnmount = function () {
         window.removeEventListener('resize', this.updateBorderStyle);
     };
     CheckboxesControl.prototype.updateBorderStyle = function () {
@@ -144,9 +144,13 @@ var CheckboxesControl = /** @class */ (function (_super) {
         if (!((_a = option.children) === null || _a === void 0 ? void 0 : _a.length)) {
             return null;
         }
-        return (React__default["default"].createElement("div", { key: index, className: cx('CheckboxesControl-group', option.className) },
+        var children = option.children.map(function (option, index) {
+            return _this.renderItem(option, index);
+        });
+        var body = this.columnsSplit(children);
+        return (React__default["default"].createElement("div", { key: 'group-' + index, className: cx('CheckboxesControl-group', option.className) },
             React__default["default"].createElement("label", { className: cx('CheckboxesControl-groupLabel', option.labelClassName) }, option[labelField || 'label']),
-            option.children.map(function (option, index) { return _this.renderItem(option, index); })));
+            body));
     };
     CheckboxesControl.prototype.renderItem = function (option, index) {
         var _this = this;
@@ -167,9 +171,31 @@ var CheckboxesControl = /** @class */ (function (_super) {
             editable && amisCore.hasAbility(option, 'editable') ? (React__default["default"].createElement("a", { "data-tooltip": "\u7F16\u8F91", "data-position": "left" },
                 React__default["default"].createElement(amisUi.Icon, { icon: "pencil", className: "icon", onClick: function (e) { return _this.handleEditClick(e, option); } }))) : null));
     };
+    CheckboxesControl.prototype.columnsSplit = function (body) {
+        var _a = this.props, columnsCount = _a.columnsCount, cx = _a.classnames;
+        var result = [];
+        var tmp = [];
+        body.forEach(function (node) {
+            // 如果有分组，组内单独分列
+            if (node && node.key && String(node.key).startsWith('group')) {
+                // 夹杂在分组间的无分组选项，分别成块
+                if (tmp.length) {
+                    result.push(amisCore.columnsSplit(tmp, cx, columnsCount));
+                    tmp = [];
+                }
+                result.push(node);
+            }
+            else {
+                tmp.push(node);
+            }
+        });
+        // 收尾
+        tmp.length && result.push(amisCore.columnsSplit(tmp, cx, columnsCount));
+        return result;
+    };
     CheckboxesControl.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className, disabled = _a.disabled, placeholder = _a.placeholder, options = _a.options, inline = _a.inline, columnsCount = _a.columnsCount, selectedOptions = _a.selectedOptions; _a.onToggle; var onToggleAll = _a.onToggleAll, checkAll = _a.checkAll, cx = _a.classnames, itemClassName = _a.itemClassName, labelClassName = _a.labelClassName, creatable = _a.creatable, addApi = _a.addApi, createBtnLabel = _a.createBtnLabel, __ = _a.translate, optionType = _a.optionType;
+        var _a = this.props, className = _a.className, disabled = _a.disabled, placeholder = _a.placeholder, options = _a.options, inline = _a.inline; _a.columnsCount; var selectedOptions = _a.selectedOptions; _a.onToggle; var onToggleAll = _a.onToggleAll, checkAll = _a.checkAll, cx = _a.classnames, itemClassName = _a.itemClassName, labelClassName = _a.labelClassName, creatable = _a.creatable, addApi = _a.addApi, createBtnLabel = _a.createBtnLabel, __ = _a.translate, optionType = _a.optionType;
         var body = [];
         if (options && options.length) {
             body = options.map(function (option, key) { return _this.renderItem(option, key); });
@@ -177,7 +203,7 @@ var CheckboxesControl = /** @class */ (function (_super) {
         if (checkAll && body.length && optionType === 'default') {
             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);
+        body = this.columnsSplit(body);
         return (React__default["default"].createElement("div", { className: cx("CheckboxesControl", className), ref: "checkboxRef" },
             body && body.length ? (body) : (React__default["default"].createElement("span", { className: "Form-placeholder" }, __(placeholder))),
             (creatable || addApi) && !disabled ? (React__default["default"].createElement("a", { className: cx('Checkboxes-addBtn'), onClick: this.handleAddClick },

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

@@ -75,6 +75,10 @@ export interface ComboControlSchema extends FormBaseControlSchema {
      * 是否可新增
      */
     addable?: boolean;
+    /**
+     * Add at top
+     */
+    addattop?: boolean;
     /**
      * 数组输入框的子项
      */

package/lib/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -134,7 +134,7 @@ var ComboControl = /** @class */ (function (_super) {
         return value;
     };
     ComboControl.prototype.addItemWith = function (condition) {
-        var _a = this.props, flat = _a.flat, joinValues = _a.joinValues, delimiter = _a.delimiter, scaffold = _a.scaffold, disabled = _a.disabled, submitOnChange = _a.submitOnChange;
+        var _a = this.props, flat = _a.flat, joinValues = _a.joinValues, addattop = _a.addattop, delimiter = _a.delimiter, scaffold = _a.scaffold, disabled = _a.disabled, submitOnChange = _a.submitOnChange;
         if (disabled) {
             return;
         }
@@ -146,15 +146,18 @@ var ComboControl = /** @class */ (function (_super) {
         if (flat && joinValues) {
             value = value.join(delimiter || ',');
         }
+        if (addattop === true) {
+            value.unshift(value.pop());
+        }
         this.props.onChange(value, submitOnChange, true);
     };
     ComboControl.prototype.addItem = function () {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, flat, joinValues, delimiter, scaffold, disabled, submitOnChange, data, dispatchEvent, value, rendererEvent;
+            var _a, flat, joinValues, addattop, delimiter, scaffold, disabled, submitOnChange, data, dispatchEvent, value, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, flat = _a.flat, joinValues = _a.joinValues, delimiter = _a.delimiter, scaffold = _a.scaffold, disabled = _a.disabled, submitOnChange = _a.submitOnChange, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, flat = _a.flat, joinValues = _a.joinValues, addattop = _a.addattop, delimiter = _a.delimiter, scaffold = _a.scaffold, disabled = _a.disabled, submitOnChange = _a.submitOnChange, data = _a.data, dispatchEvent = _a.dispatchEvent;
                         if (disabled) {
                             return [2 /*return*/];
                         }
@@ -174,6 +177,9 @@ var ComboControl = /** @class */ (function (_super) {
                         if (flat && joinValues) {
                             value = value.join(delimiter || ',');
                         }
+                        if (addattop === true) {
+                            value.unshift(value.pop());
+                        }
                         this.props.onChange(value, submitOnChange, true);
                         return [2 /*return*/];
                 }

package/lib/renderers/Form/ConditionBuilder.js

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

package/lib/renderers/Form/Control.js

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