amis-core 6.2.2 → 6.4.0

package/esm/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 

package/esm/store/crud.d.ts

@@ -79,11 +79,11 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
-    setCurrentAction(action: object): void;
-    openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
-    closeDialog(result?: any): void;
-    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
-    closeDrawer(result?: any): void;
+    setCurrentAction(action: any, resolveDefinitions?: ((schema: any) => any) | undefined): void;
+    openDialog(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, values: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
+    closeDialog(confirmed?: any, data?: any): void;
+    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
+    closeDrawer(confirmed?: any, data?: any): void;
     getDialogScoped(): import("..").IScopedContext | null;
     getDrawerScoped(): import("..").IScopedContext | null;
 } & {

package/esm/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -23,9 +23,10 @@ import { TableStore } from './table.js';
 
 var ServerError = /** @class */ (function (_super) {
     __extends(ServerError, _super);
-    function ServerError() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+    function ServerError(msg, response) {
+        var _this = _super.call(this, msg) || this;
         _this.type = 'ServerError';
+        _this.response = response;
         return _this;
     }
     return ServerError;
@@ -396,7 +397,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                                     timeout: json.msgTimeout
                                 }
                                 : undefined);
-                        throw new ServerError(self.msg);
+                        throw new ServerError(self.msg, json);
                     }
                     else {
                         self.updateMessage((_h = (_g = (_f = (_e = api === null || api === void 0 ? void 0 : api.messages) === null || _e === void 0 ? void 0 : _e.success) !== null && _f !== void 0 ? _f : json.msg) !== null && _g !== void 0 ? _g : options.successMessage) !== null && _h !== void 0 ? _h : json.defaultMsg);
@@ -408,13 +409,18 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                                 }
                                 : undefined);
                     }
-                    return [2 /*return*/, json.data];
+                    // 补一个空对象是为了区别于被取消的请求
+                    // 请求被取消时会返回 undefined
+                    return [2 /*return*/, json.data || {}];
                 case 2:
                     e_3 = _j.sent();
-                    self.markSaving(false);
                     if (!isAlive(self) || self.disposed) {
                         return [2 /*return*/];
                     }
+                    self.markSaving(false);
+                    if (getEnv(self).isCancel(e_3)) {
+                        return [2 /*return*/];
+                    }
                     !(api === null || api === void 0 ? void 0 : api.silent) &&
                         e_3.type !== 'ServerError' &&
                         getEnv(self).notify('error', e_3.message);