amis 2.4.0 → 2.5.0-rc.0

package/esm/renderers/TableView.d.ts

@@ -4,7 +4,7 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
 import { BaseSchema, SchemaObject } from '../Schema';
-export declare type TdObject = {
+export type TdObject = {
     /**
      * 单元格背景色
      */
@@ -53,7 +53,7 @@ export declare type TdObject = {
 /**
  * 行设置
  */
-export declare type TrObject = {
+export type TrObject = {
     /**
      * 行背景色
      */
@@ -71,7 +71,7 @@ export declare type TrObject = {
 /**
  * 列设置
  */
-export declare type ColObject = {
+export type ColObject = {
     span?: number;
     style?: Object;
 };

package/esm/renderers/TableView.js

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

package/esm/renderers/Tabs.d.ts

@@ -175,8 +175,8 @@ export interface TabsState {
     localTabs: Array<TabSource>;
     isFromSource: boolean;
 }
-export declare type TabsRendererEvent = 'change';
-export declare type TabsRendererAction = 'changeActiveKey';
+export type TabsRendererEvent = 'change';
+export type TabsRendererAction = 'changeActiveKey';
 export default class Tabs extends React.Component<TabsProps, TabsState> {
     static defaultProps: Partial<TabsProps>;
     renderTab?: (tab: TabSchema, props: TabsProps, index: number) => JSX.Element;

package/esm/renderers/Tabs.js

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

package/esm/renderers/Tag.js

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

package/esm/renderers/Tasks.js

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

package/esm/renderers/Timeline.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
-import { BaseSchema, SchemaApi, SchemaCollection, SchemaTokenizeableString } from '../Schema';
+import type { BaseSchema, SchemaApi, SchemaCollection, SchemaTokenizeableString } from '../Schema';
+import type { IconCheckedSchema } from 'amis-core';
 export interface TimelineItemSchema extends Omit<BaseSchema, 'type'> {
     /**
      * 时间点
@@ -29,7 +30,11 @@ export interface TimelineItemSchema extends Omit<BaseSchema, 'type'> {
     /**
      * 图标
      */
-    icon?: SchemaCollection;
+    icon?: string | IconCheckedSchema;
+    /**
+     * 图标的CSS类名
+     */
+    iconClassName?: string;
 }
 export interface TimelineSchema extends BaseSchema {
     /**

package/esm/renderers/Timeline.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __rest, __assign, __decorate } from 'tslib';
 import React from 'react';
-import { Renderer, filter } from 'amis-core';
+import { Renderer, isPureVariable, resolveVariableAndFilter, filter } from 'amis-core';
 import { withRemoteConfig, Timeline } from 'amis-ui';
 
 function TimelineCmpt(props) {
@@ -18,7 +18,10 @@ function TimelineCmpt(props) {
     };
     // 处理源数据
     var resolveTimelineItems = timelineItemsRow === null || timelineItemsRow === void 0 ? void 0 : timelineItemsRow.map(function (timelineItem) {
-        return __assign(__assign({}, timelineItem), { icon: resolveRender('icon', timelineItem.icon), title: resolveRender('title', timelineItem.title) });
+        var icon = timelineItem.icon, iconClassName = timelineItem.iconClassName, title = timelineItem.title;
+        return __assign(__assign({}, timelineItem), { iconClassName: iconClassName, icon: isPureVariable(icon)
+                ? resolveVariableAndFilter(icon, data, '| raw')
+                : icon, title: resolveRender('title', title) });
     });
     return (React.createElement(Timeline, { items: resolveTimelineItems, direction: direction, reverse: reverse, mode: mode }));
 }

package/esm/renderers/TooltipWrapper.js

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

package/esm/renderers/Tpl.d.ts

@@ -42,6 +42,10 @@ export declare class Tpl extends React.Component<TplProps, object> {
     dom: any;
     constructor(props: TplProps);
     getContent(): string;
+    /**
+     * 过滤掉HTML标签, 仅提取文本内容, 用于HTML标签的title属性
+     */
+    getTitle(content: string): string;
     render(): JSX.Element;
 }
 export declare class TplRenderer extends Tpl {

package/esm/renderers/Tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
@@ -36,14 +36,28 @@ var Tpl = /** @class */ (function (_super) {
                     : JSON.stringify(value);
         }
     };
+    /**
+     * 过滤掉HTML标签, 仅提取文本内容, 用于HTML标签的title属性
+     */
+    Tpl.prototype.getTitle = function (content) {
+        var _a;
+        var showNativeTitle = this.props.showNativeTitle;
+        if (!showNativeTitle) {
+            return '';
+        }
+        var title = typeof content === 'string' ? content : '';
+        var tempDom = new DOMParser().parseFromString(this.getContent(), 'text/html');
+        if ((_a = tempDom === null || tempDom === void 0 ? void 0 : tempDom.body) === null || _a === void 0 ? void 0 : _a.textContent) {
+            title = tempDom.body.textContent;
+        }
+        return title;
+    };
     Tpl.prototype.render = function () {
         var _a = this.props, className = _a.className, wrapperComponent = _a.wrapperComponent, inline = _a.inline, cx = _a.classnames, style = _a.style, showNativeTitle = _a.showNativeTitle, data = _a.data, env = _a.env;
         var Component = wrapperComponent || (inline ? 'span' : 'div');
-        var content = env.filterHtml(this.getContent());
-        return (React.createElement(Component, __assign({ className: cx('TplField', className), style: buildStyle(style, data) }, (showNativeTitle
-            ? { title: typeof content === 'string' ? content : '' }
-            : {})),
-            React.createElement("span", { dangerouslySetInnerHTML: { __html: content } })));
+        var content = this.getContent();
+        return (React.createElement(Component, __assign({ className: cx('TplField', className), style: buildStyle(style, data) }, (showNativeTitle ? { title: this.getTitle(content) } : {})),
+            React.createElement("span", { dangerouslySetInnerHTML: { __html: env.filterHtml(content) } })));
     };
     Tpl.defaultProps = {
         inline: true,

package/esm/renderers/VBox.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 HboxRow = SchemaObject & {
+export type HboxRow = SchemaObject & {
     rowClassName?: string;
     cellClassName?: string;
 };

package/esm/renderers/VBox.js

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

package/esm/renderers/Video.js

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

package/esm/renderers/WebComponent.js

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

package/esm/renderers/Wizard.d.ts

@@ -5,7 +5,7 @@ import { IServiceStore } from 'amis-core';
 import { ActionObject } from 'amis-core';
 import { BaseSchema, FormSchema, SchemaApi, SchemaClassName, SchemaExpression, SchemaName, SchemaReload } from '../Schema';
 import { ActionSchema } from './Action';
-export declare type WizardStepSchema = Omit<FormSchema, 'type'> & {
+export type WizardStepSchema = Omit<FormSchema, 'type'> & {
     /**
      * 当前步骤用来保存数据的 api。
      */

package/esm/renderers/Wizard.js

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

package/esm/renderers/Words.d.ts

@@ -5,7 +5,7 @@ import React from 'react';
 import { RendererProps } from 'amis-core';
 import { BaseSchema, SchemaObject } from '../Schema';
 import { TagSchema } from './Tag';
-declare type Words = string | string[];
+type Words = string | string[];
 /**
  * Words
  */

package/esm/renderers/Words.js

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

package/esm/renderers/Wrapper.js

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

package/esm/schemaExtend.js

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

package/esm/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { ActionSchema } from './renderers/Action';
 import { SchemaApi, SchemaApiObject } from './Schema';
 export interface ApiObject extends SchemaApiObject {
@@ -13,8 +12,8 @@ export interface ApiObject extends SchemaApiObject {
     adaptor?: (payload: object, response: fetcherResult, api: ApiObject) => any;
     requestAdaptor?: (api: ApiObject) => ApiObject;
 }
-export declare type ApiString = string;
-export declare type Api = ApiString | ApiObject;
+export type ApiString = string;
+export type Api = ApiString | ApiObject;
 export interface fetcherResult {
     data?: {
         data: object;
@@ -68,7 +67,7 @@ export interface Button {
     disabled?: boolean;
     className?: string;
 }
-export declare type SchemaNode = Schema | string | Array<Schema | string>;
+export type SchemaNode = Schema | string | Array<Schema | string>;
 export interface SchemaArray extends Array<SchemaNode> {
 }
 export interface Definitions {
@@ -114,8 +113,8 @@ export interface RendererData {
     __prev?: RendererDataAlias;
     __super?: RendererData;
 }
-declare type RendererDataAlias = RendererData;
-export declare type FunctionPropertyNames<T> = {
+type RendererDataAlias = RendererData;
+export type FunctionPropertyNames<T> = {
     [K in keyof T]: T[K] extends Function ? K : never;
 }[keyof T];
 export interface JSONSchema {

package/lib/Schema.d.ts

@@ -119,9 +119,9 @@ import { MultilineTextSchema } from './renderers/MultilineText';
 import { DateRangeSchema } from './renderers/DateRange';
 import { PasswordSchema } from './renderers/Password';
 import { WordsSchema } from './renderers/Words';
-export declare type SchemaType = 'form' | 'alert' | 'app' | 'audio' | 'avatar' | 'button-group' | 'breadcrumb' | 'card' | 'card2' | 'cards' | 'carousel' | 'chart' | 'calendar' | 'collapse' | 'collapse-group' | 'color' | 'crud' | 'crud2' | 'custom' | 'date' | 'static-date' | 'datetime' | 'static-datetime' | 'time' | 'static-time' | 'month' | 'static-month' | 'date-range' | 'dialog' | 'spinner' | 'divider' | 'dropdown-button' | 'drawer' | 'each' | 'flex' | 'flex-item' | 'grid-2d' | 'icon' | 'iframe' | 'image' | 'static-image' | 'images' | 'static-images' | 'json-schema' | 'json-schema-editor' | 'json' | 'static-json' | 'link' | 'list' | 'log' | 'static-list' | 'map' | 'mapping' | 'markdown' | 'nav' | 'page' | 'pagination' | 'pagination-wrapper' | 'property' | 'operation' | 'plain' | 'text' | 'progress' | 'qrcode' | 'qr-code' | 'barcode' | 'remark' | 'search-box' | 'sparkline' | 'status' | 'table' | 'static-table' | 'table2' | 'html' | 'tpl' | 'tasks' | 'vbox' | 'video' | 'wizard' | 'wrapper' | 'web-component' | 'anchor-nav' | 'steps' | 'timeline' | 'control' | 'input-array' | 'button' | 'submit' | 'reset' | 'button-group-select' | 'button-toolbar' | 'chained-select' | 'chart-radios' | 'checkbox' | 'checkboxes' | 'input-city' | 'input-color' | 'combo' | 'condition-builder' | 'container' | 'input-date' | 'input-datetime' | 'input-time' | 'input-quarter' | 'input-year' | 'input-month' | 'input-date-range' | 'input-time-range' | 'input-datetime-range' | 'input-excel' | 'input-formula' | 'diff-editor' | 'editor' | 'bat-editor' | 'c-editor' | 'coffeescript-editor' | 'cpp-editor' | 'csharp-editor' | 'css-editor' | 'dockerfile-editor' | 'fsharp-editor' | 'go-editor' | 'handlebars-editor' | 'html-editor' | 'ini-editor' | 'java-editor' | 'javascript-editor' | 'json-editor' | 'less-editor' | 'lua-editor' | 'markdown-editor' | 'msdax-editor' | 'objective-c-editor' | 'php-editor' | 'plaintext-editor' | 'postiats-editor' | 'powershell-editor' | 'pug-editor' | 'python-editor' | 'r-editor' | 'razor-editor' | 'ruby-editor' | 'sb-editor' | 'scss-editor' | 'sol-editor' | 'sql-editor' | 'swift-editor' | 'typescript-editor' | 'vb-editor' | 'xml-editor' | 'yaml-editor' | 'fieldset' | 'fieldSet' | 'input-file' | 'formula' | 'grid' | 'group' | 'hbox' | 'hidden' | 'icon-picker' | 'icon-select' | 'input-image' | 'input-group' | 'list-select' | 'location-picker' | 'matrix-checkboxes' | 'input-month-range' | 'input-quarter-range' | 'nested-select' | 'input-number' | 'panel' | 'picker' | 'radios' | 'input-range' | 'input-rating' | 'input-repeat' | 'input-rich-text' | 'select' | 'service' | 'static' | 'input-sub-form' | 'switch' | 'input-table' | 'tabs' | 'tabs-transfer' | 'input-tag' | 'input-text' | 'input-password' | 'input-email' | 'input-url' | 'uuid' | 'multi-select' | 'textarea' | 'transfer' | 'transfer-picker' | 'tabs-transfer-picker' | 'input-tree' | 'tree-select' | 'table-view' | 'portlet' | 'grid-nav' | 'users-select' | 'tag' | 'tags' | 'words' | 'password' | 'multiline-text' | 'native-date' | 'native-time' | 'native-number' | 'code' | 'tooltip-wrapper';
-export declare type SchemaObject = PageSchema | TplSchema | RemarkSchema | ActionSchema | AlertSchema | AudioSchema | AvatarSchema | ButtonGroupSchema | ButtonToolbarSchema | CalendarSchema | CardSchema | CardsSchema | CarouselSchema | ChartSchema | CollapseSchema | CollapseGroupSchema | ColorSchema | ContainerSchema | CRUDSchema | CRUD2Schema | DateSchema | DialogSchema | DividerSchema | DrawerSchema | DropdownButtonSchema | EachSchema | GridSchema | Grid2DSchema | HBoxSchema | IconSchema | IFrameSchema | ImageSchema | ImagesSchema | JsonSchema | LinkSchema | ListSchema | MappingSchema | NavSchema | OperationSchema | PaginationSchema | PaginationWrapperSchema | PanelSchema | PlainSchema | ProgressSchema | QRCodeSchema | SearchBoxSchema | ServiceSchema | SparkLineSchema | StatusSchema | SpinnerSchema | TableSchema | TableSchema2 | TabsSchema | TasksSchema | VBoxSchema | VideoSchema | WizardSchema | WrapperSchema | TooltipWrapperSchema | FormSchema | AnchorNavSchema | StepsSchema | PortletSchema | TimelineSchema | FormControlSchema | ArrayControlSchema | ButtonGroupControlSchema | ChainedSelectControlSchema | CheckboxControlSchema | CheckboxesControlSchema | InputCityControlSchema | InputColorControlSchema | ComboControlSchema | ConditionBuilderControlSchema | DateControlSchema | DateTimeControlSchema | TimeControlSchema | MonthControlSchema | QuarterControlSchema | YearControlSchema | DateRangeControlSchema | DiffControlSchema | EditorControlSchema | FieldSetControlSchema | FileControlSchema | FormulaControlSchema | GroupControlSchema | HiddenControlSchema | IconPickerControlSchema | ImageControlSchema | InputGroupControlSchema | ListControlSchema | JSONSchemaEditorControlSchema | LocationControlSchema | UUIDControlSchema | MatrixControlSchema | MonthRangeControlSchema | QuarterRangeControlSchema | NestedSelectControlSchema | NumberControlSchema | PickerControlSchema | RadiosControlSchema | RangeControlSchema | RatingControlSchema | RichTextControlSchema | RepeatControlSchema | SelectControlSchema | SubFormControlSchema | SwitchControlSchema | StaticExactControlSchema | TableControlSchema | TabsTransferControlSchema | TagControlSchema | TextControlSchema | TextareaControlSchema | TransferControlSchema | TransferPickerControlSchema | TabsTransferPickerControlSchema | TreeControlSchema | TreeSelectControlSchema | UserSelectControlSchema | DateRangeSchema | MultilineTextSchema | PasswordSchema | WordsSchema;
-export declare type SchemaCollection = SchemaObject | SchemaTpl | Array<SchemaObject | SchemaTpl>;
+export type SchemaType = 'form' | 'alert' | 'app' | 'audio' | 'avatar' | 'button-group' | 'breadcrumb' | 'card' | 'card2' | 'cards' | 'carousel' | 'chart' | 'calendar' | 'collapse' | 'collapse-group' | 'color' | 'crud' | 'crud2' | 'custom' | 'date' | 'static-date' | 'datetime' | 'static-datetime' | 'time' | 'static-time' | 'month' | 'static-month' | 'date-range' | 'dialog' | 'spinner' | 'divider' | 'dropdown-button' | 'drawer' | 'each' | 'flex' | 'flex-item' | 'grid-2d' | 'icon' | 'iframe' | 'image' | 'static-image' | 'images' | 'static-images' | 'json-schema' | 'json-schema-editor' | 'json' | 'static-json' | 'link' | 'list' | 'log' | 'static-list' | 'map' | 'mapping' | 'markdown' | 'nav' | 'page' | 'pagination' | 'pagination-wrapper' | 'property' | 'operation' | 'plain' | 'text' | 'progress' | 'qrcode' | 'qr-code' | 'barcode' | 'remark' | 'search-box' | 'sparkline' | 'status' | 'table' | 'static-table' | 'table2' | 'html' | 'tpl' | 'tasks' | 'vbox' | 'video' | 'wizard' | 'wrapper' | 'web-component' | 'anchor-nav' | 'steps' | 'timeline' | 'control' | 'input-array' | 'button' | 'submit' | 'reset' | 'button-group-select' | 'button-toolbar' | 'chained-select' | 'chart-radios' | 'checkbox' | 'checkboxes' | 'input-city' | 'input-color' | 'combo' | 'condition-builder' | 'container' | 'input-date' | 'input-datetime' | 'input-time' | 'input-quarter' | 'input-year' | 'input-month' | 'input-date-range' | 'input-time-range' | 'input-datetime-range' | 'input-excel' | 'input-formula' | 'diff-editor' | 'editor' | 'bat-editor' | 'c-editor' | 'coffeescript-editor' | 'cpp-editor' | 'csharp-editor' | 'css-editor' | 'dockerfile-editor' | 'fsharp-editor' | 'go-editor' | 'handlebars-editor' | 'html-editor' | 'ini-editor' | 'java-editor' | 'javascript-editor' | 'json-editor' | 'less-editor' | 'lua-editor' | 'markdown-editor' | 'msdax-editor' | 'objective-c-editor' | 'php-editor' | 'plaintext-editor' | 'postiats-editor' | 'powershell-editor' | 'pug-editor' | 'python-editor' | 'r-editor' | 'razor-editor' | 'ruby-editor' | 'sb-editor' | 'scss-editor' | 'sol-editor' | 'sql-editor' | 'swift-editor' | 'typescript-editor' | 'vb-editor' | 'xml-editor' | 'yaml-editor' | 'fieldset' | 'fieldSet' | 'input-file' | 'formula' | 'grid' | 'group' | 'hbox' | 'hidden' | 'icon-picker' | 'icon-select' | 'input-image' | 'input-group' | 'list-select' | 'location-picker' | 'matrix-checkboxes' | 'input-month-range' | 'input-quarter-range' | 'nested-select' | 'input-number' | 'panel' | 'picker' | 'radios' | 'input-range' | 'input-rating' | 'input-repeat' | 'input-rich-text' | 'select' | 'service' | 'static' | 'input-sub-form' | 'switch' | 'input-table' | 'tabs' | 'tabs-transfer' | 'input-tag' | 'input-text' | 'input-password' | 'input-email' | 'input-url' | 'uuid' | 'multi-select' | 'textarea' | 'transfer' | 'transfer-picker' | 'tabs-transfer-picker' | 'input-tree' | 'tree-select' | 'table-view' | 'portlet' | 'grid-nav' | 'users-select' | 'tag' | 'tags' | 'words' | 'password' | 'multiline-text' | 'native-date' | 'native-time' | 'native-number' | 'code' | 'tooltip-wrapper';
+export type SchemaObject = PageSchema | TplSchema | RemarkSchema | ActionSchema | AlertSchema | AudioSchema | AvatarSchema | ButtonGroupSchema | ButtonToolbarSchema | CalendarSchema | CardSchema | CardsSchema | CarouselSchema | ChartSchema | CollapseSchema | CollapseGroupSchema | ColorSchema | ContainerSchema | CRUDSchema | CRUD2Schema | DateSchema | DialogSchema | DividerSchema | DrawerSchema | DropdownButtonSchema | EachSchema | GridSchema | Grid2DSchema | HBoxSchema | IconSchema | IFrameSchema | ImageSchema | ImagesSchema | JsonSchema | LinkSchema | ListSchema | MappingSchema | NavSchema | OperationSchema | PaginationSchema | PaginationWrapperSchema | PanelSchema | PlainSchema | ProgressSchema | QRCodeSchema | SearchBoxSchema | ServiceSchema | SparkLineSchema | StatusSchema | SpinnerSchema | TableSchema | TableSchema2 | TabsSchema | TasksSchema | VBoxSchema | VideoSchema | WizardSchema | WrapperSchema | TooltipWrapperSchema | FormSchema | AnchorNavSchema | StepsSchema | PortletSchema | TimelineSchema | FormControlSchema | ArrayControlSchema | ButtonGroupControlSchema | ChainedSelectControlSchema | CheckboxControlSchema | CheckboxesControlSchema | InputCityControlSchema | InputColorControlSchema | ComboControlSchema | ConditionBuilderControlSchema | DateControlSchema | DateTimeControlSchema | TimeControlSchema | MonthControlSchema | QuarterControlSchema | YearControlSchema | DateRangeControlSchema | DiffControlSchema | EditorControlSchema | FieldSetControlSchema | FileControlSchema | FormulaControlSchema | GroupControlSchema | HiddenControlSchema | IconPickerControlSchema | ImageControlSchema | InputGroupControlSchema | ListControlSchema | JSONSchemaEditorControlSchema | LocationControlSchema | UUIDControlSchema | MatrixControlSchema | MonthRangeControlSchema | QuarterRangeControlSchema | NestedSelectControlSchema | NumberControlSchema | PickerControlSchema | RadiosControlSchema | RangeControlSchema | RatingControlSchema | RichTextControlSchema | RepeatControlSchema | SelectControlSchema | SubFormControlSchema | SwitchControlSchema | StaticExactControlSchema | TableControlSchema | TabsTransferControlSchema | TagControlSchema | TextControlSchema | TextareaControlSchema | TransferControlSchema | TransferPickerControlSchema | TabsTransferPickerControlSchema | TreeControlSchema | TreeSelectControlSchema | UserSelectControlSchema | DateRangeSchema | MultilineTextSchema | PasswordSchema | WordsSchema;
+export type SchemaCollection = SchemaObject | SchemaTpl | Array<SchemaObject | SchemaTpl>;
 export interface SchemaApiObject {
     /**
      * API 发送类型
@@ -225,11 +225,11 @@ export interface SchemaApiObject {
      */
     silent?: boolean;
 }
-export declare type SchemaApi = string | SchemaApiObject;
+export type SchemaApi = string | SchemaApiObject;
 /**
  * 组件名字，这个名字可以用来定位，用于组件通信
  */
-export declare type SchemaName = string;
+export type SchemaName = string;
 /**
  * 配置刷新动作，这个动作通常在完成渲染器本省的固定动作后出发。
  *
@@ -239,11 +239,11 @@ export declare type SchemaName = string;
  *
  * 刷新目标的同时还支持传递参数如： `foo?a=${a}&b=${b},boo?c=${c}`
  */
-export declare type SchemaReload = string;
+export type SchemaReload = string;
 /**
  * 页面跳转地址，支持相对地址。
  */
-export declare type SchemaRedirect = string;
+export type SchemaRedirect = string;
 /**
  * 支持两种语法，但是不能混着用。分别是：
  *
@@ -253,24 +253,24 @@ export declare type SchemaRedirect = string;
  *
  * 更多文档：https://baidu.gitee.io/amis/docs/concepts/template
  */
-export declare type SchemaTpl = string;
+export type SchemaTpl = string;
 /**
  * 初始数据，设置得值可用于组件内部模板使用。
  */
-export declare type SchemaDefaultData = {
+export type SchemaDefaultData = {
     [propName: string]: any;
 };
 /**
  * 用来关联 json schema 的，不用管。
  */
-export declare type SchemaSchema = string;
+export type SchemaSchema = string;
 /**
  * iconfont 里面的类名。
  */
-export declare type SchemaIcon = string;
-export declare type SchemaTokenizeableString = string;
-export declare type SchemaUrlPath = SchemaTokenizeableString;
-export declare type SchemaTooltip = string | {
+export type SchemaIcon = string;
+export type SchemaTokenizeableString = string;
+export type SchemaUrlPath = SchemaTokenizeableString;
+export type SchemaTooltip = string | {
     /**
      * 标题
      */
@@ -283,7 +283,7 @@ export declare type SchemaTooltip = string | {
 /**
  * 消息文案配置，记住这个优先级是最低的，如果你的接口返回了 msg，接口返回的优先。
  */
-export declare type SchemaMessage = {
+export type SchemaMessage = {
     /**
      * 获取失败时的提示
      */
@@ -301,7 +301,7 @@ export declare type SchemaMessage = {
      */
     saveSuccess?: string;
 };
-export declare type SchemaFunction = string | Function;
+export type SchemaFunction = string | Function;
 export interface BaseSchema extends BaseSchemaWithoutType {
     type: SchemaType;
 }
@@ -376,7 +376,7 @@ export interface FeedbackDialog extends DialogSchemaBase {
      */
     skipRestOnConfirm?: boolean;
 }
-export declare type RootSchema = PageSchema;
+export type RootSchema = PageSchema;
 export interface ToastSchemaBase extends BaseSchema {
     /**
      * 轻提示内容

package/lib/compat.js

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

package/lib/helper.css

@@ -890,7 +890,7 @@ a.text-black:hover {
   margin-left: 5px;
 }
 .m-l-sm {
-  margin-left: 10px;
+  margin-left: 10px !important;
 }
 .m-l {
   margin-left: 15px;

package/lib/index.js

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

package/lib/preset.js

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

package/lib/renderers/Action.d.ts

@@ -270,7 +270,7 @@ export interface VanillaAction extends ButtonSchema {
  * 按钮动作渲染器。
  * 文档：https://baidu.gitee.io/amis/docs/components/action
  */
-export declare type ActionSchema = AjaxActionSchema | UrlActionSchema | LinkActionSchema | DialogActionSchema | DrawerActionSchema | ToastActionSchema | CopyActionSchema | ReloadActionSchema | EmailActionSchema | OtherActionSchema | VanillaAction;
+export type ActionSchema = AjaxActionSchema | UrlActionSchema | LinkActionSchema | DialogActionSchema | DrawerActionSchema | ToastActionSchema | CopyActionSchema | ReloadActionSchema | EmailActionSchema | OtherActionSchema | VanillaAction;
 import { ThemeProps } from 'amis-core';
 import { BaseSchema, FeedbackDialog, SchemaApi, SchemaClassName, SchemaCollection, SchemaExpression, SchemaIcon, SchemaReload, SchemaTooltip, SchemaTpl } from '../Schema';
 import { DialogSchemaBase } from './Dialog';
@@ -313,56 +313,11 @@ export declare class Action extends React.Component<ActionProps, ActionState> {
     componentWillUnmount(): void;
     render(): JSX.Element;
 }
-declare const _default: {
-    new (props: Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps): {
-        ref: any;
-        /**
-         * 可以指定让谁来触发这个动作。
-         */
-        childRef(ref: any): void;
-        getWrappedInstance(): any;
-        render(): JSX.Element;
-        context: any;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
-        forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
-        state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
-        componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
-        componentWillUnmount?(): void; /**
-         * 是否新窗口打开
-         */
-        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
-        componentWillMount?(): void;
-        UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-    };
-    /**
-     * 跳转到哪？支持配置相对路径。
-     */
-    displayName: string;
-    contextType: React.Context<string>;
-    ComposedComponent: React.ComponentType<typeof Action>; /**
-     * 指定为刷新目标组件。
-     */
-} & import("hoist-non-react-statics").NonReactStatics<typeof Action, {}> & {
-    /**
-     * 指定目标组件。
-     */
+declare const _default: (React.ComponentType<any> & import("hoist-non-react-statics").NonReactStatics<React.ComponentType<any>, {}>) & {
     ComposedComponent: typeof Action;
 };
 export default _default;
-export declare type ActionRendererProps = RendererProps & Omit<ActionProps, 'onAction' | 'isCurrentUrl' | 'tooltipContainer'> & {
+export type ActionRendererProps = RendererProps & Omit<ActionProps, 'onAction' | 'isCurrentUrl' | 'tooltipContainer'> & {
     onAction: (e: React.MouseEvent<any> | string | void | null, action: object, data: any) => void;
     btnDisabled?: boolean;
 };

package/lib/renderers/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
@@ -322,7 +322,7 @@ var ActionRenderer = /** @class */ (function (_super) {
     };
     ActionRenderer.prototype.handleAction = function (e, action) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, env, onAction, data, ignoreConfirm, dispatchEvent, $schema, mergedData, hasOnEvent, confirmed, rendererEvent, rendererEvent;
+            var _a, env, onAction, data, ignoreConfirm, dispatchEvent, $schema, mergedData, hasOnEvent, confirmText, confirmed, rendererEvent, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -332,8 +332,12 @@ var ActionRenderer = /** @class */ (function (_super) {
                             mergedData = amisCore.createObject(data, action.args);
                         }
                         hasOnEvent = $schema.onEvent && Object.keys($schema.onEvent).length;
-                        if (!((!ignoreConfirm || hasOnEvent) && action.confirmText && env.confirm)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, env.confirm(amisCore.filter(action.confirmText, mergedData))];
+                        confirmText = '';
+                        if (!((!ignoreConfirm || hasOnEvent) &&
+                            action.confirmText &&
+                            env.confirm &&
+                            (confirmText = amisCore.filter(action.confirmText, mergedData)))) return [3 /*break*/, 5];
+                        return [4 /*yield*/, env.confirm(confirmText)];
                     case 1:
                         confirmed = _b.sent();
                         if (!confirmed) return [3 /*break*/, 3];

package/lib/renderers/Alert.js

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

package/lib/renderers/AnchorNav.d.ts

@@ -5,7 +5,7 @@ import { BaseSchema, SchemaClassName, SchemaCollection } from '../Schema';
  * AnchorNavSection 锚点区域渲染器
  * 文档：https://baidu.gitee.io/amis/docs/components/anchor-nav
  */
-export declare type AnchorNavSectionSchema = {
+export type AnchorNavSectionSchema = {
     /**
      * 导航文字说明
      */

package/lib/renderers/AnchorNav.js

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

package/lib/renderers/App.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
@@ -41,9 +41,20 @@ var App = /** @class */ (function (_super) {
     }
     App.prototype.componentDidMount = function () {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            return tslib.__generator(this, function (_a) {
-                this.reload();
-                return [2 /*return*/];
+            var _a, data, dispatchEvent, rendererEvent;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent('init', data, this)];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        this.reload();
+                        return [2 /*return*/];
+                }
             });
         });
     };

package/lib/renderers/Audio.js

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

package/lib/renderers/Avatar.js

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