amis 2.3.1 → 2.3.2-beta.1

package/esm/renderers/Form/InputFile.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __awaiter, __generator, __decorate } from 'tslib';
 import React from 'react';
-import { guid, createObject, normalizeApi, buildApi, isEmpty, dataMapping, qsstringify, prettyBytes, FormItem, isEffectiveApi, isApiOutdated, isApiOutdatedWithData } from 'amis-core';
+import { guid, createObject, normalizeApi, buildApi, isEmpty, dataMapping, qsstringify, resolveEventData, prettyBytes, FormItem, isEffectiveApi, isApiOutdated, isApiOutdatedWithData } from 'amis-core';
 import find from 'lodash/find';
 import isPlainObject from 'lodash/isPlainObject';
 import { Icon, Button, TooltipWrapper } from 'amis-ui';
@@ -401,7 +401,7 @@ var FileControl = /** @class */ (function (_super) {
                         }
                         onProgress(1);
                         value = ret.data.value || ret.data.url || ret.data;
-                        return [4 /*yield*/, this.dispatchEvent('success', __assign(__assign({}, file), { value: value, state: 'uploaded' }))];
+                        return [4 /*yield*/, this.dispatchEvent('success', __assign(__assign({}, file), { item: file, value: value }))];
                     case 1:
                         dispatcher = _a.sent();
                         if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
@@ -416,7 +416,10 @@ var FileControl = /** @class */ (function (_super) {
             var dispatcher;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.dispatchEvent('fail', { file: file, error: error })];
+                    case 0: return [4 /*yield*/, this.dispatchEvent('fail', {
+                            item: file,
+                            error: error
+                        })];
                     case 1:
                         dispatcher = _a.sent();
                         if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
@@ -436,7 +439,7 @@ var FileControl = /** @class */ (function (_super) {
                     case 0:
                         files = this.state.files.concat();
                         removeFile = files[index];
-                        return [4 /*yield*/, this.dispatchEvent('remove', removeFile)];
+                        return [4 /*yield*/, this.dispatchEvent('remove', __assign(__assign({}, removeFile), { item: removeFile }))];
                     case 1:
                         dispatcher = _a.sent();
                         if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
@@ -776,9 +779,9 @@ var FileControl = /** @class */ (function (_super) {
     };
     FileControl.prototype.dispatchEvent = function (e, data) {
         return __awaiter(this, void 0, void 0, function () {
-            var dispatchEvent, getEventData, value;
-            return __generator(this, function (_a) {
-                dispatchEvent = this.props.dispatchEvent;
+            var _a, dispatchEvent, multiple, getEventData, value;
+            return __generator(this, function (_b) {
+                _a = this.props, dispatchEvent = _a.dispatchEvent, multiple = _a.multiple;
                 getEventData = function (item) { return ({
                     name: item.path || item.name,
                     value: item.value,
@@ -788,9 +791,7 @@ var FileControl = /** @class */ (function (_super) {
                 value = data
                     ? getEventData(data)
                     : this.state.files.map(function (item) { return getEventData(item); });
-                return [2 /*return*/, dispatchEvent(e, createObject(this.props.data, {
-                        file: value
-                    }))];
+                return [2 /*return*/, dispatchEvent(e, resolveEventData(this.props, __assign(__assign({}, data), { file: multiple ? value : value === null || value === void 0 ? void 0 : value[0] }), 'file'))];
             });
         });
     };

package/esm/renderers/Form/InputFormula.js

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

package/esm/renderers/Form/InputGroup.js

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

package/esm/renderers/Form/InputImage.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __awaiter, __generator, __spreadArray, __decorate } from 'tslib';
 import React, { Suspense } from 'react';
-import { guid, isEmpty, dataMapping, prettyBytes, buildApi, createObject, qsparse, qsstringify, filter, FormItem } from 'amis-core';
+import { guid, isEmpty, dataMapping, prettyBytes, buildApi, createObject, qsparse, qsstringify, resolveEventData, filter, FormItem } from 'amis-core';
 import DropZone from 'react-dropzone';
 import 'blueimp-canvastoblob';
 import find from 'lodash/find';
@@ -297,7 +297,7 @@ var ImageControl = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         files = this.files.concat();
-                        return [4 /*yield*/, this.dispatchEvent('remove', file)];
+                        return [4 /*yield*/, this.dispatchEvent('remove', __assign(__assign({}, file), { item: file }))];
                     case 1:
                         dispatcher = _a.sent();
                         if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
@@ -587,7 +587,10 @@ var ImageControl = /** @class */ (function (_super) {
                         }
                         if (!error) return [3 /*break*/, 2];
                         file.state = 'invalid';
-                        return [4 /*yield*/, this.dispatchEvent('fail', { file: file, error: error })];
+                        return [4 /*yield*/, this.dispatchEvent('fail', {
+                                item: file,
+                                error: error
+                            })];
                     case 1:
                         dispatcher = _a.sent();
                         if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
@@ -618,7 +621,7 @@ var ImageControl = /** @class */ (function (_super) {
                         }
                         obj = __assign(__assign({}, ret.data), { state: 'uploaded' });
                         obj.value = obj.value || obj.url;
-                        return [4 /*yield*/, this.dispatchEvent('success', __assign(__assign({}, file), { value: obj.value, state: 'uploaded' }))];
+                        return [4 /*yield*/, this.dispatchEvent('success', __assign(__assign({}, file), { item: file, value: obj.value }))];
                     case 1:
                         dispatcher = _a.sent();
                         if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
@@ -634,7 +637,7 @@ var ImageControl = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.dispatchEvent('fail', {
-                            file: file,
+                            item: file,
                             error: error
                         })];
                     case 1:
@@ -781,9 +784,9 @@ var ImageControl = /** @class */ (function (_super) {
     };
     ImageControl.prototype.dispatchEvent = function (e, data) {
         return __awaiter(this, void 0, void 0, function () {
-            var dispatchEvent, getEventData, value;
-            return __generator(this, function (_a) {
-                dispatchEvent = this.props.dispatchEvent;
+            var _a, dispatchEvent, multiple, getEventData, value;
+            return __generator(this, function (_b) {
+                _a = this.props, dispatchEvent = _a.dispatchEvent, multiple = _a.multiple;
                 getEventData = function (item) { return ({
                     name: item.path || item.name,
                     value: item.value,
@@ -793,7 +796,7 @@ var ImageControl = /** @class */ (function (_super) {
                 value = data
                     ? getEventData(data)
                     : this.files.map(function (item) { return getEventData(item); });
-                return [2 /*return*/, dispatchEvent(e, createObject(this.props.data, { file: value }))];
+                return [2 /*return*/, dispatchEvent(e, resolveEventData(this.props, __assign(__assign({}, data), { file: multiple ? value : value === null || value === void 0 ? void 0 : value[0] }), 'file'))];
             });
         });
     };

package/esm/renderers/Form/InputMonthRange.js

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

package/esm/renderers/Form/InputNumber.js

@@ -1,12 +1,12 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __decorate, __metadata, __assign } from 'tslib';
 import React from 'react';
 import { toFixed as toFixed_1 } from '../../node_modules/rc-input-number/lib/utils/MiniDecimal.js';
-import { normalizeOptions, createObject, filter, autobind, FormItem } from 'amis-core';
+import { normalizeOptions, resolveEventData, filter, autobind, FormItem } from 'amis-core';
 import cx from 'classnames';
 import { NumberInput, Select } from 'amis-ui';
 
@@ -91,27 +91,23 @@ var NumberControl = /** @class */ (function (_super) {
     // 派发有event的事件
     NumberControl.prototype.dispatchEvent = function (eventName) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, value;
+            var _a, dispatchEvent, value;
             return __generator(this, function (_b) {
-                _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, value = _a.value;
-                dispatchEvent(eventName, createObject(data, {
-                    value: value
-                }));
+                _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value;
+                dispatchEvent(eventName, resolveEventData(this.props, { value: value }, 'value'));
                 return [2 /*return*/];
             });
         });
     };
     NumberControl.prototype.handleChange = function (inputValue) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, onChange, data, dispatchEvent, value, rendererEvent;
+            var _a, onChange, dispatchEvent, value, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, onChange = _a.onChange, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
                         value = this.getValue(inputValue);
-                        return [4 /*yield*/, dispatchEvent('change', createObject(data, {
-                                value: value
-                            }))];
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: value }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/esm/renderers/Form/InputQuarterRange.js

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

package/esm/renderers/Form/InputRange.d.ts

@@ -233,11 +233,11 @@ export declare class Input extends React.Component<RangeItemProps, any> {
     /**
      * 失焦事件
      */
-    onBlur(): void;
+    onBlur(e: any): Promise<void>;
     /**
      * 聚焦事件
      */
-    onFocus(): Promise<void>;
+    onFocus(e: any): Promise<void>;
     render(): JSX.Element;
 }
 export default class RangeControl extends React.PureComponent<RangeProps, RangeState> {

package/esm/renderers/Form/InputRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -9,7 +9,7 @@ import isNumber from 'lodash/isNumber';
 import isObject from 'lodash/isObject';
 import isEqual from 'lodash/isEqual';
 import forEach from 'lodash/forEach';
-import { filter, createObject, autobind, stripNumber, FormItem } from 'amis-core';
+import { filter, resolveEventData, autobind, stripNumber, FormItem } from 'amis-core';
 import { NumberInput, Range, Icon } from 'amis-ui';
 
 /**
@@ -133,24 +133,48 @@ var Input = /** @class */ (function (_super) {
     /**
      * 失焦事件
      */
-    Input.prototype.onBlur = function () {
-        var _a = this.props, data = _a.data, dispatchEvent = _a.dispatchEvent, value = _a.value;
-        dispatchEvent('blur', createObject(data, {
-            value: value
-        }));
+    Input.prototype.onBlur = function (e) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, value, onBlur, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value, onBlur = _a.onBlur;
+                        return [4 /*yield*/, dispatchEvent('blur', resolveEventData(this.props, {
+                                value: value
+                            }, 'value'))];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onBlur === null || onBlur === void 0 ? void 0 : onBlur(e);
+                        return [2 /*return*/];
+                }
+            });
+        });
     };
     /**
      * 聚焦事件
      */
-    Input.prototype.onFocus = function () {
+    Input.prototype.onFocus = function (e) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, data, dispatchEvent, value;
+            var _a, dispatchEvent, value, onFocus, rendererEvent;
             return __generator(this, function (_b) {
-                _a = this.props, data = _a.data, dispatchEvent = _a.dispatchEvent, value = _a.value;
-                dispatchEvent('focus', createObject(data, {
-                    value: value
-                }));
-                return [2 /*return*/];
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value, onFocus = _a.onFocus;
+                        return [4 /*yield*/, dispatchEvent('focus', resolveEventData(this.props, {
+                                value: value
+                            }, 'value'))];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onFocus === null || onFocus === void 0 ? void 0 : onFocus(e);
+                        return [2 /*return*/];
+                }
             });
         });
     };
@@ -179,13 +203,13 @@ var Input = /** @class */ (function (_super) {
     __decorate([
         autobind,
         __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", Promise)
     ], Input.prototype, "onBlur", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
+        __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", Promise)
     ], Input.prototype, "onFocus", null);
     return Input;
@@ -255,16 +279,16 @@ var RangeControl = /** @class */ (function (_super) {
      */
     RangeControl.prototype.onChange = function (value) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, onChange, data, dispatchEvent, result, rendererEvent;
+            var _a, onChange, dispatchEvent, result, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         this.setState({ value: this.getValue(value) });
-                        _a = this.props, onChange = _a.onChange, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
                         result = this.getFormatValue(value);
-                        return [4 /*yield*/, dispatchEvent('change', createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, {
                                 value: result
-                            }))];
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -281,7 +305,7 @@ var RangeControl = /** @class */ (function (_super) {
      */
     RangeControl.prototype.onAfterChange = function () {
         var value = this.state.value;
-        var _a = this.props, onAfterChange = _a.onAfterChange; _a.dispatchEvent; _a.data;
+        var onAfterChange = this.props.onAfterChange;
         var result = this.getFormatValue(value);
         onAfterChange && onAfterChange(result);
     };

package/esm/renderers/Form/InputRating.js

@@ -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 { Rating } from 'amis-ui';
 
 var RatingControl = /** @class */ (function (_super) {
@@ -25,14 +25,12 @@ var RatingControl = /** @class */ (function (_super) {
     };
     RatingControl.prototype.handleChange = function (value) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, onChange, dispatchEvent, data, rendererEvent;
+            var _a, onChange, dispatchEvent, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent, data = _a.data;
-                        return [4 /*yield*/, dispatchEvent('change', createObject(data, {
-                                value: value
-                            }))];
+                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: value }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/esm/renderers/Form/InputRepeat.js

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

package/esm/renderers/Form/InputRichText.js

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

package/esm/renderers/Form/InputSubForm.js

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

package/esm/renderers/Form/InputTable.js

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

package/esm/renderers/Form/InputTag.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { createObject, filterTree, Overlay, PopOver, autobind, OptionsControl } from 'amis-core';
+import { resolveEventData, filterTree, Overlay, PopOver, autobind, OptionsControl } from 'amis-core';
 import Downshift from 'downshift';
 import find from 'lodash/find';
 import isInteger from 'lodash/isInteger';
@@ -46,12 +46,12 @@ var TagControl = /** @class */ (function (_super) {
     TagControl.prototype.dispatchEvent = function (eventName, eventData) {
         if (eventData === void 0) { eventData = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, options, data, rendererEvent;
+            var _a, dispatchEvent, options, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options, data = _a.data;
-                        return [4 /*yield*/, dispatchEvent(eventName, createObject(data, __assign({ options: options }, eventData)))];
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options;
+                        return [4 /*yield*/, dispatchEvent(eventName, resolveEventData(this.props, __assign({ options: options, items: options }, eventData), 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         // 返回阻塞标识
@@ -340,7 +340,7 @@ var TagControl = /** @class */ (function (_super) {
                                     disabled: reachMax || item.disabled,
                                     className: cx('ListMenu-item', {
                                         'is-disabled': reachMax
-                                    }),
+                                    })
                                 })));
                             } })))) : (
                 // 保留原来的展现方式，不推荐

package/esm/renderers/Form/InputText.d.ts

@@ -110,9 +110,9 @@ export default class TextControl extends React.PureComponent<TextProps, TextStat
     focus(): void;
     clearValue(): void;
     removeItem(index: number): void;
-    handleClick(): void;
-    handleFocus(e: any): void;
-    handleBlur(e: any): void;
+    handleClick(): Promise<void>;
+    handleFocus(e: any): Promise<void>;
+    handleBlur(e: any): Promise<void>;
     handleInputChange(evt: React.ChangeEvent<HTMLInputElement>): Promise<void>;
     handleKeyDown(evt: React.KeyboardEvent<HTMLInputElement>): Promise<void>;
     handleChange(value: any): void;