amis 2.0.2 → 2.1.0

package/lib/renderers/Form/InputRepeat.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputRichText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputSubForm.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

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

@@ -1,7 +1,5 @@
 import React from 'react';
-import { FormControlProps, FormBaseControl } from 'amis-core';
-import { RendererData, ActionObject } from 'amis-core';
-import { SimpleMap } from 'amis-core';
+import { FormControlProps, FormBaseControl, SimpleMap, RendererData, ActionObject } from 'amis-core';
 import { TableSchema } from '../Table';
 import { SchemaApi } from '../../Schema';
 export interface TableControlSchema extends FormBaseControl, Omit<TableSchema, 'type'> {
@@ -172,6 +170,14 @@ export default class FormTable extends React.Component<TableProps, TableState> {
     handleTableSave(rows: Array<object> | object, diff: Array<object> | object, rowIndexes: Array<string> | string): void;
     handleSaveTableOrder(moved: Array<object>, rows: Array<object>): void;
     handlePageChange(page: number): void;
+    /**
+     * Table Row中数据更新到InputTable中
+     * 解决columns形如[{name: 'a'}, {name: 'c', value: '${a}'}]时，使用默认值的列数据无法更新到数据域的问题
+     *
+     * @param data 行数据
+     * @param rowIndex 行索引值
+     */
+    handlePristineChange(data: Record<string, any>, rowIndex: string): void;
     removeEntry(entry: any): void;
     getEntryId(entry: any): string;
     render(): JSX.Element | null;

package/lib/renderers/Form/InputTable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -13,14 +13,22 @@ var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 var omit = require('lodash/omit');
 var findIndex = require('lodash/findIndex');
+var cloneDeep = require('lodash/cloneDeep');
+var isEqual = require('lodash/isEqual');
+var inRange = require('lodash/inRange');
 var find = require('lodash/find');
+var moment = require('moment');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var findIndex__default = /*#__PURE__*/_interopDefaultLegacy(findIndex);
+var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
+var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
+var inRange__default = /*#__PURE__*/_interopDefaultLegacy(inRange);
 var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
+var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 
 var FormTable = /** @class */ (function (_super) {
     tslib.__extends(FormTable, _super);
@@ -226,7 +234,7 @@ var FormTable = /** @class */ (function (_super) {
     };
     FormTable.prototype.addItem = function (index) {
         var _this = this;
-        var _a = this.props, needConfirm = _a.needConfirm, scaffold = _a.scaffold, columns = _a.columns;
+        var _a = this.props, needConfirm = _a.needConfirm, scaffold = _a.scaffold, columns = _a.columns, data = _a.data;
         var items = this.state.items.concat();
         var value = {
             __isPlaceholder: true
@@ -235,7 +243,22 @@ var FormTable = /** @class */ (function (_super) {
             columns.forEach(function (column) {
                 if (typeof column.value !== 'undefined' &&
                     typeof column.name === 'string') {
-                    amisCore.setVariable(value, column.name, column.value);
+                    if ('type' in column &&
+                        (column.type === 'input-date' ||
+                            column.type === 'input-datetime' ||
+                            column.type === 'input-time' ||
+                            column.type === 'input-month' ||
+                            column.type === 'input-quarter' ||
+                            column.type === 'input-year')) {
+                        var date = amisCore.filterDate(column.value, data, column.format || 'X');
+                        amisCore.setVariable(value, column.name, (column.utc ? moment__default["default"].utc(date) : date).format(column.format || 'X'));
+                    }
+                    else {
+                        /** 如果value值设置为表达式，则忽略 */
+                        if (!amisCore.isExpression(column.value)) {
+                            amisCore.setVariable(value, column.name, column.value);
+                        }
+                    }
                 }
             });
         }
@@ -569,6 +592,29 @@ var FormTable = /** @class */ (function (_super) {
     FormTable.prototype.handlePageChange = function (page) {
         this.setState({ page: page });
     };
+    /**
+     * Table Row中数据更新到InputTable中
+     * 解决columns形如[{name: 'a'}, {name: 'c', value: '${a}'}]时，使用默认值的列数据无法更新到数据域的问题
+     *
+     * @param data 行数据
+     * @param rowIndex 行索引值
+     */
+    FormTable.prototype.handlePristineChange = function (data, rowIndex) {
+        var _this = this;
+        this.setState(function (prevState) {
+            var items = cloneDeep__default["default"](prevState.items);
+            var index = Number(rowIndex);
+            if (Number.isInteger(index) &&
+                inRange__default["default"](index, 0, items.length) &&
+                !isEqual__default["default"](items[index], data)) {
+                items.splice(index, 1, data);
+                return { items: items };
+            }
+            return null;
+        }, function () {
+            _this.emitValue();
+        });
+    };
     FormTable.prototype.removeEntry = function (entry) {
         if (this.entries.has(entry)) {
             this.entries.delete(entry);
@@ -628,7 +674,8 @@ var FormTable = /** @class */ (function (_super) {
                 reUseRow: false,
                 offset: offset,
                 rowClassName: rowClassName,
-                rowClassNameExpr: rowClassNameExpr
+                rowClassNameExpr: rowClassNameExpr,
+                onPristineChange: this.handlePristineChange
             }),
             (addable && showAddBtn !== false) || showPager ? (React__default["default"].createElement("div", { className: cx('InputTable-toolbar') },
                 addable && showAddBtn !== false ? (React__default["default"].createElement(amisUi.Button, { disabled: disabled, size: "sm", onClick: function () { return _this.addItem(_this.state.items.length); } },
@@ -674,6 +721,12 @@ var FormTable = /** @class */ (function (_super) {
         'canAccessSuperData',
         'formStore'
     ];
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object, String]),
+        tslib.__metadata("design:returntype", void 0)
+    ], FormTable.prototype, "handlePristineChange", null);
     return FormTable;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

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

@@ -102,6 +102,7 @@ export default class TagControl extends React.PureComponent<TagProps, TagState>
     getTarget(): any;
     getParent(): any;
     reload(): void;
+    isReachMax(): boolean;
     render(): JSX.Element;
 }
 export declare class TagControlRenderer extends TagControl {

package/lib/renderers/Form/InputTag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -140,6 +140,9 @@ var TagControl = /** @class */ (function (_super) {
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
+                        if (this.isReachMax()) {
+                            return [2 /*return*/];
+                        }
                         _a = this.props, selectedOptions = _a.selectedOptions, onChange = _a.onChange;
                         newValue = selectedOptions.concat();
                         if (find__default["default"](newValue, function (item) { return item.value == option.value; })) {
@@ -297,7 +300,7 @@ var TagControl = /** @class */ (function (_super) {
         });
     };
     TagControl.prototype.handleOptionChange = function (option) {
-        if (this.state.inputValue || !option) {
+        if (this.isReachMax() || this.state.inputValue || !option) {
             return;
         }
         this.addItem(option);
@@ -312,6 +315,10 @@ var TagControl = /** @class */ (function (_super) {
         var reload = this.props.reloadOptions;
         reload === null || reload === void 0 ? void 0 : reload();
     };
+    TagControl.prototype.isReachMax = function () {
+        var _a = this.props, max = _a.max, selectedOptions = _a.selectedOptions;
+        return max != null && isInteger__default["default"](max) && selectedOptions.length >= max;
+    };
     TagControl.prototype.render = function () {
         var _this = this;
         var _a = this.props, className = _a.className, cx = _a.classnames, disabled = _a.disabled, placeholder = _a.placeholder, name = _a.name, clearable = _a.clearable, selectedOptions = _a.selectedOptions, loading = _a.loading, popOverContainer = _a.popOverContainer, dropdown = _a.dropdown, options = _a.options, optionsTip = _a.optionsTip, maxTagCount = _a.maxTagCount, overflowTagPopover = _a.overflowTagPopover, __ = _a.translate;
@@ -321,19 +328,20 @@ var TagControl = /** @class */ (function (_super) {
                     (item.value !== undefined && !~selectedOptions.indexOf(item));
             }, 0, true)
             : [];
+        var reachMax = this.isReachMax();
         return (React__default["default"].createElement(Downshift__default["default"], { selectedItem: selectedOptions, isOpen: this.state.isFocused, inputValue: this.state.inputValue, onChange: this.handleOptionChange, itemToString: this.renderItem }, function (_a) {
             var isOpen = _a.isOpen, highlightedIndex = _a.highlightedIndex, getItemProps = _a.getItemProps, getInputProps = _a.getInputProps;
             return (React__default["default"].createElement("div", { className: cx(className, "TagControl") },
                 React__default["default"].createElement(amisUi.ResultBox, tslib.__assign({}, getInputProps({
                     name: name,
                     ref: _this.input,
-                    placeholder: __(placeholder || 'Tag.placeholder'),
+                    placeholder: __(placeholder !== null && placeholder !== void 0 ? placeholder : 'Tag.placeholder'),
                     value: _this.state.inputValue,
                     onKeyDown: _this.handleKeyDown,
                     onFocus: _this.handleFocus,
                     onBlur: _this.handleBlur,
                     disabled: disabled
-                }), { onChange: _this.handleInputChange, className: cx('TagControl-input'), result: selectedOptions, onResultChange: _this.handleChange, itemRender: _this.renderItem, clearable: clearable, maxTagCount: maxTagCount, overflowTagPopover: overflowTagPopover, allowInput: true }), loading ? React__default["default"].createElement(amisUi.Spinner, { size: "sm" }) : undefined),
+                }), { inputPlaceholder: '', onChange: _this.handleInputChange, className: cx('TagControl-input'), result: selectedOptions, onResultChange: _this.handleChange, itemRender: _this.renderItem, clearable: clearable, maxTagCount: maxTagCount, overflowTagPopover: overflowTagPopover, allowInput: true }), loading ? React__default["default"].createElement(amisUi.Spinner, { size: "sm" }) : undefined),
                 dropdown !== false ? (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer || _this.getParent, target: _this.getTarget, placement: 'auto', show: isOpen && !!finnalOptions.length },
                     React__default["default"].createElement(amisCore.PopOver, { overlay: true, className: cx('TagControl-popover'), onHide: _this.close },
                         React__default["default"].createElement(amisUi.ListMenu, { options: finnalOptions, itemRender: _this.renderItem, highlightIndex: highlightedIndex, getItemProps: function (_a) {
@@ -341,14 +349,17 @@ var TagControl = /** @class */ (function (_super) {
                                 return (tslib.__assign({}, getItemProps({
                                     index: index,
                                     item: item,
-                                    disabled: item.disabled
+                                    disabled: reachMax || item.disabled,
+                                    className: cx('ListMenu-item', {
+                                        'is-disabled': reachMax
+                                    }),
                                 })));
                             } })))) : (
                 // 保留原来的展现方式，不推荐
                 React__default["default"].createElement("div", { className: cx('TagControl-sug') },
                     optionsTip ? (React__default["default"].createElement("div", { className: cx('TagControl-sugTip') }, __(optionsTip))) : null,
                     options.map(function (item, index) { return (React__default["default"].createElement("div", { className: cx('TagControl-sugItem', {
-                            'is-disabled': item.disabled || disabled
+                            'is-disabled': item.disabled || disabled || reachMax
                         }), key: index, onClick: _this.addItem.bind(_this, item) }, item.label)); })))));
         }));
     };
@@ -433,6 +444,12 @@ var TagControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], TagControl.prototype, "getParent", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], TagControl.prototype, "isReachMax", null);
     return TagControl;
 }(React__default["default"].PureComponent));
 /** @class */ ((function (_super) {

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

@@ -59,7 +59,7 @@ export interface TextControlSchema extends FormOptionsSchema {
     /** control节点的CSS类名 */
     inputControlClassName?: string;
     /** 原生input标签的CSS类名 */
-    nativeInputClassName: string;
+    nativeInputClassName?: string;
 }
 export declare type InputTextRendererEvent = 'blur' | 'focus' | 'click' | 'change' | 'enter';
 export interface TextProps extends OptionsControlProps {

package/lib/renderers/Form/InputText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -147,7 +147,8 @@ var TextControl = /** @class */ (function (_super) {
         onChange(this.normalizeValue(newValue));
     };
     TextControl.prototype.handleClick = function () {
-        this.focus();
+        // 已经 focus 的就不重复执行，否则总重新定位光标
+        this.state.isFocused || this.focus();
         this.setState({
             isOpen: true
         });

package/lib/renderers/Form/InputTree.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputYearRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/JSONSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/JSONSchemaEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ListSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/LocationPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/MatrixCheckboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/NestedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -141,7 +141,7 @@ var NestedSelectControl = /** @class */ (function (_super) {
                                 }) }, text || label.slice(current, pointer)));
                         })
                         : label,
-                    !isEnd && '>'));
+                    !isEnd && ' / '));
             })
             : option[labelField || 'label']));
     };
@@ -560,7 +560,7 @@ var NestedSelectControl = /** @class */ (function (_super) {
         var _b = this.props, className = _b.className, disabled = _b.disabled, cx = _b.classnames, multiple = _b.multiple, placeholder = _b.placeholder, __ = _b.translate, inline = _b.inline, searchable = _b.searchable; _b.autoComplete; var selectedOptions = _b.selectedOptions, clearable = _b.clearable, loading = _b.loading, borderMode = _b.borderMode, useMobileUI = _b.useMobileUI, env = _b.env;
         var mobileUI = useMobileUI && amisCore.isMobile();
         return (React__default["default"].createElement("div", { className: cx('NestedSelectControl', className) },
-            React__default["default"].createElement(amisUi.ResultBox, { useMobileUI: useMobileUI, disabled: disabled, ref: this.domRef, placeholder: __(placeholder !== null && placeholder !== void 0 ? placeholder : 'placeholder.empty'), className: cx("NestedSelect", (_a = {
+            React__default["default"].createElement(amisUi.ResultBox, { useMobileUI: useMobileUI, disabled: disabled, ref: this.domRef, placeholder: __(placeholder !== null && placeholder !== void 0 ? placeholder : 'placeholder.empty'), inputPlaceholder: '', className: cx("NestedSelect", (_a = {
                         'NestedSelect--inline': inline,
                         'NestedSelect--single': !multiple,
                         'NestedSelect--multi': multiple,
@@ -573,7 +573,7 @@ var NestedSelectControl = /** @class */ (function (_super) {
                     ? selectedOptions
                     : selectedOptions.length
                         ? selectedOptions[0]
-                        : '', onResultClick: this.handleOutClick, value: this.state.inputValue, onChange: this.handleInputChange, onResultChange: this.handleResultChange, onClear: this.handleResultClear, itemRender: this.renderValue, onKeyPress: this.handleKeyPress, onFocus: this.onFocus, onBlur: this.onBlur, onKeyDown: this.handleInputKeyDown, clearable: clearable, hasDropDownArrow: true, allowInput: searchable, inputPlaceholder: '' }, loading ? React__default["default"].createElement(amisUi.Spinner, { size: "sm" }) : undefined),
+                        : '', onResultClick: this.handleOutClick, value: this.state.inputValue, onChange: this.handleInputChange, onResultChange: this.handleResultChange, onClear: this.handleResultClear, itemRender: this.renderValue, onKeyPress: this.handleKeyPress, onFocus: this.onFocus, onBlur: this.onBlur, onKeyDown: this.handleInputKeyDown, clearable: clearable, hasDropDownArrow: true, allowInput: searchable }, loading ? React__default["default"].createElement(amisUi.Spinner, { size: "sm" }) : undefined),
             mobileUI ? (React__default["default"].createElement(amisUi.PopUp, { className: cx("NestedSelect-popup"), container: env && env.getModalContainer ? env.getModalContainer : undefined, isShow: this.state.isOpened, onHide: this.close, showConfirm: false, showClose: false },
                 React__default["default"].createElement(amisUi.Cascader, tslib.__assign({ onClose: this.close }, this.props, { onChange: this.handleResultChange, options: this.props.options.slice(), value: selectedOptions })))) : this.state.isOpened ? (this.renderOuter()) : null));
     };

package/lib/renderers/Form/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -197,6 +197,7 @@ var PickerControl = /** @class */ (function (_super) {
     };
     PickerControl.prototype.handleClick = function () {
         this.input.current && this.input.current.focus();
+        this.open();
     };
     PickerControl.prototype.clearValue = function () {
         var _a = this.props, onChange = _a.onChange, resetValue = _a.resetValue;
@@ -208,7 +209,10 @@ var PickerControl = /** @class */ (function (_super) {
         return (React__default["default"].createElement("div", { className: "".concat(ns, "Picker-values") }, selectedOptions.map(function (item, index) { return (React__default["default"].createElement("div", { key: index, className: cx__default["default"]("".concat(ns, "Picker-value"), {
                 'is-disabled': disabled
             }) },
-            React__default["default"].createElement("span", { "data-tooltip": __('delete'), "data-position": "bottom", className: "".concat(ns, "Picker-valueIcon"), onClick: _this.removeItem.bind(_this, index) }, "\u00D7"),
+            React__default["default"].createElement("span", { "data-tooltip": __('delete'), "data-position": "bottom", className: "".concat(ns, "Picker-valueIcon"), onClick: function (e) {
+                    e.stopPropagation();
+                    _this.removeItem(index);
+                } }, "\u00D7"),
             React__default["default"].createElement("span", { className: "".concat(ns, "Picker-valueLabel") }, labelTpl ? (React__default["default"].createElement(amisUi.Html, { html: amisCore.filter(labelTpl, item) })) : ("".concat(amisCore.getVariable(item, labelField || 'label') ||
                 amisCore.getVariable(item, 'id')))))); })));
     };

package/lib/renderers/Form/Radios.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Select.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Static.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Switch.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/TabsTransfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/TabsTransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Textarea.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Transfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/TransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/TreeSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -124,11 +124,9 @@ var TreeSelectControl = /** @class */ (function (_super) {
         if (!multiple) {
             this.close();
         }
-        multiple || !this.state.inputValue
-            ? this.resultChangeEvent(value)
-            : this.setState({
-                inputValue: ''
-            }, function () { return _this.resultChangeEvent(value); });
+        this.setState({
+            inputValue: ''
+        }, function () { return _this.resultChangeEvent(value); });
     };
     TreeSelectControl.prototype.handleInputChange = function (value) {
         var _this = this;
@@ -303,7 +301,7 @@ var TreeSelectControl = /** @class */ (function (_super) {
         var isOpened = this.state.isOpened;
         var mobileUI = useMobileUI && amisCore.isMobile();
         return (React__default["default"].createElement("div", { ref: this.container, className: cx("TreeSelectControl", className) },
-            React__default["default"].createElement(amisUi.ResultBox, { disabled: disabled, ref: this.targetRef, placeholder: __(placeholder || 'placeholder.empty'), className: cx("TreeSelect", {
+            React__default["default"].createElement(amisUi.ResultBox, { disabled: disabled, ref: this.targetRef, placeholder: __(placeholder !== null && placeholder !== void 0 ? placeholder : 'placeholder.empty'), inputPlaceholder: '', className: cx("TreeSelect", {
                     'TreeSelect--inline': inline,
                     'TreeSelect--single': !multiple,
                     'TreeSelect--multi': multiple,
@@ -314,7 +312,7 @@ var TreeSelectControl = /** @class */ (function (_super) {
                     ? selectedOptions
                     : selectedOptions.length
                         ? this.renderItem(selectedOptions[0])
-                        : '', onResultClick: this.handleOutClick, value: this.state.inputValue, onChange: this.handleInputChange, onResultChange: this.handleResultChange, itemRender: this.renderItem, onKeyPress: this.handleKeyPress, onFocus: this.handleFocus, onBlur: this.handleBlur, onKeyDown: this.handleInputKeyDown, clearable: clearable, allowInput: searchable || amisCore.isEffectiveApi(autoComplete), inputPlaceholder: '' }, loading ? React__default["default"].createElement(amisUi.Spinner, { size: "sm" }) : undefined),
+                        : '', onResultClick: this.handleOutClick, value: this.state.inputValue, onChange: this.handleInputChange, onResultChange: this.handleResultChange, itemRender: this.renderItem, onKeyPress: this.handleKeyPress, onFocus: this.handleFocus, onBlur: this.handleBlur, onKeyDown: this.handleInputKeyDown, clearable: clearable, allowInput: searchable || amisCore.isEffectiveApi(autoComplete) }, loading ? React__default["default"].createElement(amisUi.Spinner, { size: "sm" }) : undefined),
             !mobileUI && isOpened ? (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer || (function () { return _this.container.current; }), target: function () { return _this.target; }, show: true },
                 React__default["default"].createElement(amisCore.PopOver, { classPrefix: ns, className: "".concat(ns, "TreeSelect-popover"), style: {
                         minWidth: this.target ? this.target.offsetWidth : undefined

package/lib/renderers/Form/UUID.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Grid.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -11,6 +11,7 @@ var tslib = require('tslib');
 var React = require('react');
 var amisCore = require('amis-core');
 var pick = require('lodash/pick');
+var amisUi = require('amis-ui');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -70,12 +71,14 @@ var Grid = /** @class */ (function (_super) {
     };
     Grid.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className, cx = _b.classnames, gap = _b.gap, vAlign = _b.valign, hAlign = _b.align;
+        var _b = this.props, className = _b.className, cx = _b.classnames, gap = _b.gap, vAlign = _b.valign, hAlign = _b.align, _c = _b.loading, loading = _c === void 0 ? false : _c;
         return (React__default["default"].createElement("div", { className: cx('Grid', (_a = {},
                 _a["Grid--".concat(gap)] = gap,
                 _a["Grid--v".concat(amisCore.ucFirst(vAlign))] = vAlign,
                 _a["Grid--h".concat(amisCore.ucFirst(hAlign))] = hAlign,
-                _a), className) }, this.renderColumns(this.props.columns)));
+                _a), className) },
+            this.renderColumns(this.props.columns),
+            React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading })));
     };
     Grid.propsList = ['columns'];
     Grid.defaultProps = {};

package/lib/renderers/Grid2D.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/GridNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/HBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/IFrame.d.ts

@@ -21,6 +21,10 @@ export interface IFrameSchema extends BaseSchema {
     };
     width?: number | string;
     height?: number | string;
+    alloow?: string;
+    name?: string;
+    referrerpolicy?: 'no-referrer' | 'no-referrer-when-downgrade' | 'origin' | 'origin-when-cross-origin' | 'same-origin' | 'strict-origin' | 'strict-origin-when-cross-origin' | 'unsafe-url';
+    sandbox?: string;
 }
 export interface IFrameProps extends RendererProps, Omit<IFrameSchema, 'type' | 'className'> {
 }

package/lib/renderers/IFrame.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -100,7 +100,7 @@ var IFrame = /** @class */ (function (_super) {
     };
     IFrame.prototype.render = function () {
         var _a = this.state, width = _a.width, height = _a.height;
-        var _b = this.props, className = _b.className, src = _b.src, name = _b.name, frameBorder = _b.frameBorder, data = _b.data, style = _b.style;
+        var _b = this.props, className = _b.className, src = _b.src, name = _b.name, frameBorder = _b.frameBorder, data = _b.data, style = _b.style, allow = _b.allow, sandbox = _b.sandbox, referrerpolicy = _b.referrerpolicy;
         var tempStyle = {};
         width !== void 0 && (tempStyle.width = width);
         height !== void 0 && (tempStyle.height = height);
@@ -113,7 +113,7 @@ var IFrame = /** @class */ (function (_super) {
             !/^(\.\/|\.\.\/|\/|https?\:\/\/|\/\/)/.test(finalSrc)) {
             return React__default["default"].createElement("p", null, "\u8BF7\u586B\u5199\u5408\u6CD5\u7684 iframe \u5730\u5740");
         }
-        return (React__default["default"].createElement("iframe", { name: name, className: className, frameBorder: frameBorder, style: style, ref: this.IFrameRef, onLoad: this.onLoad, src: finalSrc }));
+        return (React__default["default"].createElement("iframe", { name: name, className: className, frameBorder: frameBorder, style: style, ref: this.IFrameRef, onLoad: this.onLoad, src: finalSrc, allow: allow, referrerPolicy: referrerpolicy, sandbox: sandbox }));
     };
     IFrame.propsList = ['src', 'className'];
     IFrame.defaultProps = {