amis 2.3.0 → 2.3.2-beta.1

package/esm/renderers/Form/InputTag.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.0
+ * 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;

package/esm/renderers/Form/InputText.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { isEffectiveApi, createObject, setVariable, rendererEventDispatcher, ucFirst, highlight, filter, generateIcon, bindRendererEvent, autobind, OptionsControl } from 'amis-core';
+import { isEffectiveApi, createObject, setVariable, resolveEventData, ucFirst, highlight, filter, generateIcon, autobind, OptionsControl } from 'amis-core';
 import Downshift from 'downshift';
 import { matchSorter } from 'match-sorter';
 import debouce from 'lodash/debounce';
@@ -136,43 +136,96 @@ var TextControl = /** @class */ (function (_super) {
         onChange(this.normalizeValue(newValue));
     };
     TextControl.prototype.handleClick = function () {
-        // 已经 focus 的就不重复执行，否则总重新定位光标
-        this.state.isFocused || this.focus();
-        this.setState({
-            isOpen: true
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, value, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value;
+                        return [4 /*yield*/, dispatchEvent('click', resolveEventData(this.props, {
+                                value: value
+                            }, 'value'))];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        // 已经 focus 的就不重复执行，否则总重新定位光标
+                        this.state.isFocused || this.focus();
+                        this.setState({
+                            isOpen: true
+                        });
+                        return [2 /*return*/];
+                }
+            });
         });
     };
     TextControl.prototype.handleFocus = function (e) {
-        this.setState({
-            isOpen: true,
-            isFocused: true
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, onFocus, value, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, onFocus = _a.onFocus, value = _a.value;
+                        this.setState({
+                            isOpen: true,
+                            isFocused: true
+                        });
+                        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*/];
+                }
+            });
         });
-        this.props.onFocus && this.props.onFocus(e);
     };
     TextControl.prototype.handleBlur = function (e) {
-        var _a = this.props, onBlur = _a.onBlur, trimContents = _a.trimContents, value = _a.value, onChange = _a.onChange;
-        this.setState({
-            isFocused: false
-        }, function () {
-            if (trimContents && value && typeof value === 'string') {
-                onChange(value.trim());
-            }
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, onBlur, trimContents, value, onChange, dispatchEvent, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, onBlur = _a.onBlur, trimContents = _a.trimContents, value = _a.value, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
+                        this.setState({
+                            isFocused: false
+                        }, function () {
+                            if (trimContents && value && typeof value === 'string') {
+                                onChange(value.trim());
+                            }
+                        });
+                        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 && onBlur(e);
+                        return [2 /*return*/];
+                }
+            });
         });
-        onBlur && onBlur(e);
     };
     TextControl.prototype.handleInputChange = function (evt) {
         return __awaiter(this, void 0, void 0, function () {
-            var value, _a, creatable, multiple, onChange, dispatcher;
+            var value, _a, creatable, multiple, onChange, dispatchEvent, rendererEvent;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         value = this.transformValue(evt.currentTarget.value);
-                        _a = this.props, creatable = _a.creatable, multiple = _a.multiple, onChange = _a.onChange;
-                        return [4 /*yield*/, rendererEventDispatcher(this.props, 'change', { value: value })];
+                        _a = this.props, creatable = _a.creatable, multiple = _a.multiple, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: value }, 'value'))];
                     case 1:
