amis-core 3.1.1 → 3.2.0

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -1032,6 +1032,11 @@ var TableStore = iRenderer.iRendererStore
         self.orderBy = key;
         self.orderDir = key ? direction : '';
     }
+    function changeOrder(key, direction) {
+        setOrderByInfo(key, direction);
+        var dir = /desc/i.test(self.orderDir) ? -1 : 1;
+        self.rows.replace(helper.sortArray(self.rows.concat(), self.orderBy, dir, function (item, field) { return item.data[field]; }));
+    }
     function reset() {
         self.rows.forEach(function (item) { return item.reset(); });
         var rows = self.rows.concat();
@@ -1148,6 +1153,7 @@ var TableStore = iRenderer.iRendererStore
         collapseAllAtDepth: collapseAllAtDepth,
         clear: clear,
         setOrderByInfo: setOrderByInfo,
+        changeOrder: changeOrder,
         reset: reset,
         toggleDragging: toggleDragging,
         stopDragging: stopDragging,

package/lib/store/table2.js

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

package/lib/theme.js

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

package/lib/types.d.ts

@@ -137,7 +137,7 @@ export interface BaseApiObject {
     autoRefresh?: boolean;
     /**
      * 当开启自动刷新的时候，默认是 api 的 url 来自动跟踪变量变化的。
-     * 如果你希望监控 url 外的变量，请配置 traceExpression。
+     * 如果你希望监控 url 外的变量，请配置 trackExpression。
      */
     trackExpression?: string;
     /**
@@ -300,7 +300,10 @@ type RendererDataAlias = RendererData;
 export type FunctionPropertyNames<T> = {
     [K in keyof T]: T[K] extends Function ? K : never;
 }[keyof T];
-export type JSONSchema = JSONSchema7;
+export type JSONSchema = JSONSchema7 & {
+    group?: string;
+    typeLabel?: string;
+};
 /**
  * 事件跟踪的定义
  */

package/lib/utils/Animation.js

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

package/lib/utils/ColorScale.js

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

package/lib/utils/DataSchema.d.ts

@@ -13,13 +13,14 @@ export declare class DataSchema {
     setSchema(schemas: Array<JSONSchema>): this;
     addSchema(schema: JSONSchema): this;
     removeSchema(id: string): this;
-    getSchemas(): import("json-schema").JSONSchema7[];
+    getSchemas(): JSONSchema[];
     addScope(schema?: JSONSchema | Array<JSONSchema>, id?: string): this;
     removeScope(idOrScope: string | DataScope): this;
     hasScope(idOrScope: string | DataScope): idOrScope is string | DataScope;
     getScope(idOrScope: string | DataScope): DataScope;
     switchToRoot(): this;
     switchTo(idOrScope: string | DataScope): this;
+    pushVariable(current: DataScope, variables: any[]): void;
     getDataPropsAsOptions(): any[];
-    getSchemaByPath(path: string): import("json-schema").JSONSchema7 | null;
+    getSchemaByPath(path: string): JSONSchema | null;
 }

package/lib/utils/DataSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -83,18 +83,38 @@ var DataSchema = /** @class */ (function () {
         this.current = scope;
         return this;
     };
+    DataSchema.prototype.pushVariable = function (current, variables) {
+        if (current.tag) {
+            variables.push({
+                label: current.tag,
+                children: current.getDataPropsAsOptions()
+            });
+        }
+        else {
+            variables.push.apply(variables, tslib.__spreadArray([], tslib.__read(current.getDataPropsAsOptions()), false));
+        }
+    };
     DataSchema.prototype.getDataPropsAsOptions = function () {
+        var _a;
         var variables = [];
         var current = this.current;
         while (current) {
-            if (current.tag) {
-                variables.push({
-                    label: current.tag,
-                    children: current.getDataPropsAsOptions()
-                });
+            if (current.group) {
+                var subVars = [];
+                this.pushVariable(current, subVars);
+                var index = variables.findIndex(function (item) { return item.label === (current === null || current === void 0 ? void 0 : current.group); });
+                if (~index) {
+                    (_a = variables[index].children).push.apply(_a, tslib.__spreadArray([], tslib.__read(subVars), false));
+                }
+                else {
+                    variables.push({
+                        label: current.group,
+                        children: subVars
+                    });
+                }
             }
             else {
-                variables.push.apply(variables, tslib.__spreadArray([], tslib.__read(current.getDataPropsAsOptions()), false));
+                this.pushVariable(current, variables);
             }
             current = current.parent;
         }

package/lib/utils/DataScope.d.ts

@@ -1,4 +1,7 @@
 import { JSONSchema } from '../types';
+export declare const DATASCHEMA_TYPE_MAP: {
+    [type: string]: string;
+};
 export declare class DataScope {
     parent?: DataScope;
     readonly children: Array<DataScope>;
@@ -6,6 +9,7 @@ export declare class DataScope {
     ref?: string;
     name?: string;
     tag?: string;
+    group?: string;
     description?: string;
     readonly schemas: Array<JSONSchema>;
     constructor(schemas: JSONSchema | Array<JSONSchema>, id: string);
@@ -17,8 +21,11 @@ export declare class DataScope {
     contains(scope: DataScope): boolean;
     assignSchema(target: any, schema: any): any;
     getMergedSchema(): any;
-    protected buildOptions(options: Array<any>, schema: JSONSchema, path?: string, key?: string): void;
+    protected buildOptions(options: Array<any>, schema: JSONSchema, path?: {
+        label: string;
+        value: string;
+    }, key?: string, isMember?: boolean): void;
     getDataPropsAsOptions(): any;
-    getSchemaByPath(path: string): import("json-schema").JSONSchema7 | null;
-    getSchemaById(id: string): import("json-schema").JSONSchema7 | undefined;
+    getSchemaByPath(path: string): JSONSchema | null;
+    getSchemaById(id: string): JSONSchema | undefined;
 }

package/lib/utils/DataScope.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -11,6 +11,14 @@ var tslib = require('tslib');
 var helper = require('./helper.js');
 var keyToPath = require('./keyToPath.js');
 
+var DATASCHEMA_TYPE_MAP = {
+    boolean: '布尔',
+    integer: '整数',
+    number: '数字',
+    string: '文本',
+    array: '数组',
+    object: '对象'
+};
 var DataScope = /** @class */ (function () {
     function DataScope(schemas, id) {
         this.children = [];
@@ -171,31 +179,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, tslib.__assign(tslib.__assign({ title: '成员' }, schema.items), { disabled: true }), path, 'items');
-            option.children = helper.mapTree(option.children, function (item) { return (tslib.__assign(tslib.__assign({}, item), { disabled: true })); });
+            this.buildOptions(option.children, tslib.__assign(tslib.__assign({ title: '成员' }, schema.items), { disabled: true }), {
+                label: path.label,
+                value: path.value
+            }, 'items', schema.title === '成员');
+            option.children = helper.mapTree(option.children, function (item) { return (tslib.__assign({}, item
+            // disabled: true
+            )); });
         }
     };
     DataScope.prototype.getDataPropsAsOptions = function () {
@@ -236,4 +274,5 @@ var DataScope = /** @class */ (function () {
     return DataScope;
 }());
 
+exports.DATASCHEMA_TYPE_MAP = DATASCHEMA_TYPE_MAP;
 exports.DataScope = DataScope;

package/lib/utils/RootClose.js

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

package/lib/utils/SimpleMap.js

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

package/lib/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -105,6 +105,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 = tslib.__assign(tslib.__assign(tslib.__assign({}, helper.qsparse(apiObject.url.substring(idx + 1))), apiObject.query), ctx));
+            apiObject.url =
+                apiObject.url.substring(0, idx) + '?' + queryStringify(params);
+        }
+        else {
+            apiObject.query = tslib.__assign(tslib.__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 = helper.qsparse(url.substring(idx + 1, ~hashIdx && hashIdx > idx ? hashIdx : undefined));
@@ -158,41 +175,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 = tslib.__assign(tslib.__assign(tslib.__assign({}, helper.qsparse(api.url.substring(idx_1 + 1))), api.query), data));
-                api.url = api.url.substring(0, idx_1) + '?' + queryStringify(params);
-            }
-            else {
-                api.query = tslib.__assign(tslib.__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 = tslib.__assign(tslib.__assign(tslib.__assign({}, helper.qsparse(api.url.substring(idx_2 + 1))), api.query), api.data));
-                api.url = api.url.substring(0, idx_2) + '?' + queryStringify(params);
-            }
-            else {
-                api.query = tslib.__assign(tslib.__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 = tslib.__assign(tslib.__assign({}, helper.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 = tslib.__assign(tslib.__assign({}, helper.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);
@@ -217,8 +212,21 @@ function buildApi(api, data, options) {
     }
     else if (api.jsonql) {
         api.method = 'post';
-        api.jsonql = dataMapping.dataMapping(api.jsonql, tslib.__assign(tslib.__assign({}, api.query), data), undefined, false, true);
-        api.body = api.data = api.jsonql;
+        api.jsonql = dataMapping.dataMapping(api.jsonql, 
+        /** 需要上层数据域的内容 */
+        object.extendObject(data, tslib.__assign(tslib.__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;
 }

package/lib/utils/arraySlice.d.ts

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

package/lib/utils/arraySlice.js

@@ -0,0 +1,80 @@
+/**
+ * amis-core v3.2.0
+ * Copyright 2018-2023 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var mobx = require('mobx');
+
+function arraySlice(array, slice) {
+    var e_1, _a;
+    if (typeof slice !== 'string') {
+        return array;
+    }
+    if (mobx.isObservableArray(array)) {
+        array = mobx.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 = tslib.__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 = tslib.__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, tslib.__spreadArray([], tslib.__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;
+}
+
+exports.arraySlice = arraySlice;

package/lib/utils/attachmentAdpator.js

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

package/lib/utils/autobind.js

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

package/lib/utils/columnsSplit.js

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

package/lib/utils/dataMapping.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -98,26 +98,27 @@ function dataMapping(to, from, ignoreFunction, convertKeyToPath, ignoreIfNotMatc
         }
     }
     else {
-        Object.keys(to).forEach(function (key) {
-            var value = to[key];
-            var keys;
-            if (typeof ignoreFunction === 'function' && ignoreFunction(key, value)) {
-                // 如果被ignore，不做数据映射处理。
-                object.setVariable(ret, key, value, convertKeyToPath);
-            }
-            else if (key === '&' && value === '$$') {
+        var objectKeys = Object.keys(to);
+        // 如果存在  '&' 作为 key，则特殊处理
+        // 就是无论这个 key 的位置在什么地方始终都是当放在最前面
+        var idx = objectKeys.indexOf('&');
+        if (~idx) {
+            var value_1 = to['&'];
+            objectKeys.splice(idx, 1);
+            if (value_1 === '$$') {
                 ret = tslib.__assign(tslib.__assign({}, ret), from);
             }
-            else if (key === '&') {
-                var v = isPlainObject__default["default"](value) &&
-                    (keys = Object.keys(value)) &&
-                    keys.length === 1 &&
-                    from[keys[0].substring(1)] &&
-                    Array.isArray(from[keys[0].substring(1)])
-                    ? from[keys[0].substring(1)].map(function (raw) {
-                        return dataMapping(value[keys[0]], object.createObject(from, raw), ignoreFunction, convertKeyToPath, ignoreIfNotMatch);
+            else {
+                var keys_1;
+                var v = isPlainObject__default["default"](value_1) &&
+                    (keys_1 = Object.keys(value_1)) &&
+                    keys_1.length === 1 &&
+                    from[keys_1[0].substring(1)] &&
+                    Array.isArray(from[keys_1[0].substring(1)])
+                    ? from[keys_1[0].substring(1)].map(function (raw) {
+                        return dataMapping(value_1[keys_1[0]], object.createObject(from, raw), ignoreFunction, convertKeyToPath, ignoreIfNotMatch);
                     })
-                    : resolveMapping(value, from, undefined, ignoreIfNotMatch);
+                    : resolveMapping(value_1, from, undefined, ignoreIfNotMatch);
                 if (Array.isArray(v) || typeof v === 'string') {
                     ret = v;
                 }
@@ -128,6 +129,13 @@ function dataMapping(to, from, ignoreFunction, convertKeyToPath, ignoreIfNotMatc
                     ret = tslib.__assign(tslib.__assign({}, ret), v);
                 }
             }
+        }
+        objectKeys.forEach(function (key) {
+            var value = to[key];
+            if (typeof ignoreFunction === 'function' && ignoreFunction(key, value)) {
+                // 如果被ignore，不做数据映射处理。
+                object.setVariable(ret, key, value, convertKeyToPath);
+            }
             else if (value === '$$') {
                 object.setVariable(ret, key, from, convertKeyToPath);
             }

package/lib/utils/date.js

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

package/lib/utils/debug.js

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

package/lib/utils/decodeEntity.js

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

package/lib/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -219,6 +219,9 @@ function getStyleNumber(element, styleName) {
 }
 /** 根据关键字高亮显示文本内容 */
 function renderTextByKeyword(rendererText, curKeyword) {
+    if (!rendererText || typeof rendererText !== 'string') {
+        return rendererText;
+    }
     if (curKeyword && ~rendererText.indexOf(curKeyword)) {
         var keywordStartIndex = rendererText.indexOf(curKeyword);
         var keywordEndIndex = keywordStartIndex + curKeyword.length;

package/lib/utils/errors.js

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

package/lib/utils/escapeHtml.js

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

package/lib/utils/filter-schema.js

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

package/lib/utils/filter.js

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

package/lib/utils/formatDuration.js

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