amis 2.8.0 → 2.9.0

package/lib/renderers/OfficeViewer.js

@@ -0,0 +1,189 @@
+/**
+ * amis v2.9.0
+ * Copyright 2018-2023 baidu
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var React = require('react');
+var amisCore = require('amis-core');
+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);
+
+/**
+ * office 文件预览
+ */
+var OfficeViewer = /** @class */ (function (_super) {
+    tslib.__extends(OfficeViewer, _super);
+    function OfficeViewer(props) {
+        var _this = _super.call(this, props) || this;
+        _this.rootElement = React__default["default"].createRef();
+        return _this;
+    }
+    OfficeViewer.prototype.componentDidMount = function () {
+        var _a;
+        if ((_a = this.rootElement) === null || _a === void 0 ? void 0 : _a.current) {
+            this.renderWord();
+        }
+    };
+    OfficeViewer.prototype.componentDidUpdate = function (prevProps) {
+        var _a;
+        var props = this.props;
+        if (amisCore.isApiOutdated(prevProps.src, props.src, prevProps.data, props.data)) {
+            this.renderWord();
+        }
+        if (props.name) {
+            if (prevProps.data[props.name] !== props.data[props.name]) {
+                this.renderWord();
+            }
+        }
+        // 这个变量替换只会更新变化的部分，所以性能还能接受
+        (_a = this.word) === null || _a === void 0 ? void 0 : _a.updateVariable();
+    };
+    /**
+     * 接收动作事件
+     */
+    OfficeViewer.prototype.doAction = function (action, args, throwErrors) {
+        var _a, _b;
+        var actionType = action === null || action === void 0 ? void 0 : action.actionType;
+        if (actionType === 'saveAs') {
+            (_a = this.word) === null || _a === void 0 ? void 0 : _a.download((args === null || args === void 0 ? void 0 : args.name) || this.fileName);
+        }
+        if (actionType === 'print') {
+            (_b = this.word) === null || _b === void 0 ? void 0 : _b.print();
+        }
+    };
+    /**
+     * 执行变量替换
+     */
+    OfficeViewer.prototype.evalVar = function (text, data) {
+        var localData = this.props.data;
+        return amisCore.resolveVariable(text, amisCore.createObject(localData, data));
+    };
+    OfficeViewer.prototype.renderWord = function () {
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, src, name;
+            return tslib.__generator(this, function (_b) {
+                _a = this.props, src = _a.src, name = _a.name;
+                if (src) {
+                    this.renderRemoteWord();
+                }
+                else if (name) {
+                    this.renderFormFile();
+                }
+                return [2 /*return*/];
+            });
+        });
+    };
+    /**
+     * 渲染远端文件
+     */
+    OfficeViewer.prototype.renderRemoteWord = function () {
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, wordOptions, env, src, data, display, finalSrc, response;
+            var _this = this;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, wordOptions = _a.wordOptions, env = _a.env, src = _a.src, data = _a.data, display = _a.display;
+                        finalSrc = src
+                            ? amisCore.resolveVariableAndFilter(src, data, '| raw')
+                            : undefined;
+                        if (typeof finalSrc === 'string') {
+                            this.fileName = finalSrc.split('/').pop();
+                        }
+                        if (!finalSrc) {
+                            console.warn('file src is empty');
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, env.fetcher(finalSrc, data, {
+                                responseType: 'arraybuffer'
+                            })];
+                    case 1:
+                        response = _b.sent();
+                        Promise.resolve().then(function() {return new Promise(function(fullfill) {require(['office-viewer'], function(mod) {fullfill(tslib.__importStar(mod))})})}).then(function (officeViewer) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                            var Word, word;
+                            var _a;
+                            return tslib.__generator(this, function (_b) {
+                                Word = officeViewer.Word;
+                                word = new Word(response.data, tslib.__assign(tslib.__assign({}, wordOptions), { data: data, evalVar: this.evalVar.bind(this) }));
+                                if (display !== false) {
+                                    word.render((_a = this.rootElement) === null || _a === void 0 ? void 0 : _a.current);
+                                }
+                                this.word = word;
+                                return [2 /*return*/];
+                            });
+                        }); });
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * 渲染本地文件，用于预览 input-file
+     */
+    OfficeViewer.prototype.renderFormFile = function () {
+        var _this = this;
+        var _a = this.props, wordOptions = _a.wordOptions, name = _a.name, data = _a.data, display = _a.display;
+        var file = data[name];
+        if (file instanceof File) {
+            var reader_1 = new FileReader();
+            reader_1.onload = function (_e) {
+                var data = reader_1.result;
+                Promise.resolve().then(function() {return new Promise(function(fullfill) {require(['office-viewer'], function(mod) {fullfill(tslib.__importStar(mod))})})}).then(function (officeViewer) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                    var Word, word;
+                    var _a;
+                    return tslib.__generator(this, function (_b) {
+                        Word = officeViewer.Word;
+                        word = new Word(data, tslib.__assign(tslib.__assign({}, wordOptions), { evalVar: this.evalVar.bind(this) }));
+                        if (display !== false) {
+                            word.render((_a = this.rootElement) === null || _a === void 0 ? void 0 : _a.current);
+                        }
+                        return [2 /*return*/];
+                    });
+                }); });
+            };
+            reader_1.readAsArrayBuffer(file);
+        }
+    };
+    OfficeViewer.prototype.render = function () {
+        var _a = this.props, cx = _a.classnames; _a.translate; var className = _a.className, _b = _a.loading, loading = _b === void 0 ? false : _b, src = _a.src, name = _a.name, loadingConfig = _a.loadingConfig;
+        return (React__default["default"].createElement("div", { ref: this.rootElement, className: cx('Office-Viewer', className) },
+            (!src || !name) && (React__default["default"].createElement("svg", { width: "100%", height: "100", xmlns: "http://www.w3.org/2000/svg" },
+                React__default["default"].createElement("rect", { x: "0", y: "0", width: "100%", height: "100", style: { fill: '#F7F7F9' } }),
+                React__default["default"].createElement("text", { x: "50%", y: "50%", fontSize: "18", textAnchor: "middle", alignmentBaseline: "middle", fontFamily: "monospace, sans-serif", fill: "#555555" }, "office viewer"))),
+            React__default["default"].createElement(amisUi.Spinner, { overlay: true, key: "info", show: loading, loadingConfig: loadingConfig })));
+    };
+    return OfficeViewer;
+}(React__default["default"].Component));
+/** @class */ ((function (_super) {
+    tslib.__extends(OfficeViewerRenderer, _super);
+    function OfficeViewerRenderer(props, context) {
+        var _this = _super.call(this, props) || this;
+        var scoped = context;
+        scoped.registerComponent(_this);
+        return _this;
+    }
+    OfficeViewerRenderer.prototype.componentWillUnmount = function () {
+        var _a;
+        (_a = _super.prototype.componentWillUnmount) === null || _a === void 0 ? void 0 : _a.call(this);
+        var scoped = this.context;
+        scoped.unRegisterComponent(this);
+    };
+    OfficeViewerRenderer.contextType = amisCore.ScopedContext;
+    OfficeViewerRenderer = tslib.__decorate([
+        amisCore.Renderer({
+            type: 'office-viewer'
+        }),
+        tslib.__metadata("design:paramtypes", [Object, Object])
+    ], OfficeViewerRenderer);
+    return OfficeViewerRenderer;
+})(OfficeViewer));
+
+exports["default"] = OfficeViewer;

package/lib/renderers/Operation.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Page.d.ts

@@ -6,17 +6,11 @@ import { IScopedContext } from 'amis-core';
 import { SpinnerExtraProps } from 'amis-ui';
 import { BaseSchema, SchemaCollection, SchemaClassName, SchemaDefaultData, SchemaApi, SchemaExpression, SchemaName, SchemaMessage } from '../Schema';
 import { SchemaRemark } from './Remark';
-/**
- * 样式属性名及值
- */
-interface Declaration {
-    [property: string]: string;
-}
 /**
  * css 定义
  */
 interface CSSRule {
-    [selector: string]: Declaration;
+    [selector: string]: Record<string, string> | Record<string, Record<string, string>>;
 }
 /**
  * amis Page 渲染器。详情请见：https://baidu.gitee.io/amis/docs/components/page

package/lib/renderers/Page.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -66,7 +66,17 @@ var Page = /** @class */ (function (_super) {
             var declaration = cssRules[selector];
             var declarationStr = '';
             for (var property in declaration) {
-                declarationStr += "  ".concat(property, ": ").concat(declaration[property], ";\n");
+                var innerstr = '';
+                var innerValue = declaration[property];
+                if (typeof innerValue === 'string') {
+                    declarationStr += "  ".concat(property, ": ").concat(innerValue, ";\n");
+                }
+                else {
+                    for (var propsName in innerValue) {
+                        innerstr += " ".concat(propsName, ":").concat(innerValue[propsName], ";");
+                    }
+                    declarationStr += "  ".concat(property, " {").concat(innerstr, "}\n");
+                }
             }
             css += "\n      ".concat(selector, " {\n        ").concat(declarationStr, "\n      }\n      ");
         }
@@ -98,11 +108,11 @@ var Page = /** @class */ (function (_super) {
     };
     Page.prototype.componentDidMount = function () {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, initApi, initFetch, initFetchOn, store, messages, asideSticky, data, dispatchEvent, dom, rendererEvent;
+            var _a, initApi, initFetch, initFetchOn, store, messages, asideSticky, data, dispatchEvent, env, dom, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, initApi = _a.initApi, initFetch = _a.initFetch, initFetchOn = _a.initFetchOn, store = _a.store, messages = _a.messages, asideSticky = _a.asideSticky, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, initApi = _a.initApi, initFetch = _a.initFetch, initFetchOn = _a.initFetchOn, store = _a.store, messages = _a.messages, asideSticky = _a.asideSticky, data = _a.data, dispatchEvent = _a.dispatchEvent, env = _a.env;
                         this.mounted = true;
                         if (asideSticky && this.asideInner.current) {
                             dom = this.asideInner.current;
@@ -111,6 +121,10 @@ var Page = /** @class */ (function (_super) {
                         return [4 /*yield*/, dispatchEvent('init', data, this)];
                     case 1:
                         rendererEvent = _b.sent();
+                        // Page加载完成时触发 pageLoaded 事件
+                        if (env === null || env === void 0 ? void 0 : env.tracker) {
+                            env.tracker({ eventType: 'pageLoaded' });
+                        }
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
@@ -177,11 +191,11 @@ var Page = /** @class */ (function (_super) {
         var _a = this.props, env = _a.env, store = _a.store, messages = _a.messages, onAction = _a.onAction;
         if (action.actionType === 'dialog') {
             store.setCurrentAction(action);
-            store.openDialog(ctx);
+            store.openDialog(ctx, undefined, undefined, delegate);
         }
         else if (action.actionType === 'drawer') {
             store.setCurrentAction(action);
-            store.openDrawer(ctx);
+            store.openDrawer(ctx, undefined, undefined, delegate);
         }
         else if (action.actionType === 'ajax') {
             store.setCurrentAction(action);
@@ -208,7 +222,8 @@ var Page = /** @class */ (function (_super) {
                         case 2:
                             redirect = action.redirect && amisCore.filter(action.redirect, store.data);
                             redirect && env.jumpTo(redirect, action);
-                            action.reload && this.reloadTarget(action.reload, store.data);
+                            action.reload &&
+                                this.reloadTarget(amisCore.filter(action.reload, store.data), store.data);
                             return [2 /*return*/];
                     }
                 });
@@ -567,11 +582,11 @@ var Page = /** @class */ (function (_super) {
         for (var _i = 2; _i < arguments.length; _i++) {
             rest[_i - 2] = arguments[_i];
         }
-        _super.prototype.handleDialogConfirm.apply(this, tslib.__spreadArray([values, action], tslib.__read(rest), false));
-        var scoped = this.context;
         var store = this.props.store;
         var dialogAction = store.action;
         var reload = (_a = action.reload) !== null && _a !== void 0 ? _a : dialogAction.reload;
+        var scoped = store.getDialogScoped() || this.context;
+        _super.prototype.handleDialogConfirm.apply(this, tslib.__spreadArray([values, action], tslib.__read(rest), false));
         if (reload) {
             scoped.reload(reload, store.data);
         }
@@ -585,11 +600,11 @@ var Page = /** @class */ (function (_super) {
     };
     PageRenderer.prototype.handleDrawerConfirm = function (values, action) {
         var _a;
-        _super.prototype.handleDrawerConfirm.call(this, values, action);
-        var scoped = this.context;
         var store = this.props.store;
         var drawerAction = store.action;
         var reload = (_a = action.reload) !== null && _a !== void 0 ? _a : drawerAction.reload;
+        var scoped = store.getDrawerScoped() || this.context;
+        _super.prototype.handleDrawerConfirm.call(this, values, action);
         // 稍等会，等动画结束。
         setTimeout(function () {
             if (reload) {

package/lib/renderers/Pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/PaginationWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Panel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Password.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Plain.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Portlet.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Progress.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Property.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/QRCode.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/QuickEdit.d.ts

@@ -61,6 +61,7 @@ export interface QuickEditConfig {
     body?: any;
     focusable?: boolean;
     popOverClassName?: string;
+    isFormMode?: boolean;
     [propName: string]: any;
 }
 export interface QuickEditProps extends RendererProps {

package/lib/renderers/QuickEdit.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -13,6 +13,7 @@ var ReactDOM = require('react-dom');
 var hoistNonReactStatic = require('hoist-non-react-statics');
 var keycode = require('keycode');
 var amisCore = require('amis-core');
+var omit = require('lodash/omit');
 var amisUi = require('amis-ui');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -20,6 +21,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var hoistNonReactStatic__default = /*#__PURE__*/_interopDefaultLegacy(hoistNonReactStatic);
 var keycode__default = /*#__PURE__*/_interopDefaultLegacy(keycode);
+var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 
 /**
  * @file scoped.jsx.
@@ -240,7 +242,17 @@ var HocQuickEdit = function (config) {
                     };
                 }
                 else if (quickEdit) {
-                    if (quickEdit.body &&
+                    if (quickEdit === null || quickEdit === void 0 ? void 0 : quickEdit.isFormMode) {
+                        schema = {
+                            mode: 'normal',
+                            type: 'form',
+                            wrapWithPanel: false,
+                            body: [
+                                tslib.__assign(tslib.__assign({}, omit__default["default"](quickEdit, 'isFormMode')), { label: false })
+                            ]
+                        };
+                    }
+                    else if (quickEdit.body &&
                         !~['combo', 'group', 'panel', 'fieldSet', 'fieldset'].indexOf(quickEdit.type)) {
                         schema = tslib.__assign(tslib.__assign({ title: '', autoFocus: quickEdit.mode !== 'inline' }, quickEdit), { mode: 'normal', type: 'form' });
                     }
@@ -257,8 +269,10 @@ var HocQuickEdit = function (config) {
                         };
                     }
                 }
+                var isline = quickEdit.mode === 'inline';
+                var isFormMode = quickEdit === null || quickEdit === void 0 ? void 0 : quickEdit.isFormMode;
                 if (schema) {
-                    schema = tslib.__assign(tslib.__assign({}, schema), { wrapWithPanel: quickEdit.mode !== 'inline', actions: quickEdit.mode === 'inline'
+                    schema = tslib.__assign(tslib.__assign({}, schema), { wrapWithPanel: !(isline || isFormMode), actions: isline || isFormMode
                             ? []
                             : [
                                 {
@@ -304,16 +318,20 @@ var HocQuickEdit = function (config) {
                     React__default["default"].createElement(amisCore.PopOver, { classPrefix: ns, className: cx("".concat(ns, "QuickEdit-popover"), quickEdit.popOverClassName), onHide: this.closeQuickEdit, overlay: true }, content)));
             };
             QuickEditComponent.prototype.render = function () {
-                var _a = this.props, onQuickChange = _a.onQuickChange, quickEdit = _a.quickEdit, quickEditEnabled = _a.quickEditEnabled, className = _a.className, cx = _a.classnames, render = _a.render, noHoc = _a.noHoc, canAccessSuperData = _a.canAccessSuperData, disabled = _a.disabled, readOnly = _a.readOnly;
+                var _a = this.props, onQuickChange = _a.onQuickChange, quickEdit = _a.quickEdit, quickEditEnabled = _a.quickEditEnabled, className = _a.className, cx = _a.classnames, render = _a.render, noHoc = _a.noHoc, canAccessSuperData = _a.canAccessSuperData, disabled = _a.disabled;
                 if (!quickEdit ||
                     !onQuickChange ||
-                    quickEditEnabled === false ||
+                    (!(typeof quickEdit === 'object' && (quickEdit === null || quickEdit === void 0 ? void 0 : quickEdit.isQuickEditFormMode)) &&
+                        quickEditEnabled === false) ||
                     noHoc ||
-                    disabled ||
-                    readOnly) {
+                    disabled
+                // 此处的readOnly会导致组件值无法传递出去，如 value: "${a + b}" 这样的 value 变化需要同步到数据域
+                // || readOnly
+                ) {
                     return React__default["default"].createElement(Component, tslib.__assign({}, this.props));
                 }
-                if (quickEdit.mode === 'inline') {
+                if (quickEdit.mode === 'inline' ||
+                    quickEdit.isFormMode) {
                     return (React__default["default"].createElement(Component, tslib.__assign({}, this.props), render('inline-form', this.buildSchema(), {
                         value: undefined,
                         wrapperComponent: 'div',

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: ("focus" | "hover" | "click")[];
+        trigger: ("click" | "focus" | "hover")[];
     };
     showModalTip(tooltip?: string | TooltipObject): (e: React.MouseEvent) => void;
     renderLabel(finalIcon: any, finalLabel: string, cx: ClassNamesFn, shape?: 'circle' | 'square'): JSX.Element;
@@ -71,12 +71,10 @@ declare const _default: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<RemarkProps, keyof import("amis-core").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<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;

package/lib/renderers/Remark.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/SearchBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Service.d.ts

@@ -7,7 +7,7 @@ import { SpinnerExtraProps } from 'amis-ui';
 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 type ProviderEventType = typeof eventTypes[number];
+export type ProviderEventType = (typeof eventTypes)[number];
 export type DataProviderCollection = Partial<Record<ProviderEventType, DataProvider>>;
 export type DataProvider = string | Function;
 export type ComposedDataProvider = DataProvider | DataProviderCollection;
@@ -77,6 +77,10 @@ export interface ServiceSchema extends BaseSchema, SpinnerExtraProps {
     stopAutoRefreshWhen?: SchemaExpression;
     messages?: SchemaMessage;
     name?: SchemaName;
+    /**
+     * 是否以Alert的形式显示api接口响应的错误信息，默认展示
+     */
+    showErrorMsg?: boolean;
 }
 export interface ServiceProps extends RendererProps, Omit<ServiceSchema, 'type' | 'className'> {
     store: IServiceStore;

package/lib/renderers/Service.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -447,7 +447,8 @@ var Service = /** @class */ (function (_super) {
                         case 2:
                             redirect = action.redirect && amisCore.filter(action.redirect, store.data);
                             redirect && env.jumpTo(redirect, action);
-                            action.reload && this.reloadTarget(action.reload, store.data);
+                            action.reload &&
+                                this.reloadTarget(amisCore.filter(action.reload, store.data), store.data);
                             return [2 /*return*/];
                     }
                 });
@@ -484,12 +485,9 @@ var Service = /** @class */ (function (_super) {
         });
     };
     Service.prototype.render = function () {
-        var _a = this.props, className = _a.className, style = _a.style, store = _a.store, render = _a.render, ns = _a.classPrefix, cx = _a.classnames, loadingConfig = _a.loadingConfig;
+        var _a = this.props, className = _a.className, style = _a.style, store = _a.store, render = _a.render, ns = _a.classPrefix, cx = _a.classnames, loadingConfig = _a.loadingConfig, showErrorMsg = _a.showErrorMsg;
         return (React__default["default"].createElement("div", { className: cx("".concat(ns, "Service"), className), style: style },
-            store.error ? (React__default["default"].createElement("div", { className: cx("Alert Alert--danger") },
-                React__default["default"].createElement("button", { className: cx('Alert-close'), onClick: function () { return store.updateMessage(''); }, type: "button" },
-                    React__default["default"].createElement("span", null, "\u00D7")),
-                store.msg)) : null,
+            store.error && showErrorMsg !== false ? (React__default["default"].createElement(amisUi.Alert2, { level: "danger", showCloseButton: true, onClose: function () { return store.updateMessage(''); } }, store.msg)) : null,
             this.renderBody(),
             React__default["default"].createElement(amisUi.Spinner, { size: "lg", overlay: true, key: "info", show: store.loading, loadingConfig: loadingConfig }),
             render(
@@ -506,7 +504,8 @@ var Service = /** @class */ (function (_super) {
     Service.defaultProps = {
         messages: {
             fetchFailed: 'fetchFailed'
-        }
+        },
+        showErrorMsg: true
     };
     Service.propsList = [];
     tslib.__decorate([

package/lib/renderers/SparkLine.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Spinner.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Status.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Steps.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
-import { BaseSchema, SchemaCollection } from '../Schema';
 import { StepStatus } from 'amis-ui';
+import { BaseSchema, SchemaCollection } from '../Schema';
 import type { SchemaExpression } from 'amis-core';
 export type StepSchema = {
     /**