amis 2.9.0 → 3.0.0

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

@@ -6,7 +6,7 @@ import { FormOptionsSchema } from '../../Schema';
 import { TooltipWrapperSchema } from '../TooltipWrapper';
 /**
  * Tag 输入框
- * 文档：https://baidu.gitee.io/amis/docs/components/form/tag
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/tag
  */
 export interface TagControlSchema extends FormOptionsSchema {
     type: 'input-tag';

package/lib/renderers/Form/InputTag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -64,7 +64,7 @@ var TagControl = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0:
                         _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options;
-                        return [4 /*yield*/, dispatchEvent(eventName, amisCore.resolveEventData(this.props, tslib.__assign({ options: options, items: options }, eventData), 'value'))];
+                        return [4 /*yield*/, dispatchEvent(eventName, amisCore.resolveEventData(this.props, tslib.__assign({ options: options, items: options }, eventData)))];
                     case 1:
                         rendererEvent = _b.sent();
                         // 返回阻塞标识
@@ -75,7 +75,7 @@ var TagControl = /** @class */ (function (_super) {
     };
     /** 处理输入的内容 */
     TagControl.prototype.normalizeInputValue = function (inputValue) {
-        var _a = this.props, enableBatchAdd = _a.enableBatchAdd, separator = _a.separator;
+        var _a = this.props, enableBatchAdd = _a.enableBatchAdd, separator = _a.separator, valueField = _a.valueField, labelField = _a.labelField;
         var batchValues = [];
         if (enableBatchAdd && separator && typeof separator === 'string') {
             batchValues = inputValue.split(separator);
@@ -83,9 +83,13 @@ var TagControl = /** @class */ (function (_super) {
         else {
             batchValues.push(inputValue);
         }
-        return batchValues
-            .filter(Boolean)
-            .map(function (item) { return ({ value: item, label: item }); });
+        return batchValues.filter(Boolean).map(function (item) {
+            var _a;
+            return (_a = {},
+                _a["".concat(valueField || 'value')] = item,
+                _a["".concat(labelField || 'label')] = item,
+                _a);
+        });
     };
     TagControl.prototype.normalizeOptions = function (options) {
         var _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, valueField = _a.valueField;
@@ -98,22 +102,24 @@ var TagControl = /** @class */ (function (_super) {
     /** 输入的内容和存量的内容合并，过滤掉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; });
+        var _a = this.props, selectedOptions = _a.selectedOptions, valueField = _a.valueField;
+        var options = unionWith__default["default"](selectedOptions.concat(), this.normalizeInputValue(inputValue), function (origin, input) {
+            return origin[valueField || 'value'] === input[valueField || '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 _a = this.props, max = _a.max, maxTagLength = _a.maxTagLength; _a.enableBatchAdd; _a.separator; var onInputValidateFailed = _a.onInputValidateFailed, valueField = _a.valueField;
         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');
+            onInputValidateFailed === null || onInputValidateFailed === void 0 ? void 0 : onInputValidateFailed(normalizedValue.map(function (item) { return item[valueField || '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');
+            addedValues.some(function (item) { return item[valueField || 'value'].length > maxTagLength; })) {
+            onInputValidateFailed === null || onInputValidateFailed === void 0 ? void 0 : onInputValidateFailed(addedValues.map(function (item) { return item[valueField || 'value']; }), 'maxLength');
             return false;
         }
         return true;
@@ -137,16 +143,16 @@ var TagControl = /** @class */ (function (_super) {
     };
     TagControl.prototype.addItem = function (option) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, selectedOptions, onChange, newValue, newValueRes, isPrevented;
+            var _a, selectedOptions, onChange, valueField, newValue, newValueRes, isPrevented;
             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;
+                        _a = this.props, selectedOptions = _a.selectedOptions, onChange = _a.onChange, valueField = _a.valueField;
                         newValue = selectedOptions.concat();
-                        if (find__default["default"](newValue, function (item) { return item.value == option.value; })) {
+                        if (find__default["default"](newValue, function (item) { return item[valueField || 'value'] == option[valueField || 'value']; })) {
                             return [2 /*return*/];
                         }
                         newValueRes = this.getValue('push', option);
@@ -263,13 +269,17 @@ 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, selectedItems, newValueRes, isPrevented, newValueRes, isPrevented;
-            return tslib.__generator(this, function (_b) {
-                switch (_b.label) {
+            var _a, selectedOptions, onChange, delimiter, labelField, valueField, value, selectedItems, newValueRes, isPrevented, newValueRes, isPrevented;
+            var _b;
+            return tslib.__generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        _a = this.props, selectedOptions = _a.selectedOptions, onChange = _a.onChange, delimiter = _a.delimiter;
+                        _a = this.props, selectedOptions = _a.selectedOptions, onChange = _a.onChange, delimiter = _a.delimiter, labelField = _a.labelField, valueField = _a.valueField;
                         value = this.state.inputValue.trim();
-                        selectedItems = selectedOptions.concat({ label: value, value: value });
+                        selectedItems = selectedOptions.concat((_b = {},
+                            _b["".concat(labelField || 'label')] = value,
+                            _b["".concat(valueField || 'value')] = value,
+                            _b));
                         if (!(selectedOptions.length && !value && evt.key == 'Backspace')) return [3 /*break*/, 2];
                         newValueRes = this.getValue('pop');
                         return [4 /*yield*/, this.dispatchEvent('change', {
@@ -277,7 +287,7 @@ var TagControl = /** @class */ (function (_super) {
                                 selectedItems: selectedItems
                             })];
                     case 1:
-                        isPrevented = _b.sent();
+                        isPrevented = _c.sent();
                         isPrevented || onChange(newValueRes);
                         return [3 /*break*/, 4];
                     case 2:
@@ -290,7 +300,7 @@ var TagControl = /** @class */ (function (_super) {
                                 selectedItems: selectedItems
                             })];
                     case 3:
-                        isPrevented = _b.sent();
+                        isPrevented = _c.sent();
                         if (!this.validateInputValue(value)) {
                             this.setState({ isFocused: false, isOpened: false });
                             return [2 /*return*/];
@@ -301,7 +311,7 @@ var TagControl = /** @class */ (function (_super) {
                         this.setState({
                             inputValue: ''
                         });
-                        _b.label = 4;
+                        _c.label = 4;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -329,11 +339,12 @@ var TagControl = /** @class */ (function (_super) {
     };
     TagControl.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className; _a.style; var 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, loadingConfig = _a.loadingConfig;
+        var _a = this.props, className = _a.className; _a.style; var 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, loadingConfig = _a.loadingConfig, valueField = _a.valueField;
         var finnalOptions = Array.isArray(options)
             ? amisCore.filterTree(options, function (item) {
                 return (Array.isArray(item.children) && !!item.children.length) ||
-                    (item.value !== undefined && !~selectedOptions.indexOf(item));
+                    (item[valueField || 'value'] !== undefined &&
+                        !~selectedOptions.indexOf(item));
             }, 0, true)
             : [];
         var reachMax = this.isReachMax();

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

@@ -9,7 +9,7 @@ import type { Option } from 'amis-core';
 import type { ListenerAction } from 'amis-core';
 /**
  * Text 文本输入框。
- * 文档：https://baidu.gitee.io/amis/docs/components/form/text
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/text
  */
 export interface TextControlSchema extends FormOptionsSchema {
     type: 'input-text' | 'input-email' | 'input-url' | 'input-password' | 'native-date' | 'native-time' | 'native-number';

package/lib/renderers/Form/InputText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -156,7 +156,7 @@ var TextControl = /** @class */ (function (_super) {
                         _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value;
                         return [4 /*yield*/, dispatchEvent('click', amisCore.resolveEventData(this.props, {
                                 value: value
-                            }, 'value'))];
+                            }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -185,7 +185,7 @@ var TextControl = /** @class */ (function (_super) {
                         });
                         return [4 /*yield*/, dispatchEvent('focus', amisCore.resolveEventData(this.props, {
                                 value: value
-                            }, 'value'))];
+                            }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -213,7 +213,7 @@ var TextControl = /** @class */ (function (_super) {
                         });
                         return [4 /*yield*/, dispatchEvent('blur', amisCore.resolveEventData(this.props, {
                                 value: value
-                            }, 'value'))];
+                            }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -234,7 +234,7 @@ var TextControl = /** @class */ (function (_super) {
                     case 0:
                         value = this.transformValue(evt.currentTarget.value);
                         _a = this.props, creatable = _a.creatable, multiple = _a.multiple, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -291,7 +291,7 @@ var TextControl = /** @class */ (function (_super) {
                                 value_1 = this.normalizeValue(selectedOptions).concat();
                             }
                         }
-                        return [4 /*yield*/, dispatchEvent('enter', amisCore.resolveEventData(this.props, { value: value_1 }, 'value'))];
+                        return [4 /*yield*/, dispatchEvent('enter', amisCore.resolveEventData(this.props, { value: value_1 }))];
                     case 2:
                         rendererEvent = _c.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -384,7 +384,7 @@ var TextControl = /** @class */ (function (_super) {
                                 value = undefined;
                             }
                         }
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -592,22 +592,22 @@ var TextControl = /** @class */ (function (_super) {
             addOn && addOn.position !== 'left' ? addOnDom : null));
     };
     TextControl.prototype.render = function () {
-        var _a = this.props, options = _a.options, source = _a.source, autoComplete = _a.autoComplete, css = _a.css, inputControlClassName = _a.inputControlClassName, id = _a.id, addOnClassName = _a.addOnClassName;
+        var _a = this.props, options = _a.options, source = _a.source, autoComplete = _a.autoComplete, themeCss = _a.themeCss, css = _a.css, inputControlClassName = _a.inputControlClassName, id = _a.id, addOnClassName = _a.addOnClassName, ns = _a.classPrefix;
         var input = autoComplete !== false && (source || (options === null || options === void 0 ? void 0 : options.length) || autoComplete)
             ? this.renderSugestMode()
             : this.renderNormal();
-        amisCore.insertCustomStyle(css, [
+        amisCore.insertCustomStyle(themeCss || css, [
             {
                 key: 'inputControlClassName',
                 value: inputControlClassName,
                 weights: {
                     active: {
-                        pre: 'is-focused .'
+                        pre: "".concat(ns, "TextControl.is-focused > .").concat(inputControlClassName, ", ")
                     }
                 }
             }
-        ], id);
-        amisCore.insertCustomStyle(css, [
+        ], id, null);
+        amisCore.insertCustomStyle(themeCss || css, [
             {
                 key: 'addOnClassName',
                 value: addOnClassName

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

@@ -5,7 +5,7 @@ import { FormOptionsSchema, SchemaApi } from '../../Schema';
 import type { ItemRenderStates } from 'amis-ui/lib/components/Selection';
 /**
  * Tree 下拉选择框。
- * 文档：https://baidu.gitee.io/amis/docs/components/form/tree
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/tree
  */
 export interface TreeControlSchema extends FormOptionsSchema {
     type: 'input-tree';
@@ -111,6 +111,10 @@ export interface TreeControlSchema extends FormOptionsSchema {
          */
         sticky?: boolean;
     };
+    /**
+     * 高度自动增长？
+     */
+    heightAuto?: boolean;
 }
 export interface TreeProps extends OptionsControlProps, Omit<TreeControlSchema, 'type' | 'options' | 'className' | 'inputClassName' | 'descriptionClassName' | 'deferApi'>, SpinnerExtraProps {
     enableNodePath?: boolean;

package/lib/renderers/Form/InputTree.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -96,7 +96,7 @@ var TreeControl = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0:
                         _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -138,7 +138,7 @@ var TreeControl = /** @class */ (function (_super) {
         });
     };
     TreeControl.prototype.render = function () {
-        var _a = this.props, className = _a.className; _a.style; var 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, virtualThreshold = _a.virtualThreshold, itemHeight = _a.itemHeight, loadingConfig = _a.loadingConfig, menuTpl = _a.menuTpl, enableDefaultIcon = _a.enableDefaultIcon, searchable = _a.searchable, _c = _a.searchConfig, searchConfig = _c === void 0 ? {} : _c;
+        var _a = this.props, className = _a.className; _a.style; var 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, virtualThreshold = _a.virtualThreshold, itemHeight = _a.itemHeight, loadingConfig = _a.loadingConfig, menuTpl = _a.menuTpl, enableDefaultIcon = _a.enableDefaultIcon, searchable = _a.searchable, _c = _a.searchConfig, searchConfig = _c === void 0 ? {} : _c, heightAuto = _a.heightAuto;
         var highlightTxt = this.props.highlightTxt;
         var _d = this.state, filteredOptions = _d.filteredOptions, keyword = _d.keyword;
         if (amisCore.isPureVariable(highlightTxt)) {
@@ -146,7 +146,8 @@ var TreeControl = /** @class */ (function (_super) {
         }
         var TreeCmpt = (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: searchable ? filteredOptions : options, highlightTxt: searchable ? keyword : 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, virtualThreshold: virtualThreshold, itemHeight: amisCore.toNumber(itemHeight) > 0 ? amisCore.toNumber(itemHeight) : undefined, itemRender: menuTpl ? this.renderOptionItem : undefined, enableDefaultIcon: enableDefaultIcon }));
         return (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "TreeControl"), className, treeContainerClassName, {
-                'is-sticky': searchable && (searchConfig === null || searchConfig === void 0 ? void 0 : searchConfig.sticky)
+                'is-sticky': searchable && (searchConfig === null || searchConfig === void 0 ? void 0 : searchConfig.sticky),
+                'h-auto': heightAuto
             }) },
             React__default["default"].createElement(amisUi.Spinner, { size: "sm", key: "info", show: loading, loadingConfig: loadingConfig }),
             loading ? null : searchable ? (React__default["default"].createElement(React__default["default"].Fragment, null,

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

@@ -1,7 +1,7 @@
 import InputDateRange, { DateRangeControlSchema } from './InputDateRange';
 /**
  * YearRange 年份范围控件
- * 文档：https://baidu.gitee.io/amis/docs/components/form/input-year-range
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/input-year-range
  */
 export interface YearRangeControlSchema extends Omit<DateRangeControlSchema, 'type'> {
     type: 'input-year-range';

package/lib/renderers/Form/InputYearRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -3,7 +3,7 @@ import { FormControlProps } from 'amis-core';
 import { FormBaseControlSchema } from '../../Schema';
 /**
  * JSON Schema
- * 文档：https://baidu.gitee.io/amis/docs/components/form/json-schema
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/json-schema
  */
 export interface JSONSchemaControlSchema extends FormBaseControlSchema {
     /**

package/lib/renderers/Form/JSONSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -1,10 +1,10 @@
 import React from 'react';
 import { FormControlProps } from 'amis-core';
 import { FormBaseControlSchema } from '../../Schema';
-import type { SchemaEditorItemPlaceholder } from 'amis-ui/lib/components/schema-editor/Common';
+import type { SchemaEditorItemPlaceholder } from 'amis-ui';
 /**
  * JSON Schema Editor
- * 文档：https://baidu.gitee.io/amis/docs/components/form/json-schema-editor
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/json-schema-editor
  */
 export interface JSONSchemaEditorControlSchema extends Omit<FormBaseControlSchema, 'placeholder'> {
     /**

package/lib/renderers/Form/JSONSchemaEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -12,7 +12,6 @@ var React = require('react');
 var pick = require('lodash/pick');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
-var Common = require('amis-ui/lib/components/schema-editor/Common');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -27,7 +26,7 @@ var JSONSchemaEditorControl = /** @class */ (function (_super) {
     JSONSchemaEditorControl.prototype.normalizePlaceholder = function () {
         var placeholder = this.props.placeholder;
         if (amisCore.isObject(placeholder)) {
-            return tslib.__assign(tslib.__assign({}, Common.schemaEditorItemPlaceholder), pick__default["default"](placeholder, [
+            return tslib.__assign(tslib.__assign({}, amisUi.schemaEditorItemPlaceholder), pick__default["default"](placeholder, [
                 'key',
                 'title',
                 'description',
@@ -35,7 +34,7 @@ var JSONSchemaEditorControl = /** @class */ (function (_super) {
                 'empty'
             ]));
         }
-        return Common.schemaEditorItemPlaceholder;
+        return amisUi.schemaEditorItemPlaceholder;
     };
     JSONSchemaEditorControl.prototype.renderModalProps = function (value, onChange) {
         var _a = this.props, render = _a.render, advancedSettings = _a.advancedSettings;
@@ -56,7 +55,7 @@ var JSONSchemaEditorControl = /** @class */ (function (_super) {
     };
     JSONSchemaEditorControl.defaultProps = {
         enableAdvancedSetting: false,
-        placeholder: Common.schemaEditorItemPlaceholder
+        placeholder: amisUi.schemaEditorItemPlaceholder
     };
     tslib.__decorate([
         amisCore.autobind,

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

@@ -4,7 +4,7 @@ import { ActionObject } from 'amis-core';
 import { FormOptionsSchema, SchemaClassName, SchemaCollection } from '../../Schema';
 /**
  * List 复选框
- * 文档：https://baidu.gitee.io/amis/docs/components/form/list
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/list
  */
 export interface ListControlSchema extends FormOptionsSchema {
     type: 'list-select';

package/lib/renderers/Form/ListSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -64,16 +64,15 @@ var ListControl = /** @class */ (function (_super) {
                     })
                     : option.body
                         ? render("".concat(key, "/body"), option.body)
-                        : [(option.image
-                                ? React__default["default"].createElement("div", { key: "image", className: cx('ListControl-itemImage', imageClassName) },
-                                    React__default["default"].createElement("img", { src: option.image, alt: label }))
-                                : null),
-                            (React__default["default"].createElement("div", { key: "label", className: cx('ListControl-itemLabel') }, label))
+                        : [
+                            option.image ? (React__default["default"].createElement("div", { key: "image", className: cx('ListControl-itemImage', imageClassName) },
+                                React__default["default"].createElement("img", { src: option.image, alt: label }))) : null,
+                            React__default["default"].createElement("div", { key: "label", className: cx('ListControl-itemLabel') }, label)
                         ]));
             }
             return (React__default["default"].createElement("div", { key: key, className: cx("ListControl-static-item") }, label));
         };
-        return React__default["default"].createElement("div", { className: cx('StaticList') }, selectedOptions.map(itemRender));
+        return (React__default["default"].createElement("div", { className: cx('StaticList') }, selectedOptions.map(itemRender)));
     };
     ListControl.prototype.render = function () {
         var _this = this;

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

@@ -4,7 +4,7 @@ import { FormControlProps } from 'amis-core';
 import { FormBaseControlSchema } from '../../Schema';
 /**
  * Location 选点组件
- * 文档：https://baidu.gitee.io/amis/docs/components/form/location
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/location
  */
 export interface LocationControlSchema extends FormBaseControlSchema {
     type: 'location-picker';

package/lib/renderers/Form/LocationPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -9,7 +9,7 @@ import { ActionObject } from 'amis-core';
 import { FormBaseControlSchema, SchemaApi } from '../../Schema';
 /**
  * Matrix 选择控件。适合做权限勾选。
- * 文档：https://baidu.gitee.io/amis/docs/components/form/matrix
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/matrix
  */
 export interface MatrixControlSchema extends FormBaseControlSchema {
     type: 'matrix-checkboxes';

package/lib/renderers/Form/MatrixCheckboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -191,7 +191,7 @@ var MatrixCheckbox = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value.concat() }, 'value'))];
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value.concat() }))];
                     case 1:
                         rendererEvent = _c.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

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

@@ -4,7 +4,7 @@ import { Option, Options, OptionsControlProps, ActionObject } from 'amis-core';
 import { FormOptionsSchema } from '../../Schema';
 /**
  * Nested Select
- * 文档：https://baidu.gitee.io/amis/docs/components/form/nested-select
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/nested-select
  */
 export interface NestedSelectControlSchema extends FormOptionsSchema {
     type: 'nested-select';

package/lib/renderers/Form/NestedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -64,7 +64,7 @@ var NestedSelectControl = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         dispatchEvent = this.props.dispatchEvent;
-                        return [4 /*yield*/, dispatchEvent(eventName, amisCore.resolveEventData(this.props, eventData, 'value'))];
+                        return [4 /*yield*/, dispatchEvent(eventName, amisCore.resolveEventData(this.props, eventData))];
                     case 1:
                         rendererEvent = _a.sent();
                         // 返回阻塞标识
@@ -120,8 +120,8 @@ var NestedSelectControl = /** @class */ (function (_super) {
     };
     NestedSelectControl.prototype.renderValue = function (option, key) {
         var _a = this.props, cx = _a.classnames, labelField = _a.labelField, valueField = _a.valueField, options = _a.options, hideNodePathLabel = _a.hideNodePathLabel;
-        var inputValue = this.state.inputValue;
-        var regexp = amisCore.string2regExp(inputValue || '');
+        var inputValue = this.state.inputValue || '';
+        var regexp = amisCore.string2regExp(inputValue);
         if (hideNodePathLabel) {
             return option[labelField || 'label'];
         }
@@ -131,17 +131,9 @@ var NestedSelectControl = /** @class */ (function (_super) {
                 var label = item[labelField || 'label'];
                 var value = item[valueField || 'value'];
                 var isEnd = index === ancestors.length - 1;
-                var unmatchText = label.split(regexp || '');
-                var pointer = 0;
                 return (React__default["default"].createElement("span", { key: index },
                     regexp.test(value) || regexp.test(label)
-                        ? unmatchText.map(function (text, textIndex) {
-                            var current = pointer;
-                            pointer += text.length || (inputValue === null || inputValue === void 0 ? void 0 : inputValue.length) || 0;
-                            return (React__default["default"].createElement("span", { key: textIndex, className: cx({
-                                    'NestedSelect-optionLabel-highlight': !text
-                                }) }, text || label.slice(current, pointer)));
-                        })
+                        ? amisCore.renderTextByKeyword(label, inputValue)
                         : label,
                     !isEnd && ' / '));
             })

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

@@ -3,7 +3,7 @@ import { OptionsControlProps, SchemaNode, ActionObject, PlainObject } from 'amis
 import { FormOptionsSchema, SchemaTpl } from '../../Schema';
 /**
  * Picker
- * 文档：https://baidu.gitee.io/amis/docs/components/form/picker
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/picker
  */
 export interface PickerControlSchema extends FormOptionsSchema {
     type: 'picker';

package/lib/renderers/Form/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -162,7 +162,7 @@ var PickerControl = /** @class */ (function (_super) {
                         });
                         additionalOptions.length && setOptions(options.concat(additionalOptions));
                         option = multiple ? items : items[0];
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value, option: option, selectedItems: option }, 'value'))];
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value, option: option, selectedItems: option }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -242,7 +242,7 @@ var PickerControl = /** @class */ (function (_super) {
     };
     PickerControl.prototype.renderValues = function () {
         var _this = this;
-        var _a = this.props, ns = _a.classPrefix, selectedOptions = _a.selectedOptions, labelField = _a.labelField, labelTpl = _a.labelTpl, __ = _a.translate, disabled = _a.disabled;
+        var _a = this.props, ns = _a.classPrefix, selectedOptions = _a.selectedOptions, labelField = _a.labelField, labelTpl = _a.labelTpl, __ = _a.translate, disabled = _a.disabled, env = _a.env;
         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
             }) },
@@ -253,7 +253,7 @@ var PickerControl = /** @class */ (function (_super) {
             React__default["default"].createElement("span", { className: "".concat(ns, "Picker-valueLabel"), onClick: function (e) {
                     e.stopPropagation();
                     _this.handleItemClick(item);
-                } }, labelTpl ? (React__default["default"].createElement(amisUi.Html, { html: amisCore.filter(labelTpl, item) })) : ("".concat(amisCore.getVariable(item, labelField || 'label') ||
+                } }, labelTpl ? (React__default["default"].createElement(amisUi.Html, { html: amisCore.filter(labelTpl, item), filterHtml: env.filterHtml })) : ("".concat(amisCore.getVariable(item, labelField || 'label') ||
                 amisCore.getVariable(item, 'id')))))); })));
     };
     PickerControl.prototype.renderBody = function (_a) {
@@ -314,7 +314,7 @@ var PickerControl = /** @class */ (function (_super) {
                 clearable && !disabled && selectedOptions.length ? (React__default["default"].createElement("a", { onClick: this.clearValue, className: cx('Picker-clear') },
                     React__default["default"].createElement(amisUi.Icon, { icon: "input-clear", className: "icon" }))) : null,
                 React__default["default"].createElement("span", { onClick: this.open, className: cx('Picker-btn') },
-                    React__default["default"].createElement(amisUi.Icon, { icon: "window-restore", className: "icon" }))),
+                    React__default["default"].createElement(amisUi.Icon, { icon: "window-restore", className: "icon", iconContent: "Picker-icon" }))),
             render('modal', {
                 title: __('Select.placeholder'),
                 size: size,

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

@@ -4,7 +4,7 @@ import { ActionObject } from 'amis-core';
 import { FormOptionsSchema } from '../../Schema';
 /**
  * Radio 单选框。
- * 文档：https://baidu.gitee.io/amis/docs/components/form/radios
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/radios
  */
 export interface RadiosControlSchema extends FormOptionsSchema {
     type: 'radios';