amis 2.3.2-beta.1 → 2.4.0

package/lib/renderers/Form/InputText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -15,6 +15,7 @@ var matchSorter = require('match-sorter');
 var debouce = require('lodash/debounce');
 var find = require('lodash/find');
 var amisUi = require('amis-ui');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -364,19 +365,27 @@ var TextControl = /** @class */ (function (_super) {
     };
     TextControl.prototype.handleNormalInputChange = function (e) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onChange, dispatchEvent, value, rendererEvent;
+            var _a, onChange, dispatchEvent, trimContents, clearValueOnEmpty, value, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
-                        value = e.currentTarget.value;
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: this.transformValue(value) }, 'value'))];
+                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent, trimContents = _a.trimContents, clearValueOnEmpty = _a.clearValueOnEmpty;
+                        value = this.transformValue(e.currentTarget.value);
+                        if (typeof value === 'string') {
+                            if (trimContents) {
+                                value = value.trim();
+                            }
+                            if (clearValueOnEmpty && value === '') {
+                                value = undefined;
+                            }
+                        }
+                        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) {
                             return [2 /*return*/];
                         }
-                        onChange(this.transformValue(value));
+                        onChange(value);
                         return [2 /*return*/];
                 }
             });
@@ -543,37 +552,46 @@ var TextControl = /** @class */ (function (_super) {
             showCounter ? (React__default["default"].createElement("span", { className: cx('TextControl-counter') }, "".concat((_c = this.valueToString(value)) === null || _c === void 0 ? void 0 : _c.length).concat(typeof maxLength === 'number' && maxLength ? "/".concat(maxLength) : ''))) : null,
             suffix ? (React__default["default"].createElement("span", { className: cx('TextControl-inputSuffix') }, amisCore.filter(suffix, data))) : null));
     };
-    TextControl.prototype.render = function () {
-        var _a;
-        var _b = this.props, cx = _b.classnames, className = _b.className, ns = _b.classPrefix, options = _b.options, source = _b.source, autoComplete = _b.autoComplete, addOnRaw = _b.addOn, render = _b.render, data = _b.data, disabled = _b.disabled, inputOnly = _b.inputOnly;
+    TextControl.prototype.renderBody = function (body) {
+        var _a, _b;
+        var _c = this.props, cx = _c.classnames, className = _c.className, ns = _c.classPrefix, addOnRaw = _c.addOn, render = _c.render, data = _c.data, disabled = _c.disabled, inputOnly = _c.inputOnly, isStatic = _c.static;
         var addOn = typeof addOnRaw === 'string'
             ? {
                 label: addOnRaw,
                 type: 'plain'
             }
             : addOnRaw;
-        var input = autoComplete !== false && (source || options.length || autoComplete)
-            ? this.renderSugestMode()
-            : this.renderNormal();
         var iconElement = amisCore.generateIcon(cx, addOn === null || addOn === void 0 ? void 0 : addOn.icon, 'Icon');
-        var addOnDom = addOn ? (addOn.actionType ||
+        var addOnDom = addOn && !isStatic ? (addOn.actionType ||
             ~['button', 'submit', 'reset', 'action'].indexOf(addOn.type) ? (React__default["default"].createElement("div", { className: cx("".concat(ns, "TextControl-button"), addOn.className) }, render('addOn', addOn, {
             disabled: disabled
         }))) : (React__default["default"].createElement("div", { className: cx("".concat(ns, "TextControl-addOn"), addOn.className) },
             iconElement,
             addOn.label ? amisCore.filter(addOn.label, data) : null))) : null;
         if (inputOnly) {
-            return input;
+            return body;
         }
-        return (React__default["default"].createElement("div", { className: cx(className, "".concat(ns, "TextControl"), (_a = {},
+        var classNames = !isStatic
+            ? cx(className, "".concat(ns, "TextControl"), (_a = {},
                 _a["".concat(ns, "TextControl--withAddOn")] = !!addOnDom,
                 _a['is-focused'] = this.state.isFocused,
                 _a['is-disabled'] = disabled,
-                _a)) },
+                _a))
+            : cx("".concat(ns, "TextControl"), (_b = {},
+                _b["".concat(ns, "TextControl--withAddOn")] = !!addOnDom,
+                _b));
+        return (React__default["default"].createElement("div", { className: classNames },
             addOn && addOn.position === 'left' ? addOnDom : null,
-            input,
+            body,
             addOn && addOn.position !== 'left' ? addOnDom : null));
     };
+    TextControl.prototype.render = function () {
+        var _a = this.props, options = _a.options, source = _a.source, autoComplete = _a.autoComplete;
+        var input = autoComplete !== false && (source || (options === null || options === void 0 ? void 0 : options.length) || autoComplete)
+            ? this.renderSugestMode()
+            : this.renderNormal();
+        return this.renderBody(input);
+    };
     TextControl.defaultProps = {
         resetValue: '',
         labelField: 'label',
@@ -588,6 +606,12 @@ var TextControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
     ], TextControl.prototype, "handleNormalInputChange", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", Object)
+    ], TextControl.prototype, "render", null);
     return TextControl;
 }(React__default["default"].PureComponent));
 function mapItemIndex(items, values, valueField) {

package/lib/renderers/Form/InputTree.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -12,6 +12,7 @@ var React = require('react');
 var cx = require('classnames');
 var amisUi = require('amis-ui');
 var amisCore = require('amis-core');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -109,6 +110,12 @@ var TreeControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
     ], TreeControl.prototype, "domRef", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], TreeControl.prototype, "render", null);
     return TreeControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

package/lib/renderers/Form/InputYearRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -13,6 +13,7 @@ var amisCore = require('amis-core');
 var cx = require('classnames');
 var InputDateRange = require('./InputDateRange.js');
 var amisUi = require('amis-ui');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -29,6 +30,12 @@ var YearRangeControl = /** @class */ (function (_super) {
         return (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "DateRangeControl"), className) },
             React__default["default"].createElement(amisUi.DateRangePicker, tslib.__assign({ viewMode: "years", format: format, classPrefix: ns, data: data }, rest, { minDate: minDate ? amisCore.filterDate(minDate, data, format) : undefined, maxDate: maxDate ? amisCore.filterDate(maxDate, data, format) : undefined, minDuration: minDuration ? amisCore.parseDuration(minDuration) : undefined, maxDuration: maxDuration ? amisCore.parseDuration(maxDuration) : undefined, onChange: this.handleChange, onFocus: this.dispatchEvent, onBlur: this.dispatchEvent }))));
     };
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], YearRangeControl.prototype, "render", null);
     return YearRangeControl;
 }(InputDateRange["default"]));
 /** @class */ ((function (_super) {

package/lib/renderers/Form/JSONSchema.js

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

package/lib/renderers/Form/JSONSchemaEditor.js

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

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

@@ -39,6 +39,7 @@ export default class ListControl extends React.Component<ListProps, any> {
     handleDBClick(option: Option, e: React.MouseEvent<HTMLElement>): void;
     handleClick(option: Option, e: React.MouseEvent<HTMLElement>): void;
     reload(): void;
+    renderStatic(displayValue?: string): string | JSX.Element;
     render(): JSX.Element;
 }
 export declare class ListControlRenderer extends ListControl {

package/lib/renderers/Form/ListSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -10,6 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var amisCore = require('amis-core');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -47,6 +48,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__default["default"].createElement("div", { key: key, className: cx('ListControl-static-item', itemClassName) }, itemSchema
+                    ? render("".concat(key, "/body"), itemSchema, {
+                        data: amisCore.createObject(data, option)
+                    })
+                    : option.body
+                        ? render("".concat(key, "/body"), option.body)
+                        : [(option.image
+                                ? React__default["default"].createElement("div", { key: "image", className: cx('ListControl-itemImage', imageClassName) },
+                                    React__default["default"].createElement("img", { src: option.image, alt: label }))
+                                : null),
+                            (React__default["default"].createElement("div", { key: "label", className: cx('ListControl-itemLabel') }, label))
+                        ]));
+            }
+            return (React__default["default"].createElement("div", { key: key, className: cx("ListControl-static-item") }, label));
+        };
+        return React__default["default"].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;
@@ -78,6 +106,12 @@ var ListControl = /** @class */ (function (_super) {
         imageClassName: '',
         submitOnDBClick: false
     };
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], ListControl.prototype, "render", null);
     return ListControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

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

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -11,6 +11,7 @@ var tslib = require('tslib');
 var React = require('react');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -19,8 +20,48 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var LocationControl = /** @class */ (function (_super) {
     tslib.__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__default["default"].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__default["default"].createElement(React__default["default"].Fragment, null, displayValue);
+        }
+        return (React__default["default"].createElement("div", { className: this.props.classnames('LocationControl'), ref: this.domRef },
+            React__default["default"].createElement("span", null, value.address),
+            React__default["default"].createElement("a", { className: cx('LocationPicker-toggler', 'ml-1'), onClick: this.handleClick },
+                React__default["default"].createElement(amisUi.Icon, { icon: "location", className: "icon" })),
+            React__default["default"].createElement(amisCore.Overlay, { target: this.getTarget, container: popOverContainer || this.getParent, rootClose: false, show: this.state.isOpened },
+                React__default["default"].createElement(amisCore.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__default["default"].createElement(amisUi.BaiduMapPicker, { ak: ak, value: value, coordinatesType: coordinatesType })) : (React__default["default"].createElement(amisUi.Alert2, null, __('${vendor} 地图控件不支持', { vendor: vendor })))))));
+    };
     LocationControl.prototype.render = function () {
         return (React__default["default"].createElement("div", { className: this.props.classnames('LocationControl') },
             React__default["default"].createElement(amisUi.LocationPicker, tslib.__assign({}, this.props, { ak: amisCore.filter(this.props.ak, this.props.data) }))));
@@ -29,6 +70,42 @@ var LocationControl = /** @class */ (function (_super) {
         vendor: 'baidu',
         coordinatesType: 'bd09'
     };
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], LocationControl.prototype, "close", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], LocationControl.prototype, "open", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], LocationControl.prototype, "handleClick", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], LocationControl.prototype, "getParent", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], LocationControl.prototype, "getTarget", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], LocationControl.prototype, "render", null);
     return LocationControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

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

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -11,6 +11,7 @@ var tslib = require('tslib');
 var React = require('react');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -202,8 +203,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);
@@ -219,10 +221,18 @@ var MatrixCheckbox = /** @class */ (function (_super) {
                             row.label,
                             row.description || row.desc ? (React__default["default"].createElement("span", { className: "m-l-xs text-muted text-xs" }, row.description || row.desc)) : null),
                         columns.map(function (column, x) { return (React__default["default"].createElement("td", { key: x, className: "text-center" },
-                            React__default["default"].createElement(amisUi.Checkbox, { type: multiple ? 'checkbox' : 'radio', disabled: disabled, checked: !!(value[x] && value[x][y] && value[x][y].checked), onChange: function (checked) {
+                            React__default["default"].createElement(amisUi.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__default["default"].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;
@@ -236,6 +246,12 @@ var MatrixCheckbox = /** @class */ (function (_super) {
         multiple: true,
         singleSelectMode: 'column' // multiple 为 false 时有效。
     };
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], MatrixCheckbox.prototype, "render", null);
     return MatrixCheckbox;
 }(React__default["default"].Component));
 function buildDefaultValue(columns, rows) {

package/lib/renderers/Form/NestedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -15,6 +15,7 @@ var ReactDOM = require('react-dom');
 var xor = require('lodash/xor');
 var union = require('lodash/union');
 var compact = require('lodash/compact');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -684,6 +685,12 @@ var NestedSelectControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Array]),
         tslib.__metadata("design:returntype", Promise)
     ], NestedSelectControl.prototype, "handleResultChange", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], NestedSelectControl.prototype, "render", null);
     return NestedSelectControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

package/lib/renderers/Form/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -177,7 +177,7 @@ var PickerControl = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0:
                         _a = this.props, data = _a.data, dispatchEvent = _a.dispatchEvent;
-                        return [4 /*yield*/, dispatchEvent('itemclick', amisCore.createObject(data, { item: item }))];
+                        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) {
@@ -253,6 +253,7 @@ var PickerControl = /** @class */ (function (_super) {
                 amisCore.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, {
@@ -261,13 +262,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__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,
@@ -287,6 +308,7 @@ var PickerControl = /** @class */ (function (_super) {
                 title: __('Select.placeholder'),
                 size: size,
                 type: modalMode,
+                className: modalClassName,
                 body: {
                     children: this.renderBody
                 }

package/lib/renderers/Form/Radios.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -12,6 +12,7 @@ var React = require('react');
 var cx = require('classnames');
 var amisUi = require('amis-ui');
 var amisCore = require('amis-core');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -78,6 +79,12 @@ var RadiosControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
     ], RadiosControl.prototype, "handleChange", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], RadiosControl.prototype, "render", null);
     return RadiosControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

package/lib/renderers/Form/Select.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -15,6 +15,7 @@ var find = require('lodash/find');
 var debouce = require('lodash/debounce');
 var amisUi = require('amis-ui');
 var Transfer = require('./Transfer.js');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -255,6 +256,12 @@ var SelectControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object, Object]),
         tslib.__metadata("design:returntype", void 0)
     ], SelectControl.prototype, "renderMenu", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], SelectControl.prototype, "render", null);
     return SelectControl;
 }(React__default["default"].Component));
 var TransferDropdownRenderer = /** @class */ (function (_super) {

package/lib/renderers/Form/Static.js

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

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