amis 2.0.0-rc.9 → 2.0.0

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

@@ -140,6 +140,10 @@ export interface FileControlSchema extends FormBaseControlSchema {
     autoFill?: {
         [propName: string]: SchemaTokenizeableString;
     };
+    /**
+     * 初始化时是否把其他字段同步到表单内部。
+     */
+    initAutoFill?: boolean;
     /**
      * 接口返回的数据中，哪个用来当做值
      */
@@ -218,6 +222,7 @@ export default class FileControl extends React.Component<FileProps, FileState> {
         file: any;
         executor: () => void;
     }>;
+    initAutoFill: boolean;
     static valueToFile(value: string | FileValue, props: FileProps, files?: Array<FileX | FileValue>): FileValue | undefined;
     dropzone: React.RefObject<any>;
     constructor(props: FileProps);

package/lib/renderers/Form/InputFile.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */
 
@@ -45,6 +45,7 @@ var FileControl = /** @class */ (function (_super) {
         var joinValues = props.joinValues;
         var delimiter = props.delimiter;
         var files = [];
+        _this.initAutoFill = !!props.initAutoFill;
         if (value && value instanceof Blob) {
             files = [value];
         }
@@ -111,7 +112,12 @@ var FileControl = /** @class */ (function (_super) {
             : undefined;
     };
     FileControl.prototype.componentDidMount = function () {
-        this.syncAutoFill();
+        if (this.initAutoFill) {
+            var _a = this.props, formInited = _a.formInited, addHook = _a.addHook;
+            formInited || !addHook
+                ? this.syncAutoFill()
+                : addHook(this.syncAutoFill, 'init');
+        }
     };
     FileControl.prototype.componentDidUpdate = function (prevProps) {
         var _this = this;
@@ -140,7 +146,7 @@ var FileControl = /** @class */ (function (_super) {
             }
             this.setState({
                 files: files
-            }, this.syncAutoFill);
+            }, props.formInited !== false ? this.syncAutoFill : undefined);
         }
     };
     FileControl.prototype.handleDrop = function (files) {
@@ -333,15 +339,22 @@ var FileControl = /** @class */ (function (_super) {
         else {
             this.setState({
                 uploading: false
-            }, function () {
-                _this.onChange(!!_this.resolve);
-                if (_this.resolve) {
-                    _this.resolve(_this.state.files.some(function (file) { return file.state === 'error'; })
-                        ? __('File.errorRetry')
-                        : null);
-                    _this.resolve = undefined;
-                }
-            });
+            }, function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+                return tslib.__generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.onChange(!!this.resolve)];
+                        case 1:
+                            _a.sent();
+                            if (this.resolve) {
+                                this.resolve(this.state.files.some(function (file) { return file.state === 'error'; })
+                                    ? __('File.errorRetry')
+                                    : null);
+                                this.resolve = undefined;
+                            }
+                            return [2 /*return*/];
+                    }
+                });
+            }); });
         }
     };
     FileControl.prototype.sendFile = function (file, cb, onProgress) {
@@ -466,7 +479,7 @@ var FileControl = /** @class */ (function (_super) {
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, multiple = _a.multiple, onChange = _a.onChange, joinValues = _a.joinValues, extractValue = _a.extractValue, valueField = _a.valueField, delimiter = _a.delimiter, resetValue = _a.resetValue, asBlob = _a.asBlob;
+                        _a = this.props, multiple = _a.multiple, onChange = _a.onChange, joinValues = _a.joinValues, extractValue = _a.extractValue, valueField = _a.valueField, delimiter = _a.delimiter, resetValue = _a.resetValue, asBlob = _a.asBlob, _a.autoFill, _a.onBulkChange;
                         files = this.state.files.filter(function (file) { return ~['uploaded', 'init', 'ready'].indexOf(file.state); });
                         value = multiple ? files : files[0];
                         if (value) {
@@ -493,6 +506,7 @@ var FileControl = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         onChange((this.emitValue = value), undefined, changeImmediately);
+                        console.log('onChange', changeImmediately);
                         this.syncAutoFill();
                         return [2 /*return*/];
                 }
@@ -501,15 +515,19 @@ var FileControl = /** @class */ (function (_super) {
     };
     FileControl.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) {
             var files = this.state.files.filter(function (file) { return ~['uploaded', 'init', 'ready'].indexOf(file.state); });
-            var toSync_1 = amisCore.dataMapping(excludeSelfAutoFill, multiple
+            var toSync_1 = amisCore.dataMapping(excludeSelfAutoFill, amisCore.createObject(data, multiple
                 ? {
                     items: files
                 }
-                : files[0]);
+                : files[0]));
             Object.keys(toSync_1).forEach(function (key) {
                 if (isPlainObject__default["default"](toSync_1[key]) && isPlainObject__default["default"](data[key])) {
                     toSync_1[key] = merge__default["default"]({}, data[key], toSync_1[key]);
@@ -896,6 +914,7 @@ var FileControl = /** @class */ (function (_super) {
         multiple: false,
         autoUpload: true,
         hideUploadButton: false,
+        initAutoFill: true,
         stateTextMap: {
             init: '',
             pending: '等待上传',

package/lib/renderers/Form/InputFormula.js

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

package/lib/renderers/Form/InputGroup.js

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

package/lib/renderers/Form/InputImage.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */
 
@@ -117,7 +117,12 @@ var ImageControl = /** @class */ (function (_super) {
         return __('Image.size', { width: width, height: height });
     };
     ImageControl.prototype.componentDidMount = function () {
-        this.syncAutoFill();
+        if (this.initAutoFill) {
+            var _a = this.props, formInited = _a.formInited, addHook = _a.addHook;
+            formInited || !addHook
+                ? this.syncAutoFill()
+                : addHook(this.syncAutoFill, 'init');
+        }
     };
     ImageControl.prototype.componentDidUpdate = function (prevProps) {
         var _this_1 = this;
@@ -284,15 +289,22 @@ var ImageControl = /** @class */ (function (_super) {
             this.setState({
                 uploading: false,
                 locked: false
-            }, function () {
-                _this_1.onChange(!!_this_1.resolve, false);
-                if (_this_1.resolve) {
-                    _this_1.resolve(_this_1.files.some(function (file) { return file.state === 'error'; })
-                        ? __('File.errorRetry')
-                        : null);
-                    _this_1.resolve = undefined;
-                }
-            });
+            }, function () { return tslib.__awaiter(_this_1, void 0, void 0, function () {
+                return tslib.__generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.onChange(!!this.resolve, false)];
+                        case 1:
+                            _a.sent();
+                            if (this.resolve) {
+                                this.resolve(this.files.some(function (file) { return file.state === 'error'; })
+                                    ? __('File.errorRetry')
+                                    : null);
+                                this.resolve = undefined;
+                            }
+                            return [2 /*return*/];
+                    }
+                });
+            }); });
         }
     };
     ImageControl.prototype.removeFile = function (file, index) {
@@ -396,6 +408,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.9
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputNumber.js

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

package/lib/renderers/Form/InputQuarterRange.js

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

package/lib/renderers/Form/InputRating.js

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

package/lib/renderers/Form/InputRepeat.js

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

package/lib/renderers/Form/InputRichText.js

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

package/lib/renderers/Form/InputSubForm.js

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

package/lib/renderers/Form/InputTable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.0
  * 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): 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.9
+ * amis v2.0.0
  * 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) {
+        var _a = this.props, enableBatchAdd = _a.enableBatchAdd, separator = _a.separator;
+        var batchValues = [];
+        if (enableBatchAdd && separator && 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 selectedOptions = this.props.selectedOptions;
+        var options = unionWith__default["default"](selectedOptions.concat(), this.normalizeInputValue(inputValue), 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; _a.enableBatchAdd; _a.separator; var 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);
+        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.9
+ * amis v2.0.0
  * 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;