amis 2.3.2-beta.1 → 2.4.1-beta.0

package/lib/renderers/Form/ChainedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.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);
@@ -179,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"]);
@@ -204,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.2-beta.1
+ * amis v2.4.1-beta.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.2-beta.1
+ * amis v2.4.1-beta.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 }; }
 
@@ -53,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;
@@ -69,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.2-beta.1
+ * amis v2.4.1-beta.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,11 @@ 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;
+    renderItems(finnalControls: ComboSubControl[], data: object, index?: number): 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.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -134,13 +134,14 @@ var ComboControl = /** @class */ (function (_super) {
         return value;
     };
     ComboControl.prototype.addItemWith = function (condition) {
-        var _a = this.props, flat = _a.flat, joinValues = _a.joinValues, addattop = _a.addattop, delimiter = _a.delimiter, scaffold = _a.scaffold, disabled = _a.disabled, submitOnChange = _a.submitOnChange;
+        var _a, _b;
+        var _c = this.props, flat = _c.flat, joinValues = _c.joinValues, addattop = _c.addattop, delimiter = _c.delimiter, scaffold = _c.scaffold, disabled = _c.disabled, submitOnChange = _c.submitOnChange;
         if (disabled) {
             return;
         }
         var value = this.getValueAsArray();
         value.push(flat
-            ? condition.scaffold || scaffold || ''
+            ? (_b = (_a = condition.scaffold) !== null && _a !== void 0 ? _a : scaffold) !== null && _b !== void 0 ? _b : ''
             : tslib.__assign({}, (condition.scaffold || scaffold)));
         this.keys.push(amisCore.guid());
         if (flat && joinValues) {
@@ -171,7 +172,7 @@ var ComboControl = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         value.push(flat
-                            ? scaffold || ''
+                            ? scaffold !== null && scaffold !== void 0 ? scaffold : ''
                             : tslib.__assign({}, scaffold));
                         this.keys.push(amisCore.guid());
                         if (flat && joinValues) {
@@ -510,7 +511,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; _a.formClassName; _a.render; var disabled = _a.disabled, store = _a.store, flat = _a.flat; _a.subFormMode; _a.addButtonText; _a.addable; var removable = _a.removable, typeSwitchable = _a.typeSwitchable, itemRemovableOn = _a.itemRemovableOn, delimiter = _a.delimiter; _a.canAccessSuperData; _a.addIcon; var deleteIcon = _a.deleteIcon, tabsLabelTpl = _a.tabsLabelTpl, conditions = _a.conditions; _a.changeImmediately; var addBtnText = _a.addBtnText; _a.static; var __ = _a.translate;
         var items = this.props.items;
         var value = this.props.value;
         if (flat && typeof value === 'string') {
@@ -553,32 +554,14 @@ var ComboControl = /** @class */ (function (_super) {
                             label: item.label,
                             value: item.label
                         }); }), value: condition.label, clearable: false }))) : null,
-                React__default["default"].createElement("div", { className: cx("Combo-itemInner") }, finnalControls ? (render("multiple/".concat(index), {
-                    type: 'form',
-                    body: finnalControls,
-                    wrapperComponent: 'div',
-                    wrapWithPanel: false,
-                    mode: subFormMode,
-                    className: cx("Combo-form", formClassName)
-                }, {
-                    index: index,
-                    disabled: disabled,
-                    data: data,
-                    onChange: _this.handleChange,
-                    onInit: _this.handleFormInit,
-                    onAction: _this.handleAction,
-                    ref: _this.makeFormRef(index),
-                    canAccessSuperData: canAccessSuperData,
-                    lazyChange: changeImmediately ? false : true,
-                    formLazyChange: false,
-                    value: undefined,
-                    formItemValue: undefined,
-                    formStore: undefined
-                })) : (React__default["default"].createElement(amisUi.Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))));
+                React__default["default"].createElement("div", { className: cx("Combo-itemInner") }, finnalControls ? (_this.renderItems(finnalControls, data, index)) : (React__default["default"].createElement(amisUi.Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))));
         })));
     };
     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 && // 控件自身是否禁用
@@ -624,6 +607,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 &&
@@ -631,7 +617,7 @@ var ComboControl = /** @class */ (function (_super) {
             (hasConditions ? (render('add-button', {
                 type: 'dropdown-button',
                 icon: addIcon ? React__default["default"].createElement(amisUi.Icon, { icon: "plus", className: "icon" }) : '',
-                label: __(addButtonText || 'Combo.add'),
+                label: __(addButtonText || 'add'),
                 level: 'info',
                 size: 'sm',
                 closeOnClick: true
@@ -645,22 +631,26 @@ var ComboControl = /** @class */ (function (_super) {
                 }); })
             })) : tabsMode ? (React__default["default"].createElement("a", { onClick: this.addItem },
                 addIcon ? React__default["default"].createElement(amisUi.Icon, { icon: "plus", className: "icon" }) : null,
-                React__default["default"].createElement("span", null, __(addButtonText || 'Combo.add')))) : amisCore.isObject(addBtn) ? (render('add-button', tslib.__assign(tslib.__assign({}, addBtn), { type: 'button', onClick: function () { return _this.addItem(); } }))) : (React__default["default"].createElement(amisUi.Button, { className: cx("Combo-addBtn", addButtonClassName), onClick: this.addItem },
+                React__default["default"].createElement("span", null, __(addButtonText || 'add')))) : amisCore.isObject(addBtn) ? (render('add-button', tslib.__assign(tslib.__assign({}, addBtn), { type: 'button', onClick: function () { return _this.addItem(); } }))) : (React__default["default"].createElement(amisUi.Button, { className: cx("Combo-addBtn", addButtonClassName), onClick: this.addItem },
                 addIcon ? React__default["default"].createElement(amisUi.Icon, { icon: "plus", className: "icon" }) : null,
-                React__default["default"].createElement("span", null, __(addButtonText || 'Combo.add')))))));
+                React__default["default"].createElement("span", null, __(addButtonText || 'add')))))));
     };
     ComboControl.prototype.renderMultipe = function () {
         var _this = this;
         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, multiLine = _a.multiLine, disabled = _a.disabled, flat = _a.flat, draggable = _a.draggable, draggableTip = _a.draggableTip, typeSwitchable = _a.typeSwitchable, delimiter = _a.delimiter, dragIcon = _a.dragIcon, noBorder = _a.noBorder, conditions = _a.conditions, 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) {
@@ -677,7 +667,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')),
@@ -685,39 +675,17 @@ var ComboControl = /** @class */ (function (_super) {
                                 label: item.label,
                                 value: item.label
                             }); }), value: condition.label, clearable: false }))) : null,
-                    React__default["default"].createElement("div", { className: cx("Combo-itemInner") }, finnalControls ? (render("multiple/".concat(index), {
-                        type: 'form',
-                        body: finnalControls,
-                        wrapperComponent: 'div',
-                        wrapWithPanel: false,
-                        mode: multiLine ? subFormMode : 'row',
-                        className: cx("Combo-form", formClassName)
-                    }, {
-                        index: index,
-                        disabled: disabled,
-                        data: data,
-                        onChange: _this.handleChange,
-                        onInit: _this.handleFormInit,
-                        onAction: _this.handleAction,
-                        ref: _this.makeFormRef(index),
-                        lazyChange: changeImmediately ? false : true,
-                        formLazyChange: false,
-                        lazyLoad: lazyLoad,
-                        canAccessSuperData: canAccessSuperData,
-                        value: undefined,
-                        formItemValue: undefined,
-                        formStore: undefined
-                    })) : (React__default["default"].createElement(amisUi.Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData')))),
+                    React__default["default"].createElement("div", { className: cx("Combo-itemInner") }, finnalControls ? (_this.renderItems(finnalControls, data, index)) : (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)
                     : '')) : null)) : null));
     };
     ComboControl.prototype.renderSingle = function () {
-        var _a = this.props, conditions = _a.conditions, cx = _a.classnames, render = _a.render, value = _a.value, multiLine = _a.multiLine, formClassName = _a.formClassName, canAccessSuperData = _a.canAccessSuperData, noBorder = _a.noBorder, disabled = _a.disabled, typeSwitchable = _a.typeSwitchable, nullable = _a.nullable, __ = _a.translate, itemClassName = _a.itemClassName;
+        var _a = this.props, conditions = _a.conditions, cx = _a.classnames, value = _a.value, multiLine = _a.multiLine, noBorder = _a.noBorder, disabled = _a.disabled, typeSwitchable = _a.typeSwitchable, nullable = _a.nullable, __ = _a.translate, itemClassName = _a.itemClassName;
         var items = this.props.items;
         var data = amisCore.isObject(value) ? this.formatValue(value) : this.defaultValue;
         var condition = null;
@@ -733,26 +701,58 @@ var ComboControl = /** @class */ (function (_super) {
                             label: item.label,
                             value: item.label
                         }); }), value: condition.label, clearable: false }))) : null,
-                React__default["default"].createElement("div", { className: cx("Combo-itemInner") }, items ? (render('single', {
-                    type: 'form',
-                    body: items,
-                    wrapperComponent: 'div',
-                    wrapWithPanel: false,
-                    mode: multiLine ? 'normal' : 'row',
-                    className: cx("Combo-form", formClassName)
-                }, {
-                    disabled: disabled,
-                    data: data,
-                    onChange: this.handleSingleFormChange,
-                    ref: this.makeFormRef(0),
-                    onInit: this.handleSingleFormInit,
-                    canAccessSuperData: canAccessSuperData,
-                    formStore: undefined
-                })) : (React__default["default"].createElement(amisUi.Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))),
+                React__default["default"].createElement("div", { className: cx("Combo-itemInner") }, items ? (this.renderItems(items, data)) : (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));
     };
+    // 为了给 editor 重写使用
+    ComboControl.prototype.renderItems = function (finnalControls, data, index) {
+        var _a = this.props, cx = _a.classnames, formClassName = _a.formClassName, render = _a.render, multiLine = _a.multiLine, disabled = _a.disabled, canAccessSuperData = _a.canAccessSuperData, multiple = _a.multiple, tabsMode = _a.tabsMode, subFormMode = _a.subFormMode, changeImmediately = _a.changeImmediately, lazyLoad = _a.lazyLoad; _a.translate;
+        // 单个
+        if (!multiple) {
+            return render('single', {
+                type: 'form',
+                body: finnalControls,
+                wrapperComponent: 'div',
+                wrapWithPanel: false,
+                mode: multiLine ? 'normal' : 'row',
+                className: cx("Combo-form", formClassName)
+            }, {
+                disabled: disabled,
+                data: data,
+                onChange: this.handleSingleFormChange,
+                ref: this.makeFormRef(0),
+                onInit: this.handleSingleFormInit,
+                canAccessSuperData: canAccessSuperData,
+                formStore: undefined
+            });
+        }
+        else if (multiple && index !== undefined && index >= 0) {
+            return render("multiple/".concat(index), {
+                type: 'form',
+                body: finnalControls,
+                wrapperComponent: 'div',
+                wrapWithPanel: false,
+                mode: tabsMode ? subFormMode : multiLine ? subFormMode : 'row',
+                className: cx("Combo-form", formClassName)
+            }, tslib.__assign({ index: index, disabled: disabled, data: data, onChange: this.handleChange, onInit: this.handleFormInit, onAction: this.handleAction, ref: this.makeFormRef(index), canAccessSuperData: canAccessSuperData, lazyChange: changeImmediately ? false : true, formLazyChange: false, value: undefined, formItemValue: undefined, formStore: undefined }, (tabsMode ? {} : { lazyLoad: lazyLoad })));
+        }
+        return React__default["default"].createElement(React__default["default"].Fragment, 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.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Control.js

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

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

@@ -1,4 +1,3 @@
-/// <reference types="lodash" />
 import React from 'react';
 import { FormControlProps } from 'amis-core';
 import { FormBaseControlSchema, SchemaTokenizeableString } from '../../Schema';
@@ -3828,7 +3827,7 @@ 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" | "default" | "inline" | "normal" | "row" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
@@ -3877,6 +3876,13 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         visible?: boolean | undefined;
         visibleOn?: string | undefined;
         id?: string | undefined;
+        static?: boolean | 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;
         label?: string | false | undefined;
         remark?: import("../Remark").SchemaRemark | undefined;
         desc?: string | undefined;
@@ -3962,7 +3968,7 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         clearValueOnHidden?: boolean | undefined;
         validateApi?: string | import("amis-core").BaseApiObject | undefined;
-        diffValue?: string | undefined;
         language?: string | undefined;
+        diffValue?: string | undefined;
     };
 }

package/lib/renderers/Form/DiffEditor.js

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

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

@@ -1601,7 +1601,9 @@ export declare class EditorControlRenderer extends EditorControl {
         } & {
             msg: import("mobx-state-tree").IType<string | undefined, string, string>;
             error: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
-            fetching: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+            fetching: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>; /**
+             * 是否展示全屏模式开关
+             */
             saving: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
             busying: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
             checking: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
@@ -3827,7 +3829,7 @@ export declare class EditorControlRenderer extends EditorControl {
             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" | "default" | "inline" | "normal" | "row" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;

package/lib/renderers/Form/Editor.js

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

package/lib/renderers/Form/FieldSet.js

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

package/lib/renderers/Form/Formula.js

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

package/lib/renderers/Form/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -66,9 +66,10 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
                 return null;
             }
             var controlMode = (control === null || control === void 0 ? void 0 : control.mode) || formMode;
-            if (controlMode === 'inline'
+            if (controlMode === 'inline' ||
                 // hidden 直接渲染，否则会有个空 Form-groupColumn 层
-                || (control === null || control === void 0 ? void 0 : control.type) && ['formula', 'hidden'].includes(control.type)) {
+                ((control === null || control === void 0 ? void 0 : control.type) &&
+                    ['formula', 'hidden'].includes(control.type))) {
                 return _this.renderControl(control, index, {
                     key: index,
                     className: cx(control.className, control.columnClassName)