amis 2.7.3-beta.0 → 2.8.0

package/esm/renderers/Form/InputTable.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormControlProps, FormBaseControl, SimpleMap, RendererData, ActionObject, ITableStore } from 'amis-core';
 import { TableSchema } from '../Table';
-import { SchemaApi } from '../../Schema';
+import { SchemaApi, SchemaCollection } from '../../Schema';
 import type { SchemaTokenizeableString } from '../../Schema';
 export interface TableControlSchema extends FormBaseControl, Omit<TableSchema, 'type'> {
     type: 'input-table';
@@ -41,10 +41,6 @@ export interface TableControlSchema extends FormBaseControl, Omit<TableSchema, '
      * 新增按钮图标
      */
     addBtnIcon?: string;
-    /**
-     * 显示新增按钮
-     */
-    showAddBtn?: boolean;
     /**
      * 可否删除
      */
@@ -129,6 +125,18 @@ export interface TableControlSchema extends FormBaseControl, Omit<TableSchema, '
      * 限制最小个数
      */
     minLength?: number | SchemaTokenizeableString;
+    /**
+     * 是否显示底部新增按钮
+     */
+    showFooterAddBtn?: boolean;
+    /**
+     * 是否显示表格操作栏新增按钮
+     */
+    showTableAddBtn?: boolean;
+    /**
+     * 底部新增按钮配置
+     */
+    footerAddBtn?: SchemaCollection;
 }
 export interface TableProps extends FormControlProps, Omit<TableControlSchema, 'type' | 'className' | 'descriptionClassName' | 'inputClassName'> {
 }
@@ -153,6 +161,8 @@ export default class FormTable extends React.Component<TableProps, TableState> {
         valueField: string;
         minLength: number;
         maxLength: number;
+        showFooterAddBtn: boolean;
+        showTableAddBtn: boolean;
     };
     static propsList: Array<string>;
     entries: SimpleMap<any, number>;

package/esm/renderers/Form/InputTable.js

@@ -1,9 +1,9 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
-import { __extends, __assign, __awaiter, __generator, __decorate, __metadata, __spreadArray } from 'tslib';
+import { __extends, __assign, __awaiter, __generator, __decorate, __metadata, __spreadArray, __read } from 'tslib';
 import React from 'react';
 import { SimpleMap, isPureVariable, resolveVariableAndFilter, getVariable, dataMapping, isEffectiveApi, filterDate, setVariable, isExpression, createObject, filter, generateIcon, getTree, spliceTree, autobind, FormItem } from 'amis-core';
 import { Button, Icon } from 'amis-ui';
@@ -44,6 +44,14 @@ var FormTable = /** @class */ (function (_super) {
     FormTable.prototype.componentDidUpdate = function (nextProps) {
         var props = this.props;
         var toUpdate = null;
+        // 如果static为true 或 disabled为true，
+        // 则删掉正在新增 或 编辑的那一行
+        var items = [];
+        if (props.static !== nextProps.static
+            || props.disabled !== nextProps.disabled) {
+            items = this.state.items.filter(function (item) { return !item.__isPlaceholder; });
+            toUpdate = __assign(__assign({}, toUpdate), { items: items, editIndex: -1, columns: this.buildColumns(props) });
+        }
         if (props.columns !== nextProps.columns) {
             toUpdate = __assign(__assign({}, toUpdate), { columns: this.buildColumns(props) });
         }
@@ -229,7 +237,7 @@ var FormTable = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         _d.label = 7;
-                    case 7: return [2 /*return*/, onAction && onAction.apply(void 0, __spreadArray([action, ctx], rest, false))];
+                    case 7: return [2 /*return*/, onAction && onAction.apply(void 0, __spreadArray([action, ctx], __read(rest), false))];
                 }
             });
         });
@@ -238,7 +246,13 @@ var FormTable = /** @class */ (function (_super) {
         var _this = this;
         var needConfirm = this.props.needConfirm;
         var items = this.state.items.concat();
-        items.splice(index + 1, 0, items[index]);
+        if (needConfirm === false) {
+            items.splice(index + 1, 0, items[index]);
+        }
+        else {
+            // 复制相当于新增一行，需要同addItem一致添加__placeholder属性
+            items.splice(index + 1, 0, __assign(__assign({}, items[index]), { __isPlaceholder: true }));
+        }
         index = Math.min(index + 1, items.length - 1);
         this.setState({
             items: items
@@ -447,25 +461,28 @@ var FormTable = /** @class */ (function (_super) {
         var showIndex = this.props.showIndex;
         var minLength = this.resolveVariableProps(this.props, 'minLength');
         var maxLength = this.resolveVariableProps(this.props, 'maxLength');
+        var isStatic = this.props.static;
+        var disabled = this.props.disabled;
+        this.props.showTableAddBtn;
         var btns = [];
-        if (props.addable && props.showAddBtn !== false) {
+        if (!isStatic && props.addable && props.showTableAddBtn !== false) {
             btns.push({
                 children: function (_a) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
                     return (~_this.state.editIndex && needConfirm !== false) ||
-                        maxLength <= _this.state.items.length ? null : (React.createElement(Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.addRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.addItem.bind(_this, rowIndex + offset, undefined) },
-                        props.addBtnLabel ? React.createElement("span", null, props.addBtnLabel) : null,
-                        props.addBtnIcon ? (typeof props.addBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.addBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.addBtnIcon))) : null));
+                        maxLength <= _this.state.items.length ? null : (React.createElement(Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.addRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, disabled: disabled, onClick: _this.addItem.bind(_this, rowIndex + offset, undefined) },
+                        props.addBtnIcon ? (typeof props.addBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.addBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.addBtnIcon))) : null,
+                        props.addBtnLabel ? React.createElement("span", null, props.addBtnLabel) : null));
                 }
             });
         }
-        if (props.copyable && props.showCopyBtn !== false) {
+        if (!isStatic && props.copyable && props.showCopyBtn !== false) {
             btns.push({
                 children: function (_a) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
-                    return ~_this.state.editIndex && needConfirm !== false ? null : (React.createElement(Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.copyRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.copyItem.bind(_this, rowIndex + offset, undefined) },
-                        props.copyBtnLabel ? React.createElement("span", null, props.copyBtnLabel) : null,
-                        props.copyBtnIcon ? (typeof props.copyBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.copyBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.copyBtnIcon))) : null));
+                    return ~_this.state.editIndex && needConfirm !== false ? null : (React.createElement(Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.copyRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, disabled: disabled, onClick: _this.copyItem.bind(_this, rowIndex + offset, undefined) },
+                        props.copyBtnIcon ? (typeof props.copyBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.copyBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.copyBtnIcon))) : null,
+                        props.copyBtnLabel ? React.createElement("span", null, props.copyBtnLabel) : null));
                 }
             });
         }
@@ -474,7 +491,7 @@ var FormTable = /** @class */ (function (_super) {
                 var quickEdit = column.quickEdit;
                 return quickEdit === false
                     ? omit(column, ['quickEdit'])
-                    : __assign(__assign({}, column), { quickEdit: __assign(__assign(__assign({}, _this.columnToQuickEdit(column)), quickEdit), { saveImmediately: true, mode: 'inline' }) });
+                    : __assign(__assign({}, column), { quickEdit: __assign(__assign(__assign({}, _this.columnToQuickEdit(column)), quickEdit), { saveImmediately: true, mode: 'inline', disabled: disabled, static: isStatic }) });
             });
         }
         else if (props.addable || props.editable || isCreateMode) {
@@ -484,45 +501,45 @@ var FormTable = /** @class */ (function (_super) {
                     : column.quickEdit;
                 return quickEdit === false
                     ? omit(column, ['quickEdit'])
-                    : __assign(__assign({}, column), { quickEdit: __assign(__assign(__assign({}, _this.columnToQuickEdit(column)), quickEdit), { saveImmediately: true, mode: 'inline' }) });
+                    : __assign(__assign({}, column), { quickEdit: __assign(__assign(__assign({}, _this.columnToQuickEdit(column)), quickEdit), { saveImmediately: true, mode: 'inline', disabled: disabled }) });
             });
-            props.editable &&
+            !isStatic && props.editable &&
                 btns.push({
                     children: function (_a) {
                         var key = _a.key, rowIndex = _a.rowIndex, data = _a.data, offset = _a.offset;
                         return ~_this.state.editIndex || (data && data.__isPlaceholder) ? null : (React.createElement(Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.editRow'), tooltipContainer: env && env.getModalContainer
                                 ? env.getModalContainer
-                                : undefined, onClick: function () { return _this.startEdit(rowIndex + offset); } },
-                            props.updateBtnLabel || props.editBtnLabel ? (React.createElement("span", null, props.updateBtnLabel || props.editBtnLabel)) : null,
-                            typeof props.updateBtnIcon !== 'undefined' ? (props.updateBtnIcon ? (typeof props.updateBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.updateBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.updateBtnIcon))) : null) : props.editBtnIcon ? (typeof props.editBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.editBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.editBtnIcon))) : null));
+                                : undefined, disabled: disabled, onClick: function () { return _this.startEdit(rowIndex + offset); } },
+                            typeof props.updateBtnIcon !== 'undefined' ? (props.updateBtnIcon ? (typeof props.updateBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.updateBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.updateBtnIcon))) : null) : props.editBtnIcon ? (typeof props.editBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.editBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.editBtnIcon))) : null,
+                            props.updateBtnLabel || props.editBtnLabel ? (React.createElement("span", null, props.updateBtnLabel || props.editBtnLabel)) : null));
                     }
                 });
-            btns.push({
+            !isStatic && btns.push({
                 children: function (_a) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
                     return _this.state.editIndex === rowIndex + offset ? (React.createElement(Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('save'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.confirmEdit },
-                        props.confirmBtnLabel ? (React.createElement("span", null, props.confirmBtnLabel)) : null,
-                        props.confirmBtnIcon ? (typeof props.confirmBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.confirmBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.confirmBtnIcon))) : null)) : null;
+                        props.confirmBtnIcon ? (typeof props.confirmBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.confirmBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.confirmBtnIcon))) : null,
+                        props.confirmBtnLabel ? (React.createElement("span", null, props.confirmBtnLabel)) : null)) : null;
                 }
             });
-            btns.push({
+            !isStatic && btns.push({
                 children: function (_a) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
                     return _this.state.editIndex === rowIndex + offset ? (React.createElement(Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('cancel'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.cancelEdit },
-                        props.cancelBtnLabel ? (React.createElement("span", null, props.cancelBtnLabel)) : null,
-                        props.cancelBtnIcon ? (typeof props.cancelBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.cancelBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.cancelBtnIcon))) : null)) : null;
+                        props.cancelBtnIcon ? (typeof props.cancelBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.cancelBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.cancelBtnIcon))) : null,
+                        props.cancelBtnLabel ? (React.createElement("span", null, props.cancelBtnLabel)) : null)) : null;
                 }
             });
         }
-        if (props.removable) {
+        if (!isStatic && props.removable) {
             btns.push({
                 children: function (_a) {
                     var key = _a.key, rowIndex = _a.rowIndex, data = _a.data, offset = _a.offset;
                     return ((~_this.state.editIndex || (data && data.__isPlaceholder)) &&
                         needConfirm !== false) ||
-                        minLength >= _this.state.items.length ? null : (React.createElement(Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.deleteRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.removeItem.bind(_this, rowIndex + offset) },
-                        props.deleteBtnLabel ? (React.createElement("span", null, props.deleteBtnLabel)) : null,
-                        props.deleteBtnIcon ? (typeof props.deleteBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.deleteBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.deleteBtnIcon))) : null));
+                        minLength >= _this.state.items.length ? null : (React.createElement(Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.deleteRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, disabled: disabled, onClick: _this.removeItem.bind(_this, rowIndex + offset) },
+                        props.deleteBtnIcon ? (typeof props.deleteBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.deleteBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.deleteBtnIcon))) : null,
+                        props.deleteBtnLabel ? (React.createElement("span", null, props.deleteBtnLabel)) : null));
                 }
             });
         }
@@ -671,7 +688,7 @@ var FormTable = /** @class */ (function (_super) {
     FormTable.prototype.render = function () {
         var _this = this;
         var _a, _b;
-        var _c = this.props, className = _c.className; _c.style; _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;
+        var _c = this.props, className = _c.className; _c.style; _c.value; var 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, isStatic = _c.static, showFooterAddBtn = _c.showFooterAddBtn; _c.showTableAddBtn; var footerAddBtn = _c.footerAddBtn;
         var maxLength = this.resolveVariableProps(this.props, 'maxLength');
         if (formInited === false) {
             return null;
@@ -687,6 +704,17 @@ var FormTable = /** @class */ (function (_super) {
             showPager = true;
             offset = (page - 1) * perPage;
         }
+        var footerAddBtnSchema = {
+            type: 'button',
+            level: 'primary',
+            size: 'sm',
+            label: '新增',
+            icon: 'fa fa-plus',
+            disabled: disabled
+        };
+        if (footerAddBtn !== undefined) {
+            footerAddBtnSchema = Object.assign(footerAddBtnSchema, footerAddBtn);
+        }
         return (React.createElement("div", { className: cx('InputTable', className) },
             render('body', {
                 type: 'table',
@@ -722,13 +750,13 @@ var FormTable = /** @class */ (function (_super) {
                 // TODO: 这里是为了处理columns里使用value变量添加的，目前会影响初始化数据加载后的组件行为，先回滚
                 // onPristineChange: this.handlePristineChange
             }),
-            (addable &&
-                showAddBtn !== false &&
+            (!isStatic && addable &&
+                showFooterAddBtn !== false &&
                 (!maxLength || maxLength > items.length)) ||
                 showPager ? (React.createElement("div", { className: cx('InputTable-toolbar') },
-                addable && showAddBtn !== false ? (React.createElement(Button, { disabled: disabled, size: "sm", onClick: function () { return _this.addItem(_this.state.items.length); } },
-                    React.createElement(Icon, { icon: "plus", className: "icon" }),
-                    React.createElement("span", null, __('add')))) : null,
+                addable && showFooterAddBtn !== false ? (render('button', footerAddBtnSchema, {
+                    onClick: function () { return _this.addItem(_this.state.items.length); }
+                })) : null,
                 showPager
                     ? render('pager', {
                         type: 'pagination'
@@ -751,7 +779,9 @@ var FormTable = /** @class */ (function (_super) {
         cancelBtnIcon: 'close',
         valueField: '',
         minLength: 0,
-        maxLength: Infinity
+        maxLength: Infinity,
+        showFooterAddBtn: true,
+        showTableAddBtn: true
     };
     FormTable.propsList = [
         'onChange',
@@ -759,7 +789,7 @@ var FormTable = /** @class */ (function (_super) {
         'columns',
         'label',
         'scaffold',
-        'showAddBtn',
+        'showTableAddBtn',
         'addable',
         'removable',
         'copyable',

package/esm/renderers/Form/InputTag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/esm/renderers/Form/InputText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -1,7 +1,8 @@
 import React from 'react';
 import { SpinnerExtraProps } from 'amis-ui';
-import { OptionsControlProps, ActionObject } from 'amis-core';
+import { Option, OptionsControlProps, ActionObject } from 'amis-core';
 import { FormOptionsSchema, SchemaApi } from '../../Schema';
+import type { ItemRenderStates } from 'amis-ui/lib/components/Selection';
 /**
  * Tree 下拉选择框。
  * 文档：https://baidu.gitee.io/amis/docs/components/form/tree
@@ -69,20 +70,71 @@ export interface TreeControlSchema extends FormOptionsSchema {
      * 需要高亮的字符串
      */
     highlightTxt?: string;
+    /**
+     * 是否为选项添加默认的Icon，默认值为true
+     */
+    enableDefaultIcon?: boolean;
+    /**
+     * 是否开启搜索
+     */
+    searchable?: boolean;
+    /**
+     * 搜索框的配置
+     */
+    searchConfig?: {
+        /**
+         * 搜索框外层CSS样式类
+         */
+        className?: string;
+        /**
+         * 占位符
+         */
+        placeholder?: string;
+        /**
+         * 是否为 Mini 样式。
+         */
+        mini?: boolean;
+        /**
+         * 是否为加强样式
+         */
+        enhance?: boolean;
+        /**
+         * 是否可清除
+         */
+        clearable?: boolean;
+        /**
+         * 是否立马搜索。
+         */
+        searchImediately?: boolean;
+        /**
+         * 搜索框是否吸顶
+         */
+        sticky?: boolean;
+    };
 }
 export interface TreeProps extends OptionsControlProps, Omit<TreeControlSchema, 'type' | 'options' | 'className' | 'inputClassName' | 'descriptionClassName' | 'deferApi'>, SpinnerExtraProps {
     enableNodePath?: boolean;
     pathSeparator?: string;
 }
-export default class TreeControl extends React.Component<TreeProps> {
+interface TreeState {
+    filteredOptions: Option[];
+    keyword: string;
+}
+export default class TreeControl extends React.Component<TreeProps, TreeState> {
     static defaultProps: Partial<TreeProps>;
     treeRef: any;
+    constructor(props: TreeProps);
+    componentDidUpdate(prevProps: TreeProps): void;
     reload(): void;
     doAction(action: ActionObject, data: any, throwErrors: boolean): void;
+    filterOptions(options: Array<Option>, keywords: string): Array<Option>;
     handleChange(value: any): Promise<void>;
+    handleSearch(keyword: string): void;
     domRef(ref: any): void;
     validate(): any;
+    renderOptionItem(option: Option, states: ItemRenderStates): JSX.Element;
     render(): JSX.Element;
 }
 export declare class TreeControlRenderer extends TreeControl {
 }
+export {};

package/esm/renderers/Form/InputTree.js

@@ -1,20 +1,45 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
-import { __extends, __awaiter, __generator, __decorate, __metadata } from 'tslib';
+import { __extends, __assign, __awaiter, __generator, __decorate, __metadata } from 'tslib';
 import React from 'react';
+import omit from 'lodash/omit';
+import debouce from 'lodash/debounce';
 import cx from 'classnames';
-import { Spinner, Tree } from 'amis-ui';
-import { resolveEventData, isPureVariable, resolveVariableAndFilter, toNumber, autobind, OptionsControl } from 'amis-core';
+import { matchSorter } from 'match-sorter';
+import { Tree, Spinner, SearchBox } from 'amis-ui';
+import { resolveEventData, createObject, isPureVariable, resolveVariableAndFilter, toNumber, autobind, OptionsControl } from 'amis-core';
 import { supportStatic } from './StaticHoc.js';
 
 var TreeControl = /** @class */ (function (_super) {
     __extends(TreeControl, _super);
-    function TreeControl() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    function TreeControl(props) {
+        var _this = this;
+        var _a;
+        _this = _super.call(this, props) || this;
+        _this.state = {
+            keyword: '',
+            filteredOptions: (_a = _this.props.options) !== null && _a !== void 0 ? _a : []
+        };
+        _this.handleSearch = debouce(_this.handleSearch.bind(_this), 250, {
+            trailing: true,
+            leading: false
+        });
+        return _this;
     }
+    TreeControl.prototype.componentDidUpdate = function (prevProps) {
+        var props = this.props;
+        var keyword = this.state.keyword;
+        if (prevProps.options !== props.options ||
+            prevProps.searchable !== props.searchable) {
+            var options = props.options, searchable = props.searchable;
+            this.setState({
+                filteredOptions: searchable && keyword ? this.filterOptions(options, keyword) : options
+            });
+        }
+    };
     TreeControl.prototype.reload = function () {
         var reload = this.props.reloadOptions;
         reload && reload();
@@ -36,6 +61,23 @@ var TreeControl = /** @class */ (function (_super) {
             this.treeRef.syncUnFolded(this.props, 1);
         }
     };
+    TreeControl.prototype.filterOptions = function (options, keywords) {
+        var _this = this;
+        var _a = this.props, labelField = _a.labelField, valueField = _a.valueField;
+        return options.map(function (option) {
+            option = __assign({}, option);
+            option.visible = !!matchSorter([option], keywords, {
+                keys: [labelField || 'label', valueField || 'value']
+            }).length;
+            if (!option.visible && option.children) {
+                option.children = _this.filterOptions(option.children, keywords);
+                var visibleCount = option.children.filter(function (item) { return item.visible; }).length;
+                option.visible = !!visibleCount;
+            }
+            option.visible && (option.collapsed = false);
+            return option;
+        });
+    };
     TreeControl.prototype.handleChange = function (value) {
         return __awaiter(this, void 0, void 0, function () {
             var _a, onChange, dispatchEvent, rendererEvent;
@@ -55,6 +97,14 @@ var TreeControl = /** @class */ (function (_super) {
             });
         });
     };
+    TreeControl.prototype.handleSearch = function (keyword) {
+        var options = this.props.options;
+        var filterOptions = this.filterOptions(options, keyword);
+        this.setState({
+            keyword: keyword,
+            filteredOptions: keyword ? filterOptions : options
+        });
+    };
     TreeControl.prototype.domRef = function (ref) {
         this.treeRef = ref;
     };
@@ -70,18 +120,30 @@ var TreeControl = /** @class */ (function (_super) {
             return "\u5DF2\u9009\u62E9\u6570\u91CF\u8D85\u51FA\u8BBE\u5B9A\u7684\u6700\u5927\u4E2A\u6570".concat(maxLength, "\uFF0C\u8BF7\u53D6\u6D88\u9009\u62E9\u8D85\u51FA\u7684\u9009\u9879\u3002");
         }
     };
+    TreeControl.prototype.renderOptionItem = function (option, states) {
+        var _a = this.props, menuTpl = _a.menuTpl, render = _a.render, data = _a.data;
+        return render("option/".concat(states.index), menuTpl, {
+            data: createObject(createObject(data, __assign({}, states)), option)
+        });
+    };
     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;
+        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 highlightTxt = this.props.highlightTxt;
+        var _d = this.state, filteredOptions = _d.filteredOptions, keyword = _d.keyword;
         if (isPureVariable(highlightTxt)) {
             highlightTxt = resolveVariableAndFilter(highlightTxt, data);
         }
-        return (React.createElement("div", { className: cx("".concat(ns, "TreeControl"), className, treeContainerClassName) },
+        var TreeCmpt = (React.createElement(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: toNumber(itemHeight) > 0 ? toNumber(itemHeight) : undefined, itemRender: menuTpl ? this.renderOptionItem : undefined, enableDefaultIcon: enableDefaultIcon }));
+        return (React.createElement("div", { className: cx("".concat(ns, "TreeControl"), className, treeContainerClassName, {
+                'is-sticky': searchable && (searchConfig === null || searchConfig === void 0 ? void 0 : searchConfig.sticky)
+            }) },
             React.createElement(Spinner, { size: "sm", key: "info", show: loading, loadingConfig: loadingConfig }),
-            loading ? null : (React.createElement(Tree, { classPrefix: ns, onRef: this.domRef, labelField: labelField, valueField: valueField, iconField: iconField, disabled: disabled, onChange: this.handleChange, joinValues: joinValues, extractValue: extractValue, delimiter: delimiter, placeholder: __(placeholder), options: options, highlightTxt: highlightTxt, multiple: multiple, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, withChildren: withChildren, onlyChildren: onlyChildren, onlyLeaf: onlyLeaf, hideRoot: hideRoot, rootLabel: __(rootLabel), rootValue: rootValue, showIcon: showIcon, showRadio: showRadio, showOutline: showOutline, autoCheckChildren: autoCheckChildren, cascade: cascade, foldedField: "collapsed", value: value || '', nodePath: nodePath, enableNodePath: enableNodePath, pathSeparator: pathSeparator, selfDisabledAffectChildren: false, onAdd: onAdd, creatable: creatable, createTip: createTip, rootCreatable: rootCreatable, rootCreateTip: rootCreateTip, onEdit: onEdit, editable: editable, editTip: editTip, removable: removable, removeTip: removeTip, onDelete: onDelete, bultinCUD: !addControls && !editControls, onDeferLoad: deferLoad, onExpandTree: expandTreeOptions, virtualThreshold: virtualThreshold, itemHeight: toNumber(itemHeight) > 0 ? toNumber(itemHeight) : undefined }))));
+            loading ? null : searchable ? (React.createElement(React.Fragment, null,
+                React.createElement(SearchBox, __assign({ className: cx("".concat(ns, "TreeControl-searchbox"), searchConfig === null || searchConfig === void 0 ? void 0 : searchConfig.className, { 'is-sticky': searchConfig === null || searchConfig === void 0 ? void 0 : searchConfig.sticky }), mini: false, clearable: true }, omit(searchConfig, 'className', 'sticky'), { onSearch: this.handleSearch })),
+                TreeCmpt)) : (TreeCmpt)));
     };
     TreeControl.defaultProps = {
-        placeholder: 'loading',
+        placeholder: 'placeholder.noData',
         multiple: false,
         rootLabel: 'Tree.root',
         rootValue: '',
@@ -101,6 +163,12 @@ var TreeControl = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", void 0)
     ], TreeControl.prototype, "domRef", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object, Object]),
+        __metadata("design:returntype", void 0)
+    ], TreeControl.prototype, "renderOptionItem", null);
     __decorate([
         supportStatic(),
         __metadata("design:type", Function),

package/esm/renderers/Form/InputYearRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/esm/renderers/Form/JSONSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -1,11 +1,12 @@
 import React from 'react';
 import { FormControlProps } from 'amis-core';
 import { FormBaseControlSchema } from '../../Schema';
+import type { SchemaEditorItemPlaceholder } from 'amis-ui/lib/components/schema-editor/Common';
 /**
  * JSON Schema Editor
  * 文档：https://baidu.gitee.io/amis/docs/components/form/json-schema-editor
  */
-export interface JSONSchemaEditorControlSchema extends FormBaseControlSchema {
+export interface JSONSchemaEditorControlSchema extends Omit<FormBaseControlSchema, 'placeholder'> {
     /**
      * 指定为 JSON Schema Editor
      */
@@ -50,13 +51,33 @@ export interface JSONSchemaEditorControlSchema extends FormBaseControlSchema {
     advancedSettings?: {
         [propName: string]: any;
     };
+    /**
+     * 各属性输入控件的占位提示文本
+     *
+     * {
+     *   key: "key placeholder",
+     *   title: "title placeholder",
+     *   description: "description placeholder",
+     *   default: "default placeholder"
+     * }
+     *
+     */
+    placeholder?: SchemaEditorItemPlaceholder;
 }
 export interface JSONSchemaEditorProps extends FormControlProps, Omit<JSONSchemaEditorControlSchema, 'type' | 'className' | 'descriptionClassName' | 'inputClassName'> {
 }
 export default class JSONSchemaEditorControl extends React.PureComponent<JSONSchemaEditorProps> {
     static defaultProps: {
         enableAdvancedSetting: boolean;
+        placeholder: {
+            key: string;
+            title: string;
+            description: string;
+            default: string;
+            empty: string;
+        };
     };
+    normalizePlaceholder(): SchemaEditorItemPlaceholder;
     renderModalProps(value: any, onChange: (value: any) => void): JSX.Element;
     render(): JSX.Element;
 }

package/esm/renderers/Form/JSONSchemaEditor.js

@@ -1,18 +1,33 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
-import { __extends, __rest, __assign, __decorate, __metadata } from 'tslib';
+import { __extends, __assign, __rest, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { autobind, FormItem } from 'amis-core';
+import pick from 'lodash/pick';
+import { isObject, autobind, FormItem } from 'amis-core';
 import { JSONSchemaEditor } from 'amis-ui';
+import { schemaEditorItemPlaceholder } from 'amis-ui/lib/components/schema-editor/Common';
 
 var JSONSchemaEditorControl = /** @class */ (function (_super) {
     __extends(JSONSchemaEditorControl, _super);
     function JSONSchemaEditorControl() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
+    JSONSchemaEditorControl.prototype.normalizePlaceholder = function () {
+        var placeholder = this.props.placeholder;
+        if (isObject(placeholder)) {
+            return __assign(__assign({}, schemaEditorItemPlaceholder), pick(placeholder, [
+                'key',
+                'title',
+                'description',
+                'default',
+                'empty'
+            ]));
+        }
+        return schemaEditorItemPlaceholder;
+    };
     JSONSchemaEditorControl.prototype.renderModalProps = function (value, onChange) {
         var _a = this.props, render = _a.render, advancedSettings = _a.advancedSettings;
         var fields = (advancedSettings === null || advancedSettings === void 0 ? void 0 : advancedSettings[value === null || value === void 0 ? void 0 : value.type]) || [];
@@ -28,10 +43,11 @@ var JSONSchemaEditorControl = /** @class */ (function (_super) {
     };
     JSONSchemaEditorControl.prototype.render = function () {
         var _a = this.props, enableAdvancedSetting = _a.enableAdvancedSetting, rest = __rest(_a, ["enableAdvancedSetting"]);
-        return (React.createElement(JSONSchemaEditor, __assign({}, rest, { enableAdvancedSetting: enableAdvancedSetting, renderModalProps: this.renderModalProps })));
+        return (React.createElement(JSONSchemaEditor, __assign({}, rest, { placeholder: this.normalizePlaceholder(), enableAdvancedSetting: enableAdvancedSetting, renderModalProps: this.renderModalProps })));
     };
     JSONSchemaEditorControl.defaultProps = {
-        enableAdvancedSetting: false
+        enableAdvancedSetting: false,
+        placeholder: schemaEditorItemPlaceholder
     };
     __decorate([
         autobind,