-                        dispatcher = _b.sent();
-                        if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
                         this.setState({
@@ -190,11 +243,11 @@ var TextControl = /** @class */ (function (_super) {
     };
     TextControl.prototype.handleKeyDown = function (evt) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, selectedOptions, onChange, multiple, creatable, newValue, value_1, newValue, dispatcher;
+            var _a, selectedOptions, onChange, multiple, creatable, dispatchEvent, newValue, value_1, newValue, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, selectedOptions = _a.selectedOptions, onChange = _a.onChange, multiple = _a.multiple, creatable = _a.creatable;
+                        _a = this.props, selectedOptions = _a.selectedOptions, onChange = _a.onChange, multiple = _a.multiple, creatable = _a.creatable, dispatchEvent = _a.dispatchEvent;
                         if (!(selectedOptions.length && !this.state.inputValue && evt.keyCode === 8)) return [3 /*break*/, 1];
                         evt.preventDefault();
                         newValue = selectedOptions.concat();
@@ -221,10 +274,10 @@ var TextControl = /** @class */ (function (_super) {
                             });
                             value_1 = this.normalizeValue(newValue).concat();
                         }
-                        return [4 /*yield*/, rendererEventDispatcher(this.props, 'enter', { value: value_1 })];
+                        return [4 /*yield*/, dispatchEvent('enter', resolveEventData(this.props, { value: value_1 }, 'value'))];
                     case 2:
-                        dispatcher = _b.sent();
-                        if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
                         onChange(value_1);
@@ -300,16 +353,16 @@ var TextControl = /** @class */ (function (_super) {
     };
     TextControl.prototype.handleNormalInputChange = function (e) {
         return __awaiter(this, void 0, void 0, function () {
-            var onChange, value, dispatcher;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _a, onChange, dispatchEvent, value, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        onChange = this.props.onChange;
+                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
                         value = e.currentTarget.value;
-                        return [4 /*yield*/, rendererEventDispatcher(this.props, 'change', { value: this.transformValue(value) })];
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: this.transformValue(value) }, 'value'))];
                     case 1:
-                        dispatcher = _a.sent();
-                        if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
                         onChange(this.transformValue(value));
@@ -518,24 +571,6 @@ var TextControl = /** @class */ (function (_super) {
         allowInputText: true,
         trimContents: true
     };
-    __decorate([
-        bindRendererEvent('click'),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], TextControl.prototype, "handleClick", null);
-    __decorate([
-        bindRendererEvent('focus'),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Object]),
-        __metadata("design:returntype", void 0)
-    ], TextControl.prototype, "handleFocus", null);
-    __decorate([
-        bindRendererEvent('blur'),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Object]),
-        __metadata("design:returntype", void 0)
-    ], TextControl.prototype, "handleBlur", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),

package/esm/renderers/Form/InputTree.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -7,7 +7,7 @@ import { __extends, __awaiter, __generator, __decorate, __metadata } from 'tslib
 import React from 'react';
 import cx from 'classnames';
 import { Spinner, Tree } from 'amis-ui';
-import { createObject, isPureVariable, resolveVariableAndFilter, autobind, OptionsControl } from 'amis-core';
+import { resolveEventData, isPureVariable, resolveVariableAndFilter, autobind, OptionsControl } from 'amis-core';
 
 var TreeControl = /** @class */ (function (_super) {
     __extends(TreeControl, _super);
@@ -37,14 +37,12 @@ var TreeControl = /** @class */ (function (_super) {
     };
     TreeControl.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/InputYearRange.js

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

package/esm/renderers/Form/JSONSchema.js

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

package/esm/renderers/Form/JSONSchemaEditor.js

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

package/esm/renderers/Form/ListSelect.js

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

package/esm/renderers/Form/LocationPicker.js

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

package/esm/renderers/Form/MatrixCheckboxes.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate } from 'tslib';
 import React from 'react';
-import { buildApi, isValidApi, setVariable, isEffectiveApi, createObject, FormItem } from 'amis-core';
+import { buildApi, isValidApi, setVariable, isEffectiveApi, resolveEventData, FormItem } from 'amis-core';
 import { Checkbox, Spinner } from 'amis-ui';
 
 /**
@@ -154,12 +154,12 @@ var MatrixCheckbox = /** @class */ (function (_super) {
     };
     MatrixCheckbox.prototype.toggleItem = function (checked, x, y) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, columns, rows, _b, multiple, singleSelectMode, dispatchEvent, data, value, x2, len, y2, len, y2, len, x2, len2, rendererEvent;
+            var _a, columns, rows, _b, multiple, singleSelectMode, dispatchEvent, value, x2, len, y2, len, y2, len, x2, len2, rendererEvent;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         _a = this.state, columns = _a.columns, rows = _a.rows;
-                        _b = this.props, multiple = _b.multiple, singleSelectMode = _b.singleSelectMode, dispatchEvent = _b.dispatchEvent, data = _b.data;
+                        _b = this.props, multiple = _b.multiple, singleSelectMode = _b.singleSelectMode, dispatchEvent = _b.dispatchEvent, _b.data;
                         value = this.props.value || buildDefaultValue(columns, rows);
                         if (multiple) {
                             value[x][y] = __assign(__assign({}, value[x][y]), { checked: checked });
@@ -182,9 +182,7 @@ var MatrixCheckbox = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        return [4 /*yield*/, dispatchEvent('change', createObject(data, {
-                                value: value.concat()
-                            }))];
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: value.concat() }, 'value'))];
                     case 1:
                         rendererEvent = _c.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/esm/renderers/Form/NestedSelect.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.0
+ * 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, string2regExp, getTreeAncestors, flattenTree, getTreeParent, filterTree, RootClose, Overlay, PopOver, isMobile, ucFirst, autobind, OptionsControl } from 'amis-core';
+import { resolveEventData, string2regExp, getTreeAncestors, flattenTree, getTreeParent, filterTree, RootClose, Overlay, PopOver, isMobile, ucFirst, autobind, OptionsControl } from 'amis-core';
 import { Checkbox, Icon, ResultBox, Spinner, PopUp, Cascader } from 'amis-ui';
 import { findDOMNode } from 'react-dom';
 import xor from 'lodash/xor';
@@ -47,14 +47,14 @@ var NestedSelectControl = /** @class */ (function (_super) {
     NestedSelectControl.prototype.dispatchEvent = function (eventName, eventData) {
         if (eventData === void 0) { eventData = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, rendererEvent;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var dispatchEvent, rendererEvent;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
-                        return [4 /*yield*/, dispatchEvent(eventName, createObject(data, __assign({}, eventData)))];
+                        dispatchEvent = this.props.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent(eventName, resolveEventData(this.props, eventData, 'value'))];
                     case 1:
-                        rendererEvent = _b.sent();
+                        rendererEvent = _a.sent();
                         // 返回阻塞标识
                         return [2 /*return*/, !!(rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented)];
                 }

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

@@ -1,6 +1,5 @@
 import React from 'react';
-import { OptionsControlProps } from 'amis-core';
-import { SchemaNode, ActionObject, PlainObject } from 'amis-core';
+import { OptionsControlProps, SchemaNode, ActionObject, PlainObject } from 'amis-core';
 import { FormOptionsSchema, SchemaTpl } from '../../Schema';
 /**
  * Picker
@@ -70,9 +69,9 @@ export default class PickerControl extends React.PureComponent<PickerProps, any>
     reload(): void;
     open(): void;
     close(): void;
-    handleModalConfirm(values: Array<any>, action: ActionObject, ctx: any, components: Array<any>): void;
+    handleModalConfirm(values: Array<any>, action: ActionObject, ctx: any, components: Array<any>): Promise<void>;
     handleChange(items: Array<any>): Promise<void>;
-    handleItemClick(itemlabel: string, itemid: string): Promise<void>;
+    handleItemClick(item: any): Promise<void>;
     removeItem(index: number): void;
     handleKeyDown(e: React.KeyboardEvent): void;
     handleFocus(): void;

package/esm/renderers/Form/Picker.js

@@ -1,14 +1,15 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __awaiter, __generator, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { anyChanged, isApiOutdated, createObject, isPureVariable, resolveVariableAndFilter, isEffectiveApi, getVariable, filter, noop, autobind, OptionsControl } from 'amis-core';
 import cx from 'classnames';
 import find from 'lodash/find';
+import isEqual from 'lodash/isEqual';
 import findIndex from 'lodash/findIndex';
+import { isApiOutdated, createObject, isPureVariable, resolveVariableAndFilter, isEffectiveApi, resolveEventData, filter, getVariable, noop, autobind, OptionsControl } from 'amis-core';
 import { Html, Icon } from 'amis-ui';
 
 var PickerControl = /** @class */ (function (_super) {
@@ -28,7 +29,8 @@ var PickerControl = /** @class */ (function (_super) {
     };
     PickerControl.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
-        if (anyChanged(['pickerSchema', 'multiple', 'source'], prevProps, props)) {
+        var detectedProps = ['multiple', 'source', 'pickerSchema'];
+        if (detectedProps.some(function (key) { return !isEqual(prevProps[key], props[key]); })) {
             this.setState({
                 schema: this.buildSchema(props)
             });
@@ -100,17 +102,28 @@ var PickerControl = /** @class */ (function (_super) {
         });
     };
     PickerControl.prototype.handleModalConfirm = function (values, action, ctx, components) {
-        var idx = findIndex(components, function (item) { return item.props.type === 'crud'; });
-        this.handleChange(values[idx].items);
-        this.close();
+        return __awaiter(this, void 0, void 0, function () {
+            var idx;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        idx = findIndex(components, function (item) { return item.props.type === 'crud'; });
+                        return [4 /*yield*/, this.handleChange(values[idx].items)];
+                    case 1:
+                        _a.sent();
+                        this.close();
+                        return [2 /*return*/];
+                }
+            });
+        });
     };
     PickerControl.prototype.handleChange = function (items) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, joinValues, valueField, delimiter, extractValue, multiple, options, data, dispatchEvent, setOptions, onChange, value, additionalOptions, rendererEvent;
+            var _a, joinValues, valueField, delimiter, extractValue, multiple, options, dispatchEvent, setOptions, onChange, value, additionalOptions, option, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, joinValues = _a.joinValues, valueField = _a.valueField, delimiter = _a.delimiter, extractValue = _a.extractValue, multiple = _a.multiple, options = _a.options, data = _a.data, dispatchEvent = _a.dispatchEvent, setOptions = _a.setOptions, onChange = _a.onChange;
+                        _a = this.props, joinValues = _a.joinValues, valueField = _a.valueField, delimiter = _a.delimiter, extractValue = _a.extractValue, multiple = _a.multiple, options = _a.options, _a.data, dispatchEvent = _a.dispatchEvent, _a.selectedOptions, setOptions = _a.setOptions, onChange = _a.onChange;
                         value = items;
                         if (joinValues) {
                             value = items
@@ -132,7 +145,8 @@ var PickerControl = /** @class */ (function (_super) {
                             }
                         });
                         additionalOptions.length && setOptions(options.concat(additionalOptions));
-                        return [4 /*yield*/, dispatchEvent('change', createObject(data, { value: value, option: items[0] }))];
+                        option = multiple ? items : items[0];
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: value, option: option, selectedItems: option }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -144,14 +158,14 @@ var PickerControl = /** @class */ (function (_super) {
             });
         });
     };
-    PickerControl.prototype.handleItemClick = function (itemlabel, itemid) {
+    PickerControl.prototype.handleItemClick = function (item) {
         return __awaiter(this, void 0, void 0, function () {
             var _a, data, dispatchEvent, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, data = _a.data, dispatchEvent = _a.dispatchEvent, _a.setOptions;
-                        return [4 /*yield*/, dispatchEvent('itemclick', createObject(data, { 'label': itemlabel, 'id': itemid }))];
+                        _a = this.props, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent('itemclick', createObject(data, { item: item }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -222,7 +236,7 @@ var PickerControl = /** @class */ (function (_super) {
                 } }, "\u00D7"),
             React.createElement("span", { className: "".concat(ns, "Picker-valueLabel"), onClick: function (e) {
                     e.stopPropagation();
-                    _this.handleItemClick(getVariable(item, labelField || 'label'), getVariable(item, 'id') || '');
+                    _this.handleItemClick(item);
                 } }, labelTpl ? (React.createElement(Html, { html: filter(labelTpl, item) })) : ("".concat(getVariable(item, labelField || 'label') ||
                 getVariable(item, 'id')))))); })));
     };
@@ -241,7 +255,7 @@ var PickerControl = /** @class */ (function (_super) {
         });
     };
     PickerControl.prototype.render = function () {
-        var _a = this.props, className = _a.className, cx = _a.classnames, disabled = _a.disabled, render = _a.render, modalMode = _a.modalMode, source = _a.source, size = _a.size; _a.env; var clearable = _a.clearable, multiple = _a.multiple, placeholder = _a.placeholder, embed = _a.embed; _a.value; var selectedOptions = _a.selectedOptions, __ = _a.translate, popOverContainer = _a.popOverContainer;
+        var _a = this.props, className = _a.className, cx = _a.classnames, disabled = _a.disabled, render = _a.render, modalMode = _a.modalMode, source = _a.source, size = _a.size, clearable = _a.clearable, multiple = _a.multiple, placeholder = _a.placeholder, embed = _a.embed, selectedOptions = _a.selectedOptions, __ = _a.translate, popOverContainer = _a.popOverContainer;
         return (React.createElement("div", { className: cx("PickerControl", className) }, embed ? (React.createElement("div", { className: cx('Picker') }, this.renderBody({ popOverContainer: popOverContainer }))) : (React.createElement("div", { className: cx("Picker", {
                 'Picker--single': !multiple,
                 'Picker--multi': multiple,
@@ -322,7 +336,7 @@ var PickerControl = /** @class */ (function (_super) {
         autobind,
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [Array, Object, Object, Array]),
-        __metadata("design:returntype", void 0)
+        __metadata("design:returntype", Promise)
     ], PickerControl.prototype, "handleModalConfirm", null);
     __decorate([
         autobind,
@@ -333,7 +347,7 @@ var PickerControl = /** @class */ (function (_super) {
     __decorate([
         autobind,
         __metadata("design:type", Function),
-        __metadata("design:paramtypes", [String, String]),
+        __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", Promise)
     ], PickerControl.prototype, "handleItemClick", null);
     __decorate([

package/esm/renderers/Form/Radios.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -7,7 +7,7 @@ import { __extends, __awaiter, __generator, __decorate, __metadata } from 'tslib
 import React from 'react';
 import cx from 'classnames';
 import { Radios } from 'amis-ui';
-import { createObject, autobind, OptionsControl } from 'amis-core';
+import { resolveEventData, autobind, OptionsControl } from 'amis-core';
 
 var RadiosControl = /** @class */ (function (_super) {
     __extends(RadiosControl, _super);
@@ -26,18 +26,19 @@ var RadiosControl = /** @class */ (function (_super) {
     };
     RadiosControl.prototype.handleChange = function (option) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, joinValues, extractValue, valueField, onChange, dispatchEvent, options, data, rendererEvent;
+            var _a, joinValues, extractValue, valueField, onChange, dispatchEvent, options, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, valueField = _a.valueField, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent, options = _a.options, data = _a.data;
+                        _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, valueField = _a.valueField, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent, options = _a.options, _a.data;
                         if (option && (joinValues || extractValue)) {
                             option = option[valueField || 'value'];
                         }
-                        return [4 /*yield*/, dispatchEvent('change', createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, {
                                 value: option,
-                                options: options
-                            }))];
+                                options: options,
+                                items: options // 为了保持名字统一
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {