amis 2.3.1 → 2.4.0

package/esm/renderers/Form/ListSelect.js

@@ -1,11 +1,12 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
-import { __extends, __decorate } from 'tslib';
+import { __extends, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import { createObject, OptionsControl } from 'amis-core';
+import { supportStatic } from './StaticHoc.js';
 
 var ListControl = /** @class */ (function (_super) {
     __extends(ListControl, _super);
@@ -39,6 +40,33 @@ var ListControl = /** @class */ (function (_super) {
         var reload = this.props.reloadOptions;
         reload && reload();
     };
+    ListControl.prototype.renderStatic = function (displayValue) {
+        if (displayValue === void 0) { displayValue = '-'; }
+        var _a = this.props, itemSchema = _a.itemSchema, labelField = _a.labelField; _a.valueField; var imageClassName = _a.imageClassName, itemClassName = _a.itemClassName, selectedOptions = _a.selectedOptions, cx = _a.classnames, render = _a.render, data = _a.data;
+        if (!selectedOptions.length) {
+            return displayValue;
+        }
+        var itemRender = function (option, key) {
+            var label = option[labelField || 'label'];
+            label = label || "\u9009\u9879".concat(key + 1);
+            if (itemSchema || option.body || option.image) {
+                return (React.createElement("div", { key: key, className: cx('ListControl-static-item', itemClassName) }, itemSchema
+                    ? render("".concat(key, "/body"), itemSchema, {
+                        data: createObject(data, option)
+                    })
+                    : option.body
+                        ? render("".concat(key, "/body"), option.body)
+                        : [(option.image
+                                ? React.createElement("div", { key: "image", className: cx('ListControl-itemImage', imageClassName) },
+                                    React.createElement("img", { src: option.image, alt: label }))
+                                : null),
+                            (React.createElement("div", { key: "label", className: cx('ListControl-itemLabel') }, label))
+                        ]));
+            }
+            return (React.createElement("div", { key: key, className: cx("ListControl-static-item") }, label));
+        };
+        return React.createElement("div", { className: cx('StaticList') }, selectedOptions.map(itemRender));
+    };
     ListControl.prototype.render = function () {
         var _this = this;
         var _a = this.props, render = _a.render, itemClassName = _a.itemClassName, cx = _a.classnames, className = _a.className, disabled = _a.disabled, options = _a.options, placeholder = _a.placeholder, selectedOptions = _a.selectedOptions, imageClassName = _a.imageClassName, submitOnDBClick = _a.submitOnDBClick, itemSchema = _a.itemSchema, data = _a.data, labelField = _a.labelField, listClassName = _a.listClassName, __ = _a.translate;
@@ -70,6 +98,12 @@ var ListControl = /** @class */ (function (_super) {
         imageClassName: '',
         submitOnDBClick: false
     };
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], ListControl.prototype, "render", null);
     return ListControl;
 }(React.Component));
 /** @class */ ((function (_super) {

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

@@ -29,6 +29,16 @@ export declare class LocationControl extends React.Component<LocationControlProp
         vendor: string;
         coordinatesType: string;
     };
+    domRef: React.RefObject<HTMLDivElement>;
+    state: {
+        isOpened: boolean;
+    };
+    close(): void;
+    open(): void;
+    handleClick(): void;
+    getParent(): HTMLElement | null | undefined;
+    getTarget(): HTMLDivElement | null;
+    renderStatic(displayValue?: string): JSX.Element;
     render(): JSX.Element;
 }
 export declare class LocationRenderer extends LocationControl {

package/esm/renderers/Form/LocationPicker.js

@@ -1,18 +1,59 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
-import { __extends, __assign, __decorate } from 'tslib';
+import { __extends, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { filter, FormItem } from 'amis-core';
-import { LocationPicker } from 'amis-ui';
+import { Overlay, PopOver, filter, autobind, FormItem } from 'amis-core';
+import { Icon, BaiduMapPicker, Alert2, LocationPicker } from 'amis-ui';
+import { supportStatic } from './StaticHoc.js';
 
 var LocationControl = /** @class */ (function (_super) {
     __extends(LocationControl, _super);
     function LocationControl() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.domRef = React.createRef();
+        _this.state = {
+            isOpened: false
+        };
+        return _this;
     }
+    LocationControl.prototype.close = function () {
+        this.setState({
+            isOpened: false
+        });
+    };
+    LocationControl.prototype.open = function () {
+        this.setState({
+            isOpened: true
+        });
+    };
+    LocationControl.prototype.handleClick = function () {
+        this.state.isOpened ? this.close() : this.open();
+    };
+    LocationControl.prototype.getParent = function () {
+        var _a;
+        return (_a = this.domRef.current) === null || _a === void 0 ? void 0 : _a.parentElement;
+    };
+    LocationControl.prototype.getTarget = function () {
+        return this.domRef.current;
+    };
+    LocationControl.prototype.renderStatic = function (displayValue) {
+        var _a;
+        if (displayValue === void 0) { displayValue = '-'; }
+        var _b = this.props, cx = _b.classnames, value = _b.value, vendor = _b.vendor, ak = _b.ak, coordinatesType = _b.coordinatesType, popOverContainer = _b.popOverContainer;
+        var __ = this.props.translate;
+        if (!value) {
+            return React.createElement(React.Fragment, null, displayValue);
+        }
+        return (React.createElement("div", { className: this.props.classnames('LocationControl'), ref: this.domRef },
+            React.createElement("span", null, value.address),
+            React.createElement("a", { className: cx('LocationPicker-toggler', 'ml-1'), onClick: this.handleClick },
+                React.createElement(Icon, { icon: "location", className: "icon" })),
+            React.createElement(Overlay, { target: this.getTarget, container: popOverContainer || this.getParent, rootClose: false, show: this.state.isOpened },
+                React.createElement(PopOver, { className: cx('LocationPicker-popover'), onHide: this.close, overlay: true, style: { width: (_a = this.getTarget()) === null || _a === void 0 ? void 0 : _a.offsetWidth } }, vendor === 'baidu' ? (React.createElement(BaiduMapPicker, { ak: ak, value: value, coordinatesType: coordinatesType })) : (React.createElement(Alert2, null, __('${vendor} 地图控件不支持', { vendor: vendor })))))));
+    };
     LocationControl.prototype.render = function () {
         return (React.createElement("div", { className: this.props.classnames('LocationControl') },
             React.createElement(LocationPicker, __assign({}, this.props, { ak: filter(this.props.ak, this.props.data) }))));
@@ -21,6 +62,42 @@ var LocationControl = /** @class */ (function (_super) {
         vendor: 'baidu',
         coordinatesType: 'bd09'
     };
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], LocationControl.prototype, "close", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], LocationControl.prototype, "open", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], LocationControl.prototype, "handleClick", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], LocationControl.prototype, "getParent", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], LocationControl.prototype, "getTarget", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], LocationControl.prototype, "render", null);
     return LocationControl;
 }(React.Component));
 /** @class */ ((function (_super) {

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

@@ -72,7 +72,8 @@ export default class MatrixCheckbox extends React.Component<MatrixProps, MatrixS
     initOptions(data: any): Promise<void>;
     reload(): Promise<void>;
     toggleItem(checked: boolean, x: number, y: number): Promise<void>;
-    renderInput(): JSX.Element;
+    renderInput(forceDisabled?: boolean): JSX.Element;
+    renderStatic(displayValue?: string): JSX.Element;
     render(): JSX.Element;
 }
 export declare class MatrixRenderer extends MatrixCheckbox {

package/esm/renderers/Form/MatrixCheckboxes.js

@@ -1,12 +1,13 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
-import { __extends, __awaiter, __generator, __assign, __decorate } from 'tslib';
+import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } 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';
+import { supportStatic } from './StaticHoc.js';
 
 /**
  * @file filter
@@ -154,12 +155,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 +183,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) {
@@ -196,8 +195,9 @@ var MatrixCheckbox = /** @class */ (function (_super) {
             });
         });
     };
-    MatrixCheckbox.prototype.renderInput = function () {
+    MatrixCheckbox.prototype.renderInput = function (forceDisabled) {
         var _this = this;
+        if (forceDisabled === void 0) { forceDisabled = false; }
         var _a = this.state, columns = _a.columns, rows = _a.rows;
         var _b = this.props, rowLabel = _b.rowLabel, disabled = _b.disabled, cx = _b.classnames, multiple = _b.multiple;
         var value = this.props.value || buildDefaultValue(columns, rows);
@@ -213,10 +213,18 @@ var MatrixCheckbox = /** @class */ (function (_super) {
                             row.label,
                             row.description || row.desc ? (React.createElement("span", { className: "m-l-xs text-muted text-xs" }, row.description || row.desc)) : null),
                         columns.map(function (column, x) { return (React.createElement("td", { key: x, className: "text-center" },
-                            React.createElement(Checkbox, { type: multiple ? 'checkbox' : 'radio', disabled: disabled, checked: !!(value[x] && value[x][y] && value[x][y].checked), onChange: function (checked) {
+                            React.createElement(Checkbox, { type: multiple ? 'checkbox' : 'radio', disabled: forceDisabled || disabled, checked: !!(value[x] && value[x][y] && value[x][y].checked), onChange: function (checked) {
                                     return _this.toggleItem(checked, x, y);
                                 } }))); }))); }))))));
     };
