amis-core 3.1.1 → 3.3.0

package/lib/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -98,7 +98,7 @@ var ServiceStore = iRenderer.iRendererStore
                     reInitData(data_1, replace);
                     self.hasRemoteData = true;
                     if (!(options && options.onSuccess)) return [3 /*break*/, 4];
-                    ret = options.onSuccess(json);
+                    ret = options.onSuccess(json, data_1);
                     if (!(ret && ret.then)) return [3 /*break*/, 4];
                     return [4 /*yield*/, ret];
                 case 3:
@@ -175,7 +175,7 @@ var ServiceStore = iRenderer.iRendererStore
                     return [3 /*break*/, 5];
                 case 2:
                     if (!(options && options.onSuccess)) return [3 /*break*/, 4];
-                    ret = options.onSuccess(json);
+                    ret = options.onSuccess(json, json.data);
                     if (!(ret && ret.then)) return [3 /*break*/, 4];
                     return [4 /*yield*/, ret];
                 case 3:
@@ -246,7 +246,7 @@ var ServiceStore = iRenderer.iRendererStore
                     throw new errors.ServerError(self.msg, json);
                 case 4:
                     if (!(options && options.onSuccess)) return [3 /*break*/, 6];
-                    ret = options.onSuccess(json);
+                    ret = options.onSuccess(json, json.data);
                     if (!(ret && ret.then)) return [3 /*break*/, 6];
                     return [4 /*yield*/, ret];
                 case 5:
@@ -291,12 +291,12 @@ var ServiceStore = iRenderer.iRendererStore
     });
     var fetchSchema = mobxStateTree.flow(function fetchSchema(api$1, data, options) {
         var json, env, e_4, env, message;
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (options === void 0) { options = {}; }
-        return tslib.__generator(this, function (_h) {
-            switch (_h.label) {
+        return tslib.__generator(this, function (_j) {
+            switch (_j.label) {
                 case 0:
-                    _h.trys.push([0, 2, , 3]);
+                    _j.trys.push([0, 2, , 3]);
                     options = tslib.__assign(tslib.__assign({ method: 'post' }, options), { cancelExecutor: function (executor) { return (fetchSchemaCancel = executor); } });
                     if (fetchSchemaCancel) {
                         fetchSchemaCancel();
@@ -317,7 +317,7 @@ var ServiceStore = iRenderer.iRendererStore
                     }
                     return [4 /*yield*/, mobxStateTree.getEnv(self).fetcher(api$1, data, options)];
                 case 1:
-                    json = _h.sent();
+                    json = _j.sent();
                     fetchSchemaCancel = null;
                     if (!json.ok) {
                         updateMessage((_d = (_c = (_b = (_a = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : json.msg) !== null && _c !== void 0 ? _c : (options && options.errorMessage)) !== null && _d !== void 0 ? _d : self.__('fetchFailed'), true);
@@ -334,12 +334,17 @@ var ServiceStore = iRenderer.iRendererStore
                             json.data = replaceText.replaceText(json.data, env.replaceText, env.replaceTextIgnoreKeys);
                             self.schema = Array.isArray(json.data)
                                 ? json.data
-                                : tslib.__assign({ type: 'wrapper', wrap: false }, api.normalizeApiResponseData(json.data));
+                                : Object.assign(((_e = json.data) === null || _e === void 0 ? void 0 : _e.type)
+                                    ? {}
+                                    : {
+                                        type: 'wrapper',
+                                        wrap: false
+                                    }, api.normalizeApiResponseData(json.data));
                             self.schemaKey = '' + Date.now();
                             object.isObject(json.data.data) &&
                                 self.updateData(json.data.data, undefined, !!api$1.replaceData);
                         }
-                        updateMessage((_g = (_f = (_e = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _e === void 0 ? void 0 : _e.success) !== null && _f !== void 0 ? _f : json.msg) !== null && _g !== void 0 ? _g : (options && options.successMessage));
+                        updateMessage((_h = (_g = (_f = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _f === void 0 ? void 0 : _f.success) !== null && _g !== void 0 ? _g : json.msg) !== null && _h !== void 0 ? _h : (options && options.successMessage));
                         // 配置了获取成功提示后提示，默认是空不会提示。
                         options &&
                             options.successMessage &&
@@ -348,7 +353,7 @@ var ServiceStore = iRenderer.iRendererStore
                     self.initializing = false;
                     return [2 /*return*/, json.data];
                 case 2:
-                    e_4 = _h.sent();
+                    e_4 = _j.sent();
                     env = mobxStateTree.getEnv(self);
                     self.initializing = false;
                     if (!mobxStateTree.isAlive(self) || self.disposed) {

package/lib/store/status.js

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