amis 2.2.0 → 2.3.0

package/lib/renderers/Images.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -39,7 +39,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' && amisCore.isPureVariable(source)) {
@@ -62,7 +62,7 @@ var ImagesField = /** @class */ (function (_super) {
         return (React__default["default"].createElement("div", { className: cx('ImagesField', className) }, Array.isArray(list) ? (React__default["default"].createElement("div", { className: cx('Images', listClassName) }, list.map(function (item, index) { return (React__default["default"].createElement(Image["default"], { index: index, className: cx('Images-item'), key: index, src: (src ? amisCore.filter(src, item, '| raw') : item && item.image) ||
                 item, originalSrc: (originalSrc
                 ? amisCore.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__default["default"].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__default["default"].createElement("div", { className: cx('Images', listClassName) },
             React__default["default"].createElement(Image["default"], { className: cx('Images-item'), src: defaultImage, thumbMode: thumbMode, thumbRatio: thumbRatio }))) : (placeholder)));
     };
     ImagesField.defaultProps = {

package/lib/renderers/Json.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -59,7 +59,7 @@ var JSONField = /** @class */ (function (_super) {
             jsonThemeValue = amisCore.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/lib/renderers/Link.js

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

package/lib/renderers/List.js

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

package/lib/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/lib/renderers/Log.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -10,13 +10,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var amisCore = require('amis-core');
-var Ansi = require('ansi-to-react');
 var amisUi = require('amis-ui');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var Ansi__default = /*#__PURE__*/_interopDefaultLegacy(Ansi);
 
 var Log = /** @class */ (function (_super) {
     tslib.__extends(Log, _super);
@@ -198,27 +196,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__default["default"].createElement("div", { className: cx('Log-line'), key: index },
             showLineNumber && (React__default["default"].createElement("span", { className: cx('Log-line-number') },
                 index + 1,
                 " ")),
-            disableColor ? (this.renderHighlightWord(line)) : (React__default["default"].createElement(Ansi__default["default"], { 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) {
@@ -237,7 +228,7 @@ var Log = /** @class */ (function (_super) {
                         showLineNumber && (React__default["default"].createElement("span", { className: cx('Log-line-number') },
                             index + 1,
                             " ")),
-                        disableColor ? (_this.renderHighlightWord(logs[index])) : (React__default["default"].createElement(Ansi__default["default"], { useClasses: true }, _this.renderHighlightWordWithAnsi(logs[index])))));
+                        _this.renderHighlightWord(logs[index])));
                 } }));
         }
         else {

package/lib/renderers/Mapping.js

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

package/lib/renderers/Markdown.js

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

package/lib/renderers/Nav.d.ts

@@ -203,7 +203,7 @@ export declare class Navigation extends React.Component<NavigationProps, Navigat
     render(): JSX.Element;
 }
 declare const ThemedNavigation: {
-    new (props: Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps): {
+    new (props: Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "render" | "env" | "data" | "source" | "itemBadge" | "loading" | "reload" | "draggable" | "deferApi" | "onSelect" | "onToggle" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps): {
         ref: any; /**
          * 包裹导航的外层标签名，可以使用其他标签渲染
          * @default "ul"
@@ -212,9 +212,9 @@ declare const ThemedNavigation: {
         getWrappedInstance(): any;
         render(): JSX.Element;
         context: any;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "render" | "env" | "data" | "source" | "itemBadge" | "loading" | "reload" | "draggable" | "deferApi" | "onSelect" | "onToggle" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
+        readonly props: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "render" | "env" | "data" | "source" | "itemBadge" | "loading" | "reload" | "draggable" | "deferApi" | "onSelect" | "onToggle" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
             children?: React.ReactNode; /**
              * 懒加载 api，如果不配置复用 source 接口。
              */
@@ -224,17 +224,17 @@ declare const ThemedNavigation: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "render" | "env" | "data" | "source" | "itemBadge" | "loading" | "reload" | "draggable" | "deferApi" | "onSelect" | "onToggle" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "render" | "env" | "data" | "source" | "itemBadge" | "loading" | "reload" | "draggable" | "deferApi" | "onSelect" | "onToggle" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "render" | "env" | "data" | "source" | "itemBadge" | "loading" | "reload" | "draggable" | "deferApi" | "onSelect" | "onToggle" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "source" | "$ref" | "disabled" | "disabledOn" | "hidden" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "itemBadge" | "loading" | "reload" | "data" | "draggable" | "itemActions" | "onSelect" | "render" | "env" | "deferApi" | "onToggle" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "render" | "env" | "data" | "source" | "itemBadge" | "loading" | "reload" | "draggable" | "deferApi" | "onSelect" | "onToggle" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "render" | "env" | "data" | "source" | "itemBadge" | "loading" | "reload" | "draggable" | "deferApi" | "onSelect" | "onToggle" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "render" | "env" | "data" | "source" | "itemBadge" | "loading" | "reload" | "draggable" | "deferApi" | "onSelect" | "onToggle" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "render" | "env" | "data" | "source" | "itemBadge" | "loading" | "reload" | "draggable" | "deferApi" | "onSelect" | "onToggle" | "itemActions" | "saveOrderApi" | "links" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;
     contextType: React.Context<string>;

package/lib/renderers/Nav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -220,7 +220,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__default["default"].createElement(React__default["default"].Fragment, null,
-            React__default["default"].createElement(amisUi.Spinner, { show: !!loading, overlay: true, icon: "reload" }),
+            React__default["default"].createElement(amisUi.Spinner, { show: !!loading, overlay: true }),
             React__default["default"].createElement(Overflow__default["default"], { 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) {
@@ -258,7 +258,7 @@ var Navigation = /** @class */ (function (_super) {
                 Array.isArray(links)
                     ? links.map(function (item, index) { return _this.renderItem(item, index); })
                     : null,
-                React__default["default"].createElement(amisUi.Spinner, { show: !!loading, overlay: true, icon: "reload" })),
+                React__default["default"].createElement(amisUi.Spinner, { show: !!loading, overlay: true })),
             dropIndicator ? (React__default["default"].createElement("div", { className: cx('Nav-dropIndicator'), style: dropIndicator })) : null))));
     };
     Navigation.defaultProps = {

package/lib/renderers/Operation.js

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

package/lib/renderers/Page.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -326,7 +326,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', amisCore.createObject(data, value.data));
         }
         interval &&
@@ -399,7 +399,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,
@@ -429,7 +429,7 @@ var Page = /** @class */ (function (_super) {
                     }
                     : null)))),
                 asideResizor ? (React__default["default"].createElement("div", { onMouseDown: this.handleResizeMouseDown, className: cx("Page-asideResizor") })) : null)) : null,
-            pullRefresh && !pullRefresh.disabled ? (React__default["default"].createElement(amisUi.PullRefresh, tslib.__assign({}, pullRefresh, { translate: __, onRefresh: this.handleRefresh }), pageContent)) : (pageContent),
+            useMobileUI && amisCore.isMobile() && pullRefresh && !pullRefresh.disabled ? (React__default["default"].createElement(amisUi.PullRefresh, tslib.__assign({}, pullRefresh, { translate: __, onRefresh: this.handleRefresh }), pageContent)) : (pageContent),
             render('dialog', tslib.__assign(tslib.__assign({}, (store.action &&
                 store.action.dialog)), { type: 'dialog' }), {
                 key: 'dialog',

package/lib/renderers/Pagination.js

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

package/lib/renderers/PaginationWrapper.js

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

package/lib/renderers/Panel.js

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

package/lib/renderers/Plain.js

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

package/lib/renderers/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -103,6 +103,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;
@@ -130,7 +141,7 @@ var HocPopOver = function (config) {
                             ? _this.clearCloseTimer
                             : undefined, ref: ref }, content));
                 })) : (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer, placement: position || config.position || 'center', target: function () { return _this.target; }, onHide: this.closePopOver, rootClose: true, show: true },
-                    React__default["default"].createElement(amisCore.PopOver, { classPrefix: ns, className: cx('PopOverAble-popover', popOver.popOverClassName), offset: popOver.offset, onMouseLeave: (popOver === null || popOver === void 0 ? void 0 : popOver.trigger) === 'hover'
+                    React__default["default"].createElement(amisCore.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/lib/renderers/Portlet.js

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

package/lib/renderers/Progress.js

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

package/lib/renderers/Property.js

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

package/lib/renderers/QRCode.js

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

package/lib/renderers/QuickEdit.js

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

package/lib/renderers/Remark.d.ts

@@ -59,7 +59,7 @@ declare class Remark extends React.Component<RemarkProps> {
     static propsList: Array<string>;
     static defaultProps: {
         icon: string;
-        trigger: ("click" | "focus" | "hover")[];
+        trigger: ("click" | "hover" | "focus")[];
     };
     showModalTip(tooltip?: string | TooltipObject): (e: React.MouseEvent) => void;
     renderLabel(finalIcon: any, finalLabel: string, cx: ClassNamesFn, shape?: 'circle' | 'square'): JSX.Element;

package/lib/renderers/Remark.js

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

package/lib/renderers/SearchBox.js

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

package/lib/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,8 +95,26 @@ 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;
@@ -110,7 +134,7 @@ 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;