amis 2.4.0 → 2.5.0-rc.0

package/esm/renderers/Form/Transfer.js

@@ -1,12 +1,12 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 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, autobind, OptionsControl } from 'amis-core';
+import { findTreeIndex, optionValueCompare, getTree, spliceTree, resolveEventData, string2regExp, filterTree, createObject, resolveVariable, toNumber, autobind, OptionsControl } from 'amis-core';
 import { Selection, ResultList, Transfer, Spinner } from 'amis-ui';
 import { supportStatic } from './StaticHoc.js';
 
@@ -165,8 +165,8 @@ 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;
-        return render("cell/".concat(colIndex, "/").concat(rowIndex), __assign({ type: 'text' }, column), {
+        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), {
             value: resolveVariable(column.name, option),
             data: createObject(data, option)
         });
@@ -199,7 +199,7 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
     };
     BaseTransferRenderer.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className, 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;
+        var _b = this.props, className = _b.className, 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;
         // 目前 LeftOptions 没有接口可以动态加载
         // 为了方便可以快速实现动态化，让选项的第一个成员携带
         // LeftOptions 信息
@@ -214,7 +214,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 }),
+            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 }),
             React.createElement(Spinner, { overlay: true, key: "info", show: loading })));
     };
     __decorate([

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { OptionsControlProps } from 'amis-core';
 import { BaseTransferRenderer, TransferControlSchema } from './Transfer';
 import { ActionObject } from 'amis-core';

package/esm/renderers/Form/TransferPicker.js

@@ -1,10 +1,10 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __decorate, __metadata } from 'tslib';
-import { resolveEventData, autobind, OptionsControl } from 'amis-core';
+import { resolveEventData, toNumber, autobind, OptionsControl } from 'amis-core';
 import React from 'react';
 import { TransferPicker, Spinner } from 'amis-ui';
 import { BaseTransferRenderer } from './Transfer.js';
@@ -34,7 +34,7 @@ import { supportStatic } from './StaticHoc.js';
     TransferPickerRenderer.prototype.render = function () {
         var _this = this;
         var _a;
-        var _b = this.props, className = _b.className, cx = _b.classnames, selectedOptions = _b.selectedOptions, sortable = _b.sortable, loading = _b.loading, searchable = _b.searchable, searchResultMode = _b.searchResultMode, showArrow = _b.showArrow, deferLoad = _b.deferLoad, disabled = _b.disabled, selectTitle = _b.selectTitle, resultTitle = _b.resultTitle, pickerSize = _b.pickerSize, columns = _b.columns, leftMode = _b.leftMode, selectMode = _b.selectMode, borderMode = _b.borderMode;
+        var _b = this.props, className = _b.className, cx = _b.classnames, selectedOptions = _b.selectedOptions, sortable = _b.sortable, loading = _b.loading, searchable = _b.searchable, searchResultMode = _b.searchResultMode, showArrow = _b.showArrow, deferLoad = _b.deferLoad, disabled = _b.disabled, selectTitle = _b.selectTitle, resultTitle = _b.resultTitle, pickerSize = _b.pickerSize, columns = _b.columns, leftMode = _b.leftMode, selectMode = _b.selectMode, borderMode = _b.borderMode, itemHeight = _b.itemHeight, virtualThreshold = _b.virtualThreshold;
         // 目前 LeftOptions 没有接口可以动态加载
         // 为了方便可以快速实现动态化，让选项的第一个成员携带
         // LeftOptions 信息
@@ -49,7 +49,7 @@ import { supportStatic } from './StaticHoc.js';
             options = options[0].children;
         }
         return (React.createElement("div", { className: cx('TransferControl', className) },
-            React.createElement(TransferPicker, { borderMode: borderMode, selectMode: selectMode, value: selectedOptions, disabled: disabled, options: options, onChange: this.handleChange, option2value: this.option2value, sortable: sortable, searchResultMode: searchResultMode, onSearch: searchable ? this.handleSearch : undefined, showArrow: showArrow, onDeferLoad: deferLoad, selectTitle: selectTitle, resultTitle: resultTitle, size: pickerSize, columns: columns, leftMode: leftMode, leftOptions: leftOptions, optionItemRender: this.optionItemRender, resultItemRender: this.resultItemRender, onFocus: function () { return _this.dispatchEvent('focus'); }, onBlur: function () { return _this.dispatchEvent('blur'); } }),
+            React.createElement(TransferPicker, { borderMode: borderMode, selectMode: selectMode, value: selectedOptions, disabled: disabled, options: options, onChange: this.handleChange, option2value: this.option2value, sortable: sortable, searchResultMode: searchResultMode, onSearch: searchable ? this.handleSearch : undefined, showArrow: showArrow, onDeferLoad: deferLoad, selectTitle: selectTitle, resultTitle: resultTitle, size: pickerSize, columns: columns, leftMode: leftMode, leftOptions: leftOptions, optionItemRender: this.optionItemRender, resultItemRender: this.resultItemRender, onFocus: function () { return _this.dispatchEvent('focus'); }, onBlur: function () { return _this.dispatchEvent('blur'); }, itemHeight: toNumber(itemHeight) > 0 ? toNumber(itemHeight) : undefined, virtualThreshold: virtualThreshold }),
             React.createElement(Spinner, { overlay: true, key: "info", show: loading })));
     };
     __decorate([

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

@@ -3,6 +3,7 @@ import { OptionsControlProps, Option } from 'amis-core';
 import { Api } from 'amis-core';
 import { ActionObject } from 'amis-core';
 import { FormOptionsSchema } from '../../Schema';
+import { TooltipWrapperSchema } from '../TooltipWrapper';
 /**
  * Tree 下拉选择框。
  * 文档：https://baidu.gitee.io/amis/docs/components/form/tree
@@ -61,6 +62,14 @@ export interface TreeSelectControlSchema extends FormOptionsSchema {
      * 是否显示展开线
      */
     showOutline?: boolean;
+    /**
+     * 标签的最大展示数量，超出数量后以收纳浮层的方式展示，仅在多选模式开启后生效
+     */
+    maxTagCount?: number;
+    /**
+     * 收纳标签的Popover配置
+     */
+    overflowTagPopover?: TooltipWrapperSchema;
 }
 export interface TreeSelectProps extends OptionsControlProps {
     placeholder?: any;

package/esm/renderers/Form/TreeSelect.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __awaiter, __generator, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { resolveEventData, isEffectiveApi, normalizeOptions, getTreeAncestors, isMobile, Overlay, PopOver, autobind, OptionsControl } from 'amis-core';
+import { resolveEventData, isEffectiveApi, normalizeOptions, getTreeAncestors, toNumber, isMobile, Overlay, PopOver, autobind, OptionsControl } from 'amis-core';
 import { Tree, ResultBox, Spinner, PopUp } from 'amis-ui';
 import { matchSorter } from 'match-sorter';
 import debouce from 'lodash/debounce';
@@ -277,19 +277,19 @@ var TreeSelectControl = /** @class */ (function (_super) {
         this.treeRef = ref;
     };
     TreeSelectControl.prototype.renderOuter = function () {
-        var _a = this.props, 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; _a.placeholder; var options = _a.options, multiple = _a.multiple, valueField = _a.valueField, initiallyOpen = _a.initiallyOpen, unfoldedLevel = _a.unfoldedLevel, withChildren = _a.withChildren, rootLabel = _a.rootLabel, cascade = _a.cascade, rootValue = _a.rootValue, showIcon = _a.showIcon, showRadio = _a.showRadio; _a.popOverContainer; var onlyChildren = _a.onlyChildren, onlyLeaf = _a.onlyLeaf, ns = _a.classPrefix, optionsPlaceholder = _a.optionsPlaceholder, searchable = _a.searchable, autoComplete = _a.autoComplete, maxLength = _a.maxLength, minLength = _a.minLength, labelField = _a.labelField, nodePath = _a.nodePath, 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, __ = _a.translate, deferLoad = _a.deferLoad, expandTreeOptions = _a.expandTreeOptions, selfDisabledAffectChildren = _a.selfDisabledAffectChildren, showOutline = _a.showOutline, autoCheckChildren = _a.autoCheckChildren, hideRoot = _a.hideRoot;
+        var _a = this.props, 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; _a.placeholder; var options = _a.options, multiple = _a.multiple, valueField = _a.valueField, initiallyOpen = _a.initiallyOpen, unfoldedLevel = _a.unfoldedLevel, withChildren = _a.withChildren, rootLabel = _a.rootLabel, cascade = _a.cascade, rootValue = _a.rootValue, showIcon = _a.showIcon, showRadio = _a.showRadio; _a.popOverContainer; var onlyChildren = _a.onlyChildren, onlyLeaf = _a.onlyLeaf, ns = _a.classPrefix, optionsPlaceholder = _a.optionsPlaceholder, searchable = _a.searchable, autoComplete = _a.autoComplete, maxLength = _a.maxLength, minLength = _a.minLength, labelField = _a.labelField, nodePath = _a.nodePath, 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, __ = _a.translate, deferLoad = _a.deferLoad, expandTreeOptions = _a.expandTreeOptions, selfDisabledAffectChildren = _a.selfDisabledAffectChildren, showOutline = _a.showOutline, autoCheckChildren = _a.autoCheckChildren, hideRoot = _a.hideRoot, virtualThreshold = _a.virtualThreshold, itemHeight = _a.itemHeight;
         var filtedOptions = !isEffectiveApi(autoComplete) && searchable && this.state.inputValue
             ? this.filterOptions(options, this.state.inputValue)
             : options;
-        return (React.createElement(Tree, { classPrefix: ns, onRef: this.domRef, onlyChildren: onlyChildren, onlyLeaf: onlyLeaf, labelField: labelField, valueField: valueField, disabled: disabled, onChange: this.handleChange, joinValues: joinValues, extractValue: extractValue, delimiter: delimiter, placeholder: __(optionsPlaceholder), options: filtedOptions, highlightTxt: this.state.inputValue, multiple: multiple, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, withChildren: withChildren, autoCheckChildren: autoCheckChildren, rootLabel: __(rootLabel), rootValue: rootValue, showIcon: showIcon, showRadio: showRadio, showOutline: showOutline, cascade: cascade, foldedField: "collapsed", hideRoot: hideRoot, value: value || '', nodePath: nodePath, enableNodePath: enableNodePath, pathSeparator: pathSeparator, maxLength: maxLength, minLength: minLength, 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, selfDisabledAffectChildren: selfDisabledAffectChildren }));
+        return (React.createElement(Tree, { classPrefix: ns, onRef: this.domRef, onlyChildren: onlyChildren, onlyLeaf: onlyLeaf, labelField: labelField, valueField: valueField, disabled: disabled, onChange: this.handleChange, joinValues: joinValues, extractValue: extractValue, delimiter: delimiter, placeholder: __(optionsPlaceholder), options: filtedOptions, highlightTxt: this.state.inputValue, multiple: multiple, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, withChildren: withChildren, autoCheckChildren: autoCheckChildren, rootLabel: __(rootLabel), rootValue: rootValue, showIcon: showIcon, showRadio: showRadio, showOutline: showOutline, cascade: cascade, foldedField: "collapsed", hideRoot: hideRoot, value: value || '', nodePath: nodePath, enableNodePath: enableNodePath, pathSeparator: pathSeparator, maxLength: maxLength, minLength: minLength, 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, selfDisabledAffectChildren: selfDisabledAffectChildren, virtualThreshold: virtualThreshold, itemHeight: toNumber(itemHeight) > 0 ? toNumber(itemHeight) : undefined }));
     };
     TreeSelectControl.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className, disabled = _a.disabled, inline = _a.inline, loading = _a.loading, multiple = _a.multiple; _a.value; var clearable = _a.clearable, ns = _a.classPrefix, cx = _a.classnames, searchable = _a.searchable, autoComplete = _a.autoComplete, selectedOptions = _a.selectedOptions, placeholder = _a.placeholder, popOverContainer = _a.popOverContainer, useMobileUI = _a.useMobileUI, __ = _a.translate, env = _a.env;
+        var _a = this.props, className = _a.className, disabled = _a.disabled, inline = _a.inline, loading = _a.loading, multiple = _a.multiple; _a.value; var clearable = _a.clearable, ns = _a.classPrefix, cx = _a.classnames, searchable = _a.searchable, autoComplete = _a.autoComplete, selectedOptions = _a.selectedOptions, placeholder = _a.placeholder, popOverContainer = _a.popOverContainer, useMobileUI = _a.useMobileUI, maxTagCount = _a.maxTagCount, overflowTagPopover = _a.overflowTagPopover, __ = _a.translate, env = _a.env;
         var isOpened = this.state.isOpened;
         var mobileUI = useMobileUI && isMobile();
         return (React.createElement("div", { ref: this.container, className: cx("TreeSelectControl", className) },
-            React.createElement(ResultBox, { disabled: disabled, ref: this.targetRef, placeholder: __(placeholder !== null && placeholder !== void 0 ? placeholder : 'placeholder.empty'), inputPlaceholder: '', className: cx("TreeSelect", {
+            React.createElement(ResultBox, { maxTagCount: maxTagCount, overflowTagPopover: overflowTagPopover, disabled: disabled, ref: this.targetRef, placeholder: __(placeholder !== null && placeholder !== void 0 ? placeholder : 'placeholder.empty'), inputPlaceholder: '', className: cx("TreeSelect", {
                     'TreeSelect--inline': inline,
                     'TreeSelect--single': !multiple,
                     'TreeSelect--multi': multiple,

package/esm/renderers/Form/UUID.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Form/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Grid.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { FormHorizontal, RendererProps } from 'amis-core';
 import { BaseSchema, SchemaClassName, SchemaCollection } from '../Schema';
 export declare const ColProps: string[];
-export declare type GridColumnObject = {
+export type GridColumnObject = {
     /**
      * 极小屏（<768px）时宽度占比
      */
@@ -37,8 +37,8 @@ export declare type GridColumnObject = {
      */
     columnClassName?: SchemaClassName;
 };
-export declare type GridColumn = GridColumnObject;
-export declare type ColumnNode = GridColumn;
+export type GridColumn = GridColumnObject;
+export type ColumnNode = GridColumn;
 export interface ColumnArray extends Array<ColumnNode> {
 }
 /**

package/esm/renderers/Grid.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Grid2D.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { RendererProps } from 'amis-core';
 import { Schema } from 'amis-core';
 import { BaseSchema, SchemaObject } from '../Schema';
-export declare type GridObject = {
+export type GridObject = {
     /**
      * 起始横坐标位置，以 1 为起点
      */
@@ -40,7 +40,7 @@ export declare type GridObject = {
      */
     gridClassName?: string;
 };
-export declare type Grid = GridObject & SchemaObject;
+export type Grid = GridObject & SchemaObject;
 /**
  * 二维布局渲染器。
  * 文档：https://baidu.gitee.io/amis/docs/components/grid-2d

package/esm/renderers/Grid2D.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/GridNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/HBox.d.ts

@@ -3,7 +3,7 @@ import { RendererProps } from 'amis-core';
 import { Schema } from 'amis-core';
 import { BaseSchema, SchemaCollection, SchemaExpression } from '../Schema';
 import { FormHorizontal } from 'amis-core';
-export declare type HBoxColumnObject = {
+export type HBoxColumnObject = {
     /**
      * 列上 CSS 类名
      */
@@ -47,7 +47,7 @@ export declare type HBoxColumnObject = {
      */
     visibleOn?: SchemaExpression;
 };
-export declare type HBoxColumn = HBoxColumnObject;
+export type HBoxColumn = HBoxColumnObject;
 /**
  * Hbox 水平布局渲染器。
  * 文档：https://baidu.gitee.io/amis/docs/components/hbox

package/esm/renderers/HBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/IFrame.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { RendererProps } from 'amis-core';
+import { OnEventProps, RendererProps } from 'amis-core';
 import { IScopedContext } from 'amis-core';
 import { BaseSchema, SchemaUrlPath } from '../Schema';
 import { ActionSchema } from './Action';
@@ -19,6 +19,7 @@ export interface IFrameSchema extends BaseSchema {
     events?: {
         [eventName: string]: ActionSchema;
     };
+    onEvent?: OnEventProps['onEvent'];
     width?: number | string;
     height?: number | string;
     allow?: string;
@@ -39,7 +40,9 @@ export default class IFrame extends React.Component<IFrameProps, object> {
     componentDidMount(): void;
     componentDidUpdate(prevProps: IFrameProps): void;
     componentWillUnmount(): void;
-    onMessage(e: MessageEvent): void;
+    /** 校验URL是否合法 */
+    validateURL(url: any): boolean;
+    onMessage(e: MessageEvent): Promise<void>;
     onLoad(): void;
     reload(subpath?: any, query?: any): void;
     receive(values: object): void;

package/esm/renderers/IFrame.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
-import { __extends, __assign, __decorate, __metadata } from 'tslib';
+import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { createObject, resolveVariableAndFilter, isApiOutdated, autobind, ScopedContext, Renderer } from 'amis-core';
+import { createRendererEvent, createObject, runActions, resolveVariableAndFilter, isApiOutdated, autobind, ScopedContext, Renderer } from 'amis-core';
 
 var IFrame = /** @class */ (function (_super) {
     __extends(IFrame, _super);
@@ -37,26 +37,69 @@ var IFrame = /** @class */ (function (_super) {
     IFrame.prototype.componentWillUnmount = function () {
         window.removeEventListener('message', this.onMessage);
     };
-    IFrame.prototype.onMessage = function (e) {
-        var _a;
-        var _b = this.props, events = _b.events, onAction = _b.onAction, data = _b.data;
-        if (typeof ((_a = e === null || e === void 0 ? void 0 : e.data) === null || _a === void 0 ? void 0 : _a.type) !== 'string' || !events) {
-            return;
+    /** 校验URL是否合法 */
+    IFrame.prototype.validateURL = function (url) {
+        // base64编码格式
+        if (url &&
+            typeof url === 'string' &&
+            /^data:([a-zA-Z0-9]+\/[a-zA-Z0-9]+);base64,.*/.test(url)) {
+            return true;
         }
-        var _c = e.data.type.split(':'), prefix = _c[0], type = _c[1];
-        if (prefix !== 'amis' || !type) {
-            return;
+        // HTTP[S]协议
+        if (url &&
+            typeof url === 'string' &&
+            !/^(\.\/|\.\.\/|\/|https?\:\/\/|\/\/)/.test(url)) {
+            return false;
         }
-        if (type === 'resize' && e.data.data) {
-            this.setState({
-                width: e.data.data.width || '100%',
-                height: e.data.data.height || '100%'
+        return true;
+    };
+    IFrame.prototype.onMessage = function (e) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function () {
+            var _d, events, onEvent, onAction, data, _e, prefix, type, eventConfig, rendererEvent, action;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
+                    case 0:
+                        _d = this.props, events = _d.events, onEvent = _d.onEvent, onAction = _d.onAction, data = _d.data;
+                        if (typeof ((_a = e === null || e === void 0 ? void 0 : e.data) === null || _a === void 0 ? void 0 : _a.type) !== 'string') {
+                            return [2 /*return*/];
+                        }
+                        _e = e.data.type.split(':'), prefix = _e[0], type = _e[1];
+                        if (prefix !== 'amis' || !type) {
+                            return [2 /*return*/];
+                        }
+                        if (!(type === 'resize' && e.data.data)) return [3 /*break*/, 1];
+                        this.setState({
+                            width: e.data.data.width || '100%',
+                            height: e.data.data.height || '100%'
+                        });
+                        return [3 /*break*/, 4];
+                    case 1:
+                        eventConfig = onEvent === null || onEvent === void 0 ? void 0 : onEvent[type];
+                        if (!(eventConfig && ((_b = eventConfig.actions) === null || _b === void 0 ? void 0 : _b.length))) return [3 /*break*/, 3];
+                        rendererEvent = createRendererEvent(type, {
+                            env: (_c = this.props) === null || _c === void 0 ? void 0 : _c.env,
+                            nativeEvent: e,
+                            data: createObject(data, e.data.data),
+                            scoped: this.context
+                        });
+                        return [4 /*yield*/, runActions(eventConfig.actions, this, rendererEvent)];
+                    case 2:
+                        _f.sent();
+                        if (rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        _f.label = 3;
+                    case 3:
+                        if (events) {
+                            action = events[type];
+                            action && onAction(e, action, createObject(data, e.data.data));
+                        }
+                        _f.label = 4;
+                    case 4: return [2 /*return*/];
+                }
             });
-        }
-        else {
-            var action = events[type];
-            action && onAction(e, action, createObject(data, e.data.data));
-        }
+        });
     };
     IFrame.prototype.onLoad = function () {
         var _a = this.props, src = _a.src, data = _a.data;
@@ -100,9 +143,7 @@ var IFrame = /** @class */ (function (_super) {
         var finalSrc = src
             ? resolveVariableAndFilter(src, data, '| raw')
             : undefined;
-        if (typeof finalSrc === 'string' &&
-            finalSrc &&
-            !/^(\.\/|\.\.\/|\/|https?\:\/\/|\/\/)/.test(finalSrc)) {
+        if (!this.validateURL(finalSrc)) {
             return React.createElement("p", null, __('Iframe.invalid'));
         }
         if (location.protocol === 'https:' &&
@@ -121,7 +162,7 @@ var IFrame = /** @class */ (function (_super) {
         autobind,
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [MessageEvent]),
-        __metadata("design:returntype", void 0)
+        __metadata("design:returntype", Promise)
     ], IFrame.prototype, "onMessage", null);
     __decorate([
         autobind,

package/esm/renderers/Icon.js

@@ -1,13 +1,12 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __decorate } from 'tslib';
 import React from 'react';
 import { filter, Renderer } from 'amis-core';
-import { withBadge } from 'amis-ui';
-import { getIcon } from 'amis-ui/lib/components/icons';
+import { getIcon, withBadge } from 'amis-ui';
 import { isObject } from 'lodash';
 
 var Icon = /** @class */ (function (_super) {