amis-core 6.7.0 → 6.9.0-beta.0

package/esm/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.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 &&
@@ -424,6 +488,11 @@ function wrapFetcher(fn, tracker) {
                         // 如果发送适配器中设置了 mockResponse
                         // 则直接跳过请求发送
                         if (api.mockResponse) {
+                            console.debug("fetch api ".concat(api.url).concat(api.data
+                                ? "?".concat(typeof api.data === 'string'
+                                    ? api.data
+                                    : qsstringify(api.data, api.qsOptions))
+                                : '', " with mock response"), api.mockResponse, api);
                             return [2 /*return*/, wrapAdaptor(Promise.resolve(api.mockResponse), api, data)];
                         }
                         if (!isValidApi(api.url)) {
@@ -462,30 +531,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 +802,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.7.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/attachmentAdpator.js

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

package/esm/utils/autobind.js

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

package/esm/utils/browser.js

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

package/esm/utils/columnsSplit.js

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

package/esm/utils/concatData.js

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

package/esm/utils/dataMapping.js

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

package/esm/utils/date.js

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

package/esm/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -386,11 +386,18 @@ function debug(cat, msg, ext) {
     console.groupCollapsed('[amis debug]', msg);
     console.debug(ext);
     console.groupEnd();
+    var extStr = '';
+    try {
+        extStr = JSON.stringify(ext);
+    }
+    catch (e) {
+        console.error(e);
+    }
     var log = {
         cat: cat,
         level: 'debug',
         msg: msg,
-        ext: JSON.stringify(ext)
+        ext: extStr
     };
     store.logs.push(log);
 }
@@ -403,11 +410,18 @@ function warning(cat, msg, ext) {
     if (!isEnabled) {
         return;
     }
+    var extStr = '';
+    try {
+        extStr = JSON.stringify(ext);
+    }
+    catch (e) {
+        console.error(e);
+    }
     var log = {
         cat: cat,
         level: 'warn',
         msg: msg,
-        ext: JSON.stringify(ext)
+        ext: extStr
     };
     console.groupCollapsed('amis debug', msg);
     console.trace(log);

package/esm/utils/decodeEntity.js

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

package/esm/utils/dom.js

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

package/esm/utils/errors.js

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

package/esm/utils/escapeHtml.js

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

package/esm/utils/filter-schema.js

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

package/esm/utils/filter.js

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

package/esm/utils/formatDuration.js

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

package/esm/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -12,6 +12,7 @@ import 'tslib';
 import 'moment';
 import 'lodash/isPlainObject';
 import { getVariable } from './getVariable.js';
+import './memoryParse.js';
 import '@rc-component/mini-decimal';
 import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
 import './filter.js';

package/esm/utils/getVariable.js

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

package/esm/utils/grammar.js

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

package/esm/utils/handleAction.js

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

package/esm/utils/helper.d.ts

@@ -8,6 +8,7 @@ import { cloneObject, createObject, deleteVariable, extendObject, isObject, setV
 import { string2regExp } from './string2regExp';
 import { getVariable } from './getVariable';
 import { keyToPath } from './keyToPath';
+import type { IStatusStore } from '../store/status';
 export { createObject, cloneObject, isObject, string2regExp, getVariable, setVariable, deleteVariable, keyToPath, extendObject };
 export declare function preventDefault(event: TouchEvent | Event): void;
 export declare function isMobile(): any;
@@ -52,11 +53,13 @@ export declare function hasVisibleExpression(schema: {
     hidden?: boolean;
 }): boolean;
 export declare function isVisible(schema: {
+    id?: string;
+    name?: string;
     visibleOn?: string;
     hiddenOn?: string;
     visible?: boolean;
     hidden?: boolean;
-}, data?: object): boolean;
+}, data?: object, statusStore?: IStatusStore): any;
 export declare function isUnfolded(node: any, config: {
     foldedField?: string;
     unfoldedField?: string;

package/esm/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -14,7 +14,7 @@ import isNumber from 'lodash/isNumber';
 import isString from 'lodash/isString';
 import qs from 'qs';
 import { compile } from 'path-to-regexp';
-import { evalExpressionWithConditionBuilder, evalExpression, filter } from './tpl.js';
+import { filter, evalExpressionWithConditionBuilder, evalExpression } from './tpl.js';
 import { autobindMethod } from './autobind.js';
 import 'amis-formula';
 import 'moment';
@@ -25,12 +25,14 @@ import { isPureVariable } from './isPureVariable.js';
 import '@rc-component/mini-decimal';
 import { resolveVariable } from './resolveVariable.js';
 import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
+import './memoryParse.js';
 import './filter.js';
 export { string2regExp } from './string2regExp.js';
 export { getVariable } from './getVariable.js';
 import { keyToPath } from './keyToPath.js';
 export { keyToPath } from './keyToPath.js';
 import { isExpression, replaceExpression } from './formula.js';
+import { isAlive } from 'mobx-state-tree';
 
 function preventDefault(event) {
     if (typeof event.cancelable !== 'boolean' || event.cancelable) {
@@ -283,7 +285,19 @@ function makeColumnClassBuild(steps, classNameTpl) {
 function hasVisibleExpression(schema) {
     return !!(schema.visibleOn || schema.hiddenOn);
 }
-function isVisible(schema, data) {
+function isVisible(schema, data, statusStore) {
+    var _a;
+    // 有状态时，状态优先
+    if ((schema.id || schema.name) && statusStore) {
+        var id = filter(schema.id, data);
+        var name_1 = filter(schema.name, data);
+        var visible = isAlive(statusStore)
+            ? (_a = statusStore.visibleState[id]) !== null && _a !== void 0 ? _a : statusStore.visibleState[name_1]
+            : undefined;
+        if (typeof visible !== 'undefined') {
+            return visible;
+        }
+    }
     return !(schema.hidden ||
         schema.visible === false ||
         (schema.hiddenOn &&
@@ -415,7 +429,9 @@ function difference(object, base, keepProps) {
                     result_1[key] = a;
                 }
                 // isEquals 里面没有处理好递归引用对象的情况
-                if (!isObjectShallowModified(a, b, true, undefined, undefined, 10)) {
+                if (object.hasOwnProperty(key) && // 其中一个不是自己的属性，就不要比对了
+                    base.hasOwnProperty(key) &&
+                    !isObjectShallowModified(a, b, true, undefined, undefined, 10)) {
                     return;
                 }
                 if (!object.hasOwnProperty(key)) {

package/esm/utils/highlight.js

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

package/esm/utils/icon.js

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

package/esm/utils/image.js

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

package/esm/utils/isPureVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -10,7 +10,7 @@ function isPureVariable(path) {
         try {
             var ast = memoryParse(path);
             // 只有一个成员说明是纯表达式模式
-            return ast.body.length === 1 && ast.body[0].type === 'script';
+            return (ast === null || ast === void 0 ? void 0 : ast.body.length) === 1 && ast.body[0].type === 'script';
         }
         catch (err) {
             return false;

package/esm/utils/json-schema-2-amis-schema.js

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

package/esm/utils/keyToPath.js

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

package/esm/utils/labelToString.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -15,6 +15,9 @@ function labelToString(label) {
     else if (type === 'number') {
         return "".concat(label);
     }
+    else if (type === 'boolean') {
+        return String(label);
+    }
     if (isPlainObject(label)) {
         try {
             for (var _b = __values(['__title', 'label', Object.keys(label)[0]]), _c = _b.next(); !_c.done; _c = _b.next()) {

package/esm/utils/makeSorter.js

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

package/esm/utils/math.js

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

package/esm/utils/memoryParse.d.ts

@@ -1,3 +1,4 @@
+import type { ASTNode } from 'amis-formula';
 export declare function memoryParse(input: string, options?: {
     /**
      * 直接是运算表达式？还是从模板开始 ${} 里面才算运算表达式
@@ -14,4 +15,4 @@ export declare function memoryParse(input: string, options?: {
      */
     allowFilter?: boolean;
     variableNamespaces?: Array<string>;
-}): any;
+}): ASTNode | undefined;