amis 2.3.1 → 2.4.0

package/lib/renderers/Form/MatrixCheckboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.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 }; }
 
@@ -162,12 +163,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 +191,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) {
@@ -204,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);
@@ -221,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;
@@ -238,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.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 }; }
 
@@ -58,14 +59,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)];
                 }
@@ -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.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.4.0
  * 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,11 +248,12 @@ 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')))))); })));
     };
     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, {
@@ -260,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,
@@ -286,6 +308,7 @@ var PickerControl = /** @class */ (function (_super) {
                 title: __('Select.placeholder'),
                 size: size,
                 type: modalMode,
+                className: modalClassName,
                 body: {
                     children: this.renderBody
                 }
@@ -358,7 +381,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.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 }; }
 
@@ -35,18 +36,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) {
@@ -77,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.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 }; }
 
@@ -93,18 +94,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 +121,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) {
@@ -253,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.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>;

package/lib/renderers/Form/StaticHoc.js

@@ -0,0 +1,115 @@
+/**
+ * amis v2.4.0
+ * Copyright 2018-2022 baidu
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var React = require('react');
+var amisCore = require('amis-core');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
+function renderCommonStatic(props, defaultValue) {
+    var type = props.type, render = props.render, staticSchema = props.staticSchema;
+    var staticProps = tslib.__assign(tslib.__assign({}, props), staticSchema);
+    switch (type) {
+        case 'select':
+        case 'checkboxes':
+        case 'button-group-select':
+        case 'input-tree':
+        case 'tree-select':
+        case 'nested-select':
+        case 'cascader-select':
+        case 'radios':
+        case 'multi-select':
+        case 'transfer':
+        case 'transfer-picker':
+        case 'tabs-transfer':
+        case 'tabs-transfer-picker':
+            return render('static-select', { type: 'words' }, staticProps);
+        case 'input-date':
+        case 'input-datetime':
+        case 'input-time':
+        case 'input-month':
+        case 'input-quarter':
+        case 'input-year':
+            return renderStaticDateTypes(staticProps);
+        case 'input-date-range':
+        case 'input-datetime-range':
+        case 'input-time-range':
+        case 'input-month-range':
+        case 'input-quarter-range':
+        case 'input-year-range':
+            return render('static-input-date-range', { type: 'date-range' }, tslib.__assign(tslib.__assign(tslib.__assign({}, props), { valueFormat: props.format, format: props.inputFormat }), staticSchema));
+        case 'input-password':
+            return render('static-input-password', { type: 'password' }, staticProps);
+        case 'input-color':
+            return render('static-color', { type: 'color' }, staticProps);
+        case 'input-tag':
+            return render('static-input-tag', { type: 'tags' }, staticProps);
+        case 'input-url':
+            return render('static-input-url', { type: 'link', href: defaultValue }, staticProps);
+        default:
+            return defaultValue;
+    }
+}
+/**
+ * 表单项类成员render支持静态展示装饰器
+ */
+function supportStatic() {
+    return function (target, name, descriptor) {
+        var original = descriptor.value;
+        descriptor.value = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            var props = this.props;
+            if (props.static) {
+                var render = props.render, staticSchema = props.staticSchema, ns = props.classPrefix, cx = props.classnames, className = props.className, _a = props.staticPlaceholder, staticPlaceholder = _a === void 0 ? '-' : _a;
+                var body = void 0;
+                var displayValue = amisCore.getPropValue(props);
+                var isValueEmpty = displayValue == null || displayValue === '';
+                if (staticSchema && (staticSchema.type
+                    || Array.isArray(staticSchema)
+                    || typeof staticSchema === 'string'
+                    || typeof staticSchema === 'number')) {
+                    // 有自定义schema 且schema有type 时，展示schema
+                    body = render('form-static-schema', staticSchema, props);
+                }
+                else if (target.renderStatic) {
+                    // 特殊组件，control有 renderStatic 时，特殊处理
+                    body = target.renderStatic.apply(this, tslib.__spreadArray(tslib.__spreadArray([], args, true), [isValueEmpty ? staticPlaceholder : displayValue], false));
+                }
+                else if (isValueEmpty) {
+                    // 空值时，展示 staticPlaceholder
+                    body = staticPlaceholder;
+                }
+                else {
+                    // 可复用组件 统一处理
+                    body = renderCommonStatic(props, displayValue);
+                }
+                return React__default["default"].createElement("div", { className: cx("".concat(ns, "Form-static"), className) }, body);
+            }
+            return original.apply(this, args);
+        };
+        return descriptor;
+    };
+}
+function renderStaticDateTypes(props) {
+    var render = props.render, type = props.type, inputFormat = props.inputFormat, timeFormat = props.timeFormat, format = props.format, value = props.value;
+    return render('static-input-date', {
+        type: 'date',
+        value: value,
+        format: type === 'time' && timeFormat ? timeFormat : inputFormat,
+        valueFormat: format
+    });
+}
+
+exports.supportStatic = supportStatic;

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

@@ -48,6 +48,12 @@ export default class SwitchControl extends React.Component<SwitchProps, any> {
         optionAtLeft: boolean;
     };
     handleChange(checked: string | number | boolean): Promise<void>;
+    getResult(): {
+        on: any;
+        off: any;
+    };
+    renderBody(children: any): JSX.Element;
+    renderStatic(): JSX.Element;
     render(): JSX.Element;
 }
 export declare class SwitchControlRenderer extends SwitchControl {

package/lib/renderers/Form/Switch.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.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 }; }
 
@@ -23,14 +24,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) {
@@ -42,18 +41,34 @@ var SwitchControl = /** @class */ (function (_super) {
             });
         });
     };
-    SwitchControl.prototype.render = function () {
-        var _a = this.props, size = _a.size, className = _a.className, ns = _a.classPrefix, cx = _a.classnames, value = _a.value, trueValue = _a.trueValue, falseValue = _a.falseValue, onText = _a.onText, offText = _a.offText, option = _a.option; _a.onChange; var disabled = _a.disabled, optionAtLeft = _a.optionAtLeft;
+    SwitchControl.prototype.getResult = function () {
+        var _a = this.props, cx = _a.classnames, onText = _a.onText, offText = _a.offText;
         var on = amisCore.isObject(onText)
             ? amisCore.generateIcon(cx, onText.icon, 'Switch-icon')
             : onText;
         var off = amisCore.isObject(offText)
             ? amisCore.generateIcon(cx, offText.icon, 'Switch-icon')
             : offText;
-        return (React__default["default"].createElement("div", { className: cx("SwitchControl", className) },
-            optionAtLeft ? (React__default["default"].createElement("span", { className: cx('Switch-option') }, option)) : null,
-            React__default["default"].createElement(amisUi.Switch, { classPrefix: ns, value: value, trueValue: trueValue, falseValue: falseValue, onText: on, offText: off, disabled: disabled, onChange: this.handleChange, size: size }),
-            optionAtLeft ? null : (React__default["default"].createElement("span", { className: cx('Switch-option') }, option))));
+        return { on: on, off: off };
+    };
+    SwitchControl.prototype.renderBody = function (children) {
+        var _a = this.props, cx = _a.classnames, option = _a.option, optionAtLeft = _a.optionAtLeft;
+        var Option = React__default["default"].createElement("span", { className: cx('Switch-option') }, option);
+        return (React__default["default"].createElement(React__default["default"].Fragment, null,
+            optionAtLeft ? Option : null,
+            children,
+            optionAtLeft ? null : Option));
+    };
+    SwitchControl.prototype.renderStatic = function () {
+        var _a = this.props, value = _a.value, trueValue = _a.trueValue;
+        var _b = this.getResult(), _c = _b.on, on = _c === void 0 ? '开' : _c, _d = _b.off, off = _d === void 0 ? '关' : _d;
+        var body = React__default["default"].createElement("span", null, value === trueValue ? on : off);
+        return this.renderBody(body);
+    };
+    SwitchControl.prototype.render = function () {
+        var _a = this.props, size = _a.size, className = _a.className, ns = _a.classPrefix, cx = _a.classnames, value = _a.value, trueValue = _a.trueValue, falseValue = _a.falseValue; _a.onChange; var disabled = _a.disabled;
+        var _b = this.getResult(), on = _b.on, off = _b.off;
+        return (React__default["default"].createElement("div", { className: cx("SwitchControl", className) }, this.renderBody(React__default["default"].createElement(amisUi.Switch, { classPrefix: ns, value: value, trueValue: trueValue, falseValue: falseValue, onText: on, offText: off, disabled: disabled, onChange: this.handleChange, size: size }))));
     };
     SwitchControl.defaultProps = {
         trueValue: true,
@@ -66,6 +81,12 @@ var SwitchControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
     ], SwitchControl.prototype, "handleChange", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], SwitchControl.prototype, "render", null);
     return SwitchControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {