amis-core 6.7.0 → 6.9.0-rc.0

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -13,6 +13,7 @@ var iRenderer = require('./iRenderer.js');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
+require('../utils/memoryParse.js');
 require('@rc-component/mini-decimal');
 var resolveVariable = require('../utils/resolveVariable.js');
 var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
@@ -103,6 +104,9 @@ var Column = mobxStateTree.types
         var _a;
         var table = mobxStateTree.getParent(self, 2);
         return (((_a = table.filteredColumns.find(function (column) { return !column.type.startsWith('__'); })) === null || _a === void 0 ? void 0 : _a.id) === self.id);
+    },
+    get columnKey() {
+        return self.pristine.uid || self.name || self.label || self.rawIndex;
     }
 }); })
     .actions(function (self) { return ({
@@ -118,10 +122,13 @@ var Column = mobxStateTree.types
     setToggled: function (value) {
         self.toggled = value;
     },
-    setEnableSearch: function (value) {
+    setEnableSearch: function (value, skipSave) {
+        if (skipSave === void 0) { skipSave = false; }
         self.enableSearch = value;
-        var table = mobxStateTree.getParent(self, 2);
-        table.persistSaveToggledColumns();
+        if (!skipSave) {
+            var table = mobxStateTree.getParent(self, 2);
+            table.persistSaveToggledColumns();
+        }
     },
     setMinWidth: function (value) {
         self.minWidth = value;
@@ -372,7 +379,6 @@ var TableStore = iRenderer.iRendererStore
     .named('TableStore')
     .props({
     columns: mobxStateTree.types.array(Column),
-    columnsKey: '',
     rows: mobxStateTree.types.array(Row),
     selectedRows: mobxStateTree.types.array(mobxStateTree.types.reference(Row)),
     expandedRows: mobxStateTree.types.array(mobxStateTree.types.string),
@@ -594,6 +600,9 @@ var TableStore = iRenderer.iRendererStore
     }
     return {
         getSelectionUpperLimit: getSelectionUpperLimit,
+        get columnsKey() {
+            return location.pathname + self.path;
+        },
         get columnsData() {
             return getColumnsExceptBuiltinTypes();
         },
@@ -712,7 +721,8 @@ var TableStore = iRenderer.iRendererStore
         get columnWidthReady() {
             return getFilteredColumns().every(function (column) { return column.realWidth; });
         },
-        getStickyStyles: function (column, columns) {
+        getStickyStyles: function (column, columns, colSpan) {
+            if (colSpan === void 0) { colSpan = 1; }
             var stickyClassName = '';
             var style = {};
             var autoFixLeftColumns = ['__checkme', '__dragme', '__expandme'];
@@ -721,7 +731,7 @@ var TableStore = iRenderer.iRendererStore
                 stickyClassName = 'is-sticky is-sticky-left';
                 var index = columns.indexOf(column) - 1;
                 if (columns
-                    .slice(index + 2)
+                    .slice(index + (colSpan - 1) + 2)
                     .every(function (col) {
                     return !((col && col.fixed === 'left') ||
                         autoFixLeftColumns.includes(col.type));
@@ -835,7 +845,6 @@ var TableStore = iRenderer.iRendererStore
         typeof config.tableLayout === 'string' &&
             (self.tableLayout = config.tableLayout);
         if (config.columns && Array.isArray(config.columns)) {
-            self.columnsKey = getPersistDataKey(config.columns);
             var columns = config.columns
                 .map(function (column) {
                 if ((options === null || options === void 0 ? void 0 : options.resolveDefinitions) &&
@@ -858,7 +867,9 @@ var TableStore = iRenderer.iRendererStore
                 var order_1 = tableMetaData === null || tableMetaData === void 0 ? void 0 : tableMetaData.columnOrder;
                 if (Array.isArray(order_1) && order_1.length != 0) {
                     columns = sortBy__default["default"](columns, function (item, index) {
-                        return order_1.indexOf(item.name || item.label || index);
+                        var columnKey = item.uid || item.name || item.label || index;
+                        var idx = order_1.indexOf(columnKey);
+                        return idx === -1 ? Number.MAX_SAFE_INTEGER : idx;
                     });
                 }
             }
@@ -1085,26 +1096,28 @@ var TableStore = iRenderer.iRendererStore
         if (self.combineNum) {
             arr = autoCombineCell(arr, self.columns, self.combineNum, self.combineFromIndex);
         }
-        replaceRow(arr, reUseRow);
+        var allMatched = replaceRow(arr, reUseRow);
         self.isNested = self.rows.some(function (item) { return item.children.length || (item.defer && !item.loaded); });
-        // 前 20 个直接渲染，后面的按需渲染
-        if (self.lazyRenderAfter &&
-            self.falttenedRows.length > self.lazyRenderAfter) {
-            for (var i = self.lazyRenderAfter, len = self.falttenedRows.length; i < len; i++) {
-                self.falttenedRows[i].appeared = false;
-                self.falttenedRows[i].lazyRender = true;
+        if (!allMatched) {
+            // 前 20 个直接渲染，后面的按需渲染
+            if (self.lazyRenderAfter &&
+                self.falttenedRows.length > self.lazyRenderAfter) {
+                for (var i = self.lazyRenderAfter, len = self.falttenedRows.length; i < len; i++) {
+                    self.falttenedRows[i].appeared = false;
+                    self.falttenedRows[i].lazyRender = true;
+                }
+            }
+            var expand = self.footable && self.footable.expand;
+            if (expand === 'first' ||
+                (self.expandConfig && self.expandConfig.expand === 'first')) {
+                self.rows.length && self.expandedRows.push(self.rows[0].id);
+            }
+            else if ((expand === 'all' && !self.footable.accordion) ||
+                (self.expandConfig &&
+                    self.expandConfig.expand === 'all' &&
+                    !self.expandConfig.accordion)) {
+                self.expandedRows.replace(getExpandAllRows(self.rows));
             }
-        }
-        var expand = self.footable && self.footable.expand;
-        if (expand === 'first' ||
-            (self.expandConfig && self.expandConfig.expand === 'first')) {
-            self.rows.length && self.expandedRows.push(self.rows[0].id);
-        }
-        else if ((expand === 'all' && !self.footable.accordion) ||
-            (self.expandConfig &&
-                self.expandConfig.expand === 'all' &&
-                !self.expandConfig.accordion)) {
-            self.expandedRows.replace(getExpandAllRows(self.rows));
         }
         self.dragging = false;
     }
@@ -1122,7 +1135,21 @@ var TableStore = iRenderer.iRendererStore
     function replaceRow(arr, reUseRow) {
         if (reUseRow === false) {
             self.rows.replace(arr.map(function (item) { return Row.create(item); }));
-            return;
+            return false;
+        }
+        else if (reUseRow === 'match') {
+            var rows_1 = self.falttenedRows;
+            var allMatched_1 = true;
+            self.rows.replace(arr.map(function (item) {
+                var exist = rows_1.find(function (row) { return row.id === item.id; });
+                if (exist) {
+                    exist.replaceWith(item);
+                    return exist;
+                }
+                allMatched_1 = false;
+                return Row.create(item);
+            }));
+            return allMatched_1;
         }
         var pool = arr.concat();
         // 把多的删了先
@@ -1142,6 +1169,7 @@ var TableStore = iRenderer.iRendererStore
             }
             index++;
         }
+        return false;
     }
     function updateSelected(selected, valueField) {
         self.selectedRows.clear();
@@ -1245,8 +1273,8 @@ var TableStore = iRenderer.iRendererStore
         var maxIndex = lastCheckedRowIndex > rowIndex ? lastCheckedRowIndex : rowIndex + 1;
         var rows = checkableRows.slice(minIndex, maxIndex);
         try {
-            for (var rows_1 = tslib.__values(rows), rows_1_1 = rows_1.next(); !rows_1_1.done; rows_1_1 = rows_1.next()) {
-                var rowItem = rows_1_1.value;
+            for (var rows_2 = tslib.__values(rows), rows_2_1 = rows_2.next(); !rows_2_1.done; rows_2_1 = rows_2.next()) {
+                var rowItem = rows_2_1.value;
                 // 如果上一个是选中状态，则将之间的所有 check 都变成可选
                 if (!(lastCheckedRow.checked &&
                     maxLength &&
@@ -1258,7 +1286,7 @@ var TableStore = iRenderer.iRendererStore
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (rows_1_1 && !rows_1_1.done && (_a = rows_1.return)) _a.call(rows_1);
+                if (rows_2_1 && !rows_2_1.done && (_a = rows_2.return)) _a.call(rows_2);
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -1356,9 +1384,9 @@ var TableStore = iRenderer.iRendererStore
         var rows = self.rows.concat();
         helper.eachTree(rows, function (item) {
             if (item.children) {
-                var rows_2 = item.children.concat().sort(function (a, b) { return a.index - b.index; });
-                rows_2.forEach(function (item) { return item.reset(); });
-                item.children.replace(rows_2);
+                var rows_3 = item.children.concat().sort(function (a, b) { return a.index - b.index; });
+                rows_3.forEach(function (item) { return item.reset(); });
+                item.children.replace(rows_3);
             }
         });
         rows.forEach(function (item) { return item.reset(); });
@@ -1400,13 +1428,21 @@ var TableStore = iRenderer.iRendererStore
      */
     function persistSaveToggledColumns() {
         var key = self.columnsKey;
+        var toggledColumns = self.activeToggaleColumns;
+        var activedSearchableColumns = self.activedSearchableColumns;
         localStorage.setItem(key, JSON.stringify({
-            // 可显示列index
-            toggledColumnIndex: self.activeToggaleColumns.map(function (item) { return item.index; }),
+            // 记录隐藏的字段，因为默认不设置是显示的，设置了隐藏才需要记录，这样新出来的字段才会默认显示
+            unToggledColumns: self.columnsData
+                .filter(function (item) { return !toggledColumns.includes(item); })
+                .map(function (item) { return item.columnKey; }),
             // 列排序，name，label可能不存在
-            columnOrder: self.columnsData.map(function (item) { return item.name || item.label || item.rawIndex; }),
-            // 已激活的可查询列
-            enabledSearchableColumn: self.activedSearchableColumns.map(function (item) { return item.name; })
+            columnOrder: self.columnsData.map(function (item) { return item.columnKey; }),
+            // 同理只记录不启用的，因为默认是启用的
+            disabledSearchableColumn: self.columnsData
+                .filter(function (item) {
+                return item.searchable && !activedSearchableColumns.includes(item);
+            })
+                .map(function (item) { return item.columnKey; })
         }));
     }
     function addForm(form, rowIndex) {
@@ -1441,14 +1477,6 @@ var TableStore = iRenderer.iRendererStore
             }
         }
     }
-    function getPersistDataKey(columns) {
-        // 这里的columns使用除了__开头的所有列
-        return (location.pathname +
-            self.path +
-            // 不能 sort 因为原始列的顺序设计器是可能改变的，此时如果缓存了打开会失效
-            // 还是缓存的顺序，不符合用户调整列顺序的预期
-            columns.map(function (item, index) { return item.name || item.label || index; }).join('-'));
-    }
     function setSearchFormExpanded(value) {
         self.searchFormExpanded = !!value;
     }
@@ -1498,16 +1526,18 @@ var TableStore = iRenderer.iRendererStore
                 var key = self.columnsKey;
                 var data = localStorage.getItem(key);
                 if (data) {
-                    var tableMetaData_1 = JSON.parse(data);
-                    var toggledColumns_1 = object.isObject(tableMetaData_1)
-                        ? tableMetaData_1 === null || tableMetaData_1 === void 0 ? void 0 : tableMetaData_1.toggledColumnIndex
-                        : tableMetaData_1; // 兼容之前的类型
+                    var tableMetaData = JSON.parse(data);
+                    var unToggledColumns_1 = Array.isArray(tableMetaData.unToggledColumns)
+                        ? tableMetaData.unToggledColumns
+                        : [];
+                    var disabledSearchableColumn_1 = Array.isArray(tableMetaData.disabledSearchableColumn)
+                        ? tableMetaData.disabledSearchableColumn
+                        : [];
                     self.toggableColumns.forEach(function (item) {
-                        return item.setToggled(!!~toggledColumns_1.indexOf(item.index));
+                        return item.setToggled(!unToggledColumns_1.includes(item.columnKey));
                     });
                     self.searchableColumns.forEach(function (item) {
-                        var _a;
-                        item.setEnableSearch(!!~((_a = tableMetaData_1 === null || tableMetaData_1 === void 0 ? void 0 : tableMetaData_1.enabledSearchableColumn) !== null && _a !== void 0 ? _a : []).indexOf(item.name));
+                        item.setEnableSearch(!disabledSearchableColumn_1.includes(item.columnKey), true);
                     });
                 }
             }, 200);

package/lib/store/table2.js

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

package/lib/theme.js

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

package/lib/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/lib/utils/Animation.js

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

package/lib/utils/ColorScale.js

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

package/lib/utils/DataSchema.js

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

package/lib/utils/DataScope.js

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

package/lib/utils/RootClose.js

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

package/lib/utils/SimpleMap.js

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

package/lib/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/lib/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -34,6 +34,40 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(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'; }
@@ -386,27 +420,57 @@ function wrapFetcher(fn, tracker) {
     var wrappedFetcher = function (api, data, options) {
         var _a, _b, _c;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var originQuery, originQueryCopy, idx, apiCache, timeStamp;
+            var adaptors, adaptor_1, apiCache, timeStamp;
+            var _this = this;
             return tslib.__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.debug('api', 'before requestAdaptor', api);
-                        originQuery = api.query;
-                        originQueryCopy = isPlainObject__default["default"](api.query)
-                            ? cloneDeep__default["default"](api.query)
-                            : api.query;
-                        return [4 /*yield*/, api.requestAdaptor(api, data)];
-                    case 1:
-                        api = (_d.sent()) || api;
-                        if (api.query !== originQuery ||
-                            (isPlainObject__default["default"](api.query) && !isEqual__default["default"](api.query, originQueryCopy))) {
-                            idx = api.url.indexOf('?');
-                            api.url = "".concat(~idx ? api.url.substring(0, idx) : api.url, "?").concat(helper.qsstringify(api.query));
+                        adaptors = requestAdaptors.concat();
+                        if (api.requestAdaptor) {
+                            adaptor_1 = api.requestAdaptor;
+                            adaptors.unshift(function (api, context) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                                var originQuery, originQueryCopy, idx;
+                                return tslib.__generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            originQuery = api.query;
+                                            originQueryCopy = isPlainObject__default["default"](api.query)
+                                                ? cloneDeep__default["default"](api.query)
+                                                : api.query;
+                                            debug.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__default["default"](api.query) && !isEqual__default["default"](api.query, originQueryCopy))) {
+                                                idx = api.url.indexOf('?');
+                                                api.url = "".concat(~idx ? api.url.substring(0, idx) : api.url, "?").concat(helper.qsstringify(api.query));
+                                            }
+                                            debug.debug('api', 'after requestAdaptor', api);
+                                            return [2 /*return*/, api];
+                                    }
+                                });
+                            }); });
                         }
-                        debug.debug('api', 'after requestAdaptor', api);
+                        if (!adaptors.length) return [3 /*break*/, 2];
+                        return [4 /*yield*/, adaptors.reduce(function (api, fn) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                                var ret;
+                                return tslib.__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 &&
@@ -473,30 +537,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 tslib.__awaiter(_this, void 0, void 0, function () {
-            var result;
-            return tslib.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        debug.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.debug('api', 'after adaptor data', result);
-                        return [2 /*return*/, tslib.__assign(tslib.__assign({}, response), { data: result })];
-                }
-            });
-        }); })
-            .then(function (ret) { return responseAdaptor(ret, api); })
-        : promise.then(function (ret) { return responseAdaptor(ret, api); });
+    return tslib.__awaiter(this, void 0, void 0, function () {
+        var adaptors, adaptor_2, response;
+        var _this = this;
+        return tslib.__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 tslib.__awaiter(_this, void 0, void 0, function () {
+                            var result;
+                            return tslib.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        debug.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.debug('api', 'after adaptor data', result);
+                                        return [2 /*return*/, result];
+                                }
+                            });
+                        }); });
+                    }
+                    return [4 /*yield*/, adaptors.reduce(function (promise, adaptor) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                            var response, result;
+                            var _a;
+                            return tslib.__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*/, tslib.__assign(tslib.__assign({}, response), { data: result })];
+                                }
+                            });
+                        }); }, promise)];
+                case 1:
+                    response = _a.sent();
+                    return [2 /*return*/, responseAdaptor(response, api)];
+            }
+        });
+    });
 }
 /**
  * 请求远程 js 文件然后 new Function 执行，用于 schemaApi 支持 JavaScript
@@ -716,6 +808,8 @@ function normalizeApiResponseData(data) {
 }
 // window.apiCaches = apiCaches;
 
+exports.addApiRequestAdaptor = addApiRequestAdaptor;
+exports.addApiResponseAdator = addApiResponseAdator;
 exports.buildApi = buildApi;
 exports.callStrFunction = callStrFunction;
 exports.clearApiCache = clearApiCache;
@@ -729,6 +823,8 @@ exports.jsFetcher = jsFetcher;
 exports.jsonpFetcher = jsonpFetcher;
 exports.normalizeApi = normalizeApi;
 exports.normalizeApiResponseData = normalizeApiResponseData;
+exports.removeApiRequestAdaptor = removeApiRequestAdaptor;
+exports.removeApiResponseAdaptor = removeApiResponseAdaptor;
 exports.responseAdaptor = responseAdaptor;
 exports.setApiCache = setApiCache;
 exports.str2AsyncFunction = str2AsyncFunction;

package/lib/utils/arraySlice.js

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

package/lib/utils/attachmentAdpator.js

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

package/lib/utils/autobind.js

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

package/lib/utils/browser.js

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

package/lib/utils/columnsSplit.js

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