amis 2.6.0 → 2.7.0

package/esm/renderers/Form/ListSelect.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __decorate, __metadata } from 'tslib';

package/esm/renderers/Form/LocationPicker.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __assign, __decorate, __metadata } from 'tslib';

package/esm/renderers/Form/MatrixCheckboxes.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';

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

@@ -1,8 +1,6 @@
 import React from 'react';
 import { SpinnerExtraProps } from 'amis-ui';
-import { OptionsControlProps } from 'amis-core';
-import { Option, Options } from 'amis-core';
-import { ActionObject } from 'amis-core';
+import { Option, Options, OptionsControlProps, ActionObject } from 'amis-core';
 import { FormOptionsSchema } from '../../Schema';
 /**
  * Nested Select

package/esm/renderers/Form/NestedSelect.js

@@ -1,12 +1,12 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { resolveEventData, string2regExp, getTreeAncestors, flattenTree, getTreeParent, filterTree, RootClose, Overlay, PopOver, isMobile, ucFirst, autobind, OptionsControl } from 'amis-core';
 import { Checkbox, Icon, ResultBox, Spinner, PopUp, Cascader } from 'amis-ui';
+import { resolveEventData, string2regExp, getTreeAncestors, flattenTree, getTreeParent, filterTree, RootClose, Overlay, PopOver, isMobile, ucFirst, autobind, OptionsControl } from 'amis-core';
 import { findDOMNode } from 'react-dom';
 import xor from 'lodash/xor';
 import union from 'lodash/union';
@@ -118,11 +118,12 @@ var NestedSelectControl = /** @class */ (function (_super) {
         return (React.createElement("span", { className: cx('Select-valueLabel'), key: key || option[valueField || 'value'] }, ancestors
             ? ancestors.map(function (item, index) {
                 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.createElement("span", { key: index },
-                    regexp.test(label)
+                    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;
@@ -163,7 +164,9 @@ var NestedSelectControl = /** @class */ (function (_super) {
                         isPrevented = _b.sent();
                         isPrevented || onChange(value);
                         isPrevented || this.handleResultClear();
-                        !multiple && this.close();
+                        /** 选项选择后需要重置下拉数据源：搜索结果 => 原始数据 */
+                        this.setState({ stack: [this.props.options] });
+                        this.close();
                         return [2 /*return*/];
                 }
             });
@@ -268,6 +271,8 @@ var NestedSelectControl = /** @class */ (function (_super) {
                         isPrevented = _b.sent();
                         isPrevented || onChange(newValue);
                         isPrevented || this.handleResultClear();
+                        /** 选项选择后需要重置下拉数据源：搜索结果 => 原始数据 */
+                        this.setState({ stack: [this.props.options] });
                         return [2 /*return*/];
                 }
             });
@@ -469,14 +474,15 @@ var NestedSelectControl = /** @class */ (function (_super) {
     NestedSelectControl.prototype.renderSearchResult = function () {
         var _this = this;
         var _a = this.state, stack = _a.stack, inputValue = _a.inputValue;
-        var _b = this.props, cx = _b.classnames, __ = _b.translate, propOptions = _b.options, labelField = _b.labelField, cascade = _b.cascade, selectedOptions = _b.selectedOptions, multiple = _b.multiple, disabled = _b.disabled, onlyChildren = _b.onlyChildren, render = _b.render;
+        var _b = this.props, cx = _b.classnames, __ = _b.translate, propOptions = _b.options, labelField = _b.labelField, valueField = _b.valueField, cascade = _b.cascade, selectedOptions = _b.selectedOptions, multiple = _b.multiple, disabled = _b.disabled, onlyChildren = _b.onlyChildren, render = _b.render;
         var noResultsText = this.props.noResultsText;
         if (noResultsText) {
             noResultsText = render('noResultText', __(noResultsText));
         }
         var regexp = string2regExp(inputValue || '');
         var flattenTreeWithNodes = flattenTree(stack[0]).filter(function (option) {
-            return regexp.test(option[labelField || 'label']);
+            return !!(regexp.test(option[valueField || 'value']) ||
+                regexp.test(option[labelField || 'label']));
         });
         // 一个stack一个menu
         var resultBody = (React.createElement("div", { className: cx('NestedSelect-menu') }, flattenTreeWithNodes.length ? (flattenTreeWithNodes.map(function (option, index) {

package/esm/renderers/Form/Picker.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __assign, __awaiter, __generator, __decorate, __metadata } from 'tslib';

package/esm/renderers/Form/Radios.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __awaiter, __generator, __decorate, __metadata } from 'tslib';

package/esm/renderers/Form/Select.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __rest, __decorate, __metadata } from 'tslib';
@@ -266,7 +266,7 @@ var TransferDropdownRenderer = /** @class */ (function (_super) {
     };
     TransferDropdownRenderer.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className; _b.classnames; var selectedOptions = _b.selectedOptions, sortable = _b.sortable, loading = _b.loading, searchable = _b.searchable, searchResultMode = _b.searchResultMode, showArrow = _b.showArrow, deferLoad = _b.deferLoad, disabled = _b.disabled, clearable = _b.clearable, selectTitle = _b.selectTitle, selectMode = _b.selectMode, multiple = _b.multiple, columns = _b.columns, leftMode = _b.leftMode, borderMode = _b.borderMode, useMobileUI = _b.useMobileUI, popOverContainer = _b.popOverContainer, maxTagCount = _b.maxTagCount, overflowTagPopover = _b.overflowTagPopover, placeholder = _b.placeholder, itemHeight = _b.itemHeight, virtualThreshold = _b.virtualThreshold, rightMode = _b.rightMode, loadingConfig = _b.loadingConfig;
+        var _b = this.props, className = _b.className; _b.classnames; var selectedOptions = _b.selectedOptions, sortable = _b.sortable, loading = _b.loading, searchable = _b.searchable, searchResultMode = _b.searchResultMode, showArrow = _b.showArrow, deferLoad = _b.deferLoad, disabled = _b.disabled, clearable = _b.clearable, selectTitle = _b.selectTitle, selectMode = _b.selectMode, multiple = _b.multiple, columns = _b.columns, leftMode = _b.leftMode, borderMode = _b.borderMode, useMobileUI = _b.useMobileUI, popOverContainer = _b.popOverContainer, maxTagCount = _b.maxTagCount, overflowTagPopover = _b.overflowTagPopover, placeholder = _b.placeholder, itemHeight = _b.itemHeight, virtualThreshold = _b.virtualThreshold, rightMode = _b.rightMode, loadingConfig = _b.loadingConfig, labelField = _b.labelField, showInvalidMatch = _b.showInvalidMatch;
         // 目前 LeftOptions 没有接口可以动态加载
         // 为了方便可以快速实现动态化，让选项的第一个成员携带
         // LeftOptions 信息
@@ -281,7 +281,7 @@ var TransferDropdownRenderer = /** @class */ (function (_super) {
             options = options[0].children;
         }
         return (React.createElement(React.Fragment, null,
-            React.createElement(TransferDropDown, { selectMode: selectMode, className: className, value: selectedOptions, disabled: disabled, clearable: clearable, options: options, onChange: this.handleChange, option2value: this.option2value, itemRender: this.renderItem, sortable: sortable, searchResultMode: searchResultMode, onSearch: searchable ? this.handleSearch : undefined, showArrow: showArrow, onDeferLoad: deferLoad, selectTitle: selectTitle, multiple: multiple, columns: columns, leftMode: leftMode, rightMode: rightMode, leftOptions: leftOptions, borderMode: borderMode, useMobileUI: useMobileUI, popOverContainer: popOverContainer, maxTagCount: maxTagCount, overflowTagPopover: overflowTagPopover, placeholder: placeholder, itemHeight: itemHeight, virtualThreshold: virtualThreshold, virtualListHeight: 266 }),
+            React.createElement(TransferDropDown, { selectMode: selectMode, className: className, value: selectedOptions, disabled: disabled, clearable: clearable, options: options, onChange: this.handleChange, option2value: this.option2value, itemRender: this.renderItem, sortable: sortable, searchResultMode: searchResultMode, onSearch: searchable ? this.handleSearch : undefined, showArrow: showArrow, onDeferLoad: deferLoad, selectTitle: selectTitle, multiple: multiple, columns: columns, leftMode: leftMode, rightMode: rightMode, leftOptions: leftOptions, borderMode: borderMode, useMobileUI: useMobileUI, popOverContainer: popOverContainer, maxTagCount: maxTagCount, overflowTagPopover: overflowTagPopover, placeholder: placeholder, itemHeight: itemHeight, virtualThreshold: virtualThreshold, virtualListHeight: 266, labelField: labelField, showInvalidMatch: showInvalidMatch }),
             React.createElement(Spinner, { overlay: true, key: "info", show: loading, loadingConfig: loadingConfig })));
     };
     __decorate([

package/esm/renderers/Form/Static.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __awaiter, __generator, __rest, __assign, __decorate } from 'tslib';

package/esm/renderers/Form/StaticHoc.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __spreadArray, __assign } from 'tslib';

package/esm/renderers/Form/Switch.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __awaiter, __generator, __decorate, __metadata } from 'tslib';

package/esm/renderers/Form/TabsTransfer.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';

package/esm/renderers/Form/TabsTransferPicker.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __assign, __decorate, __metadata } from 'tslib';

package/esm/renderers/Form/Textarea.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __awaiter, __generator, __rest, __assign, __decorate, __metadata } from 'tslib';

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

@@ -99,6 +99,10 @@ export interface TransferControlSchema extends FormOptionsSchema, SpinnerExtraPr
      * 在选项数量达到多少时开启虚拟渲染
      */
     virtualThreshold?: number;
+    /**
+     * 当在value值未匹配到当前options中的选项时，是否value值对应文本飘红显示
+     */
+    showInvalidMatch?: boolean;
 }
 export interface BaseTransferProps extends OptionsControlProps, Omit<TransferControlSchema, 'type' | 'options' | 'className' | 'descriptionClassName' | 'inputClassName'>, SpinnerExtraProps {
     resultItemRender?: (option: Option) => JSX.Element;

package/esm/renderers/Form/Transfer.js

@@ -1,12 +1,12 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import find from 'lodash/find';
-import { findTreeIndex, optionValueCompare, getTree, spliceTree, resolveEventData, string2regExp, filterTree, createObject, resolveVariable, toNumber, autobind, OptionsControl } from 'amis-core';
+import { findTreeIndex, optionValueCompare, getTree, spliceTree, findTree, resolveEventData, string2regExp, filterTree, createObject, resolveVariable, toNumber, autobind, OptionsControl } from 'amis-core';
 import { Selection, ResultList, Transfer, Spinner } from 'amis-ui';
 import { supportStatic } from './StaticHoc.js';
 
@@ -21,11 +21,11 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
     };
     BaseTransferRenderer.prototype.handleChange = function (value, optionModified) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, onChange, joinValues, delimiter, valueField, extractValue, options, dispatchEvent, setOptions, newValue, newOptions, indexes, origin_1, rendererEvent;
+            var _a, onChange, joinValues, delimiter, valueField, extractValue, options, dispatchEvent, setOptions, selectMode, deferApi, newValue, newOptions, indexes, origin_1, isTreeDefer, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, onChange = _a.onChange, joinValues = _a.joinValues, delimiter = _a.delimiter, valueField = _a.valueField, extractValue = _a.extractValue, options = _a.options, dispatchEvent = _a.dispatchEvent, setOptions = _a.setOptions;
+                        _a = this.props, onChange = _a.onChange, joinValues = _a.joinValues, delimiter = _a.delimiter, valueField = _a.valueField, extractValue = _a.extractValue, options = _a.options, dispatchEvent = _a.dispatchEvent, setOptions = _a.setOptions, selectMode = _a.selectMode, deferApi = _a.deferApi;
                         newValue = value;
                         newOptions = options.concat();
                         if (Array.isArray(value)) {
@@ -60,8 +60,12 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
                                 newOptions = spliceTree(newOptions, indexes, 1, __assign(__assign({}, origin_1), value));
                             }
                         }
-                        (newOptions.length > options.length || optionModified) &&
-                            setOptions(newOptions, true);
+                        isTreeDefer = selectMode === 'tree' &&
+                            (!!deferApi ||
+                                !!findTree(options, function (option) { return option.deferApi || option.defer; }));
+                        isTreeDefer === true ||
+                            ((newOptions.length > options.length || optionModified) &&
+                                setOptions(newOptions, true));
                         return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, {
                                 value: newValue,
                                 options: options,
@@ -165,8 +169,10 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
         return ResultList.itemRender(option, states);
     };
     BaseTransferRenderer.prototype.renderCell = function (column, option, colIndex, rowIndex) {
-        var _a = this.props, render = _a.render, data = _a.data, cx = _a.classnames;
-        return render("cell/".concat(colIndex, "/").concat(rowIndex), __assign({ type: 'text', className: cx({ 'is-invalid': option === null || option === void 0 ? void 0 : option.__unmatched }) }, column), {
+        var _a = this.props, render = _a.render, data = _a.data, cx = _a.classnames, showInvalidMatch = _a.showInvalidMatch;
+        return render("cell/".concat(colIndex, "/").concat(rowIndex), __assign({ type: 'text', className: cx({
+                'is-invalid': showInvalidMatch ? option === null || option === void 0 ? void 0 : option.__unmatched : false
+            }) }, column), {
             value: resolveVariable(column.name, option),
             data: createObject(data, option)
         });
@@ -199,7 +205,7 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
     };
     BaseTransferRenderer.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className; _b.style; var cx = _b.classnames, selectedOptions = _b.selectedOptions, showArrow = _b.showArrow, sortable = _b.sortable, selectMode = _b.selectMode, columns = _b.columns, loading = _b.loading, searchable = _b.searchable, searchResultMode = _b.searchResultMode, searchResultColumns = _b.searchResultColumns, deferLoad = _b.deferLoad, leftMode = _b.leftMode, rightMode = _b.rightMode, disabled = _b.disabled, selectTitle = _b.selectTitle, resultTitle = _b.resultTitle; _b.menuTpl; var searchPlaceholder = _b.searchPlaceholder, _c = _b.resultListModeFollowSelect, resultListModeFollowSelect = _c === void 0 ? false : _c, resultSearchPlaceholder = _b.resultSearchPlaceholder, _d = _b.resultSearchable, resultSearchable = _d === void 0 ? false : _d, statistics = _b.statistics, labelField = _b.labelField, virtualThreshold = _b.virtualThreshold, itemHeight = _b.itemHeight, loadingConfig = _b.loadingConfig;
+        var _b = this.props, className = _b.className; _b.style; var cx = _b.classnames, selectedOptions = _b.selectedOptions, showArrow = _b.showArrow, sortable = _b.sortable, selectMode = _b.selectMode, columns = _b.columns, loading = _b.loading, searchable = _b.searchable, searchResultMode = _b.searchResultMode, searchResultColumns = _b.searchResultColumns, deferLoad = _b.deferLoad, leftMode = _b.leftMode, rightMode = _b.rightMode, disabled = _b.disabled, selectTitle = _b.selectTitle, resultTitle = _b.resultTitle; _b.menuTpl; var searchPlaceholder = _b.searchPlaceholder, _c = _b.resultListModeFollowSelect, resultListModeFollowSelect = _c === void 0 ? false : _c, resultSearchPlaceholder = _b.resultSearchPlaceholder, _d = _b.resultSearchable, resultSearchable = _d === void 0 ? false : _d, statistics = _b.statistics, labelField = _b.labelField, virtualThreshold = _b.virtualThreshold, itemHeight = _b.itemHeight, loadingConfig = _b.loadingConfig, showInvalidMatch = _b.showInvalidMatch;
         // 目前 LeftOptions 没有接口可以动态加载
         // 为了方便可以快速实现动态化，让选项的第一个成员携带
         // LeftOptions 信息
@@ -214,7 +220,7 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
             options = options[0].children;
         }
         return (React.createElement("div", { className: cx('TransferControl', className) },
-            React.createElement(Transfer, { value: selectedOptions, options: options, disabled: disabled, onChange: this.handleChange, option2value: this.option2value, sortable: sortable, showArrow: showArrow, selectMode: selectMode, searchResultMode: searchResultMode, searchResultColumns: searchResultColumns, columns: columns, onSearch: searchable ? this.handleSearch : undefined, onDeferLoad: deferLoad, leftOptions: leftOptions, leftMode: leftMode, rightMode: rightMode, cellRender: this.renderCell, selectTitle: selectTitle, resultTitle: resultTitle, resultListModeFollowSelect: resultListModeFollowSelect, onResultSearch: this.handleResultSearch, searchPlaceholder: searchPlaceholder, resultSearchable: resultSearchable, resultSearchPlaceholder: resultSearchPlaceholder, statistics: statistics, labelField: labelField, optionItemRender: this.optionItemRender, resultItemRender: this.resultItemRender, onSelectAll: this.onSelectAll, onRef: this.getRef, virtualThreshold: virtualThreshold, itemHeight: toNumber(itemHeight) > 0 ? toNumber(itemHeight) : undefined, loadingConfig: loadingConfig }),
+            React.createElement(Transfer, { value: selectedOptions, options: options, disabled: disabled, onChange: this.handleChange, option2value: this.option2value, sortable: sortable, showArrow: showArrow, selectMode: selectMode, searchResultMode: searchResultMode, searchResultColumns: searchResultColumns, columns: columns, onSearch: searchable ? this.handleSearch : undefined, onDeferLoad: deferLoad, leftOptions: leftOptions, leftMode: leftMode, rightMode: rightMode, cellRender: this.renderCell, selectTitle: selectTitle, resultTitle: resultTitle, resultListModeFollowSelect: resultListModeFollowSelect, onResultSearch: this.handleResultSearch, searchPlaceholder: searchPlaceholder, resultSearchable: resultSearchable, resultSearchPlaceholder: resultSearchPlaceholder, statistics: statistics, labelField: labelField, optionItemRender: this.optionItemRender, resultItemRender: this.resultItemRender, onSelectAll: this.onSelectAll, onRef: this.getRef, virtualThreshold: virtualThreshold, itemHeight: toNumber(itemHeight) > 0 ? toNumber(itemHeight) : undefined, loadingConfig: loadingConfig, showInvalidMatch: showInvalidMatch }),
             React.createElement(Spinner, { overlay: true, key: "info", loadingConfig: loadingConfig, show: loading })));
     };
     __decorate([

package/esm/renderers/Form/TransferPicker.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __decorate, __metadata } from 'tslib';

package/esm/renderers/Form/TreeSelect.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __assign, __awaiter, __generator, __decorate, __metadata } from 'tslib';

package/esm/renderers/Form/UUID.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __decorate } from 'tslib';

package/esm/renderers/Form/UserSelect.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';

package/esm/renderers/Grid.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __assign, __decorate } from 'tslib';

package/esm/renderers/Grid2D.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __assign, __decorate } from 'tslib';

package/esm/renderers/GridNav.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __assign, __decorate, __metadata } from 'tslib';

package/esm/renderers/HBox.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __assign, __decorate } from 'tslib';

package/esm/renderers/IFrame.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';

package/esm/renderers/Icon.d.ts

@@ -22,6 +22,9 @@ export interface IconProps extends RendererProps, Omit<IconSchema, 'type' | 'cla
 }
 export declare class Icon extends React.Component<IconProps, object> {
     static defaultProps: Partial<IconProps>;
+    handleClick(e: React.MouseEvent<any>): void;
+    handleMouseEnter(e: React.MouseEvent<any>): void;
+    handleMouseLeave(e: React.MouseEvent<any>): void;
     render(): JSX.Element | undefined;
 }
 export declare class IconRenderer extends Icon {

package/esm/renderers/Icon.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
-import { __extends, __decorate } from 'tslib';
+import { __extends, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { filter, Renderer } from 'amis-core';
+import { createObject, filter, autobind, Renderer } from 'amis-core';
 import { getIcon, withBadge } from 'amis-ui';
 import { isObject } from 'lodash';
 
@@ -14,6 +14,24 @@ var Icon = /** @class */ (function (_super) {
     function Icon() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
+    Icon.prototype.handleClick = function (e) {
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
+        dispatchEvent('click', createObject(data, {
+            nativeEvent: e
+        }));
+    };
+    Icon.prototype.handleMouseEnter = function (e) {
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
+        dispatchEvent(e, createObject(data, {
+            nativeEvent: e
+        }));
+    };
+    Icon.prototype.handleMouseLeave = function (e) {
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
+        dispatchEvent(e, createObject(data, {
+            nativeEvent: e
+        }));
+    };
     Icon.prototype.render = function () {
         var _a = this.props, vendor = _a.vendor, cx = _a.classnames, className = _a.className, style = _a.style, data = _a.data;
         var icon = this.props.icon;
@@ -22,14 +40,14 @@ var Icon = /** @class */ (function (_super) {
             if (isObject(icon) &&
                 typeof icon.id === 'string' &&
                 icon.id.startsWith('svg-')) {
-                return (React.createElement("svg", { className: cx('icon', className), style: style },
+                return (React.createElement("svg", { className: cx('icon', className), style: style, onClick: this.handleClick, onMouseEnter: this.handleMouseEnter, onMouseLeave: this.handleMouseLeave },
                     React.createElement("use", { xlinkHref: "#".concat(icon.id.replace(/^svg-/, '')) })));
             }
             return;
         }
         var CustomIcon = getIcon(icon);
         if (CustomIcon) {
-            return React.createElement(CustomIcon, { className: cx(className, "icon-".concat(icon)), style: style });
+            return (React.createElement(CustomIcon, { className: cx(className, "icon-".concat(icon)), style: style, onClick: this.handleClick, onMouseEnter: this.handleMouseEnter, onMouseLeave: this.handleMouseLeave }));
         }
         var isURLIcon = (icon === null || icon === void 0 ? void 0 : icon.indexOf('.')) !== -1;
         var iconPrefix = '';
@@ -44,12 +62,30 @@ var Icon = /** @class */ (function (_super) {
             // 如果vendor为空，则不设置前缀,这样可以支持fontawesome v5、fontawesome v6或者其他框架
             iconPrefix = "".concat(icon);
         }
-        return isURLIcon ? (React.createElement("img", { className: cx('Icon'), src: icon, style: style })) : (React.createElement("i", { className: cx(iconPrefix, className), style: style }));
+        return isURLIcon ? (React.createElement("img", { className: cx('Icon'), src: icon, style: style, onClick: this.handleClick, onMouseEnter: this.handleMouseEnter, onMouseLeave: this.handleMouseLeave })) : (React.createElement("i", { className: cx(iconPrefix, className), style: style, onClick: this.handleClick, onMouseEnter: this.handleMouseEnter, onMouseLeave: this.handleMouseLeave }));
     };
     Icon.defaultProps = {
         icon: '',
         vendor: 'fa'
     };
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], Icon.prototype, "handleClick", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], Icon.prototype, "handleMouseEnter", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], Icon.prototype, "handleMouseLeave", null);
     return Icon;
 }(React.Component));
 /** @class */ ((function (_super) {

package/esm/renderers/Image.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __rest, __decorate, __metadata } from 'tslib';

package/esm/renderers/Images.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __assign, __decorate, __metadata } from 'tslib';

package/esm/renderers/Json.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __decorate, __metadata } from 'tslib';

package/esm/renderers/Link.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __decorate, __metadata } from 'tslib';

package/esm/renderers/List.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __assign, __decorate, __spreadArray, __rest } from 'tslib';

package/esm/renderers/Log.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate } from 'tslib';

package/esm/renderers/Mapping.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __generator, __assign, __extends, __decorate } from 'tslib';
@@ -168,8 +168,12 @@ var MappingField = withStore(function (props) {
         };
         class_1.prototype.render = function () {
             var _this = this;
-            var style = this.props.style;
+            var _a = this.props, style = _a.style, defaultValue = _a.defaultValue, data = _a.data;
             var mapKey = getPropValue(this.props);
+            // 让默认值支持表达式
+            if (defaultValue && isPureVariable(defaultValue) && defaultValue === mapKey) {
+                mapKey = resolveVariableAndFilter(defaultValue, data, '| raw');
+            }
             if (Array.isArray(mapKey)) {
                 return (React.createElement("span", { style: style }, mapKey.map(function (singleKey, index) {
                     return _this.renderSingleValue(singleKey, index);

package/esm/renderers/Markdown.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __awaiter, __generator, __decorate } from 'tslib';

package/esm/renderers/MultilineText.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 import { __extends, __assign, __decorate } from 'tslib';