amis 2.0.0-rc.10 → 2.0.0-rc.16

package/lib/renderers/Form/InputImage.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 
@@ -396,6 +396,10 @@ var ImageControl = /** @class */ (function (_super) {
     };
     ImageControl.prototype.syncAutoFill = function () {
         var _a = this.props, autoFill = _a.autoFill, multiple = _a.multiple, onBulkChange = _a.onBulkChange, data = _a.data, name = _a.name;
+        // 参照录入｜自动填充
+        if (autoFill === null || autoFill === void 0 ? void 0 : autoFill.hasOwnProperty('api')) {
+            return;
+        }
         // 排除自身的字段，否则会无限更新state
         var excludeSelfAutoFill = omit__default["default"](autoFill, name || '');
         if (!amisCore.isEmpty(excludeSelfAutoFill) && onBulkChange && this.initAutoFill) {

package/lib/renderers/Form/InputMonthRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputQuarterRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

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

@@ -40,7 +40,7 @@ export interface RangeControlSchema extends FormBaseControlSchema {
     /**
      * 分割块数
      */
-    parts?: number;
+    parts?: number | number[];
     /**
      * 刻度
      */
@@ -73,15 +73,18 @@ export interface RangeControlSchema extends FormBaseControlSchema {
      * 是否禁用
      */
     disabled?: boolean;
+    /**
+     * 输入框是否可清除
+     */
+    clearable?: boolean;
 }
 declare type MarksType = {
-    [index: string]: MarksValue;
-    [index: number]: MarksValue;
+    [index: string | number]: MarksValue;
 };
-declare type MarksValue = Record<number, SchemaObject | {
+declare type MarksValue = string | number | SchemaObject | {
     style?: React.CSSProperties;
     label?: string;
-}>;
+};
 export interface RangeProps extends FormControlProps {
     /**
      * 滑块值
@@ -147,6 +150,10 @@ export interface RangeProps extends FormControlProps {
      * 是否禁用
      */
     disabled: boolean;
+    /**
+     * 输入框是否可清除
+     */
+    clearable?: boolean;
     /**
      * value改变事件
      */

package/lib/renderers/Form/InputRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputRating.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputRepeat.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputRichText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputSubForm.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputTable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 
@@ -134,7 +134,7 @@ var FormTable = /** @class */ (function (_super) {
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, onAction = _a.onAction, valueField = _a.valueField, env = _a.env, needConfirm = _a.needConfirm, addable = _a.addable, addApi = _a.addApi, __ = _a.translate;
+                        _a = this.props, onAction = _a.onAction, valueField = _a.valueField, env = _a.env, _a.onChange, _a.editable, needConfirm = _a.needConfirm, addable = _a.addable, addApi = _a.addApi, __ = _a.translate;
                         if (!(action.actionType === 'add')) return [3 /*break*/, 6];
                         if (addable === false) {
                             return [2 /*return*/];

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

@@ -16,6 +16,14 @@ export interface TagControlSchema extends FormOptionsSchema {
      * 是否为下拉模式
      */
     dropdown?: boolean;
+    /**
+     * 允许添加的标签的最大数量
+     */
+    max?: number;
+    /**
+     * 单个标签的最大文本长度
+     */
+    maxTagLength?: number;
     /**
      * 标签的最大展示数量，超出数量后以收纳浮层的方式展示，仅在多选模式开启后生效
      */
@@ -24,13 +32,32 @@ export interface TagControlSchema extends FormOptionsSchema {
      * 收纳标签的Popover配置
      */
     overflowTagPopover?: object;
+    /** 是否开启批量添加模式 */
+    enableBatchAdd: boolean;
+    /**
+     * 开启批量添加后，输入多个标签的分隔符，支持传入多个符号，默认为"-"
+     *
+     * @default "-"
+     */
+    separator?: string;
 }
+export declare type InputTagValidationType = 'max' | 'maxLength';
 export interface TagProps extends OptionsControlProps {
     placeholder?: string;
     clearable: boolean;
     resetValue?: any;
     optionsTip: string;
     dropdown?: boolean;
+    /** 是否支持批量输入 */
+    enableBatchAdd: boolean;
+    /** 开启批量添加后，输入多个标签的分隔符，支持传入多个符号，默认为英文逗号 */
+    separator?: string;
+    /** 允许添加的tag的最大数量 */
+    max?: number;
+    /** 单个标签的最大文本长度 */
+    maxTagLength?: number;
+    /** 文本输入后校验失败的callback */
+    onInputValidateFailed?(value: string | string[], validationType: InputTagValidationType): void;
 }
 export interface TagState {
     inputValue: string;
@@ -46,6 +73,7 @@ export default class TagControl extends React.PureComponent<TagProps, TagState>
         multiple: boolean;
         placeholder: string;
         optionsTip: string;
+        separator: string;
     };
     state: {
         isOpened: boolean;
@@ -55,6 +83,12 @@ export default class TagControl extends React.PureComponent<TagProps, TagState>
     componentDidUpdate(prevProps: TagProps): void;
     doAction(action: ActionObject, data: object, throwErrors: boolean): void;
     dispatchEvent(eventName: string, eventData?: any): Promise<boolean>;
+    /** 处理输入的内容 */
+    normalizeInputValue(inputValue: string, separator?: string): Option[];
+    normalizeOptions(options: Option[]): string | any[];
+    /** 输入的内容和存量的内容合并，过滤掉value值相同的 */
+    normalizeMergedValue(inputValue: string, normalized?: boolean): string | any[];
+    validateInputValue(inputValue: string): boolean;
     getValue(type?: 'push' | 'pop' | 'normal', option?: any): string | any[];
     addItem(option: Option): Promise<void>;
     handleFocus(e: any): Promise<void>;

package/lib/renderers/Form/InputTag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 
@@ -12,6 +12,8 @@ var React = require('react');
 var amisCore = require('amis-core');
 var Downshift = require('downshift');
 var find = require('lodash/find');
+var isInteger = require('lodash/isInteger');
+var unionWith = require('lodash/unionWith');
 var ReactDOM = require('react-dom');
 var amisUi = require('amis-ui');
 
@@ -20,6 +22,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var Downshift__default = /*#__PURE__*/_interopDefaultLegacy(Downshift);
 var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
+var isInteger__default = /*#__PURE__*/_interopDefaultLegacy(isInteger);
+var unionWith__default = /*#__PURE__*/_interopDefaultLegacy(unionWith);
 
 var TagControl = /** @class */ (function (_super) {
     tslib.__extends(TagControl, _super);
@@ -68,6 +72,51 @@ var TagControl = /** @class */ (function (_super) {
             });
         });
     };
+    /** 处理输入的内容 */
+    TagControl.prototype.normalizeInputValue = function (inputValue, separator) {
+        if (separator === void 0) { separator = '-'; }
+        var batchValues = [];
+        if (typeof separator === 'string') {
+            batchValues = inputValue.split(separator);
+        }
+        else {
+            batchValues.push(inputValue);
+        }
+        return batchValues
+            .filter(Boolean)
+            .map(function (item) { return ({ value: item, label: item }); });
+    };
+    TagControl.prototype.normalizeOptions = function (options) {
+        var _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, valueField = _a.valueField;
+        return joinValues
+            ? options.map(function (item) { return item[valueField || 'value']; }).join(delimiter || ',')
+            : extractValue
+                ? options.map(function (item) { return item[valueField || 'value']; })
+                : options;
+    };
+    /** 输入的内容和存量的内容合并，过滤掉value值相同的 */
+    TagControl.prototype.normalizeMergedValue = function (inputValue, normalized) {
+        if (normalized === void 0) { normalized = true; }
+        var _a = this.props, selectedOptions = _a.selectedOptions; _a.joinValues; _a.extractValue; _a.delimiter; _a.valueField; var enableBatchAdd = _a.enableBatchAdd, separator = _a.separator;
+        var options = unionWith__default["default"](selectedOptions.concat(), this.normalizeInputValue(inputValue, enableBatchAdd ? separator : undefined), function (origin, input) { return origin.value === input.value; });
+        return normalized ? this.normalizeOptions(options) : options;
+    };
+    TagControl.prototype.validateInputValue = function (inputValue) {
+        var _a = this.props, max = _a.max, maxTagLength = _a.maxTagLength, enableBatchAdd = _a.enableBatchAdd, separator = _a.separator, onInputValidateFailed = _a.onInputValidateFailed;
+        var normalizedValue = this.normalizeMergedValue(inputValue, false);
+        if (max != null && isInteger__default["default"](max) && normalizedValue.length > max) {
+            onInputValidateFailed === null || onInputValidateFailed === void 0 ? void 0 : onInputValidateFailed(normalizedValue.map(function (item) { return item.value; }), 'max');
+            return false;
+        }
+        var addedValues = this.normalizeInputValue(inputValue, enableBatchAdd ? separator : undefined);
+        if (maxTagLength != null &&
+            isInteger__default["default"](maxTagLength) &&
+            addedValues.some(function (item) { return item.value.length > maxTagLength; })) {
+            onInputValidateFailed === null || onInputValidateFailed === void 0 ? void 0 : onInputValidateFailed(addedValues.map(function (item) { return item.value; }), 'maxLength');
+            return false;
+        }
+        return true;
+    };
     TagControl.prototype.getValue = function (type, option) {
         if (type === void 0) { type = 'normal'; }
         if (option === void 0) { option = {}; }
@@ -79,12 +128,11 @@ var TagControl = /** @class */ (function (_super) {
         else if (type === 'pop') {
             newValue.pop();
         }
-        var newValueRes = joinValues
+        return joinValues
             ? newValue.map(function (item) { return item[valueField || 'value']; }).join(delimiter || ',')
             : extractValue
                 ? newValue.map(function (item) { return item[valueField || 'value']; })
                 : newValue;
-        return newValueRes;
     };
     TagControl.prototype.addItem = function (option) {
         return tslib.__awaiter(this, void 0, void 0, function () {
@@ -135,13 +183,17 @@ var TagControl = /** @class */ (function (_super) {
     TagControl.prototype.handleBlur = function (e) {
         var _a, _b;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _c, selectedOptions, onChange, joinValues, extractValue, delimiter, valueField, value, newValueRes, isPrevented;
+            var _c, selectedOptions, onChange, value, newValueRes, isPrevented;
             return tslib.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        _c = this.props, selectedOptions = _c.selectedOptions, onChange = _c.onChange, joinValues = _c.joinValues, extractValue = _c.extractValue, delimiter = _c.delimiter, valueField = _c.valueField;
+                        _c = this.props, selectedOptions = _c.selectedOptions, onChange = _c.onChange;
                         value = this.state.inputValue.trim();
-                        newValueRes = this.getValue('normal');
+                        if (!this.validateInputValue(value)) {
+                            this.setState({ isFocused: false, isOpened: false });
+                            return [2 /*return*/];
+                        }
+                        newValueRes = this.normalizeMergedValue(value);
                         return [4 /*yield*/, this.dispatchEvent('blur', {
                                 value: newValueRes
                             })];
@@ -154,20 +206,8 @@ var TagControl = /** @class */ (function (_super) {
                             inputValue: ''
                         }, value
                             ? function () {
-                                var newValue = selectedOptions.concat();
-                                if (!find__default["default"](newValue, function (item) { return item.value === value; })) {
-                                    var option = {
-                                        label: value,
-                                        value: value
-                                    };
-                                    newValue.push(option);
-                                    onChange(joinValues
-                                        ? newValue
-                                            .map(function (item) { return item[valueField || 'value']; })
-                                            .join(delimiter || ',')
-                                        : extractValue
-                                            ? newValue.map(function (item) { return item[valueField || 'value']; })
-                                            : newValue);
+                                if (selectedOptions.length !== newValueRes.length) {
+                                    onChange === null || onChange === void 0 ? void 0 : onChange(newValueRes);
                                 }
                             }
                             : undefined);
@@ -182,9 +222,7 @@ var TagControl = /** @class */ (function (_super) {
         });
     };
     TagControl.prototype.handleInputChange = function (text) {
-        this.setState({
-            inputValue: text
-        });
+        this.setState({ inputValue: text });
     };
     TagControl.prototype.handleChange = function (value) {
         return tslib.__awaiter(this, void 0, void 0, function () {
@@ -217,7 +255,7 @@ var TagControl = /** @class */ (function (_super) {
     };
     TagControl.prototype.handleKeyDown = function (evt) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, selectedOptions, onChange, delimiter, value, newValueRes, isPrevented, newValue, newValueRes, isPrevented;
+            var _a, selectedOptions, onChange, delimiter, value, newValueRes, isPrevented, newValueRes, isPrevented;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -231,30 +269,29 @@ var TagControl = /** @class */ (function (_super) {
                     case 1:
                         isPrevented = _b.sent();
                         isPrevented || onChange(newValueRes);
-                        return [3 /*break*/, 5];
+                        return [3 /*break*/, 4];
                     case 2:
-                        if (!(value && (evt.key === 'Enter' || evt.key === delimiter))) return [3 /*break*/, 5];
+                        if (!(value && (evt.key === 'Enter' || evt.key === delimiter))) return [3 /*break*/, 4];
                         evt.preventDefault();
                         evt.stopPropagation();
-                        newValue = selectedOptions.concat();
-                        if (!!find__default["default"](newValue, function (item) { return item.value == value; })) return [3 /*break*/, 4];
-                        newValueRes = this.getValue('push', {
-                            label: value,
-                            value: value
-                        });
+                        newValueRes = this.normalizeMergedValue(value);
                         return [4 /*yield*/, this.dispatchEvent('change', {
                                 value: newValueRes
                             })];
                     case 3:
                         isPrevented = _b.sent();
-                        isPrevented || onChange(newValueRes);
-                        _b.label = 4;
-                    case 4:
+                        if (!this.validateInputValue(value)) {
+                            this.setState({ isFocused: false, isOpened: false });
+                            return [2 /*return*/];
+                        }
+                        if (!isPrevented && selectedOptions.length !== newValueRes.length) {
+                            onChange(newValueRes);
+                        }
                         this.setState({
                             inputValue: ''
                         });
-                        _b.label = 5;
-                    case 5: return [2 /*return*/];
+                        _b.label = 4;
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -297,8 +334,8 @@ var TagControl = /** @class */ (function (_super) {
                     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),
-                dropdown !== false ? (React__default["default"].createElement(amisUi.Overlay, { container: popOverContainer || _this.getParent, target: _this.getTarget, placement: 'auto', show: isOpen && !!finnalOptions.length },
-                    React__default["default"].createElement(amisUi.PopOver, { overlay: true, className: cx('TagControl-popover'), onHide: _this.close },
+                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) {
                                 var item = _a.item, index = _a.index;
                                 return (tslib.__assign({}, getItemProps({
@@ -321,7 +358,8 @@ var TagControl = /** @class */ (function (_super) {
         valueField: 'value',
         multiple: true,
         placeholder: 'Tag.placeholder',
-        optionsTip: 'Tag.tip'
+        optionsTip: 'Tag.tip',
+        separator: '-'
     };
     tslib.__decorate([
         amisCore.autobind,

package/lib/renderers/Form/InputText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

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

@@ -1,7 +1,6 @@
 import React from 'react';
-import { OptionsControlProps } from 'amis-core';
+import { OptionsControlProps, ActionObject } from 'amis-core';
 import { FormOptionsSchema, SchemaApi } from '../../Schema';
-import { ActionObject } from 'amis-core';
 /**
  * Tree 下拉选择框。
  * 文档：https://baidu.gitee.io/amis/docs/components/form/tree
@@ -65,6 +64,10 @@ export interface TreeControlSchema extends FormOptionsSchema {
      */
     showOutline?: boolean;
     deferApi?: SchemaApi;
+    /**
+     * 需要高亮的字符串
+     */
+    highlightTxt?: string;
 }
 export interface TreeProps extends OptionsControlProps, Omit<TreeControlSchema, 'type' | 'options' | 'className' | 'inputClassName' | 'descriptionClassName'> {
     enableNodePath?: boolean;

package/lib/renderers/Form/InputTree.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 
@@ -69,10 +69,14 @@ var TreeControl = /** @class */ (function (_super) {
         this.treeRef = ref;
     };
     TreeControl.prototype.render = function () {
-        var _a = this.props, className = _a.className, treeContainerClassName = _a.treeContainerClassName, ns = _a.classPrefix, value = _a.value, enableNodePath = _a.enableNodePath, _b = _a.pathSeparator, pathSeparator = _b === void 0 ? '/' : _b, disabled = _a.disabled, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, placeholder = _a.placeholder, options = _a.options, multiple = _a.multiple, valueField = _a.valueField, initiallyOpen = _a.initiallyOpen, unfoldedLevel = _a.unfoldedLevel, withChildren = _a.withChildren, onlyChildren = _a.onlyChildren, onlyLeaf = _a.onlyLeaf, loading = _a.loading, hideRoot = _a.hideRoot, rootLabel = _a.rootLabel, autoCheckChildren = _a.autoCheckChildren, cascade = _a.cascade, rootValue = _a.rootValue, showIcon = _a.showIcon, showRadio = _a.showRadio, showOutline = _a.showOutline, onAdd = _a.onAdd, creatable = _a.creatable, createTip = _a.createTip, addControls = _a.addControls, onEdit = _a.onEdit, editable = _a.editable, editTip = _a.editTip, editControls = _a.editControls, removable = _a.removable, removeTip = _a.removeTip, onDelete = _a.onDelete, rootCreatable = _a.rootCreatable, rootCreateTip = _a.rootCreateTip, labelField = _a.labelField, iconField = _a.iconField, nodePath = _a.nodePath, deferLoad = _a.deferLoad, expandTreeOptions = _a.expandTreeOptions, __ = _a.translate;
+        var _a = this.props, className = _a.className, treeContainerClassName = _a.treeContainerClassName, ns = _a.classPrefix, value = _a.value, enableNodePath = _a.enableNodePath, _b = _a.pathSeparator, pathSeparator = _b === void 0 ? '/' : _b, disabled = _a.disabled, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, placeholder = _a.placeholder, options = _a.options, multiple = _a.multiple, valueField = _a.valueField, initiallyOpen = _a.initiallyOpen, unfoldedLevel = _a.unfoldedLevel, withChildren = _a.withChildren, onlyChildren = _a.onlyChildren, onlyLeaf = _a.onlyLeaf, loading = _a.loading, hideRoot = _a.hideRoot, rootLabel = _a.rootLabel, autoCheckChildren = _a.autoCheckChildren, cascade = _a.cascade, rootValue = _a.rootValue, showIcon = _a.showIcon, showRadio = _a.showRadio, showOutline = _a.showOutline, onAdd = _a.onAdd, creatable = _a.creatable, createTip = _a.createTip, addControls = _a.addControls, onEdit = _a.onEdit, editable = _a.editable, editTip = _a.editTip, editControls = _a.editControls, removable = _a.removable, removeTip = _a.removeTip, onDelete = _a.onDelete, rootCreatable = _a.rootCreatable, rootCreateTip = _a.rootCreateTip, labelField = _a.labelField, iconField = _a.iconField, nodePath = _a.nodePath, deferLoad = _a.deferLoad, expandTreeOptions = _a.expandTreeOptions, __ = _a.translate, data = _a.data;
+        var highlightTxt = this.props.highlightTxt;
+        if (amisCore.isPureVariable(highlightTxt)) {
+            highlightTxt = amisCore.resolveVariableAndFilter(highlightTxt, data);
+        }
         return (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "TreeControl"), className, treeContainerClassName) },
             React__default["default"].createElement(amisUi.Spinner, { size: "sm", key: "info", show: loading }),
-            loading ? null : (React__default["default"].createElement(amisUi.Tree, { classPrefix: ns, onRef: this.domRef, labelField: labelField, valueField: valueField, iconField: iconField, disabled: disabled, onChange: this.handleChange, joinValues: joinValues, extractValue: extractValue, delimiter: delimiter, placeholder: __(placeholder), options: options, multiple: multiple, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, withChildren: withChildren, onlyChildren: onlyChildren, onlyLeaf: onlyLeaf, hideRoot: hideRoot, rootLabel: __(rootLabel), rootValue: rootValue, showIcon: showIcon, showRadio: showRadio, showOutline: showOutline, autoCheckChildren: autoCheckChildren, cascade: cascade, foldedField: "collapsed", value: value || '', nodePath: nodePath, enableNodePath: enableNodePath, pathSeparator: pathSeparator, selfDisabledAffectChildren: false, onAdd: onAdd, creatable: creatable, createTip: createTip, rootCreatable: rootCreatable, rootCreateTip: rootCreateTip, onEdit: onEdit, editable: editable, editTip: editTip, removable: removable, removeTip: removeTip, onDelete: onDelete, bultinCUD: !addControls && !editControls, onDeferLoad: deferLoad, onExpandTree: expandTreeOptions }))));
+            loading ? null : (React__default["default"].createElement(amisUi.Tree, { classPrefix: ns, onRef: this.domRef, labelField: labelField, valueField: valueField, iconField: iconField, disabled: disabled, onChange: this.handleChange, joinValues: joinValues, extractValue: extractValue, delimiter: delimiter, placeholder: __(placeholder), options: options, highlightTxt: highlightTxt, multiple: multiple, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, withChildren: withChildren, onlyChildren: onlyChildren, onlyLeaf: onlyLeaf, hideRoot: hideRoot, rootLabel: __(rootLabel), rootValue: rootValue, showIcon: showIcon, showRadio: showRadio, showOutline: showOutline, autoCheckChildren: autoCheckChildren, cascade: cascade, foldedField: "collapsed", value: value || '', nodePath: nodePath, enableNodePath: enableNodePath, pathSeparator: pathSeparator, selfDisabledAffectChildren: false, onAdd: onAdd, creatable: creatable, createTip: createTip, rootCreatable: rootCreatable, rootCreateTip: rootCreateTip, onEdit: onEdit, editable: editable, editTip: editTip, removable: removable, removeTip: removeTip, onDelete: onDelete, bultinCUD: !addControls && !editControls, onDeferLoad: deferLoad, onExpandTree: expandTreeOptions }))));
     };
     TreeControl.defaultProps = {
         placeholder: 'loading',

package/lib/renderers/Form/InputYearRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/JSONSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/JSONSchemaEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ListSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/LocationPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/MatrixCheckboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/NestedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 
@@ -9,8 +9,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
-var amisUi = require('amis-ui');
 var amisCore = require('amis-core');
+var amisUi = require('amis-ui');
 var ReactDOM = require('react-dom');
 var xor = require('lodash/xor');
 var union = require('lodash/union');
@@ -552,8 +552,8 @@ var NestedSelectControl = /** @class */ (function (_super) {
         var body = (React__default["default"].createElement(amisCore.RootClose, { disabled: !this.state.isOpened, onRootClose: this.close }, function (ref) {
             return (React__default["default"].createElement("div", { className: cx('NestedSelect-menuOuter'), ref: ref }, isSearch ? (_this.renderSearchResult()) : options.length ? (_this.renderOptions()) : (React__default["default"].createElement("div", { className: cx('NestedSelect-noResult') }, noResultsText))));
         }));
-        return (React__default["default"].createElement(amisUi.Overlay, { target: this.getTarget, container: popOverContainer || (function () { return ReactDOM.findDOMNode(_this); }), placement: 'auto', show: true },
-            React__default["default"].createElement(amisUi.PopOver, { className: cx('NestedSelect-popover') }, body)));
+        return (React__default["default"].createElement(amisCore.Overlay, { target: this.getTarget, container: popOverContainer || (function () { return ReactDOM.findDOMNode(_this); }), placement: 'auto', show: true },
+            React__default["default"].createElement(amisCore.PopOver, { className: cx('NestedSelect-popover') }, body)));
     };
     NestedSelectControl.prototype.render = function () {
         var _a;

package/lib/renderers/Form/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

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

@@ -16,8 +16,13 @@ export interface RadiosControlSchema extends FormOptionsSchema {
 export interface RadiosProps extends OptionsControlProps {
     placeholder?: any;
     columnsCount?: number;
-    labelClassName?: string;
     labelField?: string;
+    /**
+     * @deprecated 和checkbox的labelClassName有冲突，请用optionClassName代替
+     */
+    labelClassName?: string;
+    /** 选项CSS类名 */
+    optionClassName?: string;
 }
 export default class RadiosControl extends React.Component<RadiosProps, any> {
     static defaultProps: Partial<RadiosProps>;

package/lib/renderers/Form/Radios.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 
@@ -63,8 +63,10 @@ var RadiosControl = /** @class */ (function (_super) {
         reload && reload();
     };
     RadiosControl.prototype.render = function () {
-        var _a = this.props, className = _a.className, ns = _a.classPrefix, value = _a.value; _a.onChange; var disabled = _a.disabled, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, placeholder = _a.placeholder, options = _a.options, _b = _a.inline, inline = _b === void 0 ? true : _b, formMode = _a.formMode, columnsCount = _a.columnsCount, classPrefix = _a.classPrefix, itemClassName = _a.itemClassName, labelClassName = _a.labelClassName, labelField = _a.labelField, valueField = _a.valueField, __ = _a.translate, optionType = _a.optionType, level = _a.level;
-        return (React__default["default"].createElement(amisUi.Radios, { inline: inline || formMode === 'inline', className: cx__default["default"]("".concat(ns, "RadiosControl"), className), value: typeof value === 'undefined' || value === null ? '' : value, disabled: disabled, onChange: this.handleChange, joinValues: joinValues, extractValue: extractValue, delimiter: delimiter, labelClassName: labelClassName, labelField: labelField, valueField: valueField, placeholder: __(placeholder), options: options, columnsCount: columnsCount, classPrefix: classPrefix, itemClassName: itemClassName, optionType: optionType, level: level }));
+        var _a = this.props, className = _a.className, ns = _a.classPrefix, value = _a.value; _a.onChange; var disabled = _a.disabled, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, placeholder = _a.placeholder, options = _a.options, _b = _a.inline, inline = _b === void 0 ? true : _b, formMode = _a.formMode, columnsCount = _a.columnsCount, classPrefix = _a.classPrefix, itemClassName = _a.itemClassName, labelClassName = _a.labelClassName, optionClassName = _a.optionClassName, labelField = _a.labelField, valueField = _a.valueField, __ = _a.translate, optionType = _a.optionType, level = _a.level;
+        return (React__default["default"].createElement(amisUi.Radios, { inline: inline || formMode === 'inline', className: cx__default["default"]("".concat(ns, "RadiosControl"), className), value: typeof value === 'undefined' || value === null ? '' : value, disabled: disabled, onChange: this.handleChange, joinValues: joinValues, extractValue: extractValue, delimiter: delimiter, 
+            /** 兼容一下错误的用法 */
+            labelClassName: optionClassName !== null && optionClassName !== void 0 ? optionClassName : labelClassName, labelField: labelField, valueField: valueField, placeholder: __(placeholder), options: options, columnsCount: columnsCount, classPrefix: classPrefix, itemClassName: itemClassName, optionType: optionType, level: level }));
     };
     RadiosControl.defaultProps = {
         columnsCount: 1

package/lib/renderers/Form/Select.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Static.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

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

@@ -31,11 +31,14 @@ export interface SwitchControlSchema extends FormBaseControlSchema {
      * 关闭时显示的内容
      */
     offText?: string | IconSchema;
+    /** 开关尺寸 */
+    size?: 'sm' | 'md';
 }
 export interface SwitchProps extends FormControlProps {
     option?: string;
     trueValue?: any;
     falseValue?: any;
+    size?: 'sm';
 }
 export declare type SwitchRendererEvent = 'change';
 export default class SwitchControl extends React.Component<SwitchProps, any> {