amis 2.3.2-beta.1 → 2.4.0

package/esm/renderers/Form/ChartRadios.js

@@ -1,11 +1,12 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.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.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.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,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/esm/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -498,7 +498,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') {
@@ -567,6 +567,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 && // 控件自身是否禁用
@@ -612,6 +615,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 &&
@@ -642,13 +648,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.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 +675,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')),
@@ -698,7 +708,7 @@ var ComboControl = /** @class */ (function (_super) {
                     })) : (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)
@@ -739,8 +749,21 @@ var ComboControl = /** @class */ (function (_super) {
                 })) : (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));
     };
+    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.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Form/Control.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.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.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Form/Editor.js

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

package/esm/renderers/Form/FieldSet.js

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

package/esm/renderers/Form/Formula.js

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

package/esm/renderers/Form/Group.js

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

package/esm/renderers/Form/Hidden.js

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

package/esm/renderers/Form/IconPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -165,7 +165,7 @@ var IconPickerControl = /** @class */ (function (_super) {
                     placeholder && !value && !_this.state.inputValue ? (React.createElement("div", { className: cx('IconPickerControl-placeholder') }, placeholder)) : null,
                     !value || (inputValue && isOpen) ? null : (React.createElement("div", { className: cx('IconPickerControl-value') },
                         React.createElement("i", { className: cx(value) }),
-                        value)),
+                        typeof value === 'string' ? value : '')),
                     React.createElement("input", __assign({}, getInputProps({
                         name: name,
                         ref: _this.inputRef,

package/esm/renderers/Form/IconPickerIcons.js

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

package/esm/renderers/Form/IconSelect.d.ts

@@ -0,0 +1,52 @@
+import React from 'react';
+import { FormControlProps } from 'amis-core';
+import { FormBaseControlSchema } from '../../Schema';
+import * as IconSelectStore from './IconSelectStore';
+export interface IconSelectControlSchema extends FormBaseControlSchema {
+    type: 'icon-select';
+    placeholder?: string;
+    disabled?: boolean;
+    noDataTip?: string;
+    clearable?: boolean;
+}
+export interface IconSelectProps extends FormControlProps {
+    placeholder?: string;
+    disabled?: boolean;
+    noDataTip?: string;
+}
+export interface IconChecked {
+    id: string;
+    name?: string;
+}
+export interface IconSelectState {
+    showModal: boolean;
+    tmpCheckIconId: IconChecked | null;
+    searchValue: string;
+    activeTypeIndex: number;
+    isRefreshLoading?: boolean;
+}
+/**
+ * 新图标选择器
+ */
+export default class IconSelectControl extends React.PureComponent<IconSelectProps, IconSelectState> {
+    input?: HTMLInputElement;
+    static defaultProps: Pick<IconSelectProps, 'noDataTip' | 'clearable'>;
+    state: IconSelectState;
+    constructor(props: IconSelectProps);
+    handleClick(): void;
+    handleClear(e: React.MouseEvent): void;
+    renderInputArea(): JSX.Element;
+    handleIconTypeClick(item: any, index: number): void;
+    renderIconTypes(): JSX.Element;
+    handleConfirm(): void;
+    handleClickIconInModal(icon: IconChecked): void;
+    renderIconList(icons: IconSelectStore.SvgIcon[]): JSX.Element;
+    handleSearchValueChange(e: string): void;
+    handleRefreshIconList(): Promise<void>;
+    renderModalContent(): JSX.Element;
+    getIconsByType(): IconSelectStore.SvgIcon[];
+    toggleModel(isShow?: boolean): void;
+    render(): JSX.Element;
+}
+export declare class IconSelectControlRenderer extends IconSelectControl {
+}