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

package/esm/renderers/Drawer.js

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

package/esm/renderers/DropDownButton.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -115,7 +115,7 @@ var DropDownButton = /** @class */ (function (_super) {
         return body;
     };
     DropDownButton.prototype.render = function () {
-        var _a = this.props, tooltip = _a.tooltip, placement = _a.placement, tooltipContainer = _a.tooltipContainer, tooltipTrigger = _a.tooltipTrigger, tooltipRootClose = _a.tooltipRootClose, disabledTip = _a.disabledTip, block = _a.block, disabled = _a.disabled, btnDisabled = _a.btnDisabled, btnClassName = _a.btnClassName, size = _a.size, label = _a.label, level = _a.level, primary = _a.primary, className = _a.className, cx = _a.classnames, align = _a.align, iconOnly = _a.iconOnly, icon = _a.icon, rightIcon = _a.rightIcon, isActived = _a.isActived, trigger = _a.trigger, data = _a.data, hideCaret = _a.hideCaret;
+        var _a = this.props, tooltip = _a.tooltip, placement = _a.placement, tooltipContainer = _a.tooltipContainer, tooltipTrigger = _a.tooltipTrigger, tooltipRootClose = _a.tooltipRootClose, disabledTip = _a.disabledTip, block = _a.block, disabled = _a.disabled, btnDisabled = _a.btnDisabled, btnClassName = _a.btnClassName, _b = _a.size, size = _b === void 0 ? 'default' : _b, label = _a.label, level = _a.level, primary = _a.primary, className = _a.className, cx = _a.classnames, align = _a.align, iconOnly = _a.iconOnly, icon = _a.icon, rightIcon = _a.rightIcon, isActived = _a.isActived, trigger = _a.trigger, data = _a.data, hideCaret = _a.hideCaret;
         return (React.createElement("div", { className: cx('DropDown ', {
                 'DropDown--block': block,
                 'DropDown--alignRight': align === 'right',
@@ -131,7 +131,7 @@ var DropDownButton = /** @class */ (function (_super) {
                         'Button--block': block,
                         'Button--primary': primary,
                         'Button--iconOnly': iconOnly
-                    }, size ? "Button--".concat(size) : '') },
+                    }, "Button--size-".concat(size)) },
                     hasIcon(icon) ? (React.createElement(Icon, { icon: icon, className: "icon" })) : (generateIcon(cx, icon, 'm-r-xs')),
                     typeof label === 'string' ? filter(label, data) : label,
                     rightIcon && hasIcon(rightIcon) ? (React.createElement(Icon, { icon: icon, className: "icon" })) : (generateIcon(cx, rightIcon, 'm-l-xs')),

package/esm/renderers/Each.js

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

package/esm/renderers/Flex.js

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

package/esm/renderers/Form/ButtonGroupSelect.js

@@ -1,11 +1,12 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import { getLevelFromClassName, autobind, OptionsControl } from 'amis-core';
+import { supportStatic } from './StaticHoc.js';
 
 var ButtonGroupControl = /** @class */ (function (_super) {
     __extends(ButtonGroupControl, _super);
@@ -94,6 +95,12 @@ var ButtonGroupControl = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", void 0)
     ], ButtonGroupControl.prototype, "handleToggle", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], ButtonGroupControl.prototype, "render", null);
     return ButtonGroupControl;
 }(React.Component));
 var ButtonGroupControlRenderer = /** @class */ (function (_super) {

package/esm/renderers/Form/ButtonToolbar.js

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

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

@@ -1,13 +1,15 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
-import { __extends, __assign, __awaiter, __generator, __rest, __decorate } from 'tslib';
+import { __extends, __assign, __awaiter, __generator, __spreadArray, __rest, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import cx from 'classnames';
 import { isEffectiveApi, resolveEventData, isMobile, OptionsControl } from 'amis-core';
 import { Select } from 'amis-ui';
+import { supportStatic } from './StaticHoc.js';
+import find from 'lodash/find';
 
 var ChainedSelectControl = /** @class */ (function (_super) {
     __extends(ChainedSelectControl, _super);
@@ -170,6 +172,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 = __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(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.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 = __rest(_a, ["options", "classPrefix", "className", "inline", "loading", "value", "delimiter", "joinValues", "extractValue", "multiple", "useMobileUI", "env"]);
@@ -195,6 +227,12 @@ var ChainedSelectControl = /** @class */ (function (_super) {
         searchable: false,
         multiple: true
     };
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], ChainedSelectControl.prototype, "render", null);
     return ChainedSelectControl;
 }(React.Component));
 /** @class */ ((function (_super) {

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

@@ -1,11 +1,12 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import { autobind, OptionsControl } from 'amis-core';
+import { supportStatic } from './StaticHoc.js';
 
 var ChartRadiosControl = /** @class */ (function (_super) {
     __extends(ChartRadiosControl, _super);
@@ -27,6 +28,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;
@@ -55,7 +59,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]));
         }
@@ -65,6 +70,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.createElement(React.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 = __assign(__assign({ legend: {
@@ -99,6 +120,12 @@ var ChartRadiosControl = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", void 0)
     ], ChartRadiosControl.prototype, "chartRef", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], ChartRadiosControl.prototype, "render", null);
     return ChartRadiosControl;
 }(React.Component));
 /** @class */ ((function (_super) {

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

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -8,6 +8,7 @@ import React from 'react';
 import { resolveEventData, autobind, FormItem } from 'amis-core';
 import cx from 'classnames';
 import { Checkbox, withBadge } from 'amis-ui';
+import { supportStatic } from './StaticHoc.js';
 
 var CheckboxControl = /** @class */ (function (_super) {
     __extends(CheckboxControl, _super);
@@ -44,6 +45,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.createElement(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;
@@ -60,6 +65,12 @@ var CheckboxControl = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", Promise)
     ], CheckboxControl.prototype, "dispatchChangeEvent", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], CheckboxControl.prototype, "render", null);
     return CheckboxControl;
 }(React.Component));
 // @ts-ignore

package/esm/renderers/Form/Checkboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -8,6 +8,7 @@ import React from 'react';
 import inRange from 'lodash/inRange';
 import { createObject, hasAbility, columnsSplit, flattenTreeWithLeafNodes, autobind, OptionsControl } from 'amis-core';
 import { Checkbox, Icon } from 'amis-ui';
+import { supportStatic } from './StaticHoc.js';
 
 var CheckboxesControl = /** @class */ (function (_super) {
     __extends(CheckboxesControl, _super);
@@ -234,6 +235,12 @@ var CheckboxesControl = /** @class */ (function (_super) {
         __metadata("design:paramtypes", []),
         __metadata("design:returntype", void 0)
     ], CheckboxesControl.prototype, "updateBorderStyle", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], CheckboxesControl.prototype, "render", null);
     return CheckboxesControl;
 }(React.Component));
 /** @class */ ((function (_super) {

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

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -122,13 +122,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 : ''
             : __assign({}, (condition.scaffold || scaffold)));
         this.keys.push(guid());
         if (flat && joinValues) {
@@ -159,7 +160,7 @@ var ComboControl = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         value.push(flat
-                            ? scaffold || ''
+                            ? scaffold !== null && scaffold !== void 0 ? scaffold : ''
                             : __assign({}, scaffold));
                         this.keys.push(guid());
                         if (flat && joinValues) {
@@ -498,7 +499,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') {
@@ -541,32 +542,14 @@ var ComboControl = /** @class */ (function (_super) {
                             label: item.label,
                             value: item.label
                         }); }), value: condition.label, clearable: false }))) : null,
-                React.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.createElement(Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))));
+                React.createElement("div", { className: cx("Combo-itemInner") }, finnalControls ? (_this.renderItems(finnalControls, data, index)) : (React.createElement(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 && // 控件自身是否禁用
@@ -612,6 +595,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.createElement(React.Fragment, null, store.addable &&
@@ -619,7 +605,7 @@ var ComboControl = /** @class */ (function (_super) {
             (hasConditions ? (render('add-button', {
                 type: 'dropdown-button',
                 icon: addIcon ? React.createElement(Icon, { icon: "plus", className: "icon" }) : '',
-                label: __(addButtonText || 'Combo.add'),
+                label: __(addButtonText || 'add'),
                 level: 'info',
                 size: 'sm',
                 closeOnClick: true
@@ -633,22 +619,26 @@ var ComboControl = /** @class */ (function (_super) {
                 }); })
             })) : tabsMode ? (React.createElement("a", { onClick: this.addItem },
                 addIcon ? React.createElement(Icon, { icon: "plus", className: "icon" }) : null,
-                React.createElement("span", null, __(addButtonText || 'Combo.add')))) : isObject(addBtn) ? (render('add-button', __assign(__assign({}, addBtn), { type: 'button', onClick: function () { return _this.addItem(); } }))) : (React.createElement(Button, { className: cx("Combo-addBtn", addButtonClassName), onClick: this.addItem },
+                React.createElement("span", null, __(addButtonText || 'add')))) : isObject(addBtn) ? (render('add-button', __assign(__assign({}, addBtn), { type: 'button', onClick: function () { return _this.addItem(); } }))) : (React.createElement(Button, { className: cx("Combo-addBtn", addButtonClassName), onClick: this.addItem },
                 addIcon ? React.createElement(Icon, { icon: "plus", className: "icon" }) : null,
-                React.createElement("span", null, __(addButtonText || 'Combo.add')))))));
+                React.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.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.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.createElement("div", { className: cx("Combo-items", itemsWrapperClassName) }, Array.isArray(value) && value.length ? (value.map(function (value, index, thelist) {
@@ -665,7 +655,7 @@ var ComboControl = /** @class */ (function (_super) {
                     ]
                     : items;
                 return (React.createElement("div", { className: cx("Combo-item", itemClassName), key: _this.keys[index] || (_this.keys[index] = guid()) },
-                    !disabled && draggable && thelist.length > 1 ? (React.createElement("div", { className: cx('Combo-itemDrager') },
+                    !isStatic && !disabled && draggable && thelist.length > 1 ? (React.createElement("div", { className: cx('Combo-itemDrager') },
                         React.createElement("a", { key: "drag", "data-tooltip": __('Combo.dragDropSort'), "data-position": "bottom" }, dragIcon ? (React.createElement("i", { className: dragIcon })) : (React.createElement(Icon, { icon: "drag-bar", className: "icon" }))))) : null,
                     condition && typeSwitchable !== false ? (React.createElement("div", { className: cx('Combo-itemTag') },
                         React.createElement("label", null, __('Combo.type')),
@@ -673,39 +663,17 @@ var ComboControl = /** @class */ (function (_super) {
                                 label: item.label,
                                 value: item.label
                             }); }), value: condition.label, clearable: false }))) : null,
-                    React.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.createElement(Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData')))),
+                    React.createElement("div", { className: cx("Combo-itemInner") }, finnalControls ? (_this.renderItems(finnalControls, data, index)) : (React.createElement(Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData')))),
                     delBtn));
             })) : placeholder ? (React.createElement("div", { className: cx("Combo-placeholder") }, __(placeholder))) : null),
-            !disabled ? (React.createElement("div", { className: cx("Combo-toolbar") },
+            !isStatic && !disabled ? (React.createElement("div", { className: cx("Combo-toolbar") },
                 this.renderAddBtn(),
                 draggable ? (React.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 = isObject(value) ? this.formatValue(value) : this.defaultValue;
         var condition = null;
@@ -721,26 +689,58 @@ var ComboControl = /** @class */ (function (_super) {
                             label: item.label,
                             value: item.label
                         }); }), value: condition.label, clearable: false }))) : null,
-                React.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.createElement(Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))),
+                React.createElement("div", { className: cx("Combo-itemInner") }, items ? (this.renderItems(items, data)) : (React.createElement(Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))),
             value && nullable ? (React.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)
+            }, __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.createElement(React.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.createElement("div", { className: cx("ComboControl", className) }, multiple ? this.renderMultipe() : this.renderSingle())) : null;
     };
     ComboControl.defaultProps = {

package/esm/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/esm/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/esm/renderers/Form/DiffEditor.d.ts

@@ -3871,6 +3871,7 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         showErrorMsg?: boolean | undefined;
         remark?: import("../Remark").SchemaRemark | undefined;
         hidden?: boolean | undefined;
+        static?: boolean | undefined;
         label?: string | false | undefined;
         $ref?: string | undefined;
         disabledOn?: string | undefined;
@@ -3878,6 +3879,12 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         visible?: boolean | undefined;
         visibleOn?: string | undefined;
         id?: string | 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;
         placeholder?: string | undefined;
         labelRemark?: import("../Remark").SchemaRemark | undefined;

package/esm/renderers/Form/DiffEditor.js

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