amis-core 3.6.4 → 6.1.0

package/lib/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -33,6 +33,7 @@ var ServerError = /** @class */ (function (_super) {
 var Column = mobxStateTree.types
     .model('Column', {
     title: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
+    label: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
     name: '',
     toggled: false,
     breakpoint: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
@@ -159,12 +160,13 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
     pageSize: 10,
     dragging: false,
     rowSelectionKeyField: 'id',
-    formsRef: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.frozen()), [])
+    formsRef: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.frozen()), []),
+    canAccessSuperData: false
 })
     .views(function (self) {
     function getToggable() {
         if (self.columnsTogglable === 'auto') {
-            return self.columns.filter.length > 10;
+            return self.columns.filter(function (item) { return !/^__/.test(item.type); }).length > 5;
         }
         return !!self.columnsTogglable;
     }
@@ -257,7 +259,9 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
             return getActiveToggableColumns();
         },
         get dataSource() {
-            return self.rows.map(function (item) { return item.data; });
+            return self.rows.map(function (item) {
+                return self.canAccessSuperData ? item.locals : item.data;
+            });
         },
         get currentSelectedRowKeys() {
             if (self.data && self.data.selectedItems) {
@@ -299,17 +303,26 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
     };
 })
     .actions(function (self) {
-    function updateColumns(columns) {
+    function updateColumns(columns, options) {
         if (columns && Array.isArray(columns)) {
             var cols = columns.filter(function (column) { return column; }).concat();
-            cols = cols.map(function (item, index) { return (tslib.__assign(tslib.__assign({}, item), { index: index, type: item.type || 'plain', pristine: item, toggled: item.toggled !== false, breakpoint: item.breakpoint, children: item.children ? updateColumns(item.children) : [] })); });
+            cols = cols.map(function (item, index) {
+                if ((options === null || options === void 0 ? void 0 : options.resolveDefinitions) &&
+                    typeof (item === null || item === void 0 ? void 0 : item.$ref) == 'string' &&
+                    item.$ref) {
+                    item = tslib.__assign(tslib.__assign({}, options.resolveDefinitions(item.$ref)), item);
+                }
+                return tslib.__assign(tslib.__assign({}, item), { index: index, type: item.type || 'plain', pristine: item, toggled: item.toggled !== false, breakpoint: item.breakpoint, children: item.children ? updateColumns(item.children, options) : [] });
+            });
             return cols;
         }
         return;
     }
-    function update(config) {
+    function update(config, options) {
         config.columnsTogglable !== void 0 &&
             (self.columnsTogglable = config.columnsTogglable);
+        config.canAccessSuperData !== undefined &&
+            (self.canAccessSuperData = !!config.canAccessSuperData);
         if (typeof config.orderBy === 'string') {
             setOrderByInfo(config.orderBy, config.order === 'desc' ? 'desc' : 'asc');
         }
@@ -317,7 +330,7 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
             self.rowSelectionKeyField = config.rowSelectionKeyField;
         }
         if (config.columns && Array.isArray(config.columns)) {
-            self.columns.replace(updateColumns(config.columns));
+            self.columns.replace(updateColumns(config.columns, options));
         }
     }
     function exchange(fromIndex, toIndex, item) {
@@ -509,7 +522,7 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
                     if (!helper.isEmpty(json.data) || json.ok) {
                         self.updateData(api.normalizeApiResponseData(json.data), {
                             __saved: Date.now()
-                        }, !!api$1 && api$1.replaceData);
+                        }, !!api$1 && api$1.replaceData, api$1 === null || api$1 === void 0 ? void 0 : api$1.concatDataFields);
                         self.updatedAt = Date.now();
                     }
                     if (!json.ok) {

package/lib/theme.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/types.d.ts

@@ -129,6 +129,13 @@ export interface BaseApiObject {
      * 默认都是追加模式，如果想完全替换把这个配置成 true
      */
     replaceData?: boolean;
+    /**
+     * 是否将两次返回的数据字段，做一个合并。配置返回对象中的字段名，支持配置多个。
+     *
+     * 比如：同时返回 log 字段，第一次返回 {log: '1'}，第二次返回 {log: '2'}，合并后的结果是 {log: ['1', '2']]}
+     * 再比如：同时返回 items 字段，第一次返回 {items: [1, 2]}，第二次返回 {items: [3, 4]}，合并后的结果是 {items: [1, 2, 3, 4]}
+     */
+    concatDataFields?: string | Array<string>;
     /**
      * 是否自动刷新，当 url 中的取值结果变化时，自动刷新数据。
      *

package/lib/utils/Animation.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/ColorScale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/DataSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/DataScope.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/RootClose.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/SimpleMap.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/arraySlice.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/attachmentAdpator.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/autobind.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/browser.d.ts

@@ -0,0 +1 @@
+export declare const chromeVersion: number | boolean;

package/lib/utils/browser.js

@@ -0,0 +1,15 @@
+/**
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var chromeVersion = (function getChromeVersion() {
+    var raw = navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./);
+    return raw ? parseInt(raw[2], 10) : false;
+})();
+
+exports.chromeVersion = chromeVersion;

package/lib/utils/columnsSplit.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/concatData.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 合并两次数据，满足轮训时总合并数据的需求，比如日志接口，每次返回一部分，但是前端组件需要全部展示。
+ *
+ * @param data
+ * @param origin
+ * @param keys
+ */
+export declare function concatData(data: any, origin: any, keys: string | string[]): any;

package/lib/utils/concatData.js

@@ -0,0 +1,43 @@
+/**
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var getVariable = require('./getVariable.js');
+var object = require('./object.js');
+
+/**
+ * 合并两次数据，满足轮训时总合并数据的需求，比如日志接口，每次返回一部分，但是前端组件需要全部展示。
+ *
+ * @param data
+ * @param origin
+ * @param keys
+ */
+function concatData(data, origin, keys) {
+    keys = Array.isArray(keys)
+        ? keys
+        : keys
+            .split(',')
+            .map(function (item) { return item.trim(); })
+            .filter(function (item) { return item; });
+    var newData = tslib.__assign({}, data);
+    var modified = false;
+    origin &&
+        keys.forEach(function (key) {
+            var prev = getVariable.getVariable(origin, key);
+            var next = getVariable.getVariable(data, key);
+            var args = [];
+            typeof prev !== 'undefined' && args.push(prev);
+            typeof next !== 'undefined' && args.push(next);
+            modified = true;
+            object.setVariable(newData, key, [].concat.apply([], args));
+        });
+    return modified ? newData : data;
+}
+
+exports.concatData = concatData;

package/lib/utils/dataMapping.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/decodeEntity.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/escapeHtml.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/filter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/formatDuration.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/getVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/grammar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/handleAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/helper.d.ts

@@ -41,7 +41,7 @@ type Mutable<T> = {
 };
 export declare function changedEffect<T extends Record<string, any>>(attrs: string | Array<string>, origin: T, data: T, effect: (changes: Partial<Mutable<T>>) => void, strictMode?: boolean): void;
 export declare function rmUndefined(obj: PlainObject): PlainObject;
-export declare function isObjectShallowModified(prev: any, next: any, strictModeOrFunc?: boolean | ((lhs: any, rhs: any) => boolean), ignoreUndefined?: boolean, stack?: Array<any>): boolean;
+export declare function isObjectShallowModified(prev: any, next: any, strictModeOrFunc?: boolean | ((lhs: any, rhs: any) => boolean), ignoreUndefined?: boolean, stack?: Array<any>, maxDepth?: number): boolean;
 export declare function isArrayChildrenModified(prev: Array<any>, next: Array<any>, strictMode?: boolean): boolean;
 export declare function immutableExtends(to: any, from: any, deep?: boolean): any;
 export declare function makeColumnClassBuild(steps: number, classNameTpl?: string): (schema: Schema) => any;
@@ -346,13 +346,17 @@ export declare function convertArrayValueToMoment(value: number[], types: string
 export declare function getRange(min: number, max: number, step?: number): number[];
 export declare function repeatCount(count: number, iterator: (index: number) => any): any[];
 export declare function isNumeric(value: any): boolean;
+export type PrimitiveTypes = 'boolean' | 'number';
 /**
  * 解析Query字符串中的原始类型，目前仅支持转化布尔类型
  *
  * @param query 查询字符串
+ * @param options 配置参数
  * @returns 解析后的查询字符串
  */
-export declare function parsePrimitiveQueryString(rawQuery: Record<string, any>): any;
+export declare function parsePrimitiveQueryString(rawQuery: Record<string, any>, options?: {
+    primitiveTypes: PrimitiveTypes[];
+}): any;
 /**
  * 获取URL链接中的query参数（包含hash mode）
  *
@@ -366,6 +370,7 @@ export declare function parseQuery(location?: Location | {
     [propName: string]: any;
 }, options?: {
     parsePrimitive?: boolean;
+    primitiveTypes?: PrimitiveTypes[];
 }): Record<string, any>;
 export declare function differenceFromAll<T>(allOptions: Array<T>, options: Array<T>, getValue: (item: T) => any): Array<T>;
 /**
@@ -378,3 +383,10 @@ export declare function buildTrackExpression(schema: any): string;
 export declare function evalTrackExpression(expression: string, data: Record<string, any>): string;
 export declare function importLazyComponent(mod: any): any;
 export declare function replaceUrlParams(path: string, params: Record<string, any>): string;
+export declare const TEST_ID_KEY: 'data-testid';
+export declare function buildTestId(testid?: string, data?: PlainObject): {
+    "data-testid"?: undefined;
+} | {
+    "data-testid": string;
+};
+export declare function getTestId(testid?: string, data?: PlainObject): string | undefined;

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -178,10 +178,11 @@ function rmUndefined(obj) {
     });
     return newObj;
 }
-function isObjectShallowModified(prev, next, strictModeOrFunc, ignoreUndefined, stack) {
+function isObjectShallowModified(prev, next, strictModeOrFunc, ignoreUndefined, stack, maxDepth) {
     if (strictModeOrFunc === void 0) { strictModeOrFunc = true; }
     if (ignoreUndefined === void 0) { ignoreUndefined = false; }
     if (stack === void 0) { stack = []; }
+    if (maxDepth === void 0) { maxDepth = -1; }
     if (Array.isArray(prev) && Array.isArray(next)) {
         return prev.length !== next.length
             ? true
@@ -220,6 +221,9 @@ function isObjectShallowModified(prev, next, strictModeOrFunc, ignoreUndefined,
         return false;
     }
     stack.push(prev);
+    if (maxDepth > 0 && stack.length > maxDepth) {
+        return true;
+    }
     for (var i = keys.length - 1; i >= 0; i--) {
         var key = keys[i];
         if (isObjectShallowModified(prev[key], next[key], strictModeOrFunc, ignoreUndefined, stack)) {
@@ -237,10 +241,8 @@ function isArrayChildrenModified(prev, next, strictMode) {
         return true;
     }
     for (var i = prev.length - 1; i >= 0; i--) {
-        if (strictMode
-            ? prev[i] !== next[i]
-            : prev[i] != next[i] ||
-                isArrayChildrenModified(prev[i].children, next[i].children, strictMode)) {
+        if ((strictMode ? prev[i] !== next[i] : prev[i] != next[i]) ||
+            isArrayChildrenModified(prev[i].children, next[i].children, strictMode)) {
             return true;
         }
     }
@@ -1339,7 +1341,7 @@ function isClickOnInput(e) {
     var formItem;
     return !!(!e.currentTarget.contains(target) ||
         ~['INPUT', 'TEXTAREA'].indexOf(target.tagName) ||
-        ((formItem = target.closest("button, a, [data-role=\"form-item\"], label[data-role=\"checkbox\"]")) &&
+        ((formItem = target.closest("button, a, [data-role=\"form-item\"], label[data-role=\"checkbox\"], label[data-role=\"switch\"]")) &&
             e.currentTarget.contains(formItem)));
 }
 // 计算字符串 hash
@@ -1455,17 +1457,34 @@ function isNumeric(value) {
  * 解析Query字符串中的原始类型，目前仅支持转化布尔类型
  *
  * @param query 查询字符串
+ * @param options 配置参数
  * @returns 解析后的查询字符串
  */
-function parsePrimitiveQueryString(rawQuery) {
+function parsePrimitiveQueryString(rawQuery, options) {
     if (!isPlainObject__default["default"](rawQuery)) {
         return rawQuery;
     }
+    options = options || { primitiveTypes: ['boolean'] };
+    if (!Array.isArray(options.primitiveTypes) ||
+        options.primitiveTypes.length === 0) {
+        options.primitiveTypes = ['boolean'];
+    }
     var query = JSONValueMap(rawQuery, function (value) {
-        /** 解析布尔类型，后续有需要在这里扩充 */
-        if (value === 'true' || value === 'false') {
+        var _a, _b;
+        if ((((_a = options === null || options === void 0 ? void 0 : options.primitiveTypes) === null || _a === void 0 ? void 0 : _a.includes('boolean')) && value === 'true') ||
+            value === 'false') {
+            /** 解析布尔类型 */
             return value === 'true';
         }
+        else if (((_b = options === null || options === void 0 ? void 0 : options.primitiveTypes) === null || _b === void 0 ? void 0 : _b.includes('number')) &&
+            isNumeric(value) &&
+            isFinite(value) &&
+            value >= -Number.MAX_SAFE_INTEGER &&
+            value <= Number.MAX_SAFE_INTEGER) {
+            /** 解析数字类型 */
+            var result = Number(value);
+            return !isNaN__default["default"](result) ? result : value;
+        }
         return value;
     });
     return query;
@@ -1479,13 +1498,13 @@ function parsePrimitiveQueryString(rawQuery) {
  */
 function parseQuery(location, options) {
     var _a;
-    var _b = (options || {}).parsePrimitive, parsePrimitive = _b === void 0 ? false : _b;
+    var _b = options || {}, _c = _b.parsePrimitive, parsePrimitive = _c === void 0 ? false : _c, _d = _b.primitiveTypes, primitiveTypes = _d === void 0 ? ['boolean'] : _d;
     var query = (location && !(location instanceof Location) && (location === null || location === void 0 ? void 0 : location.query)) ||
         (location && (location === null || location === void 0 ? void 0 : location.search) && qsparse(location.search.substring(1))) ||
         (window.location.search && qsparse(window.location.search.substring(1)));
     var normalizedQuery = isPlainObject__default["default"](query)
         ? parsePrimitive
-            ? parsePrimitiveQueryString(query)
+            ? parsePrimitiveQueryString(query, { primitiveTypes: primitiveTypes })
             : query
         : {};
     /* 处理hash中的query */
@@ -1607,6 +1626,22 @@ function replaceUrlParams(path, params) {
     }
     return path;
 }
+var TEST_ID_KEY = 'data-testid';
+function buildTestId(testid, data) {
+    var _a;
+    if (!testid) {
+        return {};
+    }
+    return _a = {},
+        _a[TEST_ID_KEY] = tpl.filter(testid, data),
+        _a;
+}
+function getTestId(testid, data) {
+    if (!testid) {
+        return undefined;
+    }
+    return buildTestId(testid, data)[TEST_ID_KEY];
+}
 
 exports.cloneObject = object.cloneObject;
 exports.createObject = object.createObject;
@@ -1620,10 +1655,12 @@ exports.keyToPath = keyToPath.keyToPath;
 exports.JSONTraverse = JSONTraverse;
 exports.JSONValueMap = JSONValueMap;
 exports.SkipOperation = SkipOperation;
+exports.TEST_ID_KEY = TEST_ID_KEY;
 exports.ValidateError = ValidateError;
 exports.__uri = __uri;
 exports.anyChanged = anyChanged;
 exports.autobind = autobind;
+exports.buildTestId = buildTestId;
 exports.buildTrackExpression = buildTrackExpression;
 exports.bulkBindFunctions = bulkBindFunctions;
 exports.camel = camel;
@@ -1651,6 +1688,7 @@ exports.getPropValue = getPropValue;
 exports.getRange = getRange;
 exports.getScrollParent = getScrollParent;
 exports.getScrollbarWidth = getScrollbarWidth;
+exports.getTestId = getTestId;
 exports.getTree = getTree;
 exports.getTreeAncestors = getTreeAncestors;
 exports.getTreeDepth = getTreeDepth;

package/lib/utils/highlight.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -8,6 +8,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('react');
+var string2regExp = require('./string2regExp.js');
 
 var __react_jsx__ = require('react');
 var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
@@ -18,7 +19,7 @@ function highlight(text, input, hlClassName) {
         return text;
     }
     text = String(text);
-    var reg = new RegExp(input.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&'), 'ig');
+    var reg = string2regExp.string2regExp(input, false, true);
     if (!reg.test(text)) {
         return text;
     }

package/lib/utils/icon.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/image.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/index.d.ts

@@ -1,8 +1,10 @@
 export * from './api';
 export * from './attachmentAdpator';
 export * from './autobind';
+export * from './browser';
 export * from './ColorScale';
 export * from './columnsSplit';
+export * from './concatData';
 export * from './dataMapping';
 export * from './DataSchema';
 export * from './DataScope';
@@ -25,6 +27,7 @@ export * from './image';
 export * from './isPureVariable';
 export * from './json-schema-2-amis-schema';
 export * from './keyToPath';
+export * from './labelToString';
 export * from './makeSorter';
 export * from './normalizeLink';
 export * from './normalizeOptions';

package/lib/utils/isPureVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */