amis-core 6.8.0 → 6.9.0-rc.0

package/esm/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/store/form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/store/index.d.ts

@@ -122,4 +122,5 @@ export declare const RendererStore: import("mobx-state-tree").IModelType<{
 export type IRendererStore = Instance<typeof RendererStore>;
 export { iRendererStore, IIRendererStore };
 export declare const RegisterStore: (store: any) => void;
+export declare const registerStore: (store: any) => void;
 export { ServiceStore, IServiceStore, FormStore, IFormStore, ComboStore, IComboStore, CRUDStore, ICRUDStore, TableStore, IColumn, IRow, ITableStore, TableStore2, ITableStore2, IColumn2, IRow2, ListStore, IListStore, ModalStore, IModalStore, FormItemStore, IFormItemStore, PaginationStore, IPaginationStore, AppStore, IAppStore, StoreNode, IStoreNode };

package/esm/store/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -86,5 +86,6 @@ var RendererStore = types
 var RegisterStore = function (store) {
     allowedStoreList.push(store);
 };
+var registerStore = RegisterStore;
 
-export { RegisterStore, RendererStore };
+export { RegisterStore, RendererStore, registerStore };

package/esm/store/list.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/store/manager.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/store/modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/store/node.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/store/pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/store/root.d.ts

@@ -33,6 +33,7 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     runtimeError: import("mobx-state-tree").IType<any, any, any>;
     runtimeErrorStack: import("mobx-state-tree").IType<any, any, any>;
     query: import("mobx-state-tree").IType<any, any, any>;
+    ready: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
 }, {
     readonly parentStore: any;
     readonly __: any;
@@ -84,5 +85,6 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     updateContext(context: any): void;
     setRuntimeError(error: any, errorStack: any): void;
     updateLocation(location?: any, parseFn?: Function): void;
+    init: (schema: any) => Promise<any>;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type IRootStore = Instance<typeof RootStore>;

package/esm/store/root.js

@@ -1,10 +1,10 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
-import { __assign } from 'tslib';
-import { types } from 'mobx-state-tree';
+import { __assign, __generator } from 'tslib';
+import { types, flow } from 'mobx-state-tree';
 import { parseQuery, isObjectShallowModified } from '../utils/helper.js';
 import { ServiceStore } from './service.js';
 import '../utils/api.js';
@@ -52,7 +52,8 @@ var RootStore = ServiceStore.named('RootStore')
     .props({
     runtimeError: types.frozen(),
     runtimeErrorStack: types.frozen(),
-    query: types.frozen()
+    query: types.frozen(),
+    ready: false
 })
     .volatile(function (self) {
     return {
@@ -72,22 +73,45 @@ var RootStore = ServiceStore.named('RootStore')
         return result;
     }
 }); })
-    .actions(function (self) { return ({
-    updateContext: function (context) {
-        // 因为 context 不是受控属性，直接共用引用好了
-        // 否则还会触发孩子节点的重新渲染
-        Object.assign(self.context, context);
-    },
-    setRuntimeError: function (error, errorStack) {
-        self.runtimeError = error;
-        self.runtimeErrorStack = errorStack;
-    },
-    updateLocation: function (location, parseFn) {
-        var query = parseFn ? parseFn(location) : parseQuery(location);
-        if (isObjectShallowModified(query, self.query, false)) {
-            self.query = query;
-        }
-    }
-}); });
+    .actions(function (self) {
+    var init = flow(function init(fn) {
+        var ret;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, , 3, 4]);
+                    ret = fn();
+                    if (!(ret === null || ret === void 0 ? void 0 : ret.then)) return [3 /*break*/, 2];
+                    return [4 /*yield*/, ret];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2: return [3 /*break*/, 4];
+                case 3:
+                    self.ready = true;
+                    return [7 /*endfinally*/];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+    return {
+        updateContext: function (context) {
+            // 因为 context 不是受控属性，直接共用引用好了
+            // 否则还会触发孩子节点的重新渲染
+            Object.assign(self.context, context);
+        },
+        setRuntimeError: function (error, errorStack) {
+            self.runtimeError = error;
+            self.runtimeErrorStack = errorStack;
+        },
+        updateLocation: function (location, parseFn) {
+            var query = parseFn ? parseFn(location) : parseQuery(location);
+            if (isObjectShallowModified(query, self.query, false)) {
+                self.query = query;
+            }
+        },
+        init: init
+    };
+});
 
 export { RootStore };

package/esm/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/store/status.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/theme.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/types.d.ts

@@ -181,6 +181,8 @@ export interface BaseApiObject {
 export type ClassName = string | {
     [propName: string]: boolean | undefined | null | string;
 };
+export type RequestAdaptor = (api: ApiObject, context: any) => ApiObject | Promise<ApiObject>;
+export type ResponseAdaptor = (payload: object, response: fetcherResult, api: ApiObject, context: any) => any;
 export interface ApiObject extends BaseApiObject {
     config?: {
         withCredentials?: boolean;
@@ -193,8 +195,8 @@ export interface ApiObject extends BaseApiObject {
     body?: PlainObject;
     query?: PlainObject;
     mockResponse?: PlainObject;
-    adaptor?: (payload: object, response: fetcherResult, api: ApiObject, context: any) => any;
-    requestAdaptor?: (api: ApiObject, context: any) => ApiObject | Promise<ApiObject>;
+    adaptor?: ResponseAdaptor;
+    requestAdaptor?: RequestAdaptor;
     /**
      * api 发送上下文，可以用来传递一些数据给 api 的 adaptor
      * @readonly

package/esm/utils/Animation.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/ColorScale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/DataSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/DataScope.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/RootClose.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/SimpleMap.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/api.d.ts

@@ -1,9 +1,29 @@
-import { Api, ApiObject, EventTrack, fetcherResult, Payload } from '../types';
+import { Api, ApiObject, EventTrack, fetcherResult, Payload, RequestAdaptor, ResponseAdaptor } from '../types';
 import { FetcherConfig } from '../factory';
 interface ApiCacheConfig extends ApiObject {
     cachedPromise: Promise<any>;
     requestTime: number;
 }
+/**
+ * 添加全局发送适配器
+ * @param adaptor
+ */
+export declare function addApiRequestAdaptor(adaptor: RequestAdaptor): () => void;
+/**
+ * 删除全局发送适配器
+ * @param adaptor
+ */
+export declare function removeApiRequestAdaptor(adaptor: RequestAdaptor): void;
+/**
+ * 添加全局响应适配器
+ * @param adaptor
+ */
+export declare function addApiResponseAdator(adaptor: ResponseAdaptor): () => void;
+/**
+ * 删除全局响应适配器
+ * @param adaptor
+ */
+export declare function removeApiResponseAdaptor(adaptor: ResponseAdaptor): void;
 export declare function normalizeApi(api: Api, defaultMethod?: string): ApiObject;
 export declare function buildApi(api: Api, data?: object, options?: {
     autoAppend?: boolean;

package/esm/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -23,6 +23,40 @@ import isEqual from 'lodash/isEqual';
 
 var rSchema = /(?:^|raw\:)(get|post|put|delete|patch|options|head|jsonp|js):/i;
 var apiCaches = [];
+var requestAdaptors = [];
+var responseAdaptors = [];
+/**
+ * 添加全局发送适配器
+ * @param adaptor
+ */
+function addApiRequestAdaptor(adaptor) {
+    requestAdaptors.push(adaptor);
+    return function () { return removeApiRequestAdaptor(adaptor); };
+}
+/**
+ * 删除全局发送适配器
+ * @param adaptor
+ */
+function removeApiRequestAdaptor(adaptor) {
+    var idx = requestAdaptors.findIndex(function (i) { return i === adaptor; });
+    ~idx && requestAdaptors.splice(idx, 1);
+}
+/**
+ * 添加全局响应适配器
+ * @param adaptor
+ */
+function addApiResponseAdator(adaptor) {
+    responseAdaptors.push(adaptor);
+    return function () { return removeApiResponseAdaptor(adaptor); };
+}
+/**
+ * 删除全局响应适配器
+ * @param adaptor
+ */
+function removeApiResponseAdaptor(adaptor) {
+    var idx = responseAdaptors.findIndex(function (i) { return i === adaptor; });
+    ~idx && responseAdaptors.splice(idx, 1);
+}
 var isIE = !!document.documentMode;
 function normalizeApi(api, defaultMethod) {
     if (defaultMethod === void 0) { defaultMethod = 'get'; }
@@ -375,27 +409,57 @@ function wrapFetcher(fn, tracker) {
     var wrappedFetcher = function (api, data, options) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
-            var originQuery, originQueryCopy, idx, apiCache, timeStamp;
+            var adaptors, adaptor_1, apiCache, timeStamp;
+            var _this = this;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         api = buildApi(api, data, options);
                         api.context = data;
-                        if (!api.requestAdaptor) return [3 /*break*/, 2];
-                        debug('api', 'before requestAdaptor', api);
-                        originQuery = api.query;
-                        originQueryCopy = isPlainObject(api.query)
-                            ? cloneDeep(api.query)
-                            : api.query;
-                        return [4 /*yield*/, api.requestAdaptor(api, data)];
-                    case 1:
-                        api = (_d.sent()) || api;
-                        if (api.query !== originQuery ||
-                            (isPlainObject(api.query) && !isEqual(api.query, originQueryCopy))) {
-                            idx = api.url.indexOf('?');
-                            api.url = "".concat(~idx ? api.url.substring(0, idx) : api.url, "?").concat(qsstringify(api.query));
+                        adaptors = requestAdaptors.concat();
+                        if (api.requestAdaptor) {
+                            adaptor_1 = api.requestAdaptor;
+                            adaptors.unshift(function (api, context) { return __awaiter(_this, void 0, void 0, function () {
+                                var originQuery, originQueryCopy, idx;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            originQuery = api.query;
+                                            originQueryCopy = isPlainObject(api.query)
+                                                ? cloneDeep(api.query)
+                                                : api.query;
+                                            debug('api', 'before requestAdaptor', api);
+                                            return [4 /*yield*/, adaptor_1.call(api, api, context)];
+                                        case 1:
+                                            api = (_a.sent()) || api;
+                                            if (api.query !== originQuery ||
+                                                (isPlainObject(api.query) && !isEqual(api.query, originQueryCopy))) {
+                                                idx = api.url.indexOf('?');
+                                                api.url = "".concat(~idx ? api.url.substring(0, idx) : api.url, "?").concat(qsstringify(api.query));
+                                            }
+                                            debug('api', 'after requestAdaptor', api);
+                                            return [2 /*return*/, api];
+                                    }
+                                });
+                            }); });
                         }
-                        debug('api', 'after requestAdaptor', api);
+                        if (!adaptors.length) return [3 /*break*/, 2];
+                        return [4 /*yield*/, adaptors.reduce(function (api, fn) { return __awaiter(_this, void 0, void 0, function () {
+                                var ret;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0: return [4 /*yield*/, api];
+                                        case 1:
+                                            ret = _a.sent();
+                                            return [4 /*yield*/, fn(ret, data)];
+                                        case 2:
+                                            ret = (_a.sent()) || ret;
+                                            return [2 /*return*/, ret];
+                                    }
+                                });
+                            }); }, Promise.resolve(api))];
+                    case 1:
+                        api = _d.sent();
                         _d.label = 2;
                     case 2:
                         if (api.data &&
@@ -462,30 +526,58 @@ function wrapFetcher(fn, tracker) {
     return wrappedFetcher;
 }
 function wrapAdaptor(promise, api, context) {
-    var _this = this;
-    var adaptor = api.adaptor;
-    return adaptor
-        ? promise
-            .then(function (response) { return __awaiter(_this, void 0, void 0, function () {
-            var result;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        debug('api', 'before adaptor data', response.data);
-                        result = adaptor(response.data, response, api, context);
-                        if (!(result === null || result === void 0 ? void 0 : result.then)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, result];
-                    case 1:
-                        result = _a.sent();
-                        _a.label = 2;
-                    case 2:
-                        debug('api', 'after adaptor data', result);
-                        return [2 /*return*/, __assign(__assign({}, response), { data: result })];
-                }
-            });
-        }); })
-            .then(function (ret) { return responseAdaptor(ret, api); })
-        : promise.then(function (ret) { return responseAdaptor(ret, api); });
+    return __awaiter(this, void 0, void 0, function () {
+        var adaptors, adaptor_2, response;
+        var _this = this;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    adaptors = responseAdaptors.concat();
+                    if (api.adaptor) {
+                        adaptor_2 = api.adaptor;
+                        adaptors.push(function (payload, response, api, context) { return __awaiter(_this, void 0, void 0, function () {
+                            var result;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        debug('api', 'before adaptor data', response.data);
+                                        result = adaptor_2(response.data, response, api, context);
+                                        if (!(result === null || result === void 0 ? void 0 : result.then)) return [3 /*break*/, 2];
+                                        return [4 /*yield*/, result];
+                                    case 1:
+                                        result = _a.sent();
+                                        _a.label = 2;
+                                    case 2:
+                                        debug('api', 'after adaptor data', result);
+                                        return [2 /*return*/, result];
+                                }
+                            });
+                        }); });
+                    }
+                    return [4 /*yield*/, adaptors.reduce(function (promise, adaptor) { return __awaiter(_this, void 0, void 0, function () {
+                            var response, result;
+                            var _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0: return [4 /*yield*/, promise];
+                                    case 1:
+                                        response = _b.sent();
+                                        result = (_a = adaptor(response.data, response, api, context)) !== null && _a !== void 0 ? _a : response.data;
+                                        if (!(result === null || result === void 0 ? void 0 : result.then)) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, result];
+                                    case 2:
+                                        result = _b.sent();
+                                        _b.label = 3;
+                                    case 3: return [2 /*return*/, __assign(__assign({}, response), { data: result })];
+                                }
+                            });
+                        }); }, promise)];
+                case 1:
+                    response = _a.sent();
+                    return [2 /*return*/, responseAdaptor(response, api)];
+            }
+        });
+    });
 }
 /**
  * 请求远程 js 文件然后 new Function 执行，用于 schemaApi 支持 JavaScript
@@ -705,4 +797,4 @@ function normalizeApiResponseData(data) {
 }
 // window.apiCaches = apiCaches;
 
-export { buildApi, callStrFunction, clearApiCache, getApiCache, isApiOutdated, isApiOutdatedWithData, isEffectiveApi, isSameApi, isValidApi, jsFetcher, jsonpFetcher, normalizeApi, normalizeApiResponseData, responseAdaptor, setApiCache, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher };
+export { addApiRequestAdaptor, addApiResponseAdator, buildApi, callStrFunction, clearApiCache, getApiCache, isApiOutdated, isApiOutdatedWithData, isEffectiveApi, isSameApi, isValidApi, jsFetcher, jsonpFetcher, normalizeApi, normalizeApiResponseData, removeApiRequestAdaptor, removeApiResponseAdaptor, responseAdaptor, setApiCache, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher };

package/esm/utils/arraySlice.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/attachmentAdpator.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/autobind.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/browser.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/columnsSplit.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/concatData.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/dataMapping.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/decodeEntity.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.8.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */