amis 2.0.0 → 2.1.0

package/lib/renderers/Form/InputNumber.js

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

package/lib/renderers/Form/InputQuarterRange.js

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

package/lib/renderers/Form/InputRange.js

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

package/lib/renderers/Form/InputRating.js

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

package/lib/renderers/Form/InputRepeat.js

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

package/lib/renderers/Form/InputRichText.js

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

package/lib/renderers/Form/InputSubForm.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * 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.0
+ * 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);
@@ -582,7 +628,8 @@ var FormTable = /** @class */ (function (_super) {
     };
     FormTable.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className; _a.value; var showAddBtn = _a.showAddBtn, disabled = _a.disabled, render = _a.render, placeholder = _a.placeholder, draggable = _a.draggable, addable = _a.addable, columnsTogglable = _a.columnsTogglable, combineNum = _a.combineNum, combineFromIndex = _a.combineFromIndex, __ = _a.translate, canAccessSuperData = _a.canAccessSuperData, expandConfig = _a.expandConfig, affixRow = _a.affixRow, prefixRow = _a.prefixRow, formInited = _a.formInited, perPage = _a.perPage, cx = _a.classnames, rowClassName = _a.rowClassName, rowClassNameExpr = _a.rowClassNameExpr;
+        var _a, _b;
+        var _c = this.props, className = _c.className; _c.value; var showAddBtn = _c.showAddBtn, disabled = _c.disabled, render = _c.render, placeholder = _c.placeholder, draggable = _c.draggable, addable = _c.addable, columnsTogglable = _c.columnsTogglable, combineNum = _c.combineNum, combineFromIndex = _c.combineFromIndex, __ = _c.translate, canAccessSuperData = _c.canAccessSuperData, expandConfig = _c.expandConfig, affixRow = _c.affixRow, prefixRow = _c.prefixRow, formInited = _c.formInited, perPage = _c.perPage, cx = _c.classnames, rowClassName = _c.rowClassName, rowClassNameExpr = _c.rowClassNameExpr, _d = _c.affixHeader, affixHeader = _d === void 0 ? false : _d, _e = _c.autoFillHeight, autoFillHeight = _e === void 0 ? false : _e, tableContentClassName = _c.tableContentClassName;
         if (formInited === false) {
             return null;
         }
@@ -602,9 +649,12 @@ var FormTable = /** @class */ (function (_super) {
                 type: 'table',
                 placeholder: __(placeholder),
                 columns: this.state.columns,
-                affixHeader: false,
+                affixHeader: affixHeader,
                 prefixRow: prefixRow,
-                affixRow: affixRow
+                affixRow: affixRow,
+                affixOffsetTop: (_b = (_a = this.props.affixOffsetTop) !== null && _a !== void 0 ? _a : this.props.env.affixOffsetTop) !== null && _b !== void 0 ? _b : 0,
+                autoFillHeight: autoFillHeight,
+                tableContentClassName: tableContentClassName
             }, {
                 value: undefined,
                 saveImmediately: true,
@@ -624,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); } },
@@ -670,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.0
+ * 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

@@ -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
+ * amis v2.1.0
  * 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();
@@ -143,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
         });
@@ -382,7 +387,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 +412,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 +438,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 +469,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.js

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

package/lib/renderers/Form/InputYearRange.js

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

package/lib/renderers/Form/JSONSchema.js

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

package/lib/renderers/Form/JSONSchemaEditor.js

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

package/lib/renderers/Form/ListSelect.js

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

package/lib/renderers/Form/LocationPicker.js

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

package/lib/renderers/Form/MatrixCheckboxes.js

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

package/lib/renderers/Form/NestedSelect.js

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

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

package/lib/renderers/Form/Switch.js

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

package/lib/renderers/Form/TabsTransfer.js

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