amis 2.3.1 → 2.4.0

package/lib/renderers/Flex.js

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

package/lib/renderers/Form/ButtonGroupSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.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 }; }
 
@@ -102,6 +103,12 @@ var ButtonGroupControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
     ], ButtonGroupControl.prototype, "handleToggle", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], ButtonGroupControl.prototype, "render", null);
     return ButtonGroupControl;
 }(React__default["default"].Component));
 var ButtonGroupControlRenderer = /** @class */ (function (_super) {

package/lib/renderers/Form/ButtonToolbar.js

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

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

@@ -30,6 +30,7 @@ export default class ChainedSelectControl extends React.Component<ChainedSelectP
     loadMore(): void;
     handleChange(index: number, currentValue: any): Promise<void>;
     reload(): void;
+    renderStatic(displayValue?: string): JSX.Element;
     render(): JSX.Element;
 }
 export declare class ChainedSelectControlRenderer extends ChainedSelectControl {

package/lib/renderers/Form/ChainedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -12,11 +12,14 @@ var React = require('react');
 var cx = require('classnames');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
+var StaticHoc = require('./StaticHoc.js');
+var find = require('lodash/find');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
+var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 
 var ChainedSelectControl = /** @class */ (function (_super) {
     tslib.__extends(ChainedSelectControl, _super);
@@ -121,9 +124,7 @@ var ChainedSelectControl = /** @class */ (function (_super) {
                             arr.splice(idx + 1, value.length - idx - 1);
                             arr.push(remoteValue);
                             valueRes = this.array2value(arr, true);
-                            return [4 /*yield*/, dispatchEvent('change', amisCore.createObject(data, {
-                                    value: valueRes
-                                }))];
+                            return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: valueRes }, 'value'))];
                         case 1:
                             rendererEvent = _d.sent();
                             if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -152,11 +153,11 @@ var ChainedSelectControl = /** @class */ (function (_super) {
     };
     ChainedSelectControl.prototype.handleChange = function (index, currentValue) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, value, delimiter, onChange, joinValues, dispatchEvent, data, arr, valueRes, rendererEvent;
+            var _a, value, delimiter, onChange, joinValues, dispatchEvent, arr, valueRes, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, value = _a.value, delimiter = _a.delimiter, onChange = _a.onChange, joinValues = _a.joinValues, _a.extractValue, dispatchEvent = _a.dispatchEvent, data = _a.data;
+                        _a = this.props, value = _a.value, delimiter = _a.delimiter, onChange = _a.onChange, joinValues = _a.joinValues, _a.extractValue, dispatchEvent = _a.dispatchEvent, _a.data;
                         arr = Array.isArray(value)
                             ? value.concat()
                             : value && typeof value === 'string'
@@ -165,9 +166,7 @@ var ChainedSelectControl = /** @class */ (function (_super) {
                         arr.splice(index, arr.length - index);
                         arr.push(joinValues ? currentValue.value : currentValue);
                         valueRes = this.array2value(arr);
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.createObject(data, {
-                                value: valueRes
-                            }))];
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: valueRes }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -183,6 +182,36 @@ var ChainedSelectControl = /** @class */ (function (_super) {
         var reload = this.props.reloadOptions;
         reload && reload();
     };
+    ChainedSelectControl.prototype.renderStatic = function (displayValue) {
+        if (displayValue === void 0) { displayValue = '-'; }
+        var _a = this.props, _b = _a.options, options = _b === void 0 ? [] : _b, _c = _a.labelField, labelField = _c === void 0 ? 'label' : _c, _d = _a.valueField, valueField = _d === void 0 ? 'value' : _d, classPrefix = _a.classPrefix, cx = _a.classnames, className = _a.className, value = _a.value, delimiter = _a.delimiter;
+        var allOptions = tslib.__spreadArray([
+            { options: options, visible: true }
+        ], (this.state.stack || []), true);
+        var valueArr = Array.isArray(value)
+            ? value.concat()
+            : value && typeof value === 'string'
+                ? value.split(delimiter || ',')
+                : [];
+        if ((valueArr === null || valueArr === void 0 ? void 0 : valueArr.length) > 0) {
+            displayValue = valueArr
+                .map(function (value, index) {
+                var _a;
+                var _b = allOptions[index] || {}, options = _b.options, visible = _b.visible;
+                if (visible === false) {
+                    return null;
+                }
+                if (!options || !options.length) {
+                    return value;
+                }
+                var selectedOption = find__default["default"](options, function (o) { return value === o[valueField]; }) || {};
+                return (_a = selectedOption[labelField]) !== null && _a !== void 0 ? _a : value;
+            })
+                .filter(function (v) { return v != null; })
+                .join(' > ');
+        }
+        return React__default["default"].createElement("div", { className: cx("".concat(classPrefix, "SelectStaticControl"), className) }, displayValue);
+    };
     ChainedSelectControl.prototype.render = function () {
         var _this = this;
         var _a = this.props, options = _a.options, ns = _a.classPrefix, className = _a.className; _a.inline; var loading = _a.loading, value = _a.value, delimiter = _a.delimiter; _a.joinValues; _a.extractValue; _a.multiple; var useMobileUI = _a.useMobileUI, env = _a.env, rest = tslib.__rest(_a, ["options", "classPrefix", "className", "inline", "loading", "value", "delimiter", "joinValues", "extractValue", "multiple", "useMobileUI", "env"]);
@@ -208,6 +237,12 @@ var ChainedSelectControl = /** @class */ (function (_super) {
         searchable: false,
         multiple: true
     };
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], ChainedSelectControl.prototype, "render", null);
     return ChainedSelectControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

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

@@ -23,8 +23,9 @@ export default class ChartRadiosControl extends React.Component<ChartRadiosProps
     chart?: any;
     chartRef(chart?: any): void;
     highlight(index?: number): void;
-    compoonentDidMount(): void;
+    componentDidMount(): void;
     componentDidUpdate(): void;
+    renderStatic(displayValue?: string): JSX.Element;
     render(): JSX.Element;
 }
 export declare class RadiosControlRenderer extends ChartRadiosControl {

package/lib/renderers/Form/ChartRadios.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.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 }; }
 
@@ -35,6 +36,9 @@ var ChartRadiosControl = /** @class */ (function (_super) {
     };
     ChartRadiosControl.prototype.highlight = function (index) {
         if (index === void 0) { index = this.highlightIndex; }
+        if (this.props.static) {
+            return;
+        }
         this.highlightIndex = index;
         if (!this.chart || this.prevIndex === index) {
             return;
@@ -63,7 +67,8 @@ var ChartRadiosControl = /** @class */ (function (_super) {
         }
         this.prevIndex = index;
     };
-    ChartRadiosControl.prototype.compoonentDidMount = function () {
+    ChartRadiosControl.prototype.componentDidMount = function () {
+        // to do 初始化有值的情况暂时无法生效
         if (this.props.selectedOptions.length) {
             this.highlight(this.props.options.indexOf(this.props.selectedOptions[0]));
         }
@@ -73,6 +78,22 @@ var ChartRadiosControl = /** @class */ (function (_super) {
             this.highlight(this.props.options.indexOf(this.props.selectedOptions[0]));
         }
     };
+    ChartRadiosControl.prototype.renderStatic = function (displayValue) {
+        if (displayValue === void 0) { displayValue = '-'; }
+        this.prevIndex = -1;
+        this.highlightIndex = -1;
+        var _a = this.props, _b = _a.options, options = _b === void 0 ? [] : _b, selectedOptions = _a.selectedOptions, _c = _a.labelField, labelField = _c === void 0 ? 'label' : _c, _d = _a.valueField, valueField = _d === void 0 ? 'value' : _d, chartValueField = _a.chartValueField;
+        if (options.length && selectedOptions.length) {
+            var count = options.reduce(function (all, cur) {
+                return all + cur[chartValueField || valueField];
+            }, 0);
+            if (count > 0) {
+                var percent = (+selectedOptions[0][chartValueField || valueField] / count * 100).toFixed(2);
+                displayValue = "".concat(selectedOptions[0][labelField], "\uFF1A").concat(percent, "%");
+            }
+        }
+        return React__default["default"].createElement(React__default["default"].Fragment, null, displayValue);
+    };
     ChartRadiosControl.prototype.render = function () {
         var _a = this.props, options = _a.options, labelField = _a.labelField, chartValueField = _a.chartValueField, valueField = _a.valueField, render = _a.render;
         var config = tslib.__assign(tslib.__assign({ legend: {
@@ -107,6 +128,12 @@ var ChartRadiosControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
     ], ChartRadiosControl.prototype, "chartRef", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], ChartRadiosControl.prototype, "render", null);
     return ChartRadiosControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

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

@@ -41,6 +41,7 @@ export default class CheckboxControl extends React.Component<CheckboxProps, any>
     static defaultProps: Partial<CheckboxProps>;
     doAction(action: ActionObject, data: object, throwErrors: boolean): void;
     dispatchChangeEvent(eventData?: any): Promise<void>;
+    renderStatic(): JSX.Element;
     render(): JSX.Element;
 }
 export declare class CheckboxControlRenderer extends CheckboxControl {

package/lib/renderers/Form/Checkbox.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 amisCore = require('amis-core');
 var cx = require('classnames');
 var amisUi = require('amis-ui');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -36,14 +37,12 @@ var CheckboxControl = /** @class */ (function (_super) {
     CheckboxControl.prototype.dispatchChangeEvent = function (eventData) {
         if (eventData === void 0) { eventData = {}; }
         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: eventData
-                            }))];
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, onChange = _a.onChange;
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: eventData }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -55,6 +54,10 @@ var CheckboxControl = /** @class */ (function (_super) {
             });
         });
     };
+    CheckboxControl.prototype.renderStatic = function () {
+        var _a = this.props, value = _a.value, trueValue = _a.trueValue, falseValue = _a.falseValue, option = _a.option, render = _a.render, partial = _a.partial, optionType = _a.optionType, checked = _a.checked, labelClassName = _a.labelClassName;
+        return (React__default["default"].createElement(amisUi.Checkbox, { inline: true, value: value || '', trueValue: trueValue, falseValue: falseValue, disabled: true, partial: partial, optionType: optionType, checked: checked, labelClassName: labelClassName }, option ? render('option', option) : null));
+    };
     CheckboxControl.prototype.render = function () {
         var _this = this;
         var _a = this.props, className = _a.className, value = _a.value, trueValue = _a.trueValue, falseValue = _a.falseValue, option = _a.option; _a.onChange; var disabled = _a.disabled, render = _a.render, partial = _a.partial, optionType = _a.optionType, checked = _a.checked, labelClassName = _a.labelClassName, ns = _a.classPrefix;
@@ -71,6 +74,12 @@ var CheckboxControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
     ], CheckboxControl.prototype, "dispatchChangeEvent", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], CheckboxControl.prototype, "render", null);
     return CheckboxControl;
 }(React__default["default"].Component));
 // @ts-ignore

package/lib/renderers/Form/Checkboxes.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 inRange = require('lodash/inRange');
 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 }; }
 
@@ -243,6 +244,12 @@ var CheckboxesControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], CheckboxesControl.prototype, "updateBorderStyle", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], CheckboxesControl.prototype, "render", null);
     return CheckboxesControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

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

@@ -243,9 +243,10 @@ export default class ComboControl extends React.Component<ComboProps> {
     renderPlaceholder(): JSX.Element;
     renderTabsMode(): JSX.Element;
     renderDelBtn(value: any, index: number): JSX.Element | null;
-    renderAddBtn(): JSX.Element;
+    renderAddBtn(): JSX.Element | null;
     renderMultipe(): JSX.Element;
     renderSingle(): JSX.Element;
+    renderStatic(displayValue?: string): JSX.Element;
     render(): JSX.Element | null;
 }
 export declare class ComboControlRenderer extends ComboControl {

package/lib/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -153,18 +153,18 @@ var ComboControl = /** @class */ (function (_super) {
     };
     ComboControl.prototype.addItem = function () {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, flat, joinValues, addattop, delimiter, scaffold, disabled, submitOnChange, data, dispatchEvent, value, rendererEvent;
+            var _a, flat, joinValues, addattop, delimiter, scaffold, disabled, submitOnChange, dispatchEvent, value, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, flat = _a.flat, joinValues = _a.joinValues, addattop = _a.addattop, delimiter = _a.delimiter, scaffold = _a.scaffold, disabled = _a.disabled, submitOnChange = _a.submitOnChange, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, flat = _a.flat, joinValues = _a.joinValues, addattop = _a.addattop, delimiter = _a.delimiter, scaffold = _a.scaffold, disabled = _a.disabled, submitOnChange = _a.submitOnChange, dispatchEvent = _a.dispatchEvent;
                         if (disabled) {
                             return [2 /*return*/];
                         }
                         value = this.getValueAsArray();
-                        return [4 /*yield*/, dispatchEvent('add', amisCore.createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('add', amisCore.resolveEventData(this.props, {
                                 value: flat && joinValues ? value.join(delimiter || ',') : cloneDeep__default["default"](value)
-                            }))];
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -198,10 +198,13 @@ var ComboControl = /** @class */ (function (_super) {
                         }
                         value = this.getValueAsArray();
                         ctx = amisCore.createObject(data, value[key]);
-                        return [4 /*yield*/, dispatchEvent('delete', amisCore.createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('delete', amisCore.resolveEventData(this.props, {
                                 key: key,
-                                value: flat && joinValues ? value.join(delimiter || ',') : cloneDeep__default["default"](value)
-                            }))];
+                                value: flat && joinValues
+                                    ? value.join(delimiter || ',')
+                                    : cloneDeep__default["default"](value),
+                                item: value[key]
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -469,16 +472,20 @@ var ComboControl = /** @class */ (function (_super) {
     };
     ComboControl.prototype.handleTabSelect = function (key) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, store, data, dispatchEvent, rendererEvent;
-            return tslib.__generator(this, function (_b) {
-                switch (_b.label) {
+            var _a, store, data, name, value, dispatchEvent, eventData, rendererEvent;
+            var _b;
+            return tslib.__generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        _a = this.props, store = _a.store, data = _a.data, dispatchEvent = _a.dispatchEvent;
-                        return [4 /*yield*/, dispatchEvent('tabsChange', amisCore.createObject(data, {
-                                key: key
-                            }))];
+                        _a = this.props, store = _a.store, data = _a.data, name = _a.name, value = _a.value, dispatchEvent = _a.dispatchEvent;
+                        eventData = {
+                            key: key,
+                            item: value[key]
+                        };
+                        return [4 /*yield*/, dispatchEvent('tabsChange', amisCore.createObject(data, name
+                                ? tslib.__assign(tslib.__assign({}, eventData), (_b = {}, _b[name] = value, _b)) : eventData))];
                     case 1:
-                        rendererEvent = _b.sent();
+                        rendererEvent = _c.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
@@ -503,7 +510,7 @@ var ComboControl = /** @class */ (function (_super) {
     };
     ComboControl.prototype.renderTabsMode = function () {
         var _this = this;
-        var _a = this.props; _a.classPrefix; var cx = _a.classnames, tabsStyle = _a.tabsStyle, formClassName = _a.formClassName, render = _a.render, disabled = _a.disabled, store = _a.store, flat = _a.flat, subFormMode = _a.subFormMode; _a.addButtonText; _a.addable; var removable = _a.removable, typeSwitchable = _a.typeSwitchable, itemRemovableOn = _a.itemRemovableOn, delimiter = _a.delimiter, canAccessSuperData = _a.canAccessSuperData; _a.addIcon; var deleteIcon = _a.deleteIcon, tabsLabelTpl = _a.tabsLabelTpl, conditions = _a.conditions, changeImmediately = _a.changeImmediately, addBtnText = _a.addBtnText, __ = _a.translate;
+        var _a = this.props; _a.classPrefix; var cx = _a.classnames, tabsStyle = _a.tabsStyle, formClassName = _a.formClassName, render = _a.render, disabled = _a.disabled, store = _a.store, flat = _a.flat, subFormMode = _a.subFormMode; _a.addButtonText; _a.addable; var removable = _a.removable, typeSwitchable = _a.typeSwitchable, itemRemovableOn = _a.itemRemovableOn, delimiter = _a.delimiter, canAccessSuperData = _a.canAccessSuperData; _a.addIcon; var deleteIcon = _a.deleteIcon, tabsLabelTpl = _a.tabsLabelTpl, conditions = _a.conditions, changeImmediately = _a.changeImmediately, addBtnText = _a.addBtnText; _a.static; var __ = _a.translate;
         var items = this.props.items;
         var value = this.props.value;
         if (flat && typeof value === 'string') {
@@ -572,6 +579,9 @@ var ComboControl = /** @class */ (function (_super) {
     };
     ComboControl.prototype.renderDelBtn = function (value, index) {
         var _this = this;
+        if (this.props.static) {
+            return null;
+        }
         var _a = this.props; _a.classPrefix; var cx = _a.classnames, render = _a.render, store = _a.store, deleteIcon = _a.deleteIcon, __ = _a.translate, itemRemovableOn = _a.itemRemovableOn, disabled = _a.disabled, removable = _a.removable, deleteBtn = _a.deleteBtn;
         var finnalRemovable = store.removable !== false && // minLength ?
             !disabled && // 控件自身是否禁用
@@ -617,6 +627,9 @@ var ComboControl = /** @class */ (function (_super) {
     };
     ComboControl.prototype.renderAddBtn = function () {
         var _this = this;
+        if (this.props.static) {
+            return null;
+        }
         var _a = this.props; _a.classPrefix; var cx = _a.classnames, render = _a.render, addButtonClassName = _a.addButtonClassName, store = _a.store, addButtonText = _a.addButtonText, addBtn = _a.addBtn, addable = _a.addable, addIcon = _a.addIcon, conditions = _a.conditions, __ = _a.translate, tabsMode = _a.tabsMode;
         var hasConditions = Array.isArray(conditions) && conditions.length;
         return (React__default["default"].createElement(React__default["default"].Fragment, null, store.addable &&
@@ -647,13 +660,17 @@ var ComboControl = /** @class */ (function (_super) {
         if (this.props.tabsMode) {
             return this.renderTabsMode();
         }
-        var _a = this.props; _a.classPrefix; var cx = _a.classnames, formClassName = _a.formClassName, render = _a.render, multiLine = _a.multiLine; _a.addButtonClassName; var disabled = _a.disabled; _a.store; var flat = _a.flat, subFormMode = _a.subFormMode, draggable = _a.draggable, draggableTip = _a.draggableTip; _a.addButtonText; _a.addable; _a.removable; var typeSwitchable = _a.typeSwitchable, delimiter = _a.delimiter, canAccessSuperData = _a.canAccessSuperData; _a.addIcon; var dragIcon = _a.dragIcon, noBorder = _a.noBorder, conditions = _a.conditions, lazyLoad = _a.lazyLoad, changeImmediately = _a.changeImmediately, placeholder = _a.placeholder, __ = _a.translate, itemClassName = _a.itemClassName, itemsWrapperClassName = _a.itemsWrapperClassName;
+        var _a = this.props; _a.classPrefix; var cx = _a.classnames, formClassName = _a.formClassName, render = _a.render, multiLine = _a.multiLine; _a.addButtonClassName; var disabled = _a.disabled; _a.store; var flat = _a.flat, subFormMode = _a.subFormMode, draggable = _a.draggable, draggableTip = _a.draggableTip; _a.addButtonText; _a.addable; _a.removable; var typeSwitchable = _a.typeSwitchable, delimiter = _a.delimiter, canAccessSuperData = _a.canAccessSuperData; _a.addIcon; var dragIcon = _a.dragIcon, noBorder = _a.noBorder, conditions = _a.conditions, lazyLoad = _a.lazyLoad, changeImmediately = _a.changeImmediately, placeholder = _a.placeholder, __ = _a.translate, itemClassName = _a.itemClassName, itemsWrapperClassName = _a.itemsWrapperClassName, isStatic = _a.static;
         var items = this.props.items;
         var value = this.props.value;
         if (flat && typeof value === 'string') {
             value = value.split(delimiter || ',');
         }
-        return (React__default["default"].createElement("div", { className: cx("Combo Combo--multi", multiLine ? "Combo--ver" : "Combo--hor", noBorder ? "Combo--noBorder" : '', disabled ? 'is-disabled' : '', !disabled && draggable && Array.isArray(value) && value.length > 1
+        return (React__default["default"].createElement("div", { className: cx("Combo Combo--multi", multiLine ? "Combo--ver" : "Combo--hor", noBorder ? "Combo--noBorder" : '', disabled ? 'is-disabled' : '', !isStatic &&
+                !disabled &&
+                draggable &&
+                Array.isArray(value) &&
+                value.length > 1
                 ? 'is-draggable'
                 : '') },
             React__default["default"].createElement("div", { className: cx("Combo-items", itemsWrapperClassName) }, Array.isArray(value) && value.length ? (value.map(function (value, index, thelist) {
@@ -670,7 +687,7 @@ var ComboControl = /** @class */ (function (_super) {
                     ]
                     : items;
                 return (React__default["default"].createElement("div", { className: cx("Combo-item", itemClassName), key: _this.keys[index] || (_this.keys[index] = amisCore.guid()) },
-                    !disabled && draggable && thelist.length > 1 ? (React__default["default"].createElement("div", { className: cx('Combo-itemDrager') },
+                    !isStatic && !disabled && draggable && thelist.length > 1 ? (React__default["default"].createElement("div", { className: cx('Combo-itemDrager') },
                         React__default["default"].createElement("a", { key: "drag", "data-tooltip": __('Combo.dragDropSort'), "data-position": "bottom" }, dragIcon ? (React__default["default"].createElement("i", { className: dragIcon })) : (React__default["default"].createElement(amisUi.Icon, { icon: "drag-bar", className: "icon" }))))) : null,
                     condition && typeSwitchable !== false ? (React__default["default"].createElement("div", { className: cx('Combo-itemTag') },
                         React__default["default"].createElement("label", null, __('Combo.type')),
@@ -703,7 +720,7 @@ var ComboControl = /** @class */ (function (_super) {
                     })) : (React__default["default"].createElement(amisUi.Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData')))),
                     delBtn));
             })) : placeholder ? (React__default["default"].createElement("div", { className: cx("Combo-placeholder") }, __(placeholder))) : null),
-            !disabled ? (React__default["default"].createElement("div", { className: cx("Combo-toolbar") },
+            !isStatic && !disabled ? (React__default["default"].createElement("div", { className: cx("Combo-toolbar") },
                 this.renderAddBtn(),
                 draggable ? (React__default["default"].createElement("span", { className: cx("Combo-dragableTip"), ref: this.dragTipRef }, Array.isArray(value) && value.length > 1
                     ? __(draggableTip)
@@ -744,8 +761,21 @@ var ComboControl = /** @class */ (function (_super) {
                 })) : (React__default["default"].createElement(amisUi.Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))),
             value && nullable ? (React__default["default"].createElement("a", { className: cx('Combo-setNullBtn'), href: "#", onClick: this.setNull }, __('clear'))) : null));
     };
+    ComboControl.prototype.renderStatic = function (displayValue) {
+        // 如有 staticSchema 会被拦截渲染schema, 不会走到这里
+        return this.props.render('static-input-kv', {
+            type: 'json'
+        }, this.props);
+    };
     ComboControl.prototype.render = function () {
-        var _a = this.props, formInited = _a.formInited, multiple = _a.multiple, className = _a.className; _a.classPrefix; var cx = _a.classnames; _a.disabled;
+        var _a = this.props, type = _a.type, formInited = _a.formInited, multiple = _a.multiple, className = _a.className; _a.classPrefix; var cx = _a.classnames, isStatic = _a.static, staticSchema = _a.staticSchema;
+        // 静态展示时
+        // 当有staticSchema 或 type = input-kv | input-kvs
+        // 才拦截处理，其他情况交给子表单项处理即可
+        if (isStatic &&
+            (staticSchema || ['input-kv', 'input-kvs'].includes(type))) {
+            return this.renderStatic();
+        }
         return formInited || typeof formInited === 'undefined' ? (React__default["default"].createElement("div", { className: cx("ComboControl", className) }, multiple ? this.renderMultipe() : this.renderSingle())) : null;
     };
     ComboControl.defaultProps = {

package/lib/renderers/Form/ConditionBuilder.js

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

package/lib/renderers/Form/Control.js

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

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

@@ -43,12 +43,12 @@ export declare class DiffEditor extends React.Component<DiffEditorProps, any> {
     componentWillUnmount(): void;
     doAction(action: ListenerAction, args: any): void;
     focus(): void;
-    handleFocus(): void;
-    handleBlur(): void;
+    handleFocus(e: any): Promise<void>;
+    handleBlur(e: any): Promise<void>;
     componentDidUpdate(prevProps: any): void;
     editorFactory(containerElement: any, monaco: any, options: any): any;
     handleEditorMounted(editor: any, monaco: any): void;
-    handleModifiedEditorChange(): void;
+    handleModifiedEditorChange(): Promise<void>;
     prevHeight: number;
     updateContainerSize(editor: any, monaco: any): void;
     render(): JSX.Element;
@@ -109,9 +109,6 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
             parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
             childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
         } & {
-            /**
-             * 左侧面板的值， 支持取变量。
-             */
             hasRemoteData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ISimpleType<boolean>, [undefined]>;
             data: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
             initedAt: import("mobx-state-tree").IType<number | undefined, number, number>;
@@ -3831,12 +3828,12 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "default" | "inline" | "row" | "normal" | undefined;
+        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
-        defaultSize?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
-        size?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
+        defaultSize?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
+        size?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         labelWidth?: string | number | undefined;
         disabled?: boolean | undefined;
@@ -3872,27 +3869,33 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         error?: string | undefined;
         showErrorMsg?: boolean | undefined;
-        placeholder?: string | undefined;
+        remark?: import("../Remark").SchemaRemark | undefined;
+        hidden?: boolean | undefined;
+        static?: boolean | undefined;
+        label?: string | false | undefined;
         $ref?: string | undefined;
         disabledOn?: string | undefined;
-        hidden?: boolean | undefined;
         hiddenOn?: string | undefined;
         visible?: boolean | undefined;
         visibleOn?: string | undefined;
         id?: string | undefined;
-        label?: string | false | undefined;
-        remark?: import("../Remark").SchemaRemark | undefined;
+        staticOn?: string | undefined;
+        staticPlaceholder?: string | undefined;
+        staticClassName?: import("amis-core").SchemaClassName | undefined;
+        staticLabelClassName?: import("amis-core").SchemaClassName | undefined;
+        staticInputClassName?: import("amis-core").SchemaClassName | undefined;
+        staticSchema?: any;
         desc?: string | undefined;
-        mode?: "horizontal" | "inline" | "normal" | undefined;
-        horizontal?: import("amis-core").FormHorizontal | undefined;
-        labelClassName?: string | undefined;
-        inline?: boolean | undefined;
-        readOnly?: boolean | undefined;
+        placeholder?: string | undefined;
         labelRemark?: import("../Remark").SchemaRemark | undefined;
-        options?: any;
+        labelClassName?: string | undefined;
         submitOnChange?: boolean | undefined;
+        readOnly?: boolean | undefined;
         readOnlyOn?: string | undefined;
         validateOnChange?: boolean | undefined;
+        mode?: "horizontal" | "inline" | "normal" | undefined;
+        horizontal?: import("amis-core").FormHorizontal | undefined;
+        inline?: boolean | undefined;
         required?: boolean | undefined;
         validationErrors?: {
             [propName: string]: any;
@@ -3965,7 +3968,8 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         clearValueOnHidden?: boolean | undefined;
         validateApi?: string | import("amis-core").BaseApiObject | undefined;
-        diffValue?: string | undefined;
+        options?: any;
         language?: string | undefined;
+        diffValue?: string | undefined;
     };
 }