amis 2.2.0 → 2.3.1

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

@@ -364,7 +364,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -492,7 +492,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -624,7 +624,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -752,7 +752,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -889,7 +889,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -1017,7 +1017,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -1149,7 +1149,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -1277,7 +1277,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -1409,7 +1409,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -1537,7 +1537,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -1570,7 +1570,7 @@ export declare class EditorControlRenderer extends EditorControl {
             setCanAccessSuperData: (value?: boolean | undefined) => void;
             deleteValueByName: (name: string) => void;
             getLocalPersistData: () => void;
-            setLocalPersistData: () => void;
+            setLocalPersistData: (keys?: string[] | undefined) => void;
             clearLocalPersistData: () => void;
             setPersistData: (value?: string | undefined) => void;
             clear: (cb?: ((data: any) => void) | undefined) => void;
@@ -1788,7 +1788,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -1916,7 +1916,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -2048,7 +2048,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -2176,7 +2176,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -2313,7 +2313,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -2441,7 +2441,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -2573,7 +2573,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -2701,7 +2701,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -2833,7 +2833,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -2961,7 +2961,7 @@ export declare class EditorControlRenderer extends EditorControl {
                 getSubStore: () => any;
                 reset: (keepErrors?: boolean | undefined) => void;
                 resetValidationStatus: (tag?: string | undefined) => void;
-                openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+                openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
                 closeDialog: (result?: any) => void;
                 changeTmpValue: (value: any) => void;
                 changeEmitedValue: (value: any) => void;
@@ -2994,7 +2994,7 @@ export declare class EditorControlRenderer extends EditorControl {
             setCanAccessSuperData: (value?: boolean | undefined) => void;
             deleteValueByName: (name: string) => void;
             getLocalPersistData: () => void;
-            setLocalPersistData: () => void;
+            setLocalPersistData: (keys?: string[] | undefined) => void;
             clearLocalPersistData: () => void;
             setPersistData: (value?: string | undefined) => void;
             clear: (cb?: ((data: any) => void) | undefined) => void;
@@ -3132,7 +3132,7 @@ export declare class EditorControlRenderer extends EditorControl {
             getSubStore: () => any;
             reset: (keepErrors?: boolean | undefined) => void;
             resetValidationStatus: (tag?: string | undefined) => void;
-            openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+            openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
             changeEmitedValue: (value: any) => void;
@@ -3542,7 +3542,7 @@ export declare class EditorControlRenderer extends EditorControl {
             getSubStore: () => any;
             reset: (keepErrors?: boolean | undefined) => void;
             resetValidationStatus: (tag?: string | undefined) => void;
-            openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
+            openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
             changeEmitedValue: (value: any) => void;

package/esm/renderers/Form/Editor.js

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

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

@@ -63,6 +63,7 @@ export default class FieldSetControl extends React.Component<FieldSetProps, any>
         headingClassName: string;
         collapsable: boolean;
     };
+    static propsList: Array<string>;
     renderBody(): JSX.Element;
     render(): JSX.Element;
 }

package/esm/renderers/Form/FieldSet.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -16,7 +16,7 @@ var FieldSetControl = /** @class */ (function (_super) {
         return _this;
     }
     FieldSetControl.prototype.renderBody = function () {
-        var _a = this.props, body = _a.body, collapsable = _a.collapsable, horizontal = _a.horizontal, render = _a.render, mode = _a.mode, formMode = _a.formMode, cx = _a.classnames, store = _a.store, formClassName = _a.formClassName, disabled = _a.disabled, formHorizontal = _a.formHorizontal, subFormMode = _a.subFormMode, subFormHorizontal = _a.subFormHorizontal;
+        var _a = this.props, body = _a.body; _a.collapsable; var horizontal = _a.horizontal, render = _a.render, mode = _a.mode, formMode = _a.formMode, cx = _a.classnames, store = _a.store, formClassName = _a.formClassName, disabled = _a.disabled, formHorizontal = _a.formHorizontal, subFormMode = _a.subFormMode, subFormHorizontal = _a.subFormHorizontal;
         var props = {
             store: store,
             data: store.data,
@@ -26,7 +26,6 @@ var FieldSetControl = /** @class */ (function (_super) {
             formHorizontal: subFormHorizontal || formHorizontal
         };
         mode && (props.mode = mode);
-        typeof collapsable !== 'undefined' && (props.collapsable = collapsable);
         horizontal && (props.horizontal = horizontal);
         return (React.createElement("div", { className: cx("Form--".concat(props.mode || formMode || 'normal'), formClassName) }, body ? render('body', body, props) : null));
     };
@@ -39,6 +38,13 @@ var FieldSetControl = /** @class */ (function (_super) {
         headingClassName: '',
         collapsable: false
     };
+    FieldSetControl.propsList = [
+        'collapsable',
+        'collapsed',
+        'collapseTitle',
+        'titlePosition',
+        'collapseTitle'
+    ];
     return FieldSetControl;
 }(React.Component));
 var FieldSetRenderer = /** @class */ (function (_super) {

package/esm/renderers/Form/Formula.js

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

package/esm/renderers/Form/Group.js

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

package/esm/renderers/Form/Hidden.js

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

package/esm/renderers/Form/IconPicker.js

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

package/esm/renderers/Form/IconPickerIcons.js

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

package/esm/renderers/Form/InputArray.js

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

package/esm/renderers/Form/InputCity.js

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

package/esm/renderers/Form/InputColor.js

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

package/esm/renderers/Form/InputDate.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -99,8 +99,8 @@ var DateControl = /** @class */ (function (_super) {
     };
     // 派发有event的事件
     DateControl.prototype.dispatchEvent = function (e) {
-        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
-        dispatchEvent(e, data);
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, value = _a.value;
+        dispatchEvent(e, createObject(data, { value: value }));
     };
     // 动作
     DateControl.prototype.doAction = function (action, data, throwErrors) {

package/esm/renderers/Form/InputDateRange.js

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

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import { FormControlProps } from 'amis-core';
 import { FormBaseControlSchema } from '../../Schema';
+import type { CellRichTextValue } from 'exceljs';
 /**
  * Excel 解析
  * 文档：https://baidu.gitee.io/amis/docs/components/form/input-excel
@@ -41,6 +42,19 @@ export default class ExcelControl extends React.PureComponent<ExcelProps, ExcelC
     componentDidUpdate(prevProps: ExcelProps): void;
     handleDrop(files: File[]): void;
     dispatchEvent(eventName: string, eventData?: Record<string, any>): Promise<any>;
+    /**
+     * 检查当前单元格数据是否为富文本
+     *
+     * @reference https://github.com/exceljs/exceljs#rich-text
+     */
+    isRichTextValue(value: any): boolean;
+    /**
+     * 将富文本类型的单元格内容转化为Plain Text
+     *
+     * @param {CellRichTextValue} cellValue 单元格值
+     * @param {Boolean} html 是否输出为html格式
+     */
+    richText2PlainString(cellValue: CellRichTextValue, html?: boolean): string;
     /**
      * 读取单个 sheet 的内容
      */

package/esm/renderers/Form/InputExcel.js

@@ -1,12 +1,12 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import DropZone from 'react-dropzone';
-import { createObject, autobind, FormItem } from 'amis-core';
+import { createObject, isObject, autobind, FormItem } from 'amis-core';
 
 var ExcelControl = /** @class */ (function (_super) {
     __extends(ExcelControl, _super);
@@ -88,6 +88,58 @@ var ExcelControl = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * 检查当前单元格数据是否为富文本
+     *
+     * @reference https://github.com/exceljs/exceljs#rich-text
+     */
+    ExcelControl.prototype.isRichTextValue = function (value) {
+        return !!(value &&
+            isObject(value) &&
+            value.hasOwnProperty('richText') &&
+            Array.isArray(value === null || value === void 0 ? void 0 : value.richText));
+    };
+    /**
+     * 将富文本类型的单元格内容转化为Plain Text
+     *
+     * @param {CellRichTextValue} cellValue 单元格值
+     * @param {Boolean} html 是否输出为html格式
+     */
+    ExcelControl.prototype.richText2PlainString = function (cellValue, html) {
+        if (html === void 0) { html = false; }
+        var result = cellValue.richText.map(function (_a) {
+            var text = _a.text, _b = _a.font, font = _b === void 0 ? {} : _b;
+            var outputStr = text;
+            /* 如果以HTML格式输出，简单处理一下样式 */
+            if (html) {
+                var styles = '';
+                var htmlTag = (font === null || font === void 0 ? void 0 : font.bold)
+                    ? 'strong'
+                    : (font === null || font === void 0 ? void 0 : font.italic)
+                        ? 'em'
+                        : (font === null || font === void 0 ? void 0 : font.vertAlign) === 'superscript'
+                            ? 'sup'
+                            : (font === null || font === void 0 ? void 0 : font.vertAlign) === 'subscript'
+                                ? 'sub'
+                                : 'span';
+                if (font === null || font === void 0 ? void 0 : font.strike) {
+                    styles += 'text-decoration: line-through;';
+                }
+                else if (font === null || font === void 0 ? void 0 : font.underline) {
+                    styles += 'text-decoration: underline;';
+                }
+                if (font === null || font === void 0 ? void 0 : font.outline) {
+                    styles += 'outline: solid;';
+                }
+                if (font === null || font === void 0 ? void 0 : font.size) {
+                    styles += "font-size: ".concat(font.size, "px;");
+                }
+                outputStr = "<".concat(htmlTag, " ").concat(styles ? "style=".concat(styles) : '', ">").concat(text, "</").concat(htmlTag, ">");
+            }
+            return outputStr;
+        });
+        return result.join('');
+    };
     /**
      * 读取单个 sheet 的内容
      */
@@ -106,9 +158,14 @@ var ExcelControl = /** @class */ (function (_super) {
         else {
             var firstRowValues_1 = [];
             worksheet.eachRow(function (row, rowNumber) {
+                var _a;
                 // 将第一列作为字段名
                 if (rowNumber == 1) {
-                    firstRowValues_1 = row.values;
+                    firstRowValues_1 = ((_a = row.values) !== null && _a !== void 0 ? _a : []).map(function (item) {
+                        return _this.isRichTextValue(item)
+                            ? _this.richText2PlainString(item)
+                            : item;
+                    });
                 }
                 else {
                     var data_1 = {};

package/esm/renderers/Form/InputFile.js

@@ -1,14 +1,13 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __awaiter, __generator, __decorate } from 'tslib';
 import React from 'react';
-import { guid, createObject, normalizeApi, buildApi, isEmpty, dataMapping, qsstringify, FormItem, isEffectiveApi, isApiOutdated, isApiOutdatedWithData } from 'amis-core';
+import { guid, createObject, normalizeApi, buildApi, isEmpty, dataMapping, qsstringify, prettyBytes, FormItem, isEffectiveApi, isApiOutdated, isApiOutdatedWithData } from 'amis-core';
 import find from 'lodash/find';
 import isPlainObject from 'lodash/isPlainObject';
-import ImageControl from './InputImage.js';
 import { Icon, Button, TooltipWrapper } from 'amis-ui';
 import DropZone from 'react-dropzone';
 import merge from 'lodash/merge';
@@ -152,8 +151,8 @@ var FileControl = /** @class */ (function (_super) {
                 // this.props.env.alert(
                 //   __('File.maxSize', {
                 //     filename: file[nameField as keyof typeof file] || file.name,
-                //     actualSize: ImageControl.formatFileSize(file.size),
-                //     maxSize: ImageControl.formatFileSize(maxSize)
+                //     actualSize: prettyBytes(file.size),
+                //     maxSize: prettyBytes(maxSize)
                 //   })
                 // );
                 file.state = 'invalid';
@@ -844,7 +843,9 @@ var FileControl = /** @class */ (function (_super) {
                             __('File.dragDrop'),
                             React.createElement("span", { className: cx('FileControl-acceptTip-click') }, __('File.clickUpload'))),
                         React.createElement("div", { className: cx('FileControl-acceptTip-help', 'TplField') }, documentLink ? (React.createElement("a", { href: documentLink, onClick: function (e) { return e.stopPropagation(); } }, documentation ? documentation : __('File.helpText'))) : null),
-                        maxSize ? (React.createElement("div", { className: cx('FileControl-sizeTip') }, __('File.sizeLimit', { maxSize: maxSize }))) : null)) : (React.createElement(React.Fragment, null,
+                        maxSize ? (React.createElement("div", { className: cx('FileControl-sizeTip') }, __('File.sizeLimit', {
+                            maxSize: prettyBytes(maxSize, 1024)
+                        }))) : null)) : (React.createElement(React.Fragment, null,
                         React.createElement(Button, { level: "default", disabled: disabled, className: cx('FileControl-selectBtn', btnClassName, {
                                 'is-disabled': multiple && !!maxLength && files.length >= maxLength
                             }), tooltip: multiple && maxLength && files.length >= maxLength
@@ -864,7 +865,7 @@ var FileControl = /** @class */ (function (_super) {
                         })
                         : null));
             }),
-            maxSize && !drag ? (React.createElement("div", { className: cx('FileControl-sizeTip') }, __('File.sizeLimit', { maxSize: maxSize }))) : null,
+            maxSize && !drag ? (React.createElement("div", { className: cx('FileControl-sizeTip') }, __('File.sizeLimit', { maxSize: prettyBytes(maxSize, 1024) }))) : null,
             Array.isArray(files) ? (React.createElement("ul", { className: cx('FileControl-list') }, files.map(function (file, index) {
                 var filename = file[nameField] ||
                     file.filename;
@@ -874,8 +875,8 @@ var FileControl = /** @class */ (function (_super) {
                                 (maxSize && file.size > maxSize
                                     ? __('File.maxSize', {
                                         filename: file.name,
-                                        actualSize: ImageControl.formatFileSize(file.size),
-                                        maxSize: ImageControl.formatFileSize(maxSize)
+                                        actualSize: prettyBytes(file.size, 1024),
+                                        maxSize: prettyBytes(maxSize, 1024)
                                     })
                                     : '')
                             : '' },

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

@@ -14,6 +14,13 @@ export interface InputFormulaControlSchema extends FormBaseControlSchema {
      * 默认为 true
      */
     evalMode?: boolean;
+    /**
+     * 混合模式，意味着这个输入框既可以输入不同文本
+     * 也可以输入公式。
+     * 当输入公式时，值格式为 ${公式内容}
+     * 其他内容当字符串。
+     */
+    mixedMode?: boolean;
     /**
      * 用于提示的变量集合，默认为空
      */

package/esm/renderers/Form/InputFormula.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -35,7 +35,7 @@ import { FormulaPicker } from 'amis-ui';
         }
     };
     InputFormulaRenderer.prototype.render = function () {
-        var _a = this.props; _a.selectedOptions; var disabled = _a.disabled, onChange = _a.onChange, evalMode = _a.evalMode, variableMode = _a.variableMode, header = _a.header, label = _a.label, value = _a.value, clearable = _a.clearable, className = _a.className; _a.classPrefix; _a.classnames; var _b = _a.allowInput, allowInput = _b === void 0 ? true : _b, borderMode = _a.borderMode, placeholder = _a.placeholder, inputMode = _a.inputMode, btnLabel = _a.btnLabel, level = _a.level, btnSize = _a.btnSize, icon = _a.icon, title = _a.title, variableClassName = _a.variableClassName, functionClassName = _a.functionClassName, data = _a.data, onPickerOpen = _a.onPickerOpen, selfVariableName = _a.selfVariableName;
+        var _a = this.props; _a.selectedOptions; var disabled = _a.disabled, onChange = _a.onChange, evalMode = _a.evalMode, mixedMode = _a.mixedMode, variableMode = _a.variableMode, header = _a.header, label = _a.label, value = _a.value, clearable = _a.clearable, className = _a.className; _a.classPrefix; _a.classnames; var _b = _a.allowInput, allowInput = _b === void 0 ? true : _b, borderMode = _a.borderMode, placeholder = _a.placeholder, inputMode = _a.inputMode, btnLabel = _a.btnLabel, level = _a.level, btnSize = _a.btnSize, icon = _a.icon, title = _a.title, variableClassName = _a.variableClassName, functionClassName = _a.functionClassName, data = _a.data, onPickerOpen = _a.onPickerOpen, selfVariableName = _a.selfVariableName;
         var _c = this.props, variables = _c.variables, functions = _c.functions;
         if (isPureVariable(variables)) {
             // 如果 variables 是 ${xxx} 这种形式，将其处理成实际的值
@@ -45,7 +45,7 @@ import { FormulaPicker } from 'amis-ui';
             // 如果 functions 是 ${xxx} 这种形式，将其处理成实际的值
             functions = resolveVariableAndFilter(functions, this.props.data, '| raw');
         }
-        return (React.createElement(FormulaPicker, { ref: this.formulaRef, className: className, value: value, disabled: disabled, allowInput: allowInput, onChange: onChange, evalMode: evalMode, variables: variables, variableMode: variableMode, functions: functions, header: header || label || '', borderMode: borderMode, placeholder: placeholder, mode: inputMode, btnLabel: btnLabel, level: level, btnSize: btnSize, icon: icon, title: title, clearable: clearable, variableClassName: variableClassName, functionClassName: functionClassName, data: data, onPickerOpen: onPickerOpen, selfVariableName: selfVariableName }));
+        return (React.createElement(FormulaPicker, { ref: this.formulaRef, className: className, value: value, disabled: disabled, allowInput: allowInput, onChange: onChange, evalMode: evalMode, variables: variables, variableMode: variableMode, functions: functions, header: header || label || '', borderMode: borderMode, placeholder: placeholder, mode: inputMode, btnLabel: btnLabel, level: level, btnSize: btnSize, icon: icon, title: title, clearable: clearable, variableClassName: variableClassName, functionClassName: functionClassName, data: data, onPickerOpen: onPickerOpen, selfVariableName: selfVariableName, mixedMode: mixedMode }));
     };
     InputFormulaRenderer.defaultProps = {
         inputMode: 'input-button',

package/esm/renderers/Form/InputGroup.js

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

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

@@ -256,7 +256,6 @@ export default class ImageControl extends React.Component<ImageProps, ImageState
         multiple: boolean;
         dropCrop: boolean;
     };
-    static formatFileSize(size: number | string, units?: string[]): string;
     static valueToFile(value: string | object, props?: ImageProps): FileValue | undefined;
     static sizeInfo(width: number | undefined, height: number | undefined, __: TranslateFn): string;
     state: ImageState;