amis 2.3.0 → 2.3.2-beta.1

package/lib/renderers/Form/InputFile.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -414,7 +414,7 @@ var FileControl = /** @class */ (function (_super) {
                         }
                         onProgress(1);
                         value = ret.data.value || ret.data.url || ret.data;
-                        return [4 /*yield*/, this.dispatchEvent('success', tslib.__assign(tslib.__assign({}, file), { value: value, state: 'uploaded' }))];
+                        return [4 /*yield*/, this.dispatchEvent('success', tslib.__assign(tslib.__assign({}, file), { item: file, value: value }))];
                     case 1:
                         dispatcher = _a.sent();
                         if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
@@ -429,7 +429,10 @@ var FileControl = /** @class */ (function (_super) {
             var dispatcher;
             return tslib.__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) {
@@ -449,7 +452,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', tslib.__assign(tslib.__assign({}, removeFile), { item: removeFile }))];
                     case 1:
                         dispatcher = _a.sent();
                         if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
@@ -789,9 +792,9 @@ var FileControl = /** @class */ (function (_super) {
     };
     FileControl.prototype.dispatchEvent = function (e, data) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var dispatchEvent, getEventData, value;
-            return tslib.__generator(this, function (_a) {
-                dispatchEvent = this.props.dispatchEvent;
+            var _a, dispatchEvent, multiple, getEventData, value;
+            return tslib.__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,
@@ -801,9 +804,7 @@ var FileControl = /** @class */ (function (_super) {
                 value = data
                     ? getEventData(data)
                     : this.state.files.map(function (item) { return getEventData(item); });
-                return [2 /*return*/, dispatchEvent(e, amisCore.createObject(this.props.data, {
-                        file: value
-                    }))];
+                return [2 /*return*/, dispatchEvent(e, amisCore.resolveEventData(this.props, tslib.__assign(tslib.__assign({}, data), { file: multiple ? value : value === null || value === void 0 ? void 0 : value[0] }), 'file'))];
             });
         });
     };

package/lib/renderers/Form/InputFormula.js

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

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

@@ -25,7 +25,7 @@ export declare class InputGroup extends React.Component<InputGroupProps, InputGr
     handleFocus(): void;
     handleBlur(): void;
     renderControl(control: any, index: any, otherProps?: any): JSX.Element | null;
-    validate(): "" | string[];
+    validate(): string[] | "";
     render(): JSX.Element;
 }
 export default class InputGroupRenderer extends InputGroup {

package/lib/renderers/Form/InputGroup.js

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

package/lib/renderers/Form/InputImage.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -311,7 +311,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', tslib.__assign(tslib.__assign({}, file), { item: file }))];
                     case 1:
                         dispatcher = _a.sent();
                         if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
@@ -411,7 +411,7 @@ var ImageControl = /** @class */ (function (_super) {
         }
         // 排除自身的字段，否则会无限更新state
         var excludeSelfAutoFill = omit__default["default"](autoFill, name || '');
-        if (!amisCore.isEmpty(excludeSelfAutoFill) && onBulkChange && this.initAutoFill) {
+        if (!amisCore.isEmpty(excludeSelfAutoFill) && onBulkChange) {
             var files = this.state.files.filter(function (file) { return ~['uploaded', 'init', 'ready'].indexOf(file.state); });
             var toSync_1 = amisCore.dataMapping(excludeSelfAutoFill, multiple
                 ? {
@@ -601,7 +601,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) {
@@ -632,7 +635,7 @@ var ImageControl = /** @class */ (function (_super) {
                         }
                         obj = tslib.__assign(tslib.__assign({}, ret.data), { state: 'uploaded' });
                         obj.value = obj.value || obj.url;
-                        return [4 /*yield*/, this.dispatchEvent('success', tslib.__assign(tslib.__assign({}, file), { value: obj.value, state: 'uploaded' }))];
+                        return [4 /*yield*/, this.dispatchEvent('success', tslib.__assign(tslib.__assign({}, file), { item: file, value: obj.value }))];
                     case 1:
                         dispatcher = _a.sent();
                         if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
@@ -648,7 +651,7 @@ var ImageControl = /** @class */ (function (_super) {
             return tslib.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.dispatchEvent('fail', {
-                            file: file,
+                            item: file,
                             error: error
                         })];
                     case 1:
@@ -795,9 +798,9 @@ var ImageControl = /** @class */ (function (_super) {
     };
     ImageControl.prototype.dispatchEvent = function (e, data) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var dispatchEvent, getEventData, value;
-            return tslib.__generator(this, function (_a) {
-                dispatchEvent = this.props.dispatchEvent;
+            var _a, dispatchEvent, multiple, getEventData, value;
+            return tslib.__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,
@@ -807,7 +810,7 @@ var ImageControl = /** @class */ (function (_super) {
                 value = data
                     ? getEventData(data)
                     : this.files.map(function (item) { return getEventData(item); });
-                return [2 /*return*/, dispatchEvent(e, amisCore.createObject(this.props.data, { file: value }))];
+                return [2 /*return*/, dispatchEvent(e, amisCore.resolveEventData(this.props, tslib.__assign(tslib.__assign({}, data), { file: multiple ? value : value === null || value === void 0 ? void 0 : value[0] }), 'file'))];
             });
         });
     };

package/lib/renderers/Form/InputMonthRange.js

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

package/lib/renderers/Form/InputNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -100,27 +100,23 @@ var NumberControl = /** @class */ (function (_super) {
     // 派发有event的事件
     NumberControl.prototype.dispatchEvent = function (eventName) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, value;
+            var _a, dispatchEvent, value;
             return tslib.__generator(this, function (_b) {
-                _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, value = _a.value;
-                dispatchEvent(eventName, amisCore.createObject(data, {
-                    value: value
-                }));
+                _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value;
+                dispatchEvent(eventName, amisCore.resolveEventData(this.props, { value: value }, 'value'));
                 return [2 /*return*/];
             });
         });
     };
     NumberControl.prototype.handleChange = function (inputValue) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onChange, data, dispatchEvent, value, rendererEvent;
+            var _a, onChange, dispatchEvent, value, rendererEvent;
             return tslib.__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', amisCore.createObject(data, {
-                                value: value
-                            }))];
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/lib/renderers/Form/InputQuarterRange.js

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

package/lib/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/lib/renderers/Form/InputRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -145,24 +145,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', amisCore.createObject(data, {
-            value: value
-        }));
+    Input.prototype.onBlur = function (e) {
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, value, onBlur, rendererEvent;
+            return tslib.__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', amisCore.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 tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, data, dispatchEvent, value;
+            var _a, dispatchEvent, value, onFocus, rendererEvent;
             return tslib.__generator(this, function (_b) {
-                _a = this.props, data = _a.data, dispatchEvent = _a.dispatchEvent, value = _a.value;
-                dispatchEvent('focus', amisCore.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', amisCore.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*/];
+                }
             });
         });
     };
@@ -191,13 +215,13 @@ var Input = /** @class */ (function (_super) {
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", []),
-        tslib.__metadata("design:returntype", void 0)
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", Promise)
     ], Input.prototype, "onBlur", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
     ], Input.prototype, "onFocus", null);
     return Input;
@@ -267,16 +291,16 @@ var RangeControl = /** @class */ (function (_super) {
      */
     RangeControl.prototype.onChange = function (value) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onChange, data, dispatchEvent, result, rendererEvent;
+            var _a, onChange, dispatchEvent, result, rendererEvent;
             return tslib.__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', amisCore.createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, {
                                 value: result
-                            }))];
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -293,7 +317,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/lib/renderers/Form/InputRating.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -33,14 +33,12 @@ var RatingControl = /** @class */ (function (_super) {
     };
     RatingControl.prototype.handleChange = function (value) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onChange, dispatchEvent, data, rendererEvent;
+            var _a, onChange, dispatchEvent, rendererEvent;
             return tslib.__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', amisCore.createObject(data, {
-                                value: value
-                            }))];
+                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/lib/renderers/Form/InputRepeat.js

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

package/lib/renderers/Form/InputRichText.js

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

package/lib/renderers/Form/InputSubForm.js

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

package/lib/renderers/Form/InputTable.js

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

package/lib/renderers/Form/InputTag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -58,12 +58,12 @@ var TagControl = /** @class */ (function (_super) {
     TagControl.prototype.dispatchEvent = function (eventName, eventData) {
         if (eventData === void 0) { eventData = {}; }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, options, data, rendererEvent;
+            var _a, dispatchEvent, options, rendererEvent;
             return tslib.__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, amisCore.createObject(data, tslib.__assign({ options: options }, eventData)))];
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options;
+                        return [4 /*yield*/, dispatchEvent(eventName, amisCore.resolveEventData(this.props, tslib.__assign({ options: options, items: options }, eventData), 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         // 返回阻塞标识
@@ -352,7 +352,7 @@ var TagControl = /** @class */ (function (_super) {
                                     disabled: reachMax || item.disabled,
                                     className: cx('ListMenu-item', {
                                         'is-disabled': reachMax
-                                    }),
+                                    })
                                 })));
                             } })))) : (
                 // 保留原来的展现方式，不推荐

package/lib/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;