+    MatrixCheckbox.prototype.renderStatic = function (displayValue) {
+        if (displayValue === void 0) { displayValue = '-'; }
+        var _a = this.props, className = _a.className; _a.render; var cx = _a.classnames;
+        var error = this.state.error;
+        return (React.createElement("div", { key: "input", className: cx('MatrixControl', className || '') }, error
+            ? displayValue
+            : this.renderInput(true)));
+    };
     MatrixCheckbox.prototype.render = function () {
         var _a = this.props, className = _a.className; _a.render; var cx = _a.classnames;
         var _b = this.state, error = _b.error, loading = _b.loading;
@@ -230,6 +238,12 @@ var MatrixCheckbox = /** @class */ (function (_super) {
         multiple: true,
         singleSelectMode: 'column' // multiple 为 false 时有效。
     };
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], MatrixCheckbox.prototype, "render", null);
     return MatrixCheckbox;
 }(React.Component));
 function buildDefaultValue(columns, rows) {

package/esm/renderers/Form/NestedSelect.js

@@ -1,16 +1,17 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * 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';
 import union from 'lodash/union';
 import compact from 'lodash/compact';
+import { supportStatic } from './StaticHoc.js';
 
 var NestedSelectControl = /** @class */ (function (_super) {
     __extends(NestedSelectControl, _super);
@@ -47,14 +48,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)];
                 }
@@ -673,6 +674,12 @@ var NestedSelectControl = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Array]),
         __metadata("design:returntype", Promise)
     ], NestedSelectControl.prototype, "handleResultChange", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], NestedSelectControl.prototype, "render", null);
     return NestedSelectControl;
 }(React.Component));
 /** @class */ ((function (_super) {

package/esm/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/esm/renderers/Form/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -9,7 +9,7 @@ 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, getVariable, filter, noop, autobind, OptionsControl } from 'amis-core';
+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) {
@@ -119,11 +119,11 @@ var PickerControl = /** @class */ (function (_super) {
     };
     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, _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
@@ -145,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) {
@@ -157,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) {
@@ -235,11 +236,12 @@ 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')))))); })));
     };
     PickerControl.prototype.renderBody = function (_a) {
+        var _this = this;
         var _b = _a === void 0 ? {} : _a, popOverContainer = _b.popOverContainer;
         var _c = this.props, render = _c.render, selectedOptions = _c.selectedOptions, options = _c.options, multiple = _c.multiple, valueField = _c.valueField, embed = _c.embed, source = _c.source;
         return render('modal-body', this.state.schema, {
@@ -248,13 +250,33 @@ var PickerControl = /** @class */ (function (_super) {
             primaryField: valueField,
             options: source ? [] : options,
             multiple: multiple,
-            onSelect: embed ? this.handleChange : undefined,
+            onSelect: embed
+                ? function (selectedItems, unSelectedItems) {
+                    // 过滤掉一些无用事件，否则会导致 value 错误
+                    if (!Array.isArray(selectedItems) ||
+                        !Array.isArray(unSelectedItems) ||
+                        (!selectedItems.length && !unSelectedItems.length)) {
+                        return;
+                    }
+                    else if (selectedItems
+                        .map(function (item) { return item[valueField || 'value']; })
+                        .sort()
+                        .join(',') ===
+                        selectedOptions
+                            .map(function (item) { return item[valueField || 'value']; })
+                            .sort()
+                            .join(',')) {
+                        return;
+                    }
+                    _this.handleChange(selectedItems);
+                }
+                : undefined,
             ref: this.crudRef,
             popOverContainer: popOverContainer
         });
     };
     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, clearable = _a.clearable, multiple = _a.multiple, placeholder = _a.placeholder, embed = _a.embed, selectedOptions = _a.selectedOptions, __ = _a.translate, popOverContainer = _a.popOverContainer;
+        var _a = this.props, className = _a.className, modalClassName = _a.modalClassName, 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,
@@ -274,6 +296,7 @@ var PickerControl = /** @class */ (function (_super) {
                 title: __('Select.placeholder'),
                 size: size,
                 type: modalMode,
+                className: modalClassName,
                 body: {
                     children: this.renderBody
                 }
@@ -346,7 +369,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.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -7,7 +7,8 @@ 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';
+import { supportStatic } from './StaticHoc.js';
 
 var RadiosControl = /** @class */ (function (_super) {
     __extends(RadiosControl, _super);
@@ -26,18 +27,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) {
@@ -68,6 +70,12 @@ var RadiosControl = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", Promise)
     ], RadiosControl.prototype, "handleChange", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], RadiosControl.prototype, "render", null);
     return RadiosControl;
 }(React.Component));
 /** @class */ ((function (_super) {

package/esm/renderers/Form/Select.js

@@ -1,16 +1,17 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __rest, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import cx from 'classnames';
-import { isEffectiveApi, isApiOutdated, createObject, normalizeOptions, isMobile, autobind, OptionsControl } from 'amis-core';
+import { isEffectiveApi, isApiOutdated, resolveEventData, createObject, normalizeOptions, isMobile, autobind, OptionsControl } from 'amis-core';
 import find from 'lodash/find';
 import debouce from 'lodash/debounce';
 import { Select, TransferDropDown, Spinner } from 'amis-ui';
 import { BaseTransferRenderer } from './Transfer.js';
+import { supportStatic } from './StaticHoc.js';
 
 var SelectControl = /** @class */ (function (_super) {
     __extends(SelectControl, _super);
@@ -82,18 +83,19 @@ var SelectControl = /** @class */ (function (_super) {
     SelectControl.prototype.dispatchEvent = function (eventName, eventData) {
         if (eventData === void 0) { eventData = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var event, _a, dispatchEvent, options, data, rendererEvent;
+            var event, _a, dispatchEvent, options, rendererEvent;
             return __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, createObject(data, {
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options, _a.data;
+                        return [4 /*yield*/, dispatchEvent(eventName, 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) {
@@ -108,19 +110,20 @@ var SelectControl = /** @class */ (function (_super) {
     };
     SelectControl.prototype.changeValue = function (value) {
         return __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 __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', createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('change', 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) {
@@ -242,6 +245,12 @@ var SelectControl = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Object, Object]),
         __metadata("design:returntype", void 0)
     ], SelectControl.prototype, "renderMenu", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], SelectControl.prototype, "render", null);
     return SelectControl;
 }(React.Component));
 var TransferDropdownRenderer = /** @class */ (function (_super) {

package/esm/renderers/Form/Static.js

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

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

@@ -0,0 +1,5 @@
+import { FormControlProps } from "amis-core";
+/**
+ * 表单项类成员render支持静态展示装饰器
+ */
+export declare function supportStatic<T extends FormControlProps>(): (target: any, name: string, descriptor: TypedPropertyDescriptor<any>) => TypedPropertyDescriptor<any>;