amis-core 3.1.1 → 3.3.0

package/esm/utils/DataScope.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -7,6 +7,14 @@ import { __values, __assign, __spreadArray, __read } from 'tslib';
 import { guid, mapTree } from './helper.js';
 import { keyToPath } from './keyToPath.js';
 
+var DATASCHEMA_TYPE_MAP = {
+    boolean: '布尔',
+    integer: '整数',
+    number: '数字',
+    string: '文本',
+    array: '数组',
+    object: '对象'
+};
 var DataScope = /** @class */ (function () {
     function DataScope(schemas, id) {
         this.children = [];
@@ -167,31 +175,61 @@ var DataScope = /** @class */ (function () {
         });
         return mergedSchema;
     };
-    DataScope.prototype.buildOptions = function (options, schema, path, key) {
+    DataScope.prototype.buildOptions = function (options, schema, path, key, isMember // 是否是数组成员
+    ) {
         var _this = this;
-        var _a;
-        if (path === void 0) { path = ''; }
+        var _a, _b, _c;
+        if (path === void 0) { path = { label: '', value: '' }; }
         if (key === void 0) { key = ''; }
         // todo 支持 oneOf, anyOf
         var option = {
             label: schema.title || key,
-            value: path,
+            value: schema.title === '成员' ? '' : path.value,
+            path: schema.title === '成员' ? '' : path.label,
             type: schema.type,
-            tag: (_a = schema.description) !== null && _a !== void 0 ? _a : schema.type
+            tag: (_b = (_a = schema.typeLabel) !== null && _a !== void 0 ? _a : DATASCHEMA_TYPE_MAP[schema.type]) !== null && _b !== void 0 ? _b : schema.type,
+            description: schema.description,
+            isMember: isMember,
+            disabled: schema.title === '成员'
         };
-        options.push(option);
+        // 处理option分组
+        if (schema.group) {
+            var index = options.findIndex(function (item) { return item.label === schema.group; });
+            if (~index) {
+                options[index].children.push(option);
+            }
+            else {
+                options.push({
+                    label: schema.group,
+                    value: '',
+                    children: [option]
+                });
+            }
+        }
+        else {
+            options.push(option);
+        }
         if (schema.type === 'object' && schema.properties) {
             option.children = [];
             var keys = Object.keys(schema.properties);
             keys.forEach(function (key) {
+                var _a;
                 var child = schema.properties[key];
-                _this.buildOptions(option.children, child, path + (path ? '.' : '') + key, key);
+                _this.buildOptions(option.children, child, {
+                    label: path.label + (path.label ? '.' : '') + ((_a = child.title) !== null && _a !== void 0 ? _a : key),
+                    value: path.value + (path.value ? '.' : '') + key
+                }, key, schema.title === '成员');
             });
         }
-        else if (schema.type === 'array' && schema.items) {
+        else if (schema.type === 'array' && ((_c = schema.items) === null || _c === void 0 ? void 0 : _c.properties)) {
             option.children = [];
-            this.buildOptions(option.children, __assign(__assign({ title: '成员' }, schema.items), { disabled: true }), path, 'items');
-            option.children = mapTree(option.children, function (item) { return (__assign(__assign({}, item), { disabled: true })); });
+            this.buildOptions(option.children, __assign(__assign({ title: '成员' }, schema.items), { disabled: true }), {
+                label: path.label,
+                value: path.value
+            }, 'items', schema.title === '成员');
+            option.children = mapTree(option.children, function (item) { return (__assign({}, item
+            // disabled: true
+            )); });
         }
     };
     DataScope.prototype.getDataPropsAsOptions = function () {
@@ -232,4 +270,4 @@ var DataScope = /** @class */ (function () {
     return DataScope;
 }());
 
-export { DataScope };
+export { DATASCHEMA_TYPE_MAP, DataScope };

package/esm/utils/RootClose.js

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

package/esm/utils/SimpleMap.js

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

package/esm/utils/api.d.ts

@@ -14,7 +14,7 @@ export declare function str2function(contents: string, ...args: Array<string>):
 export declare function str2AsyncFunction(contents: string, ...args: Array<string>): Function | null;
 export declare function responseAdaptor(ret: fetcherResult, api: ApiObject): Payload;
 export declare function wrapFetcher(fn: (config: fetcherConfig) => Promise<fetcherResult>, tracker?: (eventTrack: EventTrack, data: any) => void): any;
-export declare function wrapAdaptor(promise: Promise<fetcherResult>, api: ApiObject): Promise<Payload>;
+export declare function wrapAdaptor(promise: Promise<fetcherResult>, api: ApiObject, context: any): Promise<Payload>;
 /**
  * 请求远程 js 文件然后 new Function 执行，用于 schemaApi 支持 JavaScript
  * @param api
@@ -24,7 +24,7 @@ export declare function jsFetcher(fetcher: (config: fetcherConfig) => Promise<fe
 export declare function jsonpFetcher(api: ApiObject): Promise<fetcherResult>;
 export declare function isApiOutdatedWithData(prevApi: Api | undefined, nextApi: Api | undefined, prevData: any, nextData: any): nextApi is Api;
 export declare function isApiOutdated(prevApi: Api | undefined, nextApi: Api | undefined, prevData: any, nextData: any): nextApi is Api;
-export declare function isValidApi(api: string): boolean | "";
+export declare function isValidApi(api: string): boolean;
 export declare function isEffectiveApi(api?: Api, data?: any, initFetch?: boolean, initFetchOn?: string): api is Api;
 export declare function isSameApi(apiA: ApiObject | ApiCacheConfig, apiB: ApiObject | ApiCacheConfig): boolean;
 export declare function getApiCache(api: ApiObject): ApiCacheConfig | undefined;

package/esm/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -8,7 +8,7 @@ import omit from 'lodash/omit';
 import { evaluate } from 'amis-formula';
 import { escapeHtml } from './escapeHtml.js';
 import 'moment';
-import { cloneObject, createObject, isObject } from './object.js';
+import { cloneObject, extendObject, createObject, isObject } from './object.js';
 import { tokenize } from './tokenize.js';
 import { memoryParse } from './memoryParse.js';
 import { dataMapping } from './dataMapping.js';
@@ -47,10 +47,10 @@ function buildApi(api, data, options) {
         api.headers = dataMapping(api.headers, data, undefined, false);
     }
     if (api.requestAdaptor && typeof api.requestAdaptor === 'string') {
-        api.requestAdaptor = str2function(api.requestAdaptor, 'api');
+        api.requestAdaptor = str2AsyncFunction(api.requestAdaptor, 'api', 'context');
     }
     if (api.adaptor && typeof api.adaptor === 'string') {
-        api.adaptor = str2function(api.adaptor, 'payload', 'response', 'api');
+        api.adaptor = str2AsyncFunction(api.adaptor, 'payload', 'response', 'api', 'context');
     }
     if (!data) {
         return api;
@@ -96,6 +96,23 @@ function buildApi(api, data, options) {
             }
             : undefined);
     };
+    /** 追加data到请求的Query中 */
+    var attachDataToQuery = function (apiObject, ctx, merge) {
+        var idx = apiObject.url.indexOf('?');
+        if (~idx) {
+            var params = (apiObject.query = __assign(__assign(__assign({}, qsparse(apiObject.url.substring(idx + 1))), apiObject.query), ctx));
+            apiObject.url =
+                apiObject.url.substring(0, idx) + '?' + queryStringify(params);
+        }
+        else {
+            apiObject.query = __assign(__assign({}, apiObject.query), ctx);
+            var query = queryStringify(merge ? apiObject.query : ctx);
+            if (query) {
+                apiObject.url = "".concat(apiObject.url, "?").concat(query);
+            }
+        }
+        return apiObject;
+    };
     if (~idx) {
         var hashIdx = url.indexOf('#');
         var params = qsparse(url.substring(idx + 1, ~hashIdx && hashIdx > idx ? hashIdx : undefined));
@@ -149,41 +166,19 @@ function buildApi(api, data, options) {
         else if (api.attachDataToQuery === false &&
             api.data &&
             ((!~raw.indexOf('$') && autoAppend) || api.forceAppendDataToQuery)) {
-            var idx_1 = api.url.indexOf('?');
-            if (~idx_1) {
-                var params = (api.query = __assign(__assign(__assign({}, qsparse(api.url.substring(idx_1 + 1))), api.query), data));
-                api.url = api.url.substring(0, idx_1) + '?' + queryStringify(params);
-            }
-            else {
-                api.query = __assign(__assign({}, api.query), data);
-                var query = queryStringify(data);
-                if (query) {
-                    api.url = "".concat(api.url, "?").concat(query);
-                }
-            }
+            api = attachDataToQuery(api, data, false);
         }
         if (api.data && api.attachDataToQuery !== false) {
-            var idx_2 = api.url.indexOf('?');
-            if (~idx_2) {
-                var params = (api.query = __assign(__assign(__assign({}, qsparse(api.url.substring(idx_2 + 1))), api.query), api.data));
-                api.url = api.url.substring(0, idx_2) + '?' + queryStringify(params);
-            }
-            else {
-                api.query = __assign(__assign({}, api.query), api.data);
-                var query = queryStringify(api.query);
-                if (query) {
-                    api.url = "".concat(api.url, "?").concat(query);
-                }
-            }
+            api = attachDataToQuery(api, api.data, true);
             delete api.data;
         }
     }
     // 非 get 类请求也可以携带参数到 url，只要 query 有值
     else if (api.method) {
-        var idx_3 = api.url.indexOf('?');
-        if (~idx_3) {
-            var params = (api.query = __assign(__assign({}, qsparse(api.url.substring(idx_3 + 1))), api.query));
-            api.url = api.url.substring(0, idx_3) + '?' + queryStringify(params);
+        var idx_1 = api.url.indexOf('?');
+        if (~idx_1) {
+            var params = (api.query = __assign(__assign({}, qsparse(api.url.substring(idx_1 + 1))), api.query));
+            api.url = api.url.substring(0, idx_1) + '?' + queryStringify(params);
         }
         else {
             var query = queryStringify(api.query);
@@ -208,8 +203,21 @@ function buildApi(api, data, options) {
     }
     else if (api.jsonql) {
         api.method = 'post';
-        api.jsonql = dataMapping(api.jsonql, __assign(__assign({}, api.query), data), undefined, false, true);
-        api.body = api.data = api.jsonql;
+        api.jsonql = dataMapping(api.jsonql, 
+        /** 需要上层数据域的内容 */
+        extendObject(data, __assign(__assign({}, api.query), data), false), undefined, false, true);
+        /** 同时设置了JSONQL和data时走兼容场景 */
+        api.body = api.data =
+            api.data && api.jsonql
+                ? {
+                    data: api.data,
+                    jsonql: api.jsonql
+                }
+                : api.jsonql;
+        /** JSONQL所有method需要追加data中的变量到query中 */
+        if (api.forceAppendDataToQuery) {
+            api = attachDataToQuery(api, data, true);
+        }
     }
     return api;
 }
@@ -346,68 +354,84 @@ function wrapFetcher(fn, tracker) {
     }
     var wrappedFetcher = function (api, data, options) {
         var _a, _b, _c;
-        api = buildApi(api, data, options);
-        if (api.requestAdaptor) {
-            debug('api', 'before requestAdaptor', api);
-            api = api.requestAdaptor(api) || api;
-            debug('api', 'after requestAdaptor', api);
-        }
-        if (api.data &&
-            (api.data instanceof FormData ||
-                hasFile(api.data) ||
-                api.dataType === 'form-data')) {
-            api.data =
-                api.data instanceof FormData
-                    ? api.data
-                    : object2formData(api.data, api.qsOptions);
-        }
-        else if (api.data &&
-            typeof api.data !== 'string' &&
-            api.dataType === 'form') {
-            api.data = qsstringify(api.data, api.qsOptions);
-            api.headers = api.headers || (api.headers = {});
-            api.headers['Content-Type'] = 'application/x-www-form-urlencoded';
-        }
-        else if (api.data &&
-            typeof api.data !== 'string' &&
-            api.dataType === 'json') {
-            api.data = JSON.stringify(api.data);
-            api.headers = api.headers || (api.headers = {});
-            api.headers['Content-Type'] = 'application/json';
-        }
-        if (!isValidApi(api.url)) {
-            throw new Error("invalid api url:".concat(api.url));
-        }
-        debug('api', 'request api', api);
-        tracker === null || tracker === void 0 ? void 0 : tracker({ eventType: 'api', eventData: omit(api, ['config', 'data', 'body']) }, api.data);
-        if (((_a = api.method) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === 'jsonp') {
-            return wrapAdaptor(jsonpFetcher(api), api);
-        }
-        if (((_b = api.method) === null || _b === void 0 ? void 0 : _b.toLocaleLowerCase()) === 'js') {
-            return wrapAdaptor(jsFetcher(fn, api), api);
-        }
-        if (typeof api.cache === 'number' && api.cache > 0) {
-            var apiCache = getApiCache(api);
-            return wrapAdaptor(apiCache
-                ? apiCache.cachedPromise
-                : setApiCache(api, fn(api)), api);
-        }
-        // IE 下 get 请求会被缓存，所以自动加个时间戳
-        if (isIE && api && ((_c = api.method) === null || _c === void 0 ? void 0 : _c.toLocaleLowerCase()) === 'get') {
-            var timeStamp = "_t=".concat(Date.now());
-            if (api.url.indexOf('?') === -1) {
-                api.url = api.url + "?".concat(timeStamp);
-            }
-            else {
-                api.url = api.url + "&".concat(timeStamp);
-            }
-        }
-        return wrapAdaptor(fn(api), api);
+        return __awaiter(this, void 0, void 0, function () {
+            var apiCache, timeStamp;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        api = buildApi(api, data, options);
+                        if (!api.requestAdaptor) return [3 /*break*/, 2];
+                        debug('api', 'before requestAdaptor', api);
+                        return [4 /*yield*/, api.requestAdaptor(api, data)];
+                    case 1:
+                        api = (_d.sent()) || api;
+                        debug('api', 'after requestAdaptor', api);
+                        _d.label = 2;
+                    case 2:
+                        if (api.data &&
+                            (api.data instanceof FormData ||
+                                hasFile(api.data) ||
+                                api.dataType === 'form-data')) {
+                            api.data =
+                                api.data instanceof FormData
+                                    ? api.data
+                                    : object2formData(api.data, api.qsOptions);
+                        }
+                        else if (api.data &&
+                            typeof api.data !== 'string' &&
+                            api.dataType === 'form') {
+                            api.data = qsstringify(api.data, api.qsOptions);
+                            api.headers = api.headers || (api.headers = {});
+                            api.headers['Content-Type'] = 'application/x-www-form-urlencoded';
+                        }
+                        else if (api.data &&
+                            typeof api.data !== 'string' &&
+                            api.dataType === 'json') {
+                            api.data = JSON.stringify(api.data);
+                            api.headers = api.headers || (api.headers = {});
+                            api.headers['Content-Type'] = 'application/json';
+                        }
+                        // 如果发送适配器中设置了 mockResponse
+                        // 则直接跳过请求发送
+                        if (api.mockResponse) {
+                            return [2 /*return*/, wrapAdaptor(Promise.resolve(api.mockResponse), api, data)];
+                        }
+                        if (!isValidApi(api.url)) {
+                            throw new Error("invalid api url:".concat(api.url));
+                        }
+                        debug('api', 'request api', api);
+                        tracker === null || tracker === void 0 ? void 0 : tracker({ eventType: 'api', eventData: omit(api, ['config', 'data', 'body']) }, api.data);
+                        if (((_a = api.method) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === 'jsonp') {
+                            return [2 /*return*/, wrapAdaptor(jsonpFetcher(api), api, data)];
+                        }
+                        if (((_b = api.method) === null || _b === void 0 ? void 0 : _b.toLocaleLowerCase()) === 'js') {
+                            return [2 /*return*/, wrapAdaptor(jsFetcher(fn, api), api, data)];
+                        }
+                        if (typeof api.cache === 'number' && api.cache > 0) {
+                            apiCache = getApiCache(api);
+                            return [2 /*return*/, wrapAdaptor(apiCache
+                                    ? apiCache.cachedPromise
+                                    : setApiCache(api, fn(api)), api, data)];
+                        }
+                        // IE 下 get 请求会被缓存，所以自动加个时间戳
+                        if (isIE && api && ((_c = api.method) === null || _c === void 0 ? void 0 : _c.toLocaleLowerCase()) === 'get') {
+                            timeStamp = "_t=".concat(Date.now());
+                            if (api.url.indexOf('?') === -1) {
+                                api.url = api.url + "?".concat(timeStamp);
+                            }
+                            else {
+                                api.url = api.url + "&".concat(timeStamp);
+                            }
+                        }
+                        return [2 /*return*/, wrapAdaptor(fn(api), api, data)];
+                }
+            });
+        });
     };
     wrappedFetcher._wrappedFetcher = true;
     return wrappedFetcher;
 }
-function wrapAdaptor(promise, api) {
+function wrapAdaptor(promise, api, context) {
     var _this = this;
     var adaptor = api.adaptor;
     return adaptor
@@ -418,7 +442,7 @@ function wrapAdaptor(promise, api) {
                 switch (_a.label) {
                     case 0:
                         debug('api', 'before adaptor data', response.data);
-                        result = adaptor(response.data, response, api);
+                        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:
@@ -532,41 +556,57 @@ function isApiOutdated(prevApi, nextApi, prevData, nextData) {
         return true;
     }
     nextApi = normalizeApi(nextApi);
+    prevApi = (prevApi ? normalizeApi(prevApi) : prevApi);
     if (nextApi.autoRefresh === false) {
         return false;
     }
+    // api 本身有变化
+    if ((prevApi && prevApi.url !== nextApi.url) || !prevApi) {
+        return !!(isValidApi(nextApi.url) &&
+            (!nextApi.sendOn || evalExpression(nextApi.sendOn, nextData)));
+    }
     var trackExpression = (_a = nextApi.trackExpression) !== null && _a !== void 0 ? _a : nextApi.url;
     if (typeof trackExpression !== 'string' || !~trackExpression.indexOf('$')) {
         return false;
     }
     var isModified = false;
-    if (prevApi) {
-        prevApi = normalizeApi(prevApi);
-        if (nextApi.trackExpression || prevApi.trackExpression) {
-            isModified =
-                tokenize(prevApi.trackExpression || '', prevData) !==
-                    tokenize(nextApi.trackExpression || '', nextData);
-        }
-        else {
-            prevApi = buildApi(prevApi, prevData, {
-                ignoreData: true
-            });
-            nextApi = buildApi(nextApi, nextData, {
-                ignoreData: true
-            });
-            isModified = prevApi.url !== nextApi.url;
-        }
+    if (nextApi.trackExpression || prevApi.trackExpression) {
+        isModified =
+            tokenize(prevApi.trackExpression || '', prevData) !==
+                tokenize(nextApi.trackExpression || '', nextData);
     }
     else {
-        isModified = true;
+        prevApi = buildApi(prevApi, prevData, {
+            ignoreData: true
+        });
+        nextApi = buildApi(nextApi, nextData, {
+            ignoreData: true
+        });
+        isModified = prevApi.url !== nextApi.url;
     }
     return !!(isModified &&
         isValidApi(nextApi.url) &&
         (!nextApi.sendOn || evalExpression(nextApi.sendOn, nextData)));
 }
 function isValidApi(api) {
-    return (api &&
-        /^(?:(https?|wss?|taf):\/\/[^\/]+)?(\/?[^\s\/\?]*){1,}(\?.*)?$/.test(api));
+    if (!api || typeof api !== 'string') {
+        return false;
+    }
+    var idx = api.indexOf('://');
+    // 不允许直接相对路径写 api
+    // 不允许 :// 结尾
+    if ((!~idx && api[0] !== '/') || (~idx && idx + 3 === api.length)) {
+        return false;
+    }
+    try {
+        // 不补一个协议，URL 判断为 false
+        api = (~idx ? '' : 'schema://domain') + api;
+        new URL(api);
+    }
+    catch (error) {
+        return false;
+    }
+    return true;
 }
 function isEffectiveApi(api, data, initFetch, initFetchOn) {
     if (!api) {

package/esm/utils/arraySlice.d.ts

@@ -0,0 +1 @@
+export declare function arraySlice(array: any[], slice: string): any[];

package/esm/utils/arraySlice.js

@@ -0,0 +1,76 @@
+/**
+ * amis-core v3.3.0
+ * Copyright 2018-2023 fex
+ */
+
+import { __values, __read, __spreadArray } from 'tslib';
+import { isObservableArray, toJS } from 'mobx';
+
+function arraySlice(array, slice) {
+    var e_1, _a;
+    if (typeof slice !== 'string') {
+        return array;
+    }
+    if (isObservableArray(array)) {
+        array = toJS(array);
+    }
+    slice = slice.trim();
+    if (!slice || !Array.isArray(array)) {
+        return array;
+    }
+    var parts = slice.split(',');
+    var ret = [];
+    var arrayLength = array.length;
+    if (!arrayLength) {
+        return array;
+    }
+    try {
+        for (var parts_1 = __values(parts), parts_1_1 = parts_1.next(); !parts_1_1.done; parts_1_1 = parts_1.next()) {
+            var part = parts_1_1.value;
+            // 普通的场景
+            if (part.indexOf(':') === -1) {
+                var index = parseInt(part, 10);
+                if (!isNaN(index) && index < arrayLength) {
+                    ret.push(array[index]);
+                }
+            }
+            else {
+                var _b = __read(part.split(':'), 2), start = _b[0], end = _b[1];
+                var startIndex = parseInt(start || '0', 10);
+                if (isNaN(startIndex) || startIndex < 0) {
+                    startIndex = 0;
+                }
+                // 大于就没意义了
+                if (startIndex >= arrayLength) {
+                    continue;
+                }
+                var endIndex = parseInt(end, 10);
+                if (isNaN(endIndex)) {
+                    endIndex = arrayLength;
+                }
+                // 负数就从后面开始取
+                if (endIndex < 0) {
+                    endIndex = arrayLength + endIndex;
+                }
+                // 小于没有意义
+                if (endIndex < startIndex) {
+                    continue;
+                }
+                if (endIndex > arrayLength) {
+                    endIndex = arrayLength;
+                }
+                ret.push.apply(ret, __spreadArray([], __read(array.slice(startIndex, endIndex)), false));
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (parts_1_1 && !parts_1_1.done && (_a = parts_1.return)) _a.call(parts_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return ret;
+}
+
+export { arraySlice };

package/esm/utils/attachmentAdpator.js

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

package/esm/utils/autobind.js

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

package/esm/utils/columnsSplit.js

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