amis 2.0.0-rc.9 → 2.0.2

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

@@ -56,6 +56,10 @@ export interface TextControlSchema extends FormOptionsSchema {
         /** 用户输入的字符自动转大写 */
         upperCase?: boolean;
     };
+    /** control节点的CSS类名 */
+    inputControlClassName?: string;
+    /** 原生input标签的CSS类名 */
+    nativeInputClassName: string;
 }
 export declare type InputTextRendererEvent = 'blur' | 'focus' | 'click' | 'change' | 'enter';
 export interface TextProps extends OptionsControlProps {
@@ -77,6 +81,10 @@ export interface TextProps extends OptionsControlProps {
         lowerCase?: boolean;
         upperCase?: boolean;
     };
+    /** control节点的CSS类名 */
+    inputControlClassName?: string;
+    /** 原生input标签的CSS类名 */
+    nativeInputClassName?: string;
 }
 export interface TextState {
     isOpen?: boolean;

package/lib/renderers/Form/InputText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -90,6 +90,10 @@ var TextControl = /** @class */ (function (_super) {
                     : this.valueToString(props.value)
             });
         }
+        if (prevProps.revealPassword !== props.revealPassword) {
+            /** 隐藏按钮的同时将密码设置为隐藏态 */
+            !props.revealPassword && this.setState({ revealPassword: false });
+        }
     };
     TextControl.prototype.componentWillUnmount = function () {
         this.unHook && this.unHook();
@@ -382,7 +386,7 @@ var TextControl = /** @class */ (function (_super) {
     TextControl.prototype.renderSugestMode = function () {
         var _this = this;
         var _a;
-        var _b = this.props, className = _b.className, inputOnly = _b.inputOnly, value = _b.value, placeholder = _b.placeholder, cx = _b.classnames, disabled = _b.disabled, readOnly = _b.readOnly, name = _b.name, loading = _b.loading, clearable = _b.clearable, options = _b.options, selectedOptions = _b.selectedOptions, autoComplete = _b.autoComplete, labelField = _b.labelField, valueField = _b.valueField, multiple = _b.multiple, creatable = _b.creatable, borderMode = _b.borderMode, showCounter = _b.showCounter, maxLength = _b.maxLength, __ = _b.translate;
+        var _b = this.props, className = _b.className, inputControlClassName = _b.inputControlClassName, nativeInputClassName = _b.nativeInputClassName, inputOnly = _b.inputOnly, value = _b.value, placeholder = _b.placeholder, cx = _b.classnames, disabled = _b.disabled, readOnly = _b.readOnly, name = _b.name, loading = _b.loading, clearable = _b.clearable, options = _b.options, selectedOptions = _b.selectedOptions, autoComplete = _b.autoComplete, labelField = _b.labelField, valueField = _b.valueField, multiple = _b.multiple, creatable = _b.creatable, borderMode = _b.borderMode, showCounter = _b.showCounter, maxLength = _b.maxLength, __ = _b.translate;
         var type = (_a = this.props.type) === null || _a === void 0 ? void 0 : _a.replace(/^(?:native|input)\-/, '');
         return (React__default["default"].createElement(Downshift__default["default"], { isOpen: this.state.isOpen && !disabled && !readOnly, inputValue: this.state.inputValue, onChange: this.handleChange, onStateChange: this.handleStateChange, selectedItem: selectedOptions.map(function (item) { return item[valueField || 'value']; }) }, function (_a) {
             var _b, _c;
@@ -407,7 +411,7 @@ var TextControl = /** @class */ (function (_super) {
                     _b.isNew = true,
                     _b));
             }
-            return (React__default["default"].createElement("div", { className: cx("TextControl-input TextControl-input--withAC", inputOnly ? className : '', (_c = {
+            return (React__default["default"].createElement("div", { className: cx("TextControl-input TextControl-input--withAC", inputControlClassName, inputOnly ? className : '', (_c = {
                         'is-opened': isOpen,
                         'TextControl-input--multiple': multiple
                     },
@@ -433,7 +437,7 @@ var TextControl = /** @class */ (function (_super) {
                         onBlur: _this.handleBlur,
                         onChange: _this.handleInputChange,
                         onKeyDown: _this.handleKeyDown
-                    }), { autoComplete: "off", size: 10 }))),
+                    }), { autoComplete: "off", size: 10, className: cx(nativeInputClassName) }))),
                 clearable && !disabled && !readOnly && value ? (React__default["default"].createElement("a", { onClick: _this.clearValue, className: cx('TextControl-clear') },
                     React__default["default"].createElement(amisUi.Icon, { icon: "input-clear", className: "icon" }))) : null,
                 showCounter ? (React__default["default"].createElement("span", { className: cx('TextControl-counter') }, "".concat((_d = _this.valueToString(value)) === null || _d === void 0 ? void 0 : _d.length).concat(typeof maxLength === 'number' && maxLength
@@ -464,15 +468,15 @@ var TextControl = /** @class */ (function (_super) {
     TextControl.prototype.renderNormal = function () {
         var _a;
         var _b, _c;
-        var _d = this.props, ns = _d.classPrefix, cx = _d.classnames, className = _d.className, inputOnly = _d.inputOnly, value = _d.value, placeholder = _d.placeholder; _d.onChange; var disabled = _d.disabled, readOnly = _d.readOnly, max = _d.max, min = _d.min, step = _d.step, clearable = _d.clearable, _e = _d.revealPassword, revealPassword = _e === void 0 ? true : _e, name = _d.name, borderMode = _d.borderMode, prefix = _d.prefix, suffix = _d.suffix, data = _d.data, showCounter = _d.showCounter, maxLength = _d.maxLength;
+        var _d = this.props, ns = _d.classPrefix, cx = _d.classnames, className = _d.className, inputControlClassName = _d.inputControlClassName, nativeInputClassName = _d.nativeInputClassName, inputOnly = _d.inputOnly, value = _d.value, placeholder = _d.placeholder; _d.onChange; var disabled = _d.disabled, readOnly = _d.readOnly, max = _d.max, min = _d.min, step = _d.step, clearable = _d.clearable, _e = _d.revealPassword, revealPassword = _e === void 0 ? true : _e, name = _d.name, borderMode = _d.borderMode, prefix = _d.prefix, suffix = _d.suffix, data = _d.data, showCounter = _d.showCounter, maxLength = _d.maxLength;
         var type = (_b = this.props.type) === null || _b === void 0 ? void 0 : _b.replace(/^(?:native|input)\-/, '');
         return (React__default["default"].createElement("div", { className: cx('TextControl-input', (_a = {},
                 _a["TextControl-input--border".concat(amisCore.ucFirst(borderMode))] = borderMode,
-                _a), inputOnly ? className : '') },
+                _a), inputControlClassName, inputOnly ? className : '') },
             prefix ? (React__default["default"].createElement("span", { className: cx('TextControl-inputPrefix') }, amisCore.filter(prefix, data))) : null,
-            React__default["default"].createElement(amisUi.Input, { name: name, placeholder: placeholder, ref: this.inputRef, disabled: disabled, readOnly: readOnly, type: this.state.revealPassword ? 'text' : type, onFocus: this.handleFocus, onBlur: this.handleBlur, max: max, min: min, autoComplete: "off", size: 10, step: step, onChange: this.handleNormalInputChange, value: this.valueToString(value), className: cx(type === 'password' &&
-                    revealPassword &&
-                    'TextControl-input-password') }),
+            React__default["default"].createElement(amisUi.Input, { name: name, placeholder: placeholder, ref: this.inputRef, disabled: disabled, readOnly: readOnly, type: this.state.revealPassword ? 'text' : type, onFocus: this.handleFocus, onBlur: this.handleBlur, max: max, min: min, autoComplete: "off", size: 10, step: step, onChange: this.handleNormalInputChange, value: this.valueToString(value), className: cx(nativeInputClassName, {
+                    'TextControl-input-password': type === 'password' && revealPassword
+                }) }),
             clearable && !disabled && !readOnly && value ? (React__default["default"].createElement("a", { onClick: this.clearValue, className: "".concat(ns, "TextControl-clear") },
                 React__default["default"].createElement(amisUi.Icon, { icon: "input-clear", className: "icon" }))) : null,
             type === 'password' && revealPassword && !disabled ? (React__default["default"].createElement("a", { onClick: this.toggleRevealPassword, className: "".concat(ns, "TextControl-revealPassword") }, this.state.revealPassword ? (React__default["default"].createElement(amisUi.Icon, { icon: "view", className: "icon" })) : (React__default["default"].createElement(amisUi.Icon, { icon: "invisible", className: "icon" })))) : null,

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.9
+ * amis v2.0.2
  * 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.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/JSONSchema.js

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

package/lib/renderers/Form/JSONSchemaEditor.js

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

package/lib/renderers/Form/ListSelect.js

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

package/lib/renderers/Form/LocationPicker.js

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

package/lib/renderers/Form/MatrixCheckboxes.js

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

package/lib/renderers/Form/NestedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * 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.9
+ * amis v2.0.2
  * 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.9
+ * amis v2.0.2
  * 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.d.ts

@@ -20,6 +20,10 @@ export interface SelectControlSchema extends FormOptionsSchema {
      * 可以自定义菜单展示。
      */
     menuTpl?: string;
+    /**
+     * 当在value值未匹配到当前options中的选项时，是否value值对应文本飘红显示
+     */
+    showInvalidMatch: boolean;
     /**
      * 边框模式，全边框，还是半边框，或者没边框。
      */
@@ -96,6 +100,7 @@ export interface SelectControlSchema extends FormOptionsSchema {
 export interface SelectProps extends OptionsControlProps {
     autoComplete?: Api;
     searchable?: boolean;
+    showInvalidMatch?: boolean;
     defaultOpen?: boolean;
     useMobileUI?: boolean;
     maxTagCount?: number;

package/lib/renderers/Form/Select.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -228,7 +228,7 @@ var SelectControl = /** @class */ (function (_super) {
     };
     SelectControl.prototype.render = function () {
         var _this = this;
-        var _a = this.props, autoComplete = _a.autoComplete, searchable = _a.searchable, options = _a.options, className = _a.className, loading = _a.loading; _a.value; var selectedOptions = _a.selectedOptions, multi = _a.multi, multiple = _a.multiple, placeholder = _a.placeholder; _a.id; var classPrefix = _a.classPrefix; _a.classnames; var creatable = _a.creatable; _a.inline; var noResultsText = _a.noResultsText, render = _a.render, menuTpl = _a.menuTpl, borderMode = _a.borderMode, selectMode = _a.selectMode, env = _a.env, useMobileUI = _a.useMobileUI, rest = tslib.__rest(_a, ["autoComplete", "searchable", "options", "className", "loading", "value", "selectedOptions", "multi", "multiple", "placeholder", "id", "classPrefix", "classnames", "creatable", "inline", "noResultsText", "render", "menuTpl", "borderMode", "selectMode", "env", "useMobileUI"]);
+        var _a = this.props, autoComplete = _a.autoComplete, searchable = _a.searchable, showInvalidMatch = _a.showInvalidMatch, options = _a.options, className = _a.className, loading = _a.loading; _a.value; var selectedOptions = _a.selectedOptions, multi = _a.multi, multiple = _a.multiple, placeholder = _a.placeholder; _a.id; var classPrefix = _a.classPrefix; _a.classnames; var creatable = _a.creatable; _a.inline; var noResultsText = _a.noResultsText, render = _a.render, menuTpl = _a.menuTpl, borderMode = _a.borderMode, selectMode = _a.selectMode, env = _a.env, useMobileUI = _a.useMobileUI, rest = tslib.__rest(_a, ["autoComplete", "searchable", "showInvalidMatch", "options", "className", "loading", "value", "selectedOptions", "multi", "multiple", "placeholder", "id", "classPrefix", "classnames", "creatable", "inline", "noResultsText", "render", "menuTpl", "borderMode", "selectMode", "env", "useMobileUI"]);
         if (noResultsText) {
             noResultsText = render('noResultText', noResultsText);
         }
@@ -237,12 +237,13 @@ var SelectControl = /** @class */ (function (_super) {
                 ? env.getModalContainer
                 : mobileUI
                     ? undefined
-                    : rest.popOverContainer, borderMode: borderMode, placeholder: placeholder, multiple: multiple || multi, ref: this.inputRef, value: selectedOptions, options: options, loadOptions: amisCore.isEffectiveApi(autoComplete) ? this.lazyloadRemote : undefined, creatable: creatable, searchable: searchable || !!autoComplete, onChange: this.changeValue, onBlur: function (e) { return _this.dispatchEvent('blur', e); }, onFocus: function (e) { return _this.dispatchEvent('focus', e); }, onAdd: function () { return _this.dispatchEvent('add'); }, onEdit: function (item) { return _this.dispatchEvent('edit', item); }, onDelete: function (item) { return _this.dispatchEvent('delete', item); }, loading: loading, noResultsText: noResultsText, renderMenu: menuTpl ? this.renderMenu : undefined })))));
+                    : rest.popOverContainer, borderMode: borderMode, placeholder: placeholder, multiple: multiple || multi, ref: this.inputRef, value: selectedOptions, options: options, loadOptions: amisCore.isEffectiveApi(autoComplete) ? this.lazyloadRemote : undefined, showInvalidMatch: showInvalidMatch, creatable: creatable, searchable: searchable || !!autoComplete, onChange: this.changeValue, onBlur: function (e) { return _this.dispatchEvent('blur', e); }, onFocus: function (e) { return _this.dispatchEvent('focus', e); }, onAdd: function () { return _this.dispatchEvent('add'); }, onEdit: function (item) { return _this.dispatchEvent('edit', item); }, onDelete: function (item) { return _this.dispatchEvent('delete', item); }, loading: loading, noResultsText: noResultsText, renderMenu: menuTpl ? this.renderMenu : undefined })))));
     };
     SelectControl.defaultProps = {
         clearable: false,
         searchable: false,
-        multiple: false
+        multiple: false,
+        showInvalidMatch: false
     };
     tslib.__decorate([
         amisCore.autobind,

package/lib/renderers/Form/Static.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * 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> {

package/lib/renderers/Form/Switch.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -43,7 +43,7 @@ var SwitchControl = /** @class */ (function (_super) {
         });
     };
     SwitchControl.prototype.render = function () {
-        var _a = this.props, className = _a.className, ns = _a.classPrefix, cx = _a.classnames, value = _a.value, trueValue = _a.trueValue, falseValue = _a.falseValue, onText = _a.onText, offText = _a.offText, option = _a.option; _a.onChange; var disabled = _a.disabled, optionAtLeft = _a.optionAtLeft;
+        var _a = this.props, size = _a.size, className = _a.className, ns = _a.classPrefix, cx = _a.classnames, value = _a.value, trueValue = _a.trueValue, falseValue = _a.falseValue, onText = _a.onText, offText = _a.offText, option = _a.option; _a.onChange; var disabled = _a.disabled, optionAtLeft = _a.optionAtLeft;
         var on = amisCore.isObject(onText)
             ? amisCore.generateIcon(cx, onText.icon, 'Switch-icon')
             : onText;
@@ -52,7 +52,7 @@ var SwitchControl = /** @class */ (function (_super) {
             : offText;
         return (React__default["default"].createElement("div", { className: cx("SwitchControl", className) },
             optionAtLeft ? (React__default["default"].createElement("span", { className: cx('Switch-option') }, option)) : null,
-            React__default["default"].createElement(amisUi.Switch, { classPrefix: ns, value: value, trueValue: trueValue, falseValue: falseValue, onText: on, offText: off, disabled: disabled, onChange: this.handleChange }),
+            React__default["default"].createElement(amisUi.Switch, { classPrefix: ns, value: value, trueValue: trueValue, falseValue: falseValue, onText: on, offText: off, disabled: disabled, onChange: this.handleChange, size: size }),
             optionAtLeft ? null : (React__default["default"].createElement("span", { className: cx('Switch-option') }, option))));
     };
     SwitchControl.defaultProps = {

package/lib/renderers/Form/TabsTransfer.js

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

package/lib/renderers/Form/TabsTransferPicker.js

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

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

@@ -44,7 +44,7 @@ export interface TextareaControlSchema extends FormBaseControlSchema {
      */
     resetValue?: string;
 }
-export declare type TextAreaRendererEvent = 'blur' | 'focus';
+export declare type TextAreaRendererEvent = 'blur' | 'focus' | 'change';
 export interface TextAreaProps extends FormControlProps {
     placeholder?: string;
     minRows?: number;
@@ -60,6 +60,7 @@ export default class TextAreaControl extends React.Component<TextAreaProps, Text
     inputRef: React.RefObject<any>;
     doAction(action: ListenerAction, args: any): void;
     focus(): void;
+    handleChange(e: React.ChangeEvent<HTMLTextAreaElement>): void;
     handleFocus(e: React.FocusEvent<HTMLTextAreaElement>): void;
     handleBlur(e: React.FocusEvent<HTMLTextAreaElement>): void;
     render(): JSX.Element;

package/lib/renderers/Form/Textarea.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -38,6 +38,10 @@ var TextAreaControl = /** @class */ (function (_super) {
         var _a;
         (_a = this.inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
     };
+    TextAreaControl.prototype.handleChange = function (e) {
+        var onChange = this.props.onChange;
+        onChange && onChange(e);
+    };
     TextAreaControl.prototype.handleFocus = function (e) {
         var onFocus = this.props.onFocus;
         this.setState({
@@ -59,7 +63,7 @@ var TextAreaControl = /** @class */ (function (_super) {
     };
     TextAreaControl.prototype.render = function () {
         var rest = tslib.__rest(this.props, []);
-        return (React__default["default"].createElement(amisUi.Textarea, tslib.__assign({}, rest, { onFocus: this.handleFocus, onBlur: this.handleBlur })));
+        return (React__default["default"].createElement(amisUi.Textarea, tslib.__assign({}, rest, { onFocus: this.handleFocus, onBlur: this.handleBlur, onChange: this.handleChange })));
     };
     TextAreaControl.defaultProps = {
         minRows: 3,
@@ -68,6 +72,13 @@ var TextAreaControl = /** @class */ (function (_super) {
         resetValue: '',
         clearable: false
     };
+    tslib.__decorate([
+        amisCore.autobind,
+        amisCore.bindRendererEvent('change', undefined, false),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], TextAreaControl.prototype, "handleChange", null);
     tslib.__decorate([
         amisCore.autobind,
         amisCore.bindRendererEvent('focus'),

package/lib/renderers/Form/Transfer.js

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

package/lib/renderers/Form/TransferPicker.js

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

package/lib/renderers/Form/TreeSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * 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 matchSorter = require('match-sorter');
 var debouce = require('lodash/debounce');
 var find = require('lodash/find');
@@ -315,8 +315,8 @@ var TreeSelectControl = /** @class */ (function (_super) {
                     : 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),
-            !mobileUI && isOpened ? (React__default["default"].createElement(amisUi.Overlay, { container: popOverContainer || (function () { return _this.container.current; }), target: function () { return _this.target; }, show: true },
-                React__default["default"].createElement(amisUi.PopOver, { classPrefix: ns, className: "".concat(ns, "TreeSelect-popover"), style: {
+            !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
                     }, onHide: this.close, overlay: true }, this.renderOuter()))) : null,
             mobileUI ? (React__default["default"].createElement(amisUi.PopUp, { container: env && env.getModalContainer ? env.getModalContainer : undefined, className: cx("".concat(ns, "TreeSelect-popup")), isShow: isOpened, onHide: this.close }, this.renderOuter())) : null));

package/lib/renderers/Form/UUID.js

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

package/lib/renderers/Form/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -69,7 +69,7 @@ var UserSelectControl = /** @class */ (function (_super) {
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, env = _a.env, deferApi = _a.deferApi, setLoading = _a.setLoading;
+                        _a = this.props, env = _a.env, deferApi = _a.deferApi, setLoading = _a.setLoading, _a.formInited, _a.addHook;
                         deferApi = (param === null || param === void 0 ? void 0 : param.deferApi) || deferApi;
                         if (!env || !env.fetcher) {
                             throw new Error('fetcher is required');
@@ -105,7 +105,7 @@ var UserSelectControl = /** @class */ (function (_super) {
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, multiple = _a.multiple, valueField = _a.valueField, onChange = _a.onChange, options = _a.options, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, multiple = _a.multiple, valueField = _a.valueField, onChange = _a.onChange, options = _a.options, _a.setOptions, data = _a.data, dispatchEvent = _a.dispatchEvent;
                         newValue = value;
                         additonalOptions = [];
                         (Array.isArray(value) ? value : value ? [value] : []).forEach(function (option) {

package/lib/renderers/Grid.js

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

package/lib/renderers/Grid2D.js

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

package/lib/renderers/GridNav.js

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

package/lib/renderers/HBox.js

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

package/lib/renderers/IFrame.js

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

package/lib/renderers/Icon.d.ts

@@ -24,5 +24,5 @@ export declare class Icon extends React.Component<IconProps, object> {
     static defaultProps: Partial<IconProps>;
     render(): JSX.Element;
 }
-export declare class TplRenderer extends Icon {
+export declare class IconRenderer extends Icon {
 }

package/lib/renderers/Icon.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -11,6 +11,7 @@ var tslib = require('tslib');
 var React = require('react');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
+var icons = require('amis-ui/lib/components/icons');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -23,6 +24,10 @@ var Icon = /** @class */ (function (_super) {
     }
     Icon.prototype.render = function () {
         var _a = this.props, icon = _a.icon, vendor = _a.vendor, cx = _a.classnames, className = _a.className;
+        var CustomIcon = icons.getIcon(icon);
+        if (CustomIcon) {
+            return React__default["default"].createElement(CustomIcon, { className: cx(className, "icon-".concat(icon)) });
+        }
         var isURLIcon = (icon === null || icon === void 0 ? void 0 : icon.indexOf('.')) !== -1;
         var iconPrefix = '';
         if (vendor === 'iconfont') {
@@ -45,19 +50,19 @@ var Icon = /** @class */ (function (_super) {
     return Icon;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {
-    tslib.__extends(TplRenderer, _super);
-    function TplRenderer() {
+    tslib.__extends(IconRenderer, _super);
+    function IconRenderer() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    TplRenderer = tslib.__decorate([
+    IconRenderer = tslib.__decorate([
         amisCore.Renderer({
             type: 'icon'
         })
         // @ts-ignore 类型没搞定
         ,
         amisUi.withBadge
-    ], TplRenderer);
-    return TplRenderer;
+    ], IconRenderer);
+    return IconRenderer;
 })(Icon));
 
 exports.Icon = Icon;