amis 2.3.2-beta.1 → 2.4.1-beta.0

package/esm/Schema.d.ts

@@ -115,8 +115,12 @@ import { JSONSchemaEditorControlSchema } from './renderers/Form/JSONSchemaEditor
 import { TableSchema2 } from './renderers/Table2';
 import { BaseSchemaWithoutType, FormBaseControl, FormOptionsControl, SchemaClassName, SchemaExpression } from 'amis-core';
 import type { FormSchemaBase } from 'amis-core/lib/renderers/Form';
-export declare type SchemaType = 'form' | 'button' | 'submit' | 'reset' | 'alert' | 'app' | 'audio' | 'avatar' | 'button-group' | 'button-toolbar' | 'breadcrumb' | 'card' | 'card2' | 'cards' | 'carousel' | 'chart' | 'calendar' | 'collapse' | 'collapse-group' | 'color' | 'container' | 'crud' | 'crud2' | 'custom' | 'date' | 'static-date' | 'datetime' | 'static-datetime' | 'time' | 'static-time' | 'month' | 'static-month' | 'dialog' | 'spinner' | 'divider' | 'dropdown-button' | 'drawer' | 'each' | 'flex' | 'flex-item' | 'grid' | 'grid-2d' | 'hbox' | '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' | 'panel' | 'plain' | 'text' | 'progress' | 'qrcode' | 'qr-code' | 'barcode' | 'remark' | 'search-box' | 'service' | 'sparkline' | 'status' | 'switch' | 'table' | 'static-table' | 'table2' | 'tabs' | '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' | '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' | 'native-date' | 'native-time' | 'native-number' | 'code' | 'tooltip-wrapper';
-export declare type SchemaObject = PageSchema | TplSchema | RemarkSchema | ActionSchema | AlertSchema | AudioSchema | AvatarSchema | ButtonGroupSchema | ButtonToolbarSchema | CalendarSchema | CardSchema | CardsSchema | CarouselSchema | ChartSchema | CollapseSchema | CollapseGroupSchema | ColorSchema | ContainerSchema | CRUDSchema | CRUD2Schema | DateSchema | DialogSchema | DividerSchema | DrawerSchema | DropdownButtonSchema | EachSchema | GridSchema | Grid2DSchema | HBoxSchema | IconSchema | IFrameSchema | ImageSchema | ImagesSchema | JsonSchema | LinkSchema | ListSchema | MappingSchema | NavSchema | OperationSchema | PaginationSchema | PaginationWrapperSchema | PanelSchema | PlainSchema | ProgressSchema | QRCodeSchema | SearchBoxSchema | ServiceSchema | SparkLineSchema | StatusSchema | SpinnerSchema | TableSchema | TableSchema2 | TabsSchema | TasksSchema | VBoxSchema | VideoSchema | WizardSchema | WrapperSchema | TooltipWrapperSchema | FormSchema | AnchorNavSchema | StepsSchema | PortletSchema | TimelineSchema | FormControlSchema | ArrayControlSchema | ButtonGroupControlSchema | ChainedSelectControlSchema | CheckboxControlSchema | CheckboxesControlSchema | InputCityControlSchema | InputColorControlSchema | ComboControlSchema | ConditionBuilderControlSchema | DateControlSchema | DateTimeControlSchema | TimeControlSchema | MonthControlSchema | 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;
+import { MultilineTextSchema } from './renderers/MultilineText';
+import { DateRangeSchema } from './renderers/DateRange';
+import { PasswordSchema } from './renderers/Password';
+import { WordsSchema } from './renderers/Words';
+export declare type SchemaType = 'form' | 'alert' | 'app' | 'audio' | 'avatar' | 'button-group' | 'breadcrumb' | 'card' | 'card2' | 'cards' | 'carousel' | 'chart' | 'calendar' | 'collapse' | 'collapse-group' | 'color' | 'crud' | 'crud2' | 'custom' | 'date' | 'static-date' | 'datetime' | 'static-datetime' | 'time' | 'static-time' | 'month' | 'static-month' | 'date-range' | 'dialog' | 'spinner' | 'divider' | 'dropdown-button' | 'drawer' | 'each' | 'flex' | 'flex-item' | 'grid-2d' | 'icon' | 'iframe' | 'image' | 'static-image' | 'images' | 'static-images' | 'json-schema' | 'json-schema-editor' | 'json' | 'static-json' | 'link' | 'list' | 'log' | 'static-list' | 'map' | 'mapping' | 'markdown' | 'nav' | 'page' | 'pagination' | 'pagination-wrapper' | 'property' | 'operation' | 'plain' | 'text' | 'progress' | 'qrcode' | 'qr-code' | 'barcode' | 'remark' | 'search-box' | 'sparkline' | 'status' | 'table' | 'static-table' | 'table2' | 'html' | 'tpl' | 'tasks' | 'vbox' | 'video' | 'wizard' | 'wrapper' | 'web-component' | 'anchor-nav' | 'steps' | 'timeline' | 'control' | 'input-array' | 'button' | 'submit' | 'reset' | 'button-group-select' | 'button-toolbar' | 'chained-select' | 'chart-radios' | 'checkbox' | 'checkboxes' | 'input-city' | 'input-color' | 'combo' | 'condition-builder' | 'container' | 'input-date' | 'input-datetime' | 'input-time' | 'input-quarter' | 'input-year' | 'input-month' | 'input-date-range' | 'input-time-range' | 'input-datetime-range' | 'input-excel' | 'input-formula' | 'diff-editor' | 'editor' | 'bat-editor' | 'c-editor' | 'coffeescript-editor' | 'cpp-editor' | 'csharp-editor' | 'css-editor' | 'dockerfile-editor' | 'fsharp-editor' | 'go-editor' | 'handlebars-editor' | 'html-editor' | 'ini-editor' | 'java-editor' | 'javascript-editor' | 'json-editor' | 'less-editor' | 'lua-editor' | 'markdown-editor' | 'msdax-editor' | 'objective-c-editor' | 'php-editor' | 'plaintext-editor' | 'postiats-editor' | 'powershell-editor' | 'pug-editor' | 'python-editor' | 'r-editor' | 'razor-editor' | 'ruby-editor' | 'sb-editor' | 'scss-editor' | 'sol-editor' | 'sql-editor' | 'swift-editor' | 'typescript-editor' | 'vb-editor' | 'xml-editor' | 'yaml-editor' | 'fieldset' | 'fieldSet' | 'input-file' | 'formula' | 'grid' | 'group' | 'hbox' | 'hidden' | 'icon-picker' | 'icon-select' | 'input-image' | 'input-group' | 'list-select' | 'location-picker' | 'matrix-checkboxes' | 'input-month-range' | 'input-quarter-range' | 'nested-select' | 'input-number' | 'panel' | 'picker' | 'radios' | 'input-range' | 'input-rating' | 'input-repeat' | 'input-rich-text' | 'select' | 'service' | 'static' | 'input-sub-form' | 'switch' | 'input-table' | 'tabs' | 'tabs-transfer' | 'input-tag' | 'input-text' | 'input-password' | 'input-email' | 'input-url' | 'uuid' | 'multi-select' | 'textarea' | 'transfer' | 'transfer-picker' | 'tabs-transfer-picker' | 'input-tree' | 'tree-select' | 'table-view' | 'portlet' | 'grid-nav' | 'users-select' | 'tag' | 'tags' | 'words' | 'password' | 'multiline-text' | 'native-date' | 'native-time' | 'native-number' | 'code' | 'tooltip-wrapper';
+export declare type SchemaObject = PageSchema | TplSchema | RemarkSchema | ActionSchema | AlertSchema | AudioSchema | AvatarSchema | ButtonGroupSchema | ButtonToolbarSchema | CalendarSchema | CardSchema | CardsSchema | CarouselSchema | ChartSchema | CollapseSchema | CollapseGroupSchema | ColorSchema | ContainerSchema | CRUDSchema | CRUD2Schema | DateSchema | DialogSchema | DividerSchema | DrawerSchema | DropdownButtonSchema | EachSchema | GridSchema | Grid2DSchema | HBoxSchema | IconSchema | IFrameSchema | ImageSchema | ImagesSchema | JsonSchema | LinkSchema | ListSchema | MappingSchema | NavSchema | OperationSchema | PaginationSchema | PaginationWrapperSchema | PanelSchema | PlainSchema | ProgressSchema | QRCodeSchema | SearchBoxSchema | ServiceSchema | SparkLineSchema | StatusSchema | SpinnerSchema | TableSchema | TableSchema2 | TabsSchema | TasksSchema | VBoxSchema | VideoSchema | WizardSchema | WrapperSchema | TooltipWrapperSchema | FormSchema | AnchorNavSchema | StepsSchema | PortletSchema | TimelineSchema | FormControlSchema | ArrayControlSchema | ButtonGroupControlSchema | ChainedSelectControlSchema | CheckboxControlSchema | CheckboxesControlSchema | InputCityControlSchema | InputColorControlSchema | ComboControlSchema | ConditionBuilderControlSchema | DateControlSchema | DateTimeControlSchema | TimeControlSchema | MonthControlSchema | QuarterControlSchema | YearControlSchema | DateRangeControlSchema | DiffControlSchema | EditorControlSchema | FieldSetControlSchema | FileControlSchema | FormulaControlSchema | GroupControlSchema | HiddenControlSchema | IconPickerControlSchema | ImageControlSchema | InputGroupControlSchema | ListControlSchema | JSONSchemaEditorControlSchema | LocationControlSchema | UUIDControlSchema | MatrixControlSchema | MonthRangeControlSchema | QuarterRangeControlSchema | NestedSelectControlSchema | NumberControlSchema | PickerControlSchema | RadiosControlSchema | RangeControlSchema | RatingControlSchema | RichTextControlSchema | RepeatControlSchema | SelectControlSchema | SubFormControlSchema | SwitchControlSchema | StaticExactControlSchema | TableControlSchema | TabsTransferControlSchema | TagControlSchema | TextControlSchema | TextareaControlSchema | TransferControlSchema | TransferPickerControlSchema | TabsTransferPickerControlSchema | TreeControlSchema | TreeSelectControlSchema | UserSelectControlSchema | DateRangeSchema | MultilineTextSchema | PasswordSchema | WordsSchema;
 export declare type SchemaCollection = SchemaObject | SchemaTpl | Array<SchemaObject | SchemaTpl>;
 export interface SchemaApiObject {
     /**

package/esm/compat.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/index.d.ts

@@ -82,6 +82,7 @@ import './renderers/Form/TransferPicker';
 import './renderers/Form/InputTable';
 import './renderers/Form/Picker';
 import './renderers/Form/IconPicker';
+import './renderers/Form/IconSelect';
 import './renderers/Form/Formula';
 import './renderers/Form/FieldSet';
 import './renderers/Form/TabsTransfer';
@@ -141,6 +142,11 @@ import './renderers/GridNav';
 import './renderers/TooltipWrapper';
 import './renderers/Tag';
 import './renderers/Table2/index';
+import './renderers/Words';
+import './renderers/Password';
+import './renderers/DateRange';
+import './renderers/MultilineText';
 import './compat';
 import './schemaExtend';
 export * from './renderers/Form/IconPickerIcons';
+export * from './renderers/Form/IconSelectStore';

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -80,6 +80,7 @@ import './renderers/Form/TransferPicker.js';
 import './renderers/Form/InputTable.js';
 import './renderers/Form/Picker.js';
 import './renderers/Form/IconPicker.js';
+import './renderers/Form/IconSelect.js';
 import './renderers/Form/Formula.js';
 import './renderers/Form/FieldSet.js';
 import './renderers/Form/TabsTransfer.js';
@@ -139,6 +140,11 @@ import './renderers/GridNav.js';
 import './renderers/TooltipWrapper.js';
 import './renderers/Tag.js';
 import './renderers/Table2/index.js';
+import './renderers/Words.js';
+import './renderers/Password.js';
+import './renderers/DateRange.js';
+import './renderers/MultilineText.js';
 import './compat.js';
 import './schemaExtend.js';
 export { ICONS, setIconVendor } from './renderers/Form/IconPickerIcons.js';
+export { mountIconSpiriteToDom, refreshIconList, setRefreshSvgListAction, setSvgIconList, svgIcons } from './renderers/Form/IconSelectStore.js';

package/esm/preset.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -311,7 +311,7 @@ var ActionRenderer = /** @class */ (function (_super) {
     };
     ActionRenderer.prototype.handleAction = function (e, action) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, env, onAction, data, ignoreConfirm, dispatchEvent, $schema, mergedData, hasOnEvent, confirmed, rendererEvent, rendererEvent;
+            var _a, env, onAction, data, ignoreConfirm, dispatchEvent, $schema, mergedData, hasOnEvent, confirmText, confirmed, rendererEvent, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -321,11 +321,15 @@ var ActionRenderer = /** @class */ (function (_super) {
                             mergedData = createObject(data, action.args);
                         }
                         hasOnEvent = $schema.onEvent && Object.keys($schema.onEvent).length;
-                        if (!((!ignoreConfirm || hasOnEvent) && action.confirmText && env.confirm)) return [3 /*break*/, 6];
-                        return [4 /*yield*/, env.confirm(filter(action.confirmText, mergedData))];
+                        confirmText = '';
+                        if (!((!ignoreConfirm || hasOnEvent) &&
+                            action.confirmText &&
+                            env.confirm &&
+                            (confirmText = filter(action.confirmText, mergedData)))) return [3 /*break*/, 5];
+                        return [4 /*yield*/, env.confirm(confirmText)];
                     case 1:
                         confirmed = _b.sent();
-                        if (!confirmed) return [3 /*break*/, 4];
+                        if (!confirmed) return [3 /*break*/, 3];
                         return [4 /*yield*/, dispatchEvent(e, mergedData)];
                     case 2:
                         rendererEvent = _b.sent();
@@ -334,29 +338,24 @@ var ActionRenderer = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         // 因为crud里面也会处理二次确认，所以如果按钮处理过了就跳过crud的二次确认
-                        return [4 /*yield*/, onAction(e, __assign(__assign({}, action), { ignoreConfirm: !!hasOnEvent }), mergedData)];
+                        onAction(e, __assign(__assign({}, action), { ignoreConfirm: !!hasOnEvent }), mergedData);
+                        return [3 /*break*/, 4];
                     case 3:
-                        // 因为crud里面也会处理二次确认，所以如果按钮处理过了就跳过crud的二次确认
-                        _b.sent();
-                        return [3 /*break*/, 5];
-                    case 4:
                         if (action.countDown) {
                             throw new Error('cancel');
                         }
-                        _b.label = 5;
-                    case 5: return [3 /*break*/, 9];
-                    case 6: return [4 /*yield*/, dispatchEvent(e, mergedData)];
-                    case 7:
+                        _b.label = 4;
+                    case 4: return [3 /*break*/, 7];
+                    case 5: return [4 /*yield*/, dispatchEvent(e, mergedData)];
+                    case 6:
                         rendererEvent = _b.sent();
                         // 阻止原有动作执行
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
-                        return [4 /*yield*/, onAction(e, action, mergedData)];
-                    case 8:
-                        _b.sent();
-                        _b.label = 9;
-                    case 9: return [2 /*return*/];
+                        onAction(e, action, mergedData);
+                        _b.label = 7;
+                    case 7: return [2 /*return*/];
                 }
             });
         });

package/esm/renderers/Alert.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/AnchorNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/App.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Audio.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Avatar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/BarCode.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Breadcrumb.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/ButtonGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/CRUD.d.ts

@@ -271,9 +271,9 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     handleSelect(items: Array<any>, unSelectedItems: Array<any>): void;
     handleChildPopOverOpen(popOver: any): void;
     handleChildPopOverClose(popOver: any): void;
-    handleQuery(values: object, forceReload?: boolean, replace?: boolean): void;
-    reload(subpath?: string, query?: any, replace?: boolean): void;
-    receive(values: object, subPath?: string, replace?: boolean): void;
+    handleQuery(values: object, forceReload?: boolean, replace?: boolean, resetPage?: boolean): void;
+    reload(subpath?: string, query?: any, replace?: boolean, resetPage?: boolean): void;
+    receive(values: object, subPath?: string, replace?: boolean, resetPage?: boolean): void;
     reloadTarget(target: string, data: any): void;
     closeTarget(target: string): void;
     doAction(action: ActionObject, data: object, throwErrors?: boolean): any;
@@ -298,8 +298,8 @@ export declare class CRUDRenderer extends CRUD {
     static contextType: React.Context<IScopedContext>;
     constructor(props: CRUDProps, context: IScopedContext);
     componentWillUnmount(): void;
-    reload(subpath?: string, query?: any, ctx?: any, silent?: boolean, replace?: boolean): void;
-    receive(values: any, subPath?: string, replace?: boolean): void;
+    reload(subpath?: string, query?: any, ctx?: any, silent?: boolean, replace?: boolean, args?: any): void;
+    receive(values: any, subPath?: string, replace?: boolean, resetPage?: boolean): void;
     reloadTarget(target: string, data: any): void;
     closeTarget(target: string): void;
 }

package/esm/renderers/CRUD.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -235,7 +235,7 @@ var CRUD = /** @class */ (function (_super) {
         })
             .filter(function (item) { return item; })
             .join(',');
-        var ctx = createObject(store.mergedData, __assign(__assign({}, selectedItems[0]), { rows: selectedItems, items: selectedItems, selectedItems: selectedItems, unSelectedItems: unSelectedItems, ids: ids }));
+        var ctx = createObject(store.mergedData, __assign(__assign({}, selectedItems[0]), { currentPageData: store.mergedData.items.concat(), rows: selectedItems, items: selectedItems, selectedItems: selectedItems, unSelectedItems: unSelectedItems, ids: ids }));
         var fn = function () {
             if (action.actionType === 'dialog') {
                 return _this.handleAction(e, __assign(__assign({}, action), { __from: 'bulkAction' }), ctx);
@@ -280,10 +280,12 @@ var CRUD = /** @class */ (function (_super) {
             }
         };
         // Action如果配了事件动作也会处理二次确认，这里需要处理一下忽略
-        if (!action.ignoreConfirm && action.confirmText && env.confirm) {
-            env
-                .confirm(filter(action.confirmText, ctx))
-                .then(function (confirmed) { return confirmed && fn(); });
+        var confirmText = '';
+        if (!action.ignoreConfirm &&
+            action.confirmText &&
+            env.confirm &&
+            (confirmText = filter(action.confirmText, ctx))) {
+            env.confirm(confirmText).then(function (confirmed) { return confirmed && fn(); });
         }
         else {
             fn();
@@ -341,9 +343,11 @@ var CRUD = /** @class */ (function (_super) {
         var _this = this;
         var action = this.props.store.selectedAction;
         var env = this.props.env;
-        if (action.confirmText) {
+        var confirmText = '';
+        if (action.confirmText &&
+            (confirmText = filter(action.confirmText, this.props.store.mergedData))) {
             return env
-                .confirm(action.confirmText)
+                .confirm(confirmText)
                 .then(function (confirmed) {
                 return confirmed &&
                     _this.handleBulkAction(selectedItems, unSelectedItems, e, action);
@@ -719,7 +723,7 @@ var CRUD = /** @class */ (function (_super) {
         }
         store.setSelectedItems(newItems);
         store.setUnSelectedItems(newUnSelectedItems);
-        onSelect && onSelect(newItems);
+        onSelect && onSelect(newItems, newUnSelectedItems);
     };
     CRUD.prototype.handleChildPopOverOpen = function (popOver) {
         if (this.props.interval &&
@@ -738,25 +742,26 @@ var CRUD = /** @class */ (function (_super) {
             }
         }
     };
-    CRUD.prototype.handleQuery = function (values, forceReload, replace) {
+    CRUD.prototype.handleQuery = function (values, forceReload, replace, resetPage) {
         var _a;
         if (forceReload === void 0) { forceReload = false; }
         var _b = this.props, store = _b.store, syncLocation = _b.syncLocation, env = _b.env, pageField = _b.pageField, perPageField = _b.perPageField;
-        store.updateQuery(__assign(__assign({}, values), (_a = {}, _a[pageField || 'page'] = 1, _a)), syncLocation && env && env.updateLocation
+        store.updateQuery(resetPage
+            ? __assign((_a = {}, _a[pageField || 'page'] = 1, _a), values) : values, syncLocation && env && env.updateLocation
             ? env.updateLocation
             : undefined, pageField, perPageField, replace);
         this.search(undefined, undefined, undefined, forceReload);
     };
-    CRUD.prototype.reload = function (subpath, query, replace) {
+    CRUD.prototype.reload = function (subpath, query, replace, resetPage) {
         if (query) {
-            return this.receive(query, undefined, replace);
+            return this.receive(query, undefined, replace, resetPage);
         }
         else {
             this.search(undefined, undefined, true, true);
         }
     };
-    CRUD.prototype.receive = function (values, subPath, replace) {
-        this.handleQuery(values, true, replace);
+    CRUD.prototype.receive = function (values, subPath, replace, resetPage) {
+        this.handleQuery(values, true, replace, resetPage);
     };
     CRUD.prototype.reloadTarget = function (target, data) {
         // implement this.
@@ -817,6 +822,7 @@ var CRUD = /** @class */ (function (_super) {
         var bulkBtns = [];
         var itemBtns = [];
         var ctx = createObject(store.mergedData, {
+            currentPageData: store.mergedData.items.concat(),
             selectedItems: selectedItems.concat(),
             unSelectedItems: unSelectedItems.concat()
         });
@@ -929,13 +935,13 @@ var CRUD = /** @class */ (function (_super) {
             __('CRUD.filter')));
     };
     CRUD.prototype.renderExportCSV = function (toolbar) {
-        var _a = this.props, store = _a.store, ns = _a.classPrefix; _a.classnames; var __ = _a.translate, loadDataOnce = _a.loadDataOnce, data = _a.data;
+        var _a = this.props, store = _a.store, ns = _a.classPrefix, __ = _a.translate, loadDataOnce = _a.loadDataOnce;
         var api = toolbar.api;
         return (React.createElement(Button, { classPrefix: ns, onClick: function () {
                 return store.exportAsCSV({
                     loadDataOnce: loadDataOnce,
                     api: api,
-                    data: data
+                    data: store.filterData /* 因为filter区域可能设置了过滤字段值，所以query信息也要写入数据域 */
                 });
             } }, toolbar.label || __('CRUD.exportCSV')));
     };
@@ -1240,19 +1246,20 @@ var CRUD = /** @class */ (function (_super) {
         var scoped = this.context;
         scoped.unRegisterComponent(this);
     };
-    CRUDRenderer.prototype.reload = function (subpath, query, ctx, silent, replace) {
+    CRUDRenderer.prototype.reload = function (subpath, query, ctx, silent, replace, args) {
+        var _a;
         var scoped = this.context;
         if (subpath) {
             return scoped.reload(query ? "".concat(subpath, "?").concat(qsstringify(query)) : subpath, ctx);
         }
-        return _super.prototype.reload.call(this, subpath, query, replace);
+        return _super.prototype.reload.call(this, subpath, query, replace, (_a = args === null || args === void 0 ? void 0 : args.resetPage) !== null && _a !== void 0 ? _a : true);
     };
-    CRUDRenderer.prototype.receive = function (values, subPath, replace) {
+    CRUDRenderer.prototype.receive = function (values, subPath, replace, resetPage) {
         var scoped = this.context;
         if (subPath) {
             return scoped.send(subPath, values);
         }
-        return _super.prototype.receive.call(this, values, undefined, replace);
+        return _super.prototype.receive.call(this, values, undefined, replace, resetPage);
     };
     CRUDRenderer.prototype.reloadTarget = function (target, data) {
         var scoped = this.context;

package/esm/renderers/CRUD2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Card.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Card2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Cards.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Carousel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Chart.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { RendererProps } from 'amis-core';
+import { ActionObject, RendererProps } from 'amis-core';
 import { IServiceStore } from 'amis-core';
 import { IScopedContext } from 'amis-core';
 import { BaseSchema, SchemaApi, SchemaExpression, SchemaFunction, SchemaName, SchemaTokenizeableString } from '../Schema';
@@ -76,6 +76,18 @@ export interface ChartSchema extends BaseSchema {
      * 不可见的时候隐藏
      */
     unMountOnHidden?: boolean;
+    /**
+     * 获取 geo json 文件的地址
+     */
+    mapURL?: string;
+    /**
+     * 地图名称
+     */
+    mapName?: string;
+    /**
+     * 加载百度地图
+     */
+    loadBaiduMap?: boolean;
 }
 export interface ChartProps extends RendererProps, Omit<ChartSchema, 'type' | 'className'> {
     chartRef?: (echart: any) => void;
@@ -100,8 +112,10 @@ export declare class Chart extends React.Component<ChartProps> {
     componentDidMount(): void;
     componentDidUpdate(prevProps: ChartProps): void;
     componentWillUnmount(): void;
-    handleClick(ctx: object): void;
+    handleClick(ctx: object): Promise<void>;
+    dispatchEvent(ctx: any): void;
     refFn(ref: any): void;
+    doAction(action: ActionObject, data: object, throwErrors?: boolean): any;
     reload(subpath?: string, query?: any, ctx?: any, silent?: boolean, replace?: boolean): void;
     receive(data: object, subPath?: string, replace?: boolean): void;
     renderChart(config?: object, data?: any): void;