amis 2.3.0 → 2.3.2-beta.1

package/lib/renderers/Form/InputText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -147,43 +147,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 tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, value, rendererEvent;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value;
+                        return [4 /*yield*/, dispatchEvent('click', 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*/];
+                        }
+                        // 已经 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 tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, onFocus, value, rendererEvent;
+            return tslib.__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', 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*/];
+                }
+            });
         });
-        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 tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, onBlur, trimContents, value, onChange, dispatchEvent, rendererEvent;
+            return tslib.__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', 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 && onBlur(e);
+                        return [2 /*return*/];
+                }
+            });
         });
-        onBlur && onBlur(e);
     };
     TextControl.prototype.handleInputChange = function (evt) {
         return tslib.__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 tslib.__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*/, amisCore.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', amisCore.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({
@@ -201,11 +254,11 @@ var TextControl = /** @class */ (function (_super) {
     };
     TextControl.prototype.handleKeyDown = function (evt) {
         return tslib.__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 tslib.__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();
@@ -232,10 +285,10 @@ var TextControl = /** @class */ (function (_super) {
                             });
                             value_1 = this.normalizeValue(newValue).concat();
                         }
-                        return [4 /*yield*/, amisCore.rendererEventDispatcher(this.props, 'enter', { value: value_1 })];
+                        return [4 /*yield*/, dispatchEvent('enter', amisCore.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);
@@ -311,16 +364,16 @@ var TextControl = /** @class */ (function (_super) {
     };
     TextControl.prototype.handleNormalInputChange = function (e) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var onChange, value, dispatcher;
-            return tslib.__generator(this, function (_a) {
-                switch (_a.label) {
+            var _a, onChange, dispatchEvent, value, rendererEvent;
+            return tslib.__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*/, amisCore.rendererEventDispatcher(this.props, 'change', { value: this.transformValue(value) })];
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.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));
@@ -529,24 +582,6 @@ var TextControl = /** @class */ (function (_super) {
         allowInputText: true,
         trimContents: true
     };
-    tslib.__decorate([
-        amisCore.bindRendererEvent('click'),
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", []),
-        tslib.__metadata("design:returntype", void 0)
-    ], TextControl.prototype, "handleClick", null);
-    tslib.__decorate([
-        amisCore.bindRendererEvent('focus'),
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [Object]),
-        tslib.__metadata("design:returntype", void 0)
-    ], TextControl.prototype, "handleFocus", null);
-    tslib.__decorate([
-        amisCore.bindRendererEvent('blur'),
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [Object]),
-        tslib.__metadata("design:returntype", void 0)
-    ], TextControl.prototype, "handleBlur", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),

package/lib/renderers/Form/InputTree.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -46,14 +46,12 @@ var TreeControl = /** @class */ (function (_super) {
     };
     TreeControl.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/InputYearRange.js

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

package/lib/renderers/Form/JSONSchema.js

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

package/lib/renderers/Form/JSONSchemaEditor.js

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

package/lib/renderers/Form/ListSelect.js

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

package/lib/renderers/Form/LocationPicker.js

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

package/lib/renderers/Form/MatrixCheckboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -162,12 +162,12 @@ var MatrixCheckbox = /** @class */ (function (_super) {
     };
     MatrixCheckbox.prototype.toggleItem = function (checked, x, y) {
         return tslib.__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 tslib.__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] = tslib.__assign(tslib.__assign({}, value[x][y]), { checked: checked });
@@ -190,9 +190,7 @@ var MatrixCheckbox = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.createObject(data, {
-                                value: value.concat()
-                            }))];
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value.concat() }, 'value'))];
                     case 1:
                         rendererEvent = _c.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/lib/renderers/Form/NestedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -58,14 +58,14 @@ var NestedSelectControl = /** @class */ (function (_super) {
     NestedSelectControl.prototype.dispatchEvent = function (eventName, eventData) {
         if (eventData === void 0) { eventData = {}; }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, rendererEvent;
-            return tslib.__generator(this, function (_b) {
-                switch (_b.label) {
+            var dispatchEvent, rendererEvent;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
-                        return [4 /*yield*/, dispatchEvent(eventName, amisCore.createObject(data, tslib.__assign({}, eventData)))];
+                        dispatchEvent = this.props.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent(eventName, amisCore.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/lib/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/lib/renderers/Form/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -9,10 +9,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
-var amisCore = require('amis-core');
 var cx = require('classnames');
 var find = require('lodash/find');
+var isEqual = require('lodash/isEqual');
 var findIndex = require('lodash/findIndex');
+var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -20,6 +21,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
+var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 var findIndex__default = /*#__PURE__*/_interopDefaultLegacy(findIndex);
 
 var PickerControl = /** @class */ (function (_super) {
@@ -39,7 +41,8 @@ var PickerControl = /** @class */ (function (_super) {
     };
     PickerControl.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
-        if (amisCore.anyChanged(['pickerSchema', 'multiple', 'source'], prevProps, props)) {
+        var detectedProps = ['multiple', 'source', 'pickerSchema'];
+        if (detectedProps.some(function (key) { return !isEqual__default["default"](prevProps[key], props[key]); })) {
             this.setState({
                 schema: this.buildSchema(props)
             });
@@ -111,17 +114,28 @@ var PickerControl = /** @class */ (function (_super) {
         });
     };
     PickerControl.prototype.handleModalConfirm = function (values, action, ctx, components) {
-        var idx = findIndex__default["default"](components, function (item) { return item.props.type === 'crud'; });
-        this.handleChange(values[idx].items);
-        this.close();
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var idx;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        idx = findIndex__default["default"](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 tslib.__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 tslib.__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
@@ -143,7 +157,8 @@ var PickerControl = /** @class */ (function (_super) {
                             }
                         });
                         additionalOptions.length && setOptions(options.concat(additionalOptions));
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.createObject(data, { value: value, option: items[0] }))];
+                        option = multiple ? items : items[0];
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.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) {
@@ -155,14 +170,14 @@ var PickerControl = /** @class */ (function (_super) {
             });
         });
     };
-    PickerControl.prototype.handleItemClick = function (itemlabel, itemid) {
+    PickerControl.prototype.handleItemClick = function (item) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, data, dispatchEvent, rendererEvent;
             return tslib.__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', amisCore.createObject(data, { 'label': itemlabel, 'id': itemid }))];
+                        _a = this.props, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent('itemclick', amisCore.createObject(data, { item: item }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -233,7 +248,7 @@ var PickerControl = /** @class */ (function (_super) {
                 } }, "\u00D7"),
             React__default["default"].createElement("span", { className: "".concat(ns, "Picker-valueLabel"), onClick: function (e) {
                     e.stopPropagation();
-                    _this.handleItemClick(amisCore.getVariable(item, labelField || 'label'), amisCore.getVariable(item, 'id') || '');
+                    _this.handleItemClick(item);
                 } }, labelTpl ? (React__default["default"].createElement(amisUi.Html, { html: amisCore.filter(labelTpl, item) })) : ("".concat(amisCore.getVariable(item, labelField || 'label') ||
                 amisCore.getVariable(item, 'id')))))); })));
     };
@@ -252,7 +267,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__default["default"].createElement("div", { className: cx("PickerControl", className) }, embed ? (React__default["default"].createElement("div", { className: cx('Picker') }, this.renderBody({ popOverContainer: popOverContainer }))) : (React__default["default"].createElement("div", { className: cx("Picker", {
                 'Picker--single': !multiple,
                 'Picker--multi': multiple,
@@ -333,7 +348,7 @@ var PickerControl = /** @class */ (function (_super) {
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Array, Object, Object, Array]),
-        tslib.__metadata("design:returntype", void 0)
+        tslib.__metadata("design:returntype", Promise)
     ], PickerControl.prototype, "handleModalConfirm", null);
     tslib.__decorate([
         amisCore.autobind,
@@ -344,7 +359,7 @@ var PickerControl = /** @class */ (function (_super) {
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [String, String]),
+        tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
     ], PickerControl.prototype, "handleItemClick", null);
     tslib.__decorate([

package/lib/renderers/Form/Radios.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -35,18 +35,19 @@ var RadiosControl = /** @class */ (function (_super) {
     };
     RadiosControl.prototype.handleChange = function (option) {
         return tslib.__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 tslib.__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', amisCore.createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.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) {

package/lib/renderers/Form/Select.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -93,18 +93,19 @@ var SelectControl = /** @class */ (function (_super) {
     SelectControl.prototype.dispatchEvent = function (eventName, eventData) {
         if (eventData === void 0) { eventData = {}; }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var event, _a, dispatchEvent, options, data, rendererEvent;
+            var event, _a, dispatchEvent, options, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         event = 'on' + eventName.charAt(0).toUpperCase() + eventName.slice(1);
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options, data = _a.data;
-                        return [4 /*yield*/, dispatchEvent(eventName, amisCore.createObject(data, {
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options, _a.data;
+                        return [4 /*yield*/, dispatchEvent(eventName, amisCore.resolveEventData(this.props, {
                                 options: options,
+                                items: options,
                                 value: ['onEdit', 'onDelete'].includes(event)
                                     ? eventData
                                     : eventData && eventData.value
-                            }))];
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -119,19 +120,20 @@ var SelectControl = /** @class */ (function (_super) {
     };
     SelectControl.prototype.changeValue = function (value) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onChange, setOptions, options, data, dispatchEvent, additonalOptions, newValue, rendererEvent;
+            var _a, onChange, setOptions, options, dispatchEvent, additonalOptions, newValue, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, onChange = _a.onChange, setOptions = _a.setOptions, options = _a.options, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, onChange = _a.onChange, setOptions = _a.setOptions, options = _a.options, _a.data, dispatchEvent = _a.dispatchEvent;
                         additonalOptions = [];
                         newValue = this.getValue(value, additonalOptions);
                         // 不设置没法回显
                         additonalOptions.length && setOptions(options.concat(additonalOptions));
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, {
                                 value: newValue,
-                                options: options
-                            }))];
+                                options: options,
+                                items: options // 为了保持名字统一
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/lib/renderers/Form/Static.js

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

package/lib/renderers/Form/Switch.js

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

package/lib/renderers/Form/TabsTransfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -159,10 +159,11 @@ var BaseTabsTransferRenderer = /** @class */ (function (_super) {
                         }
                         (newOptions.length > options.length || optionModified) &&
                             setOptions(newOptions, true);
-                        return [4 /*yield*/, dispatchEvent('change', {
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, {
                                 value: newValue,
-                                options: options
-                            })];
+                                options: options,
+                                items: options // 为了保持名字统一
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {