amis 2.2.0 → 2.3.1

package/esm/renderers/Image.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -57,7 +57,7 @@ var ImageField = /** @class */ (function (_super) {
     }
     ImageField.prototype.handleEnlarge = function (_a) {
         var src = _a.src, originalSrc = _a.originalSrc, title = _a.title, caption = _a.caption, thumbMode = _a.thumbMode, thumbRatio = _a.thumbRatio;
-        var _b = this.props, onImageEnlarge = _b.onImageEnlarge, enlargeTitle = _b.enlargeTitle, enlargeCaption = _b.enlargeCaption;
+        var _b = this.props, onImageEnlarge = _b.onImageEnlarge, enlargeTitle = _b.enlargeTitle, enlargeCaption = _b.enlargeCaption, showToolbar = _b.showToolbar, toolbarActions = _b.toolbarActions;
         onImageEnlarge &&
             onImageEnlarge({
                 src: src,
@@ -65,7 +65,9 @@ var ImageField = /** @class */ (function (_super) {
                 title: enlargeTitle || title,
                 caption: enlargeCaption || caption,
                 thumbMode: thumbMode,
-                thumbRatio: thumbRatio
+                thumbRatio: thumbRatio,
+                showToolbar: showToolbar,
+                toolbarActions: toolbarActions
             }, this.props);
     };
     ImageField.prototype.handleClick = function (e) {

package/esm/renderers/Images.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { RendererProps } from 'amis-core';
 import { ImageThumbProps } from './Image';
 import { BaseSchema, SchemaClassName, SchemaUrlPath } from '../Schema';
+import type { ImageToolbarAction } from './Image';
 /**
  * 图片集展示控件。
  * 文档：https://baidu.gitee.io/amis/docs/components/images
@@ -63,11 +64,19 @@ export interface ImagesSchema extends BaseSchema {
      * 列表 CSS 类名
      */
     listClassName?: SchemaClassName;
+    /**
+     * 是否展示图片工具栏
+     */
+    showToolbar?: boolean;
+    /**
+     * 工具栏配置
+     */
+    toolbarActions?: ImageToolbarAction[];
 }
 export interface ImagesProps extends RendererProps, Omit<ImagesSchema, 'type' | 'className'> {
     delimiter: string;
     onEnlarge?: (info: ImageThumbProps & {
-        list?: Array<Pick<ImageThumbProps, 'src' | 'originalSrc' | 'title' | 'caption'>>;
+        list?: Array<Pick<ImageThumbProps, 'src' | 'originalSrc' | 'title' | 'caption' | 'showToolbar'>>;
     }) => void;
 }
 export declare class ImagesField extends React.Component<ImagesProps> {

package/esm/renderers/Images.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -31,7 +31,7 @@ var ImagesField = /** @class */ (function (_super) {
     };
     ImagesField.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className, defaultImage = _a.defaultImage, thumbMode = _a.thumbMode, thumbRatio = _a.thumbRatio, data = _a.data; _a.name; var placeholder = _a.placeholder, cx = _a.classnames, source = _a.source, delimiter = _a.delimiter, enlargeAble = _a.enlargeAble, src = _a.src, originalSrc = _a.originalSrc, listClassName = _a.listClassName, options = _a.options;
+        var _a = this.props, className = _a.className, defaultImage = _a.defaultImage, thumbMode = _a.thumbMode, thumbRatio = _a.thumbRatio, data = _a.data; _a.name; var placeholder = _a.placeholder, cx = _a.classnames, source = _a.source, delimiter = _a.delimiter, enlargeAble = _a.enlargeAble, src = _a.src, originalSrc = _a.originalSrc, listClassName = _a.listClassName, options = _a.options, showToolbar = _a.showToolbar, toolbarActions = _a.toolbarActions;
         var value;
         var list;
         if (typeof source === 'string' && isPureVariable(source)) {
@@ -54,7 +54,7 @@ var ImagesField = /** @class */ (function (_super) {
         return (React.createElement("div", { className: cx('ImagesField', className) }, Array.isArray(list) ? (React.createElement("div", { className: cx('Images', listClassName) }, list.map(function (item, index) { return (React.createElement(ThemedImageThumb, { index: index, className: cx('Images-item'), key: index, src: (src ? filter(src, item, '| raw') : item && item.image) ||
                 item, originalSrc: (originalSrc
                 ? filter(originalSrc, item, '| raw')
-                : item && item.src) || item, title: item && item.title, caption: item && (item.description || item.caption), thumbMode: thumbMode, thumbRatio: thumbRatio, enlargeAble: enlargeAble, onEnlarge: _this.handleEnlarge })); }))) : defaultImage ? (React.createElement("div", { className: cx('Images', listClassName) },
+                : item && item.src) || item, title: item && item.title, caption: item && (item.description || item.caption), thumbMode: thumbMode, thumbRatio: thumbRatio, enlargeAble: enlargeAble, onEnlarge: _this.handleEnlarge, showToolbar: showToolbar, toolbarActions: toolbarActions })); }))) : defaultImage ? (React.createElement("div", { className: cx('Images', listClassName) },
             React.createElement(ThemedImageThumb, { className: cx('Images-item'), src: defaultImage, thumbMode: thumbMode, thumbRatio: thumbRatio }))) : (placeholder)));
     };
     ImagesField.defaultProps = {

package/esm/renderers/Json.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -50,7 +50,7 @@ var JSONField = /** @class */ (function (_super) {
             jsonThemeValue = resolveVariableAndFilter(jsonTheme, this.props.data, '| raw');
         }
         // JsonView 只支持对象，所以不是对象格式需要转成对象格式。
-        if (data && ~['string', 'number'].indexOf(typeof data)) {
+        if (~['string', 'number', 'boolean'].indexOf(typeof data)) {
             data = (_a = {},
                 _a[typeof data] = data,
                 _a);

package/esm/renderers/Link.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/List.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Log.d.ts

@@ -42,10 +42,6 @@ export interface LogSchema extends BaseSchema {
      * 每行高度
      */
     rowHeight?: number;
-    /**
-     * 关闭 ANSI 颜色支持
-     */
-    disableColor?: boolean;
     /**
      * 一些可操作选项
      */
@@ -82,7 +78,6 @@ export declare class Log extends React.Component<LogProps, LogState> {
     changeFilterWord: (value: string) => void;
     loadLogs(): Promise<void>;
     renderHighlightWord(line: string): string | (string | JSX.Element)[];
-    renderHighlightWordWithAnsi(line: string): string;
     /**
      * 渲染某一行
      */

package/esm/renderers/Log.js

@@ -1,12 +1,11 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate } from 'tslib';
 import React from 'react';
 import { isApiOutdated, buildApi, Renderer } from 'amis-core';
-import Ansi from 'ansi-to-react';
 import { VirtualList, Icon, SearchBox } from 'amis-ui';
 
 var Log = /** @class */ (function (_super) {
@@ -189,27 +188,20 @@ var Log = /** @class */ (function (_super) {
             return item;
         });
     };
-    Log.prototype.renderHighlightWordWithAnsi = function (line) {
-        var filterWord = this.state.filterWord;
-        if (filterWord === '') {
-            return line;
-        }
-        return line.replaceAll(filterWord, "\u001B[43;1m\u001B[30;1m".concat(filterWord, "\u001B[0m"));
-    };
     /**
      * 渲染某一行
      */
     Log.prototype.renderLine = function (index, line, showLineNumber) {
-        var _a = this.props, cx = _a.classnames, disableColor = _a.disableColor;
+        var _a = this.props, cx = _a.classnames; _a.disableColor;
         return (React.createElement("div", { className: cx('Log-line'), key: index },
             showLineNumber && (React.createElement("span", { className: cx('Log-line-number') },
                 index + 1,
                 " ")),
-            disableColor ? (this.renderHighlightWord(line)) : (React.createElement(Ansi, { useClasses: true }, this.renderHighlightWordWithAnsi(line)))));
+            this.renderHighlightWord(line)));
     };
     Log.prototype.render = function () {
         var _this = this;
-        var _a = this.props, source = _a.source, className = _a.className, cx = _a.classnames, placeholder = _a.placeholder, height = _a.height, rowHeight = _a.rowHeight, disableColor = _a.disableColor, __ = _a.translate, operation = _a.operation;
+        var _a = this.props, source = _a.source, className = _a.className, cx = _a.classnames, placeholder = _a.placeholder, height = _a.height, rowHeight = _a.rowHeight; _a.disableColor; var __ = _a.translate, operation = _a.operation;
         var _b = this.state, refresh = _b.refresh, showLineNumber = _b.showLineNumber;
         var loading = __(placeholder);
         if (!source) {
@@ -228,7 +220,7 @@ var Log = /** @class */ (function (_super) {
                         showLineNumber && (React.createElement("span", { className: cx('Log-line-number') },
                             index + 1,
                             " ")),
-                        disableColor ? (_this.renderHighlightWord(logs[index])) : (React.createElement(Ansi, { useClasses: true }, _this.renderHighlightWordWithAnsi(logs[index])))));
+                        _this.renderHighlightWord(logs[index])));
                 } }));
         }
         else {

package/esm/renderers/Mapping.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Markdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Nav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -211,7 +211,7 @@ var Navigation = /** @class */ (function (_super) {
         var _a = this.props, render = _a.render, cx = _a.classnames, className = _a.className, loading = _a.loading, _b = _a.links, links = _b === void 0 ? [] : _b;
         var overflowClassName = overflowConfig.overflowClassName, overflowPopoverClassName = overflowConfig.overflowPopoverClassName, overflowListClassName = overflowConfig.overflowListClassName, overflowLabel = overflowConfig.overflowLabel, overflowIndicator = overflowConfig.overflowIndicator, _c = overflowConfig.itemWidth, itemWidth = _c === void 0 ? 160 : _c, overflowSuffix = overflowConfig.overflowSuffix, popOverContainer = overflowConfig.popOverContainer, style = overflowConfig.style, maxVisibleCount = overflowConfig.maxVisibleCount, _d = overflowConfig.wrapperComponent, wrapperComponent = _d === void 0 ? 'ul' : _d;
         return (React.createElement(React.Fragment, null,
-            React.createElement(Spinner, { show: !!loading, overlay: true, icon: "reload" }),
+            React.createElement(Spinner, { show: !!loading, overlay: true }),
             React.createElement(Overflow, { className: cx('Nav-list--tabs', className), prefixCls: cx('Nav-list'), itemWidth: itemWidth, style: style, component: wrapperComponent, data: links, suffix: overflowSuffix
                     ? render('nav-overflow-suffix', overflowSuffix)
                     : null, renderRawItem: function (item, index) {
@@ -249,7 +249,7 @@ var Navigation = /** @class */ (function (_super) {
                 Array.isArray(links)
                     ? links.map(function (item, index) { return _this.renderItem(item, index); })
                     : null,
-                React.createElement(Spinner, { show: !!loading, overlay: true, icon: "reload" })),
+                React.createElement(Spinner, { show: !!loading, overlay: true })),
             dropIndicator ? (React.createElement("div", { className: cx('Nav-dropIndicator'), style: dropIndicator })) : null))));
     };
     Navigation.defaultProps = {

package/esm/renderers/Operation.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Page.d.ts

@@ -206,8 +206,8 @@ export default class Page extends React.Component<PageProps> {
     handleResizeMouseMove(e: MouseEvent): void;
     handleResizeMouseUp(): void;
     openFeedback(dialog: any, ctx: any): Promise<unknown>;
-    reload(subpath?: any, query?: any, ctx?: any, silent?: boolean): void;
-    receive(values: object): void;
+    reload(subpath?: any, query?: any, ctx?: any, silent?: boolean, replace?: boolean): void;
+    receive(values: object, subPath?: string, replace?: boolean): void;
     silentReload(target?: string, query?: any): void;
     initInterval(value: any): any;
     handleRefresh(): Promise<void>;
@@ -224,6 +224,6 @@ export declare class PageRenderer extends Page {
     handleAction(e: React.UIEvent<any>, action: ActionObject, ctx: object, throwErrors?: boolean, delegate?: IScopedContext): void;
     handleDialogConfirm(values: object[], action: ActionObject, ...rest: Array<any>): void;
     handleDrawerConfirm(values: object[], action: ActionObject, ...rest: Array<any>): void;
-    setData(values: object): void;
+    setData(values: object, replace?: boolean): void;
 }
 export {};

package/esm/renderers/Page.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __spreadArray, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { bulkBindFunctions, isEffectiveApi, scrollPosition, isApiOutdated, isObjectShallowModified, filter, isVisible, createObject, evalExpression, buildStyle, autobind, ScopedContext, Renderer, ServiceStore } from 'amis-core';
+import { bulkBindFunctions, isEffectiveApi, scrollPosition, isApiOutdated, isObjectShallowModified, filter, isVisible, createObject, evalExpression, buildStyle, isMobile, autobind, ScopedContext, Renderer, ServiceStore } from 'amis-core';
 import { Spinner, Alert2, PullRefresh } from 'amis-ui';
 
 var Page = /** @class */ (function (_super) {
@@ -295,9 +295,9 @@ var Page = /** @class */ (function (_super) {
             });
         });
     };
-    Page.prototype.reload = function (subpath, query, ctx, silent) {
+    Page.prototype.reload = function (subpath, query, ctx, silent, replace) {
         if (query) {
-            return this.receive(query);
+            return this.receive(query, undefined, replace);
         }
         var _a = this.props, store = _a.store, initApi = _a.initApi;
         clearTimeout(this.timer);
@@ -308,9 +308,9 @@ var Page = /** @class */ (function (_super) {
             })
                 .then(this.initInterval);
     };
-    Page.prototype.receive = function (values) {
+    Page.prototype.receive = function (values, subPath, replace) {
         var store = this.props.store;
-        store.updateData(values);
+        store.updateData(values, undefined, replace);
         this.reload();
     };
     Page.prototype.silentReload = function (target, query) {
@@ -318,7 +318,7 @@ var Page = /** @class */ (function (_super) {
     };
     Page.prototype.initInterval = function (value) {
         var _a = this.props, interval = _a.interval, silentPolling = _a.silentPolling, stopAutoRefreshWhen = _a.stopAutoRefreshWhen, data = _a.data, dispatchEvent = _a.dispatchEvent;
-        if (value.data) {
+        if (value === null || value === void 0 ? void 0 : value.data) {
             dispatchEvent('inited', createObject(data, value.data));
         }
         interval &&
@@ -391,7 +391,7 @@ var Page = /** @class */ (function (_super) {
         return header || right;
     };
     Page.prototype.render = function () {
-        var _a = this.props, className = _a.className, store = _a.store, body = _a.body, bodyClassName = _a.bodyClassName, render = _a.render, aside = _a.aside, asideClassName = _a.asideClassName, cx = _a.classnames; _a.header; var showErrorMsg = _a.showErrorMsg, initApi = _a.initApi, regions = _a.regions, style = _a.style, data = _a.data, asideResizor = _a.asideResizor, pullRefresh = _a.pullRefresh, __ = _a.translate;
+        var _a = this.props, className = _a.className, store = _a.store, body = _a.body, bodyClassName = _a.bodyClassName, render = _a.render, aside = _a.aside, asideClassName = _a.asideClassName, cx = _a.classnames; _a.header; var showErrorMsg = _a.showErrorMsg, initApi = _a.initApi, regions = _a.regions, style = _a.style, data = _a.data, asideResizor = _a.asideResizor, pullRefresh = _a.pullRefresh, useMobileUI = _a.useMobileUI, __ = _a.translate;
         var subProps = {
             onAction: this.handleAction,
             onQuery: initApi ? this.handleQuery : undefined,
@@ -421,7 +421,7 @@ var Page = /** @class */ (function (_super) {
                     }
                     : null)))),
                 asideResizor ? (React.createElement("div", { onMouseDown: this.handleResizeMouseDown, className: cx("Page-asideResizor") })) : null)) : null,
-            pullRefresh && !pullRefresh.disabled ? (React.createElement(PullRefresh, __assign({}, pullRefresh, { translate: __, onRefresh: this.handleRefresh }), pageContent)) : (pageContent),
+            useMobileUI && isMobile() && pullRefresh && !pullRefresh.disabled ? (React.createElement(PullRefresh, __assign({}, pullRefresh, { translate: __, onRefresh: this.handleRefresh }), pageContent)) : (pageContent),
             render('dialog', __assign(__assign({}, (store.action &&
                 store.action.dialog)), { type: 'dialog' }), {
                 key: 'dialog',
@@ -581,8 +581,8 @@ var Page = /** @class */ (function (_super) {
             }
         }, 300);
     };
-    PageRenderer.prototype.setData = function (values) {
-        return this.props.store.updateData(values);
+    PageRenderer.prototype.setData = function (values, replace) {
+        return this.props.store.updateData(values, undefined, replace);
     };
     PageRenderer.contextType = ScopedContext;
     PageRenderer = __decorate([

package/esm/renderers/Pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/PaginationWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Panel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Plain.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -94,6 +94,17 @@ var HocPopOver = function (config) {
                 }
                 return schema || 'error';
             };
+            PopOverComponent.prototype.getOffset = function () {
+                var popOver = this.props.popOver;
+                if (typeof popOver === 'boolean' || !popOver.offset) {
+                    return undefined;
+                }
+                // PopOver 组件接收的 offset 格式为 { x: number, y: number }
+                return {
+                    x: popOver.offset.left || 0,
+                    y: popOver.offset.top || 0
+                };
+            };
             PopOverComponent.prototype.renderPopOver = function () {
                 var _this = this;
                 var _a = this.props, popOver = _a.popOver, render = _a.render, popOverContainer = _a.popOverContainer, cx = _a.classnames, ns = _a.classPrefix;
@@ -121,7 +132,7 @@ var HocPopOver = function (config) {
                             ? _this.clearCloseTimer
                             : undefined, ref: ref }, content));
                 })) : (React.createElement(Overlay, { container: popOverContainer, placement: position || config.position || 'center', target: function () { return _this.target; }, onHide: this.closePopOver, rootClose: true, show: true },
-                    React.createElement(PopOver, { classPrefix: ns, className: cx('PopOverAble-popover', popOver.popOverClassName), offset: popOver.offset, onMouseLeave: (popOver === null || popOver === void 0 ? void 0 : popOver.trigger) === 'hover'
+                    React.createElement(PopOver, { classPrefix: ns, className: cx('PopOverAble-popover', popOver.popOverClassName), offset: this.getOffset(), onMouseLeave: (popOver === null || popOver === void 0 ? void 0 : popOver.trigger) === 'hover'
                             ? this.closePopOver
                             : undefined, onMouseEnter: (popOver === null || popOver === void 0 ? void 0 : popOver.trigger) === 'hover'
                             ? this.clearCloseTimer

package/esm/renderers/Portlet.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Progress.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Property.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/QRCode.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/QuickEdit.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Remark.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/SearchBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Service.d.ts

@@ -2,9 +2,14 @@ import React from 'react';
 import { RendererProps } from 'amis-core';
 import { IServiceStore } from 'amis-core';
 import { Api, RendererData, ActionObject } from 'amis-core';
-import Scoped, { IScopedContext } from 'amis-core';
+import { IScopedContext } from 'amis-core';
 import { BaseSchema, SchemaApi, SchemaCollection, SchemaExpression, SchemaMessage, SchemaName } from '../Schema';
 import type { ListenerAction } from 'amis-core';
+export declare const eventTypes: readonly ["inited", "onApiFetched", "onSchemaApiFetched", "onWsFetched"];
+export declare type ProviderEventType = typeof eventTypes[number];
+export declare type DataProviderCollection = Partial<Record<ProviderEventType, DataProvider>>;
+export declare type DataProvider = string | Function;
+export declare type ComposedDataProvider = DataProvider | DataProviderCollection;
 /**
  * Service 服务类控件。
  * 文档：https://baidu.gitee.io/amis/docs/components/service
@@ -25,7 +30,7 @@ export interface ServiceSchema extends BaseSchema {
     /**
      * 通过调用外部函数来获取数据
      */
-    dataProvider?: string | Function;
+    dataProvider?: ComposedDataProvider;
     /**
      * 内容区域
      */
@@ -80,7 +85,8 @@ export default class Service extends React.Component<ServiceProps> {
     timer: ReturnType<typeof setTimeout>;
     mounted: boolean;
     socket: any;
-    dataProviderUnsubscribe?: Function;
+    dataProviders: DataProviderCollection;
+    dataProviderUnsubscribe?: Partial<Record<ProviderEventType, Function>>;
     static defaultProps: Partial<ServiceProps>;
     static propsList: Array<string>;
     constructor(props: ServiceProps);
@@ -89,16 +95,34 @@ export default class Service extends React.Component<ServiceProps> {
     componentWillUnmount(): void;
     doAction(action: ListenerAction, args: any): void;
     initFetch(): void;
-    runDataProvider(): Promise<void>;
-    runDataProviderUnsubscribe(): void;
+    /**
+     * 初始化Provider函数集，将Schema配置统一转化为DataProviderCollection格式
+     */
+    initDataProviders(provider?: ComposedDataProvider): Partial<Record<"inited" | "onApiFetched" | "onSchemaApiFetched" | "onWsFetched", DataProvider>>;
+    /**
+     * 标准化处理Provider函数
+     */
+    normalizeProvider(provider: any, event?: ProviderEventType): DataProviderCollection | null;
+    /**
+     * 使用外部函数获取数据
+     *
+     * @param {ProviderEventType} event 触发provider函数执行的事件，默认初始时执行
+     */
+    runDataProvider(event: ProviderEventType): Promise<void>;
+    /**
+     * 运行销毁外部函数的方法
+     *
+     * @param {ProviderEventType} event 事件名称，不传参数即执行所有销毁函数
+     */
+    runDataProviderUnsubscribe(event?: ProviderEventType): void;
     dataProviderSetData(data: any): void;
     fetchWSData(ws: string | Api, data: any): void;
     afterDataFetch(result: any): void;
     afterSchemaFetch(schema: any): void;
     initInterval(value: any): any;
-    reload(subpath?: string, query?: any, ctx?: RendererData, silent?: boolean): void;
+    reload(subpath?: string, query?: any, ctx?: RendererData, silent?: boolean, replace?: boolean): void;
     silentReload(target?: string, query?: any): void;
-    receive(values: object): void;
+    receive(values: object, subPath?: string, replace?: boolean): void;
     handleQuery(query: any): void;
     reloadTarget(target: string, data?: any): void;
     handleDialogConfirm(values: object[], action: ActionObject, ctx: any, targets: Array<any>): void;
@@ -110,11 +134,11 @@ export default class Service extends React.Component<ServiceProps> {
     render(): JSX.Element;
 }
 export declare class ServiceRenderer extends Service {
-    static contextType: React.Context<Scoped.IScopedContext>;
+    static contextType: React.Context<IScopedContext>;
     constructor(props: ServiceProps, context: IScopedContext);
-    reload(subpath?: string, query?: any, ctx?: any, silent?: boolean): void;
-    receive(values: any, subPath?: string): void;
+    reload(subpath?: string, query?: any, ctx?: any, silent?: boolean, replace?: boolean): void;
+    receive(values: any, subPath?: string, replace?: boolean): void;
     componentWillUnmount(): void;
     reloadTarget(target: string, data?: any): void;
-    setData(values: object): void;
+    setData(values: object, replace?: boolean): void;
 }