amis 2.8.0 → 2.9.0

package/esm/renderers/Video.js

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

package/esm/renderers/WebComponent.js

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

package/esm/renderers/Wizard.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { isEffectiveApi, until, toNumber, tokenize, getScrollParent, resizeSensor, isApiOutdated, createObject, filter, isVisible, SkipOperation, autobind, evalExpression, ScopedContext, Renderer, ServiceStore } from 'amis-core';
+import { isEffectiveApi, until, toNumber, tokenize, getScrollParent, resizeSensor, isApiOutdated, createObject, filter, isVisible, autobind, evalExpression, ScopedContext, Renderer, ServiceStore, SkipOperation } from 'amis-core';
 import { Icon, Spinner } from 'amis-ui';
 import { findDOMNode } from 'react-dom';
 
@@ -323,19 +323,16 @@ var Wizard = /** @class */ (function (_super) {
                         case 2:
                             reidrect = action.redirect && filter(action.redirect, store.data);
                             reidrect && env.jumpTo(reidrect, action);
-                            action.reload && this.reloadTarget(action.reload, store.data);
+                            action.reload &&
+                                this.reloadTarget(filter(action.reload, store.data), store.data);
                             return [2 /*return*/];
                     }
                 });
             }); })
-                .catch(function (reason) {
-                if (reason instanceof SkipOperation) {
-                    return;
-                }
-            });
+                .catch(function (reason) { });
         }
         else if (action.actionType === 'reload') {
-            action.target && this.reloadTarget(action.target, data);
+            action.target && this.reloadTarget(filter(action.target, data), data);
         }
         else if (action.actionType === 'goto-step') {
             var targetStep = data.step;
@@ -432,7 +429,7 @@ var Wizard = /** @class */ (function (_super) {
                         store.updateData(values);
                         // 最后一步
                         if (target) {
-                            this.submitToTarget(target, store.data);
+                            this.submitToTarget(filter(target, store.data), store.data);
                             this.setState({ completeStep: steps.length });
                         }
                         else if (action.api || step.api || api) {
@@ -521,7 +518,7 @@ var Wizard = /** @class */ (function (_super) {
                                                 env.jumpTo(finalRedirect, action);
                                             }
                                             else if (action.reload || step.reload || reload) {
-                                                this.reloadTarget(action.reload || step.reload || reload, store.data);
+                                                this.reloadTarget(filter(action.reload || step.reload || reload, store.data), store.data);
                                             }
                                             return [2 /*return*/, value];
                                     }
@@ -597,9 +594,6 @@ var Wizard = /** @class */ (function (_super) {
                 }); })
                     .catch(function (reason) {
                     _this.dispatchEvent('stepSubmitFail', { error: reason });
-                    if (reason instanceof SkipOperation) {
-                        return;
-                    }
                     // do nothing
                 });
             }

package/esm/renderers/Words.js

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

package/esm/renderers/Wrapper.js

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

package/esm/schemaExtend.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 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 {

package/lib/Schema.d.ts

@@ -119,7 +119,7 @@ import { MultilineTextSchema } from './renderers/MultilineText';
 import { DateRangeSchema } from './renderers/DateRange';
 import { PasswordSchema } from './renderers/Password';
 import { WordsSchema } from './renderers/Words';
-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 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' | 'number' | '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' | 'office-viewer' | '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 {

package/lib/compat.js

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

package/lib/index.d.ts

@@ -123,6 +123,7 @@ import './renderers/SparkLine';
 import './renderers/Video';
 import './renderers/Audio';
 import './renderers/Nav';
+import './renderers/Number';
 import './renderers/Tasks';
 import './renderers/Drawer';
 import './renderers/Wrapper';
@@ -146,6 +147,7 @@ import './renderers/Words';
 import './renderers/Password';
 import './renderers/DateRange';
 import './renderers/MultilineText';
+import './renderers/OfficeViewer';
 import './compat';
 import './schemaExtend';
 export * from './renderers/Form/IconPickerIcons';

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -125,6 +125,7 @@ require('./renderers/SparkLine.js');
 require('./renderers/Video.js');
 require('./renderers/Audio.js');
 require('./renderers/Nav.js');
+require('./renderers/Number.js');
 require('./renderers/Tasks.js');
 require('./renderers/Drawer.js');
 require('./renderers/Wrapper.js');
@@ -148,6 +149,7 @@ require('./renderers/Words.js');
 require('./renderers/Password.js');
 require('./renderers/DateRange.js');
 require('./renderers/MultilineText.js');
+require('./renderers/OfficeViewer.js');
 require('./compat.js');
 require('./schemaExtend.js');
 var IconPickerIcons = require('./renderers/Form/IconPickerIcons.js');

package/lib/preset.js

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

package/lib/renderers/Action.d.ts

@@ -287,7 +287,7 @@ export interface ActionProps extends Omit<ButtonSchema, 'className' | 'iconClass
     onActionSensor?: (promise?: Promise<any>) => void;
     isCurrentUrl?: (link: string) => boolean;
     onClick?: ((e: React.MouseEvent<any>, props: any) => void) | string | Function | null;
-    componentClass: React.ReactType;
+    componentClass: React.ElementType;
     tooltipContainer?: any;
     data?: any;
     isMenuItem?: boolean;
@@ -301,7 +301,7 @@ interface ActionState {
 export declare class Action extends React.Component<ActionProps, ActionState> {
     static defaultProps: {
         type: "button";
-        componentClass: React.ReactType<any>;
+        componentClass: React.ElementType<any>;
         tooltipPlacement: "bottom";
         activeClassName: string;
         countDownTpl: string;
@@ -326,15 +326,10 @@ declare const _default: {
          * 倒计时文字自定义
          */
         render(): JSX.Element;
-        context: any;
-        /**
-         * 角标
-         */
+        context: unknown;
         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;
-        }>;
+        readonly props: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;

package/lib/renderers/Action.js

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

package/lib/renderers/Alert.js

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

package/lib/renderers/AnchorNav.js

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

package/lib/renderers/App.js

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

package/lib/renderers/Audio.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -186,8 +186,8 @@ var Audio = /** @class */ (function (_super) {
     Audio.prototype.formatTime = function (seconds) {
         var date = new Date(seconds * 1000);
         var hh = date.getUTCHours();
-        var mm = date.getUTCMinutes();
-        var ss = this.pad(date.getUTCSeconds());
+        var mm = isNaN(date.getUTCMinutes()) ? 0 : date.getUTCMinutes();
+        var ss = isNaN(date.getUTCSeconds()) ? '00' : this.pad(date.getUTCSeconds());
         if (hh) {
             return "".concat(hh, ":").concat(this.pad(mm), ":").concat(ss);
         }

package/lib/renderers/Avatar.js

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

package/lib/renderers/BarCode.js

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

package/lib/renderers/Breadcrumb.js

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

package/lib/renderers/ButtonGroup.js

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

package/lib/renderers/CRUD.d.ts

@@ -293,9 +293,9 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     renderLoadMore(): JSX.Element;
     renderFilterToggler(): JSX.Element | null;
     renderExportCSV(toolbar: Schema): JSX.Element;
-    renderToolbar(toolbar?: SchemaNode, index?: number, childProps?: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): {} | null;
-    renderHeaderToolbar(childProps: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): {} | null;
-    renderFooterToolbar(childProps: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): {} | null;
+    renderToolbar(toolbar?: SchemaNode, index?: number, childProps?: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): string | number | boolean | React.ReactFragment | JSX.Element | null;
+    renderHeaderToolbar(childProps: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): string | number | boolean | React.ReactFragment | JSX.Element | null;
+    renderFooterToolbar(childProps: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): string | number | boolean | React.ReactFragment | JSX.Element | null;
     renderSelection(): React.ReactNode;
     render(): JSX.Element;
 }

package/lib/renderers/CRUD.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -208,7 +208,7 @@ var CRUD = /** @class */ (function (_super) {
                             redirect = action.redirect && amisCore.filter(action.redirect, data);
                             redirect && !action.blank && env.jumpTo(redirect, action);
                             action.reload
-                                ? this.reloadTarget(action.reload, data)
+                                ? this.reloadTarget(amisCore.filter(action.reload, data), data)
                                 : redirect
                                     ? null
                                     : this.search(undefined, undefined, true, true);
@@ -286,7 +286,7 @@ var CRUD = /** @class */ (function (_super) {
                                     _b.label = 2;
                                 case 2:
                                     action.reload
-                                        ? this.reloadTarget(action.reload, data)
+                                        ? this.reloadTarget(amisCore.filter(action.reload, data), data)
                                         : this.search((_a = {}, _a[pageField || 'page'] = 1, _a), undefined, true, true);
                                     action.close && this.closeTarget(action.close);
                                     redirect = action.redirect && amisCore.filter(action.redirect, data);
@@ -426,7 +426,7 @@ var CRUD = /** @class */ (function (_super) {
         }
         var reload = (_c = action.reload) !== null && _c !== void 0 ? _c : dialogAction.reload;
         if (reload) {
-            this.reloadTarget(reload, ctx);
+            this.reloadTarget(amisCore.filter(reload, ctx), ctx);
         }
         var redirect = (_d = action.redirect) !== null && _d !== void 0 ? _d : dialogAction.redirect;
         redirect = redirect && amisCore.filter(redirect, ctx);
@@ -569,7 +569,7 @@ var CRUD = /** @class */ (function (_super) {
                 var _a;
                 var finalReload = (_a = options === null || options === void 0 ? void 0 : options.reload) !== null && _a !== void 0 ? _a : reload;
                 finalReload
-                    ? _this.reloadTarget(finalReload, data_1)
+                    ? _this.reloadTarget(amisCore.filter(finalReload, data_1), data_1)
                     : _this.search(undefined, undefined, true, true);
             })
                 .catch(function () { });
@@ -591,7 +591,7 @@ var CRUD = /** @class */ (function (_super) {
                 var _a;
                 var finalReload = (_a = options === null || options === void 0 ? void 0 : options.reload) !== null && _a !== void 0 ? _a : reload;
                 finalReload
-                    ? _this.reloadTarget(finalReload, data_2)
+                    ? _this.reloadTarget(amisCore.filter(finalReload, data_2), data_2)
                     : _this.search(undefined, undefined, true, true);
             })
                 .catch(function () {
@@ -678,7 +678,7 @@ var CRUD = /** @class */ (function (_super) {
             store
                 .saveRemote(saveOrderApi, model)
                 .then(function () {
-                reload && _this.reloadTarget(reload, model);
+                reload && _this.reloadTarget(amisCore.filter(reload, model), model);
                 _this.search(undefined, undefined, true, true);
             })
                 .catch(function () { });
@@ -1117,7 +1117,7 @@ var CRUD = /** @class */ (function (_super) {
     };
     CRUD.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className, style = _b.style, bodyClassName = _b.bodyClassName, filter = _b.filter, render = _b.render, store = _b.store, mode = _b.mode; _b.syncLocation; _b.children; var bulkActions = _b.bulkActions, pickerMode = _b.pickerMode, multiple = _b.multiple, valueField = _b.valueField, primaryField = _b.primaryField; _b.value; var hideQuickSaveBtn = _b.hideQuickSaveBtn, itemActions = _b.itemActions, cx = _b.classnames, keepItemSelectionOnPageChange = _b.keepItemSelectionOnPageChange, maxKeepItemSelectionLength = _b.maxKeepItemSelectionLength; _b.onAction; var popOverContainer = _b.popOverContainer, __ = _b.translate; _b.onQuery; var autoGenerateFilter = _b.autoGenerateFilter; _b.onSelect; var autoFillHeight = _b.autoFillHeight; _b.onEvent; var rest = tslib.__rest(_b, ["className", "style", "bodyClassName", "filter", "render", "store", "mode", "syncLocation", "children", "bulkActions", "pickerMode", "multiple", "valueField", "primaryField", "value", "hideQuickSaveBtn", "itemActions", "classnames", "keepItemSelectionOnPageChange", "maxKeepItemSelectionLength", "onAction", "popOverContainer", "translate", "onQuery", "autoGenerateFilter", "onSelect", "autoFillHeight", "onEvent"]);
+        var _b = this.props, className = _b.className, style = _b.style, bodyClassName = _b.bodyClassName, filter = _b.filter, render = _b.render, store = _b.store, mode = _b.mode; _b.syncLocation; _b.children; var bulkActions = _b.bulkActions, pickerMode = _b.pickerMode, multiple = _b.multiple, valueField = _b.valueField, primaryField = _b.primaryField; _b.value; var hideQuickSaveBtn = _b.hideQuickSaveBtn, itemActions = _b.itemActions, cx = _b.classnames, keepItemSelectionOnPageChange = _b.keepItemSelectionOnPageChange, maxKeepItemSelectionLength = _b.maxKeepItemSelectionLength; _b.onAction; var popOverContainer = _b.popOverContainer, __ = _b.translate; _b.onQuery; var autoGenerateFilter = _b.autoGenerateFilter; _b.onSelect; var autoFillHeight = _b.autoFillHeight; _b.onEvent; _b.onSave; _b.onSaveOrder; _b.onPopOverOpened; _b.onPopOverClosed; _b.onSearchableFromReset; _b.onSearchableFromSubmit; _b.onSearchableFromInit; _b.headerToolbarRender; _b.footerToolbarRender; var rest = tslib.__rest(_b, ["className", "style", "bodyClassName", "filter", "render", "store", "mode", "syncLocation", "children", "bulkActions", "pickerMode", "multiple", "valueField", "primaryField", "value", "hideQuickSaveBtn", "itemActions", "classnames", "keepItemSelectionOnPageChange", "maxKeepItemSelectionLength", "onAction", "popOverContainer", "translate", "onQuery", "autoGenerateFilter", "onSelect", "autoFillHeight", "onEvent", "onSave", "onSaveOrder", "onPopOverOpened", "onPopOverClosed", "onSearchableFromReset", "onSearchableFromSubmit", "onSearchableFromInit", "headerToolbarRender", "footerToolbarRender"]);
         return (React__default["default"].createElement("div", { className: cx('Crud', className, {
                 'is-loading': store.loading
             }), style: style },
@@ -1236,6 +1236,7 @@ var CRUD = /** @class */ (function (_super) {
         'onChange',
         'onInit',
         'onSaved',
+        'onSave',
         'onQuery',
         'formStore',
         'autoFillHeight'

package/lib/renderers/CRUD2.d.ts

@@ -166,6 +166,7 @@ export default class CRUD2 extends React.Component<CRUD2Props, any> {
         query?: object;
         resetQuery?: boolean;
         replaceQuery?: boolean;
+        loadMore?: boolean;
     }): void;
     handleStopAutoRefresh(): void;
     handleStartAutoRefresh(): void;

package/lib/renderers/CRUD2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -123,7 +123,7 @@ var CRUD2 = /** @class */ (function (_super) {
         this.control = control;
     };
     CRUD2.prototype.initQuery = function (values) {
-        var _a = this.props, store = _a.store, orderBy = _a.orderBy, orderDir = _a.orderDir;
+        var _a = this.props, store = _a.store, orderBy = _a.orderBy, orderDir = _a.orderDir, loadType = _a.loadType;
         var params = {};
         if (orderBy) {
             params['orderBy'] = orderBy;
@@ -131,7 +131,8 @@ var CRUD2 = /** @class */ (function (_super) {
         }
         this.handleSearch({
             query: tslib.__assign(tslib.__assign(tslib.__assign({}, params), values), store.query),
-            replaceQuery: this.props.initFetch !== false
+            replaceQuery: this.props.initFetch !== false,
+            loadMore: loadType === 'more'
         });
         // 保留一次用于重置查询条件
         store.setPristineQuery();
@@ -140,6 +141,8 @@ var CRUD2 = /** @class */ (function (_super) {
      * 加载更多动作处理器
      */
     CRUD2.prototype.handleLoadMore = function () {
+        var _a = this.props, store = _a.store, perPage = _a.perPage;
+        store.changePage(store.page + 1, perPage);
         this.getData(undefined, undefined, undefined, true);
     };
     /**
@@ -147,7 +150,7 @@ var CRUD2 = /** @class */ (function (_super) {
      */
     CRUD2.prototype.handleSearch = function (data) {
         var _a = this.props, store = _a.store, syncLocation = _a.syncLocation, env = _a.env, pageField = _a.pageField, perPageField = _a.perPageField;
-        var _b = data || {}, query = _b.query, resetQuery = _b.resetQuery, replaceQuery = _b.replaceQuery;
+        var _b = data || {}, query = _b.query, resetQuery = _b.resetQuery, replaceQuery = _b.replaceQuery, loadMore = _b.loadMore;
         query =
             syncLocation && query
                 ? amisCore.qsparse(amisCore.qsstringify(query, undefined, true))
@@ -155,8 +158,9 @@ var CRUD2 = /** @class */ (function (_super) {
         store.updateQuery(resetQuery ? this.props.store.pristineQuery : query, syncLocation && env && env.updateLocation
             ? function (location) { return env.updateLocation(location, true); }
             : undefined, pageField, perPageField, replaceQuery);
+        store.changePage(1);
         this.lastQuery = store.query;
-        this.getData(undefined, undefined, undefined);
+        this.getData(undefined, undefined, undefined, loadMore !== null && loadMore !== void 0 ? loadMore : false);
     };
     CRUD2.prototype.handleStopAutoRefresh = function () {
         this.timer && clearTimeout(this.timer);
@@ -190,7 +194,7 @@ var CRUD2 = /** @class */ (function (_super) {
         var _this = this;
         var _a;
         if (forceReload === void 0) { forceReload = false; }
-        var _b = this.props, store = _b.store, api = _b.api, messages = _b.messages, pageField = _b.pageField, perPageField = _b.perPageField, interval = _b.interval, stopAutoRefreshWhen = _b.stopAutoRefreshWhen, silentPolling = _b.silentPolling; _b.syncLocation; var syncResponse2Query = _b.syncResponse2Query, keepItemSelectionOnPageChange = _b.keepItemSelectionOnPageChange, stopAutoRefreshWhenModalIsOpen = _b.stopAutoRefreshWhenModalIsOpen, pickerMode = _b.pickerMode; _b.env; var loadType = _b.loadType, loadDataOnce = _b.loadDataOnce, loadDataOnceFetchOnFilter = _b.loadDataOnceFetchOnFilter, source = _b.source, columns = _b.columns;
+        var _b = this.props, store = _b.store, api = _b.api, messages = _b.messages, pageField = _b.pageField, perPageField = _b.perPageField, interval = _b.interval, stopAutoRefreshWhen = _b.stopAutoRefreshWhen, silentPolling = _b.silentPolling; _b.syncLocation; var syncResponse2Query = _b.syncResponse2Query, keepItemSelectionOnPageChange = _b.keepItemSelectionOnPageChange, stopAutoRefreshWhenModalIsOpen = _b.stopAutoRefreshWhenModalIsOpen, pickerMode = _b.pickerMode; _b.env; var loadType = _b.loadType, loadDataOnce = _b.loadDataOnce, loadDataOnceFetchOnFilter = _b.loadDataOnceFetchOnFilter, source = _b.source, columns = _b.columns, perPage = _b.perPage;
         // reload 需要清空用户选择
         if (!loadMore &&
             keepItemSelectionOnPageChange &&
@@ -203,6 +207,11 @@ var CRUD2 = /** @class */ (function (_super) {
         this.lastQuery = store.query;
         var loadDataMode = loadMore !== null && loadMore !== void 0 ? loadMore : loadType === 'more';
         var data = amisCore.createObject(store.data, store.query);
+        // handleLoadMore 是在事件触发后才执行，首次加载并不走到 handleLoadMore
+        // 所以加载更多模式下，首次加载也需要使用设置的 perPage，避免前后 perPage 不一致导致的问题
+        if (loadDataMode && perPage) {
+            store.changePerPage(perPage);
+        }
         amisCore.isEffectiveApi(api, data)
             ? store
                 .fetchInitData(api, data, {
@@ -282,7 +291,7 @@ var CRUD2 = /** @class */ (function (_super) {
                 errorMessage: messages && messages.saveSuccess
             })
                 .then(function () {
-                reload && _this.reloadTarget(reload, data_1);
+                reload && _this.reloadTarget(amisCore.filter(reload, data_1), data_1);
                 _this.getData(undefined, undefined, true, true);
             })
                 .catch(function () { });
@@ -301,7 +310,7 @@ var CRUD2 = /** @class */ (function (_super) {
             store
                 .saveRemote(quickSaveItemApi, sendData)
                 .then(function () {
-                reload && _this.reloadTarget(reload, data_2);
+                reload && _this.reloadTarget(amisCore.filter(reload, data_2), data_2);
                 _this.getData(undefined, undefined, true, true);
             })
                 .catch(function () {
@@ -388,7 +397,7 @@ var CRUD2 = /** @class */ (function (_super) {
             store
                 .saveRemote(saveOrderApi, model)
                 .then(function () {
-                reload && _this.reloadTarget(reload, model);
+                reload && _this.reloadTarget(amisCore.filter(reload, model), model);
                 _this.getData(undefined, undefined, true, true);
             })
                 .catch(function () { });
@@ -548,11 +557,12 @@ var CRUD2 = /** @class */ (function (_super) {
             onQuery: this.handleQuerySearch
             // onAction: onAction
         };
-        return render(region, schema, tslib.__assign(tslib.__assign(tslib.__assign({}, props), { 
+        return render(region, schema, tslib.__assign(tslib.__assign({ 
             // 包两层，主要是为了处理以下 case
             // 里面放了个 form，form 提交过来的时候不希望把 items 这些发送过来。
             // 因为会把数据呈现在地址栏上。
-            data: amisCore.createObject(amisCore.createObject(store.filterData, store.getData(this.props.data)), {}), render: this.renderChild }), childProps));
+            /** data 可以被覆盖，因为 filter 中不需要额外的 data */
+            data: amisCore.createObject(amisCore.createObject(store.filterData, store.getData(this.props.data)), {}) }, props), childProps));
     };
     CRUD2.prototype.renderToolbar = function (region, toolbar) {
         var _this = this;
@@ -573,8 +583,15 @@ var CRUD2 = /** @class */ (function (_super) {
         }
         return filter.map(function (item, index) {
             return _this.renderChild("filter/".concat(index), item, {
-                key: index + '',
-                onSubmit: function (data) { return _this.handleSearch({ query: data }); }
+                key: index + 'filter',
+                data: _this.props.store.filterData,
+                onSubmit: function (data) { return _this.handleSearch({ query: data }); },
+                onReset: function () {
+                    return _this.handleSearch({
+                        resetQuery: true,
+                        replaceQuery: true
+                    });
+                }
             });
         });
     };

package/lib/renderers/Calendar.d.ts

@@ -37,7 +37,6 @@ export interface CalendarSchema extends BaseSchema {
 export declare class CalendarRenderer extends DateControlRenderer {
     static defaultProps: {
         embed: boolean;
-        placeholder: string;
         dateFormat: string;
         timeFormat: string;
         strictMode: boolean;

package/lib/renderers/Calendar.js

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

package/lib/renderers/Card.d.ts

@@ -206,7 +206,7 @@ export declare class CardRenderer extends React.Component<CardProps> {
     isHaveLink(): any;
     handleClick(e: React.MouseEvent<HTMLDivElement>): void;
     handleAction(e: React.UIEvent<any>, action: ActionObject, ctx: object): void;
-    handleCheck(e: React.MouseEvent<any>): void;
+    handleCheck(): void;
     getPopOverContainer(): Element | Text | null;
     handleQuickChange(values: object, saveImmediately?: boolean, savePristine?: boolean, options?: {
         resetOnFailed?: boolean;