amis-core 3.5.3 → 3.6.1

package/esm/store/combo.d.ts

@@ -165,7 +165,7 @@ export declare const UniqueGroup: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -674,7 +674,7 @@ export declare const UniqueGroup: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -1215,7 +1215,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -1724,7 +1724,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -2354,7 +2354,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -2863,7 +2863,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -3376,7 +3376,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -3885,7 +3885,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -4403,7 +4403,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -4912,7 +4912,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -5425,7 +5425,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -5934,7 +5934,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -6447,7 +6447,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -6956,7 +6956,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -7588,7 +7588,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -8097,7 +8097,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -8610,7 +8610,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -9119,7 +9119,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -9637,7 +9637,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -10146,7 +10146,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -10659,7 +10659,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -11168,7 +11168,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -11681,7 +11681,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -12190,7 +12190,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;

package/esm/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.1
  * Copyright 2018-2023 fex
  */
 

package/esm/store/crud.d.ts

@@ -1,11 +1,17 @@
 import { Instance } from 'mobx-state-tree';
 import { Api, fetchOptions, ActionObject } from '../types';
+import type { MatchSorterOptions } from 'match-sorter';
 interface MatchFunc {
     (items: any, itemsRaw: any, 
     /** 相关配置 */
     options?: {
         query: Record<string, any>;
         columns: any;
+        /**
+         * match-sorter 匹配函数
+         * @doc https://github.com/kentcdodds/match-sorter
+         */
+        matchSorter: (items: any[], value: string, options?: MatchSorterOptions<any>) => any[];
     }): any;
 }
 export declare const CRUDStore: import("mobx-state-tree").IModelType<{
@@ -120,7 +126,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
         columns?: Array<any>;
         isTable2?: Boolean;
     }) => Promise<any>;
-    changePage: (page: number, perPage?: number | string) => void;
+    changePage: (page: number | string, perPage?: number | string) => void;
     changePerPage: (perPage: number | string) => void;
     selectAction: (action: ActionObject) => void;
     saveRemote: (api: Api, data?: object, options?: fetchOptions) => Promise<any>;
@@ -138,6 +144,8 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
         api?: Api | undefined;
         data?: any;
         filename?: string | undefined;
+        pageField?: string | undefined;
+        perPageField?: string | undefined;
     }) => Promise<void>;
     updateColumns: (columns: Array<any>) => void;
     updateTotal: (total: number) => void;

package/esm/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.1
  * Copyright 2018-2023 fex
  */
 
@@ -140,7 +140,8 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                         if (matchFunc && typeof matchFunc === 'function') {
                             items_1 = matchFunc(items_1, self.data.itemsRaw, {
                                 query: self.query,
-                                columns: options.columns
+                                columns: options.columns,
+                                matchSorter: matchSorter
                             });
                         }
                         else {
@@ -266,8 +267,11 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                         }
                         data_2 = __assign(__assign(__assign({}, (api.replaceData ? {} : self.pristine)), { items: rowsData, count: count, total: total }), rest);
                         if (options.loadDataOnce) {
-                            // 记录原始集合，后续可能基于原始数据做排序查找。
-                            data_2.itemsRaw = oItems || oRows;
+                            /**
+                             * 1. 记录原始集合，后续可能基于原始数据做排序查找。
+                             * 2. 接口返回中没有 items 和 rows 字段，则直接用查到的数据。
+                             */
+                            data_2.itemsRaw = oItems || oRows || rowsData.concat();
                             filteredItems_1 = rowsData.concat();
                             if (Array.isArray(options.columns)) {
                                 options.columns.forEach(function (column) {
@@ -351,11 +355,13 @@ var CRUDStore = ServiceStore.named('CRUDStore')
         });
     });
     function changePage(page, perPage) {
-        self.page = page;
+        var pageNum = typeof page !== 'number' ? parseInt(page, 10) : page;
+        self.page = isNaN(pageNum) ? 1 : pageNum;
         perPage && changePerPage(perPage);
     }
     function changePerPage(perPage) {
-        self.perPage = parseInt(perPage, 10);
+        var perPageNum = typeof perPage !== 'number' ? parseInt(perPage, 10) : perPage;
+        self.perPage = isNaN(perPageNum) ? 10 : perPageNum;
     }
     function selectAction(action) {
         self.selectedAction = action;
@@ -453,7 +459,8 @@ var CRUDStore = ServiceStore.named('CRUDStore')
         if (matchFunc && typeof matchFunc === 'function') {
             items = matchFunc(items, items.concat(), {
                 query: self.query,
-                columns: options.columns
+                columns: options.columns,
+                matchSorter: matchSorter
             });
         }
         else {
@@ -469,6 +476,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                             if (value.length > 0) {
                                 var arr_3 = __spreadArray([], __read(items), false);
                                 var arrItems_3 = [];
+                                /** 搜索 query 值为数组的情况 */
                                 value.forEach(function (item) {
                                     arrItems_3 = __spreadArray(__spreadArray([], __read(arrItems_3), false), __read(matchSorter(arr_3, item, {
                                         keys: [key],
@@ -504,19 +512,27 @@ var CRUDStore = ServiceStore.named('CRUDStore')
     var exportAsCSV = function (options) {
         if (options === void 0) { options = {}; }
         return __awaiter(void 0, void 0, void 0, function () {
-            var items, filename, env, res;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var items, filename, pageField, perPageField, env, ctx, res;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         items = options.loadDataOnce ? self.data.itemsRaw : self.data.items;
                         filename = options.filename
                             ? filter(options.filename, options.data, '| raw')
                             : 'data';
                         if (!options.api) return [3 /*break*/, 2];
+                        pageField = options.pageField || 'page';
+                        perPageField = options.perPageField || 'perPage';
                         env = getEnv(self);
-                        return [4 /*yield*/, env.fetcher(options.api, options.data)];
+                        ctx = createObject(self.data, __assign(__assign(__assign({}, self.query), options.data), (_a = {}, _a[pageField] = self.page || 1, _a[perPageField] = self.perPage || 10, _a)));
+                        return [4 /*yield*/, env.fetcher(options.api, ctx, {
+                                autoAppend: true,
+                                pageField: pageField,
+                                perPageField: perPageField
+                            })];
                     case 1:
-                        res = _a.sent();
+                        res = _b.sent();
                         if (!res.data) {
                             return [2 /*return*/];
                         }
@@ -526,7 +542,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                         else {
                             items = res.data.rows || res.data.items;
                         }
-                        _a.label = 2;
+                        _b.label = 2;
                     case 2:
                         import('papaparse').then(function (papaparse) {
                             var e_4, _a;

package/esm/store/form.d.ts

@@ -243,7 +243,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -752,7 +752,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -1266,7 +1266,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -1775,7 +1775,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -2293,7 +2293,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -2802,7 +2802,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -3315,7 +3315,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -3824,7 +3824,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -4337,7 +4337,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -4846,7 +4846,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, ctx: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "formInited" | "defaultValue" | "input" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;

package/esm/store/form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.1
  * Copyright 2018-2023 fex
  */
 

package/esm/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.1
  * Copyright 2018-2023 fex
  */
 
@@ -327,7 +327,7 @@ var FormItemStore = StoreNode.named('FormItemStore')
     }
     var validateCancel = null;
     var validate$1 = flow(function validate$1(data, hook, customRules) {
-        var json, combo, group;
+        var json, err_1, combo, group;
         var _a;
         var _b, _c, _d, _e, _f;
         return __generator(this, function (_g) {
@@ -345,24 +345,33 @@ var FormItemStore = StoreNode.named('FormItemStore')
                     _g.label = 2;
                 case 2:
                     addError(validate(self.tmpValue, data, customRules ? str2rules(customRules) : self.rules, self.messages, self.__));
-                    if (!(!self.errors.length && isEffectiveApi(self.validateApi, data))) return [3 /*break*/, 4];
+                    if (!(!self.errors.length && isEffectiveApi(self.validateApi, data))) return [3 /*break*/, 6];
                     if (validateCancel) {
                         validateCancel();
                         validateCancel = null;
                     }
+                    _g.label = 3;
+                case 3:
+                    _g.trys.push([3, 5, , 6]);
                     return [4 /*yield*/, getEnv(self).fetcher(self.validateApi, 
                         /** 如果配置validateApi，需要将用户最新输入同步到数据域内 */
                         createObject(data, (_a = {}, _a[self.name] = self.tmpValue, _a)), {
-                            cancelExecutor: function (executor) { return (validateCancel = executor); }
+                            cancelExecutor: function (executor) {
+                                return (validateCancel = executor);
+                            }
                         })];
-                case 3:
+                case 4:
                     json = _g.sent();
                     validateCancel = null;
                     if (!json.ok && json.status === 422 && json.errors) {
                         addError(String((_d = (_c = (_b = self.validateApi) === null || _b === void 0 ? void 0 : _b.messages) === null || _c === void 0 ? void 0 : _c.failed) !== null && _d !== void 0 ? _d : (json.errors || json.msg || "\u8868\u5355\u9879\u300C".concat(self.name, "\u300D\u6821\u9A8C\u5931\u8D25"))));
                     }
-                    _g.label = 4;
-                case 4:
+                    return [3 /*break*/, 6];
+                case 5:
+                    err_1 = _g.sent();
+                    addError(String(err_1));
+                    return [3 /*break*/, 6];
+                case 6:
                     self.validated = true;
                     if (self.unique && ((_f = (_e = self.form) === null || _e === void 0 ? void 0 : _e.parentStore) === null || _f === void 0 ? void 0 : _f.storeType) === 'ComboStore') {
                         combo = self.form.parentStore;

package/esm/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.1
  * Copyright 2018-2023 fex
  */
 

package/esm/store/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.1
  * Copyright 2018-2023 fex
  */
 

package/esm/store/list.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.1
  * Copyright 2018-2023 fex
  */
 

package/esm/store/manager.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.1
  * Copyright 2018-2023 fex
  */
 

package/esm/store/modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.1
  * Copyright 2018-2023 fex
  */
 

package/esm/store/node.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.1
  * Copyright 2018-2023 fex
  */
 

package/esm/store/pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.1
  * Copyright 2018-2023 fex
  */
 

package/esm/store/root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.1
  * Copyright 2018-2023 fex
  */
 

package/esm/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.1
  * Copyright 2018-2023 fex
  */
 

package/esm/store/status.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.1
  * Copyright 2018-2023 fex
  */