amis 2.3.1 → 2.3.2-beta.1

package/lib/renderers/Form/InputTree.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * 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.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/JSONSchema.js

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

package/lib/renderers/Form/JSONSchemaEditor.js

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

package/lib/renderers/Form/ListSelect.js

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

package/lib/renderers/Form/LocationPicker.js

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

package/lib/renderers/Form/MatrixCheckboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * 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.1
+ * 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

@@ -71,7 +71,7 @@ export default class PickerControl extends React.PureComponent<PickerProps, any>
     close(): 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.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -131,11 +131,11 @@ var PickerControl = /** @class */ (function (_super) {
     };
     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, _a.selectedOptions, 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
@@ -157,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) {
@@ -169,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) {
@@ -247,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')))))); })));
     };
@@ -358,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.1
+ * 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.1
+ * 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.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Switch.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * 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.1
+ * 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) {

package/lib/renderers/Form/TabsTransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -25,8 +25,8 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
         return _this;
     }
     TabsTransferPickerRenderer.prototype.dispatchEvent = function (name) {
-        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
-        dispatchEvent(name, data);
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value;
+        dispatchEvent(name, amisCore.resolveEventData(this.props, { value: value }, 'value'));
     };
     TabsTransferPickerRenderer.prototype.optionItemRender = function (option, states) {
         var _a = this.props, menuTpl = _a.menuTpl, render = _a.render, data = _a.data;

package/lib/renderers/Form/Textarea.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -39,27 +39,55 @@ var TextAreaControl = /** @class */ (function (_super) {
         (_a = this.inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
     };
     TextAreaControl.prototype.handleChange = function (e) {
-        var onChange = this.props.onChange;
+        var _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
+        dispatchEvent('change', amisCore.resolveEventData(this.props, { value: e }, 'value'));
         onChange && onChange(e);
     };
     TextAreaControl.prototype.handleFocus = function (e) {
-        var onFocus = this.props.onFocus;
+        var _this = this;
+        var _a = this.props, onFocus = _a.onFocus, dispatchEvent = _a.dispatchEvent, value = _a.value;
         this.setState({
             focused: true
-        }, function () {
-            onFocus && onFocus(e);
-        });
+        }, function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+            var rendererEvent;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, dispatchEvent('focus', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
+                    case 1:
+                        rendererEvent = _a.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onFocus && onFocus(e);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
     };
     TextAreaControl.prototype.handleBlur = function (e) {
-        var _a = this.props, onBlur = _a.onBlur, trimContents = _a.trimContents, value = _a.value, onChange = _a.onChange;
+        var _this = this;
+        var _a = this.props, onBlur = _a.onBlur, trimContents = _a.trimContents, value = _a.value, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
         this.setState({
             focused: false
-        }, function () {
-            if (trimContents && value && typeof value === 'string') {
-                onChange(value.trim());
-            }
-            onBlur && onBlur(e);
-        });
+        }, function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+            var rendererEvent;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (trimContents && value && typeof value === 'string') {
+                            onChange(value.trim());
+                        }
+                        return [4 /*yield*/, dispatchEvent('blur', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
+                    case 1:
+                        rendererEvent = _a.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onBlur && onBlur(e);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
     };
     TextAreaControl.prototype.render = function () {
         var rest = tslib.__rest(this.props, []);
@@ -74,21 +102,18 @@ var TextAreaControl = /** @class */ (function (_super) {
     };
     tslib.__decorate([
         amisCore.autobind,
-        amisCore.bindRendererEvent('change', undefined, false),
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
     ], TextAreaControl.prototype, "handleChange", null);
     tslib.__decorate([
         amisCore.autobind,
-        amisCore.bindRendererEvent('focus'),
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
     ], TextAreaControl.prototype, "handleFocus", null);
     tslib.__decorate([
         amisCore.autobind,
-        amisCore.bindRendererEvent('blur'),
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)

package/lib/renderers/Form/Transfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -70,10 +70,11 @@ var BaseTransferRenderer = /** @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) {
@@ -184,7 +185,7 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
     };
     BaseTransferRenderer.prototype.onSelectAll = function (options) {
         var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
-        dispatchEvent('selectAll', amisCore.createObject(data, { options: options }));
+        dispatchEvent('selectAll', amisCore.createObject(data, { items: options }));
     };
     // 动作
     BaseTransferRenderer.prototype.doAction = function (action, data, throwErrors) {

package/lib/renderers/Form/TransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -21,8 +21,8 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
         return _super !== null && _super.apply(this, arguments) || this;
     }
     TransferPickerRenderer.prototype.dispatchEvent = function (name) {
-        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, value = _a.value;
-        dispatchEvent(name, amisCore.createObject(data, { value: value }));
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value;
+        dispatchEvent(name, amisCore.resolveEventData(this.props, { value: value }, 'value'));
     };
     // 动作
     TransferPickerRenderer.prototype.doAction = function (action) {

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

@@ -76,6 +76,7 @@ export interface TreeSelectState {
 }
 export default class TreeSelectControl extends React.Component<TreeSelectProps, TreeSelectState> {
     static defaultProps: {
+        hideRoot: boolean;
         placeholder: string;
         optionsPlaceholder: string;
         multiple: boolean;

package/lib/renderers/Form/TreeSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -73,16 +73,12 @@ var TreeSelectControl = /** @class */ (function (_super) {
         }, function () { return _this.loadRemote(_this.state.inputValue); });
     };
     TreeSelectControl.prototype.handleFocus = function (e) {
-        var _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value, data = _a.data;
-        dispatchEvent('focus', amisCore.createObject(data, {
-            value: value
-        }));
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value;
+        dispatchEvent('focus', amisCore.resolveEventData(this.props, { value: value }, 'value'));
     };
     TreeSelectControl.prototype.handleBlur = function (e) {
-        var _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value, data = _a.data;
-        dispatchEvent('blur', amisCore.createObject(data, {
-            value: value
-        }));
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value; _a.data;
+        dispatchEvent('blur', amisCore.resolveEventData(this.props, { value: value }, 'value'));
     };
     TreeSelectControl.prototype.handleKeyPress = function (e) {
         if (e.key === ' ') {
@@ -258,14 +254,12 @@ var TreeSelectControl = /** @class */ (function (_super) {
     };
     TreeSelectControl.prototype.resultChangeEvent = 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, _a.data;
+                        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) {
@@ -292,11 +286,11 @@ var TreeSelectControl = /** @class */ (function (_super) {
         this.treeRef = ref;
     };
     TreeSelectControl.prototype.renderOuter = function () {
-        var _a = this.props, value = _a.value, enableNodePath = _a.enableNodePath, _b = _a.pathSeparator, pathSeparator = _b === void 0 ? '/' : _b, disabled = _a.disabled, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter; _a.placeholder; var options = _a.options, multiple = _a.multiple, valueField = _a.valueField, initiallyOpen = _a.initiallyOpen, unfoldedLevel = _a.unfoldedLevel, withChildren = _a.withChildren, rootLabel = _a.rootLabel, cascade = _a.cascade, rootValue = _a.rootValue, showIcon = _a.showIcon, showRadio = _a.showRadio; _a.popOverContainer; var onlyChildren = _a.onlyChildren, onlyLeaf = _a.onlyLeaf, ns = _a.classPrefix, optionsPlaceholder = _a.optionsPlaceholder, searchable = _a.searchable, autoComplete = _a.autoComplete, maxLength = _a.maxLength, minLength = _a.minLength, labelField = _a.labelField, nodePath = _a.nodePath, onAdd = _a.onAdd, creatable = _a.creatable, createTip = _a.createTip, addControls = _a.addControls, onEdit = _a.onEdit, editable = _a.editable, editTip = _a.editTip, editControls = _a.editControls, removable = _a.removable, removeTip = _a.removeTip, onDelete = _a.onDelete, rootCreatable = _a.rootCreatable, rootCreateTip = _a.rootCreateTip, __ = _a.translate, deferLoad = _a.deferLoad, expandTreeOptions = _a.expandTreeOptions, selfDisabledAffectChildren = _a.selfDisabledAffectChildren, showOutline = _a.showOutline, autoCheckChildren = _a.autoCheckChildren;
+        var _a = this.props, value = _a.value, enableNodePath = _a.enableNodePath, _b = _a.pathSeparator, pathSeparator = _b === void 0 ? '/' : _b, disabled = _a.disabled, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter; _a.placeholder; var options = _a.options, multiple = _a.multiple, valueField = _a.valueField, initiallyOpen = _a.initiallyOpen, unfoldedLevel = _a.unfoldedLevel, withChildren = _a.withChildren, rootLabel = _a.rootLabel, cascade = _a.cascade, rootValue = _a.rootValue, showIcon = _a.showIcon, showRadio = _a.showRadio; _a.popOverContainer; var onlyChildren = _a.onlyChildren, onlyLeaf = _a.onlyLeaf, ns = _a.classPrefix, optionsPlaceholder = _a.optionsPlaceholder, searchable = _a.searchable, autoComplete = _a.autoComplete, maxLength = _a.maxLength, minLength = _a.minLength, labelField = _a.labelField, nodePath = _a.nodePath, onAdd = _a.onAdd, creatable = _a.creatable, createTip = _a.createTip, addControls = _a.addControls, onEdit = _a.onEdit, editable = _a.editable, editTip = _a.editTip, editControls = _a.editControls, removable = _a.removable, removeTip = _a.removeTip, onDelete = _a.onDelete, rootCreatable = _a.rootCreatable, rootCreateTip = _a.rootCreateTip, __ = _a.translate, deferLoad = _a.deferLoad, expandTreeOptions = _a.expandTreeOptions, selfDisabledAffectChildren = _a.selfDisabledAffectChildren, showOutline = _a.showOutline, autoCheckChildren = _a.autoCheckChildren, hideRoot = _a.hideRoot;
         var filtedOptions = !amisCore.isEffectiveApi(autoComplete) && searchable && this.state.inputValue
             ? this.filterOptions(options, this.state.inputValue)
             : options;
-        return (React__default["default"].createElement(amisUi.Tree, { classPrefix: ns, onRef: this.domRef, onlyChildren: onlyChildren, onlyLeaf: onlyLeaf, labelField: labelField, valueField: valueField, disabled: disabled, onChange: this.handleChange, joinValues: joinValues, extractValue: extractValue, delimiter: delimiter, placeholder: __(optionsPlaceholder), options: filtedOptions, highlightTxt: this.state.inputValue, multiple: multiple, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, withChildren: withChildren, autoCheckChildren: autoCheckChildren, rootLabel: __(rootLabel), rootValue: rootValue, showIcon: showIcon, showRadio: showRadio, showOutline: showOutline, cascade: cascade, foldedField: "collapsed", hideRoot: true, value: value || '', nodePath: nodePath, enableNodePath: enableNodePath, pathSeparator: pathSeparator, maxLength: maxLength, minLength: minLength, onAdd: onAdd, creatable: creatable, createTip: createTip, rootCreatable: rootCreatable, rootCreateTip: rootCreateTip, onEdit: onEdit, editable: editable, editTip: editTip, removable: removable, removeTip: removeTip, onDelete: onDelete, bultinCUD: !addControls && !editControls, onDeferLoad: deferLoad, onExpandTree: expandTreeOptions, selfDisabledAffectChildren: selfDisabledAffectChildren }));
+        return (React__default["default"].createElement(amisUi.Tree, { classPrefix: ns, onRef: this.domRef, onlyChildren: onlyChildren, onlyLeaf: onlyLeaf, labelField: labelField, valueField: valueField, disabled: disabled, onChange: this.handleChange, joinValues: joinValues, extractValue: extractValue, delimiter: delimiter, placeholder: __(optionsPlaceholder), options: filtedOptions, highlightTxt: this.state.inputValue, multiple: multiple, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, withChildren: withChildren, autoCheckChildren: autoCheckChildren, rootLabel: __(rootLabel), rootValue: rootValue, showIcon: showIcon, showRadio: showRadio, showOutline: showOutline, cascade: cascade, foldedField: "collapsed", hideRoot: hideRoot, value: value || '', nodePath: nodePath, enableNodePath: enableNodePath, pathSeparator: pathSeparator, maxLength: maxLength, minLength: minLength, onAdd: onAdd, creatable: creatable, createTip: createTip, rootCreatable: rootCreatable, rootCreateTip: rootCreateTip, onEdit: onEdit, editable: editable, editTip: editTip, removable: removable, removeTip: removeTip, onDelete: onDelete, bultinCUD: !addControls && !editControls, onDeferLoad: deferLoad, onExpandTree: expandTreeOptions, selfDisabledAffectChildren: selfDisabledAffectChildren }));
     };
     TreeSelectControl.prototype.render = function () {
         var _this = this;
@@ -323,6 +317,7 @@ var TreeSelectControl = /** @class */ (function (_super) {
             mobileUI ? (React__default["default"].createElement(amisUi.PopUp, { container: env && env.getModalContainer ? env.getModalContainer : undefined, className: cx("".concat(ns, "TreeSelect-popup")), isShow: isOpened, onHide: this.close }, this.renderOuter())) : null));
     };
     TreeSelectControl.defaultProps = {
+        hideRoot: true,
         placeholder: 'Select.placeholder',
         optionsPlaceholder: 'placeholder.noData',
         multiple: false,

package/lib/renderers/Form/UUID.js

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