npm - amis - Versions diffs - 2.3.1 → 2.3.2-beta.1 - Mend

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
@@ -455,12 +455,12 @@ var Dialog = /** @class */ (function (_super) {
     DialogRenderer.prototype.handleAction = function (e, action, data, throwErrors, delegate) {
         if (throwErrors === void 0) { throwErrors = false; }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, onAction, store, onConfirm, env, dispatchEvent, scoped, rendererEvent, rendererEvent, ret;
+            var _a, onAction, store, onConfirm, env, dispatchEvent, onClose, scoped, rendererEvent, rendererEvent, handleResult, ret;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, onAction = _a.onAction, store = _a.store, onConfirm = _a.onConfirm, env = _a.env, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, onAction = _a.onAction, store = _a.store, onConfirm = _a.onConfirm, env = _a.env, dispatchEvent = _a.dispatchEvent, onClose = _a.onClose;
                         if (action.from === this.$$id) {
                             return [2 /*return*/, onAction
                                     ? onAction(e, action, data, throwErrors, delegate || this.context)
@@ -481,7 +481,9 @@ var Dialog = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         store.setCurrentAction(action);
-                        this.handleSelfClose();
+                        // clear error
+                        store.updateMessage();
+                        onClose();
                         action.close && this.closeTarget(action.close);
                         return [3 /*break*/, 6];
                     case 3:
@@ -493,7 +495,12 @@ var Dialog = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         store.setCurrentAction(action);
-                        this.tryChildrenToHandle(__assign(__assign({}, action), { actionType: 'submit' }), data, action) || this.handleSelfClose(undefined, true);
+                        handleResult = this.tryChildrenToHandle(__assign(__assign({}, action), { actionType: 'submit' }), data, action);
+                        if (!handleResult) {
+                            // clear error
+                            store.updateMessage();
+                            onClose(true);
+                        }
                         return [3 /*break*/, 6];
                     case 5:
                         if (action.actionType === 'next' || action.actionType === 'prev') {

package/esm/renderers/Divider.js CHANGED Viewed

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

package/esm/renderers/Drawer.js CHANGED Viewed

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

package/esm/renderers/DropDownButton.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
@@ -42,7 +42,9 @@ var DropDownButton = /** @class */ (function (_super) {
         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 0: return [4 /*yield*/, this.props.dispatchEvent('mouseenter', {
+                            items: this.props.buttons // 为了保持名字统一
+                        })];
                     case 1:
                         _a.sent();
                         this.setState({
@@ -56,7 +58,7 @@ var DropDownButton = /** @class */ (function (_super) {
     DropDownButton.prototype.close = function () {
         var _this = this;
         this.timer = setTimeout(function () {
-            _this.props.dispatchEvent('mouseleave', { data: _this.props.buttons });
+            _this.props.dispatchEvent('mouseleave', { items: _this.props.buttons });
             _this.setState({
                 isOpened: false
             });
@@ -130,13 +132,9 @@ var DropDownButton = /** @class */ (function (_super) {
                         'Button--primary': primary,
                         'Button--iconOnly': iconOnly
                     }, size ? "Button--".concat(size) : '') },
-                    hasIcon(icon)
-                        ? React.createElement(Icon, { icon: icon, className: "icon" })
-                        : generateIcon(cx, icon, 'm-r-xs'),
+                    hasIcon(icon) ? (React.createElement(Icon, { icon: icon, className: "icon" })) : (generateIcon(cx, icon, 'm-r-xs')),
                     typeof label === 'string' ? filter(label, data) : label,
-                    rightIcon && hasIcon(rightIcon)
-                        ? React.createElement(Icon, { icon: icon, className: "icon" })
-                        : generateIcon(cx, rightIcon, 'm-l-xs'),
+                    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 CHANGED Viewed

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

package/esm/renderers/Flex.js CHANGED Viewed

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

package/esm/renderers/Form/ButtonGroupSelect.js CHANGED Viewed

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

package/esm/renderers/Form/ButtonToolbar.js CHANGED Viewed

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

package/esm/renderers/Form/ChainedSelect.js CHANGED Viewed

@@ -1,12 +1,12 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 import { __extends, __assign, __awaiter, __generator, __rest, __decorate } from 'tslib';
 import React from 'react';
 import cx from 'classnames';
-import { isEffectiveApi, createObject, isMobile, OptionsControl } from 'amis-core';
+import { isEffectiveApi, resolveEventData, isMobile, OptionsControl } from 'amis-core';
 import { Select } from 'amis-ui';
 var ChainedSelectControl = /** @class */ (function (_super) {
@@ -112,9 +112,7 @@ var ChainedSelectControl = /** @class */ (function (_super) {
                             arr.splice(idx + 1, value.length - idx - 1);
                             arr.push(remoteValue);
                             valueRes = this.array2value(arr, true);
-                            return [4 /*yield*/, dispatchEvent('change', createObject(data, {
-                                    value: valueRes
-                                }))];
+                            return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: valueRes }, 'value'))];
                         case 1:
                             rendererEvent = _d.sent();
                             if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -143,11 +141,11 @@ var ChainedSelectControl = /** @class */ (function (_super) {
     };
     ChainedSelectControl.prototype.handleChange = function (index, currentValue) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, value, delimiter, onChange, joinValues, dispatchEvent, data, arr, valueRes, rendererEvent;
+            var _a, value, delimiter, onChange, joinValues, dispatchEvent, arr, valueRes, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, value = _a.value, delimiter = _a.delimiter, onChange = _a.onChange, joinValues = _a.joinValues, _a.extractValue, dispatchEvent = _a.dispatchEvent, data = _a.data;
+                        _a = this.props, value = _a.value, delimiter = _a.delimiter, onChange = _a.onChange, joinValues = _a.joinValues, _a.extractValue, dispatchEvent = _a.dispatchEvent, _a.data;
                         arr = Array.isArray(value)
                             ? value.concat()
                             : value && typeof value === 'string'
@@ -156,9 +154,7 @@ var ChainedSelectControl = /** @class */ (function (_super) {
                         arr.splice(index, arr.length - index);
                         arr.push(joinValues ? currentValue.value : currentValue);
                         valueRes = this.array2value(arr);
-                        return [4 /*yield*/, dispatchEvent('change', createObject(data, {
-                                value: valueRes
-                            }))];
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: valueRes }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/esm/renderers/Form/ChartRadios.js CHANGED Viewed

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

package/esm/renderers/Form/Checkbox.js CHANGED Viewed

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 import { __extends, __awaiter, __generator, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { createObject, autobind, FormItem } from 'amis-core';
+import { resolveEventData, autobind, FormItem } from 'amis-core';
 import cx from 'classnames';
 import { Checkbox, withBadge } from 'amis-ui';
@@ -27,14 +27,12 @@ var CheckboxControl = /** @class */ (function (_super) {
     CheckboxControl.prototype.dispatchChangeEvent = function (eventData) {
         if (eventData === void 0) { eventData = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, onChange, rendererEvent;
+            var _a, dispatchEvent, onChange, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, onChange = _a.onChange;
-                        return [4 /*yield*/, dispatchEvent('change', createObject(data, {
-                                value: eventData
-                            }))];
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, onChange = _a.onChange;
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: eventData }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/esm/renderers/Form/Checkboxes.js CHANGED Viewed

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