amis-core 3.6.4 → 6.1.0

package/esm/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -14,7 +14,6 @@ import { resolveVariableAndFilter } from '../utils/resolveVariableAndFilter.js';
 import 'lodash/isPlainObject';
 import '../utils/filter.js';
 import isEqual from 'lodash/isEqual';
-import find from 'lodash/find';
 import sortBy from 'lodash/sortBy';
 import { immutableExtends, flattenTree, findTree, eachTree, guid, isVisible, hasVisibleExpression, isBreakpoint, difference, sortArray } from '../utils/helper.js';
 import { evalExpression } from '../utils/tpl.js';
@@ -254,11 +253,9 @@ var Row = types
     get isCheckAvaiableOnClick() {
         var _a;
         var table = getParent(self, self.depth * 2);
-        var keepItemSelectionOnPageChange = table === null || table === void 0 ? void 0 : table.keepItemSelectionOnPageChange;
-        var selectionUpperLimit = table === null || table === void 0 ? void 0 : table.maxKeepItemSelectionLength;
+        var selectionUpperLimit = table.getSelectionUpperLimit();
         // 如果未做配置，或者配置不合法直接通过检查
-        if (!keepItemSelectionOnPageChange ||
-            !Number.isInteger(selectionUpperLimit) ||
+        if (!Number.isInteger(selectionUpperLimit) ||
             selectionUpperLimit === Infinity) {
             return true;
         }
@@ -388,6 +385,7 @@ var TableStore = iRendererStore
     formsRef: types.optional(types.array(types.frozen()), []),
     maxKeepItemSelectionLength: Infinity,
     keepItemSelectionOnPageChange: false,
+    maxItemSelectionLength: Infinity,
     // 导出 Excel 按钮的 loading 状态
     exportExcelLoading: false,
     searchFormExpanded: false,
@@ -573,7 +571,17 @@ var TableStore = iRendererStore
     function getSearchableColumns() {
         return self.columns.filter(function (column) { return column.searchable; });
     }
+    function getSelectionUpperLimit() {
+        var keep = self.keepItemSelectionOnPageChange;
+        var selectionUpperLimit = keep
+            ? self.maxKeepItemSelectionLength !== Infinity
+                ? self.maxKeepItemSelectionLength
+                : self.maxItemSelectionLength
+            : self.maxItemSelectionLength;
+        return selectionUpperLimit;
+    }
     return {
+        getSelectionUpperLimit: getSelectionUpperLimit,
         get columnsData() {
             return getColumnsExceptBuiltinTypes();
         },
@@ -606,6 +614,10 @@ var TableStore = iRendererStore
             return !!self.selectedRows.length;
         },
         get allChecked() {
+            var selectionUpperLimit = getSelectionUpperLimit();
+            if (selectionUpperLimit !== Infinity) {
+                return self.isSelectionThresholdReached;
+            }
             // 只要selectedRows中包含checkableRows中的全部数据，就认为是全选
             return self.checkableRows.every(function (item) {
                 return self.selectedRows.includes(item);
@@ -651,8 +663,8 @@ var TableStore = iRendererStore
         get isSelectionThresholdReached() {
             var _a, _b;
             var selectedLength = (_b = (_a = self.data) === null || _a === void 0 ? void 0 : _a.selectedItems) === null || _b === void 0 ? void 0 : _b.length;
-            var maxLength = self.maxKeepItemSelectionLength;
-            if (!self.data || !self.keepItemSelectionOnPageChange || !maxLength) {
+            var maxLength = getSelectionUpperLimit();
+            if (!self.data || maxLength === Infinity) {
                 return false;
             }
             return maxLength <= selectedLength;
@@ -799,6 +811,8 @@ var TableStore = iRendererStore
         config.keepItemSelectionOnPageChange !== undefined &&
             (self.keepItemSelectionOnPageChange =
                 config.keepItemSelectionOnPageChange);
+        config.maxItemSelectionLength !== undefined &&
+            (self.maxItemSelectionLength = config.maxItemSelectionLength);
         config.exportExcelLoading !== undefined &&
             (self.exportExcelLoading = config.exportExcelLoading);
         config.loading !== undefined && (self.loading = config.loading);
@@ -864,11 +878,18 @@ var TableStore = iRendererStore
                 className: 'Table-dragCell'
             });
             var originColumns_1 = self.columns.concat();
+            var ids_1 = [];
             columns = columns.map(function (item, index) {
                 var origin = item.id
                     ? originColumns_1.find(function (column) { return column.pristine.id === item.id; })
                     : originColumns_1[index];
-                return __assign(__assign({}, item), { id: (origin === null || origin === void 0 ? void 0 : origin.id) || guid(), index: index, width: (origin === null || origin === void 0 ? void 0 : origin.width) || 0, minWidth: (origin === null || origin === void 0 ? void 0 : origin.minWidth) || 0, realWidth: (origin === null || origin === void 0 ? void 0 : origin.realWidth) || 0, rawIndex: index - PARTITION_INDEX, type: item.type || 'plain', pristine: item.pristine || item, toggled: item.toggled !== false, breakpoint: item.breakpoint, isPrimary: index === PARTITION_INDEX });
+                var id = (origin === null || origin === void 0 ? void 0 : origin.id) || guid();
+                // 还不知道为何会出现这个，先用这种方式避免 id 重复
+                if (ids_1.includes(id)) {
+                    id = guid();
+                }
+                ids_1.push(id);
+                return __assign(__assign({}, item), { id: id, index: index, width: (origin === null || origin === void 0 ? void 0 : origin.width) || 0, minWidth: (origin === null || origin === void 0 ? void 0 : origin.minWidth) || 0, realWidth: (origin === null || origin === void 0 ? void 0 : origin.realWidth) || 0, rawIndex: index - PARTITION_INDEX, type: item.type || 'plain', pristine: item.pristine || item, toggled: item.toggled !== false, breakpoint: item.breakpoint, isPrimary: index === PARTITION_INDEX });
             });
             self.columns.replace(columns);
         }
@@ -1111,26 +1132,33 @@ var TableStore = iRendererStore
     }
     function updateSelected(selected, valueField) {
         self.selectedRows.clear();
-        eachTree(self.rows, function (item) {
-            if (~selected.indexOf(item.pristine)) {
-                self.selectedRows.push(item.id);
+        selected.forEach(function (item) {
+            var resolved = findTree(self.rows, function (a) { return a.pristine === item; });
+            // 先严格比较，
+            if (!resolved) {
+                resolved = findTree(self.rows, function (a) {
+                    var selectValue = item[valueField || 'value'];
+                    var itemValue = a.pristine[valueField || 'value'];
+                    return selectValue === itemValue;
+                });
             }
-            else if (find(selected, function (a) {
-                return a[valueField || 'value'] &&
-                    a[valueField || 'value'] == item.pristine[valueField || 'value'];
-            })) {
-                self.selectedRows.push(item.id);
+            // 再宽松比较
+            if (!resolved) {
+                resolved = findTree(self.rows, function (a) {
+                    var selectValue = item[valueField || 'value'];
+                    var itemValue = a.pristine[valueField || 'value'];
+                    return selectValue == itemValue;
+                });
             }
+            resolved && self.selectedRows.push(resolved);
         });
         updateCheckDisable();
     }
     function getSelectedRows() {
         var _a;
-        var maxLength = self.maxKeepItemSelectionLength;
-        var keep = self.keepItemSelectionOnPageChange;
+        var maxLength = self.getSelectionUpperLimit();
         var selectedItems = (_a = self.data) === null || _a === void 0 ? void 0 : _a.selectedItems;
-        if (keep &&
-            maxLength &&
+        if (maxLength !== Infinity &&
             selectedItems &&
             maxLength >= selectedItems.length) {
             var restCheckableRows = self.checkableRows.filter(function (item) { return !item.checked; });
@@ -1245,10 +1273,10 @@ var TableStore = iRendererStore
         if (!self.data) {
             return;
         }
-        var maxLength = self.maxKeepItemSelectionLength;
+        var maxLength = self.getSelectionUpperLimit();
         var selectedItems = self.data.selectedItems;
         self.selectedRows.map(function (item) { return item.setCheckdisable(false); });
-        if (maxLength && maxLength <= selectedItems.length) {
+        if (maxLength !== Infinity && maxLength <= selectedItems.length) {
             self.unSelectedRows.map(function (item) { return !item.checked && item.setCheckdisable(true); });
         }
         else {
@@ -1387,10 +1415,11 @@ var TableStore = iRendererStore
     }
     function getPersistDataKey(columns) {
         // 这里的columns使用除了__开头的所有列
-        // sort保证存储和读取的key值保持一致
         return (location.pathname +
             self.path +
-            sortBy(columns.map(function (item, index) { return item.name || item.label || index; })).join('-'));
+            // 不能 sort 因为原始列的顺序设计器是可能改变的，此时如果缓存了打开会失效
+            // 还是缓存的顺序，不符合用户调整列顺序的预期
+            columns.map(function (item, index) { return item.name || item.label || index; }).join('-'));
     }
     function setSearchFormExpanded(value) {
         self.searchFormExpanded = !!value;

package/esm/store/table2.d.ts

@@ -3,6 +3,7 @@ import { Api, fetchOptions } from '../types';
 import { IFormStore } from './form';
 export declare const Column: import("mobx-state-tree").IModelType<{
     title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+    label: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     name: import("mobx-state-tree").IType<string | undefined, string, string>;
     toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -73,6 +74,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
 } & {
     columns: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IModelType<{
         title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+        label: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         name: import("mobx-state-tree").IType<string | undefined, string, string>;
         toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
         breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -142,6 +144,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
     dragging: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     rowSelectionKeyField: import("mobx-state-tree").IType<string | undefined, string, string>;
     formsRef: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IType<any, any, any>>, [undefined]>;
+    canAccessSuperData: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
 }, {
     readonly parentStore: any;
     readonly __: any;
@@ -160,7 +163,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
-    updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
+    updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
     setCurrentAction(action: object): void;
     openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
@@ -177,7 +180,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
     markBusying: (busying?: boolean) => void;
     fetchInitData: (api: Api, data?: object | undefined, options?: fetchOptions | undefined) => Promise<any>;
     fetchData: (api: Api, data?: object | undefined, options?: fetchOptions | undefined) => Promise<any>;
-    reInitData: (data: object | undefined, replace?: boolean) => void;
+    reInitData: (data: object | undefined, replace?: boolean, concatFields?: string | string[] | undefined) => void;
     updateMessage: (msg?: string | undefined, error?: boolean) => void;
     clearMessage: () => void;
     setHasRemoteData: () => void;
@@ -188,6 +191,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
     readonly toggable: boolean;
     readonly columnsData: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").IModelType<{
         title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+        label: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         name: import("mobx-state-tree").IType<string | undefined, string, string>;
         toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
         breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -201,6 +205,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
         setToggled(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IModelType<{
         title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+        label: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         name: import("mobx-state-tree").IType<string | undefined, string, string>;
         toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
         breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -215,6 +220,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
     readonly toggableColumns: ({
         title: any;
+        label: any;
         name: string;
         toggled: boolean;
         breakpoint: any;
@@ -228,6 +234,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
         setToggled(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+        label: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         name: import("mobx-state-tree").IType<string | undefined, string, string>;
         toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
         breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -243,6 +250,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
     readonly filteredColumns: any[];
     readonly activeToggaleColumns: ({
         title: any;
+        label: any;
         name: string;
         toggled: boolean;
         breakpoint: any;
@@ -256,6 +264,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
         setToggled(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+        label: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         name: import("mobx-state-tree").IType<string | undefined, string, string>;
         toggled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
         breakpoint: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
@@ -507,7 +516,9 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
         reset(): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
 } & {
-    update: (config: Partial<STableStore2>) => void;
+    update: (config: Partial<STableStore2>, options?: {
+        resolveDefinitions?: ((ref: string) => any) | undefined;
+    } | undefined) => void;
     persistSaveToggledColumns: () => void;
     setOrderByInfo: (key: string, direction: 'asc' | 'desc') => void;
     updateQuery: (values: object, updater?: Function, pageNoField?: string, pageSizeField?: string, replace?: boolean) => void;

package/esm/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -24,6 +24,7 @@ var ServerError = /** @class */ (function (_super) {
 var Column = types
     .model('Column', {
     title: types.optional(types.frozen(), undefined),
+    label: types.optional(types.frozen(), undefined),
     name: '',
     toggled: false,
     breakpoint: types.optional(types.frozen(), undefined),
@@ -150,12 +151,13 @@ var TableStore2 = ServiceStore.named('TableStore2')
     pageSize: 10,
     dragging: false,
     rowSelectionKeyField: 'id',
-    formsRef: types.optional(types.array(types.frozen()), [])
+    formsRef: types.optional(types.array(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;
     }
@@ -248,7 +250,9 @@ var TableStore2 = 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) {
@@ -290,17 +294,26 @@ var TableStore2 = 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 (__assign(__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 = __assign(__assign({}, options.resolveDefinitions(item.$ref)), item);
+                }
+                return __assign(__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');
         }
@@ -308,7 +321,7 @@ var TableStore2 = 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) {
@@ -500,7 +513,7 @@ var TableStore2 = ServiceStore.named('TableStore2')
                     if (!isEmpty(json.data) || json.ok) {
                         self.updateData(normalizeApiResponseData(json.data), {
                             __saved: Date.now()
-                        }, !!api && api.replaceData);
+                        }, !!api && api.replaceData, api === null || api === void 0 ? void 0 : api.concatDataFields);
                         self.updatedAt = Date.now();
                     }
                     if (!json.ok) {

package/esm/theme.js

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

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

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

package/esm/utils/ColorScale.js

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

package/esm/utils/DataSchema.js

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

package/esm/utils/DataScope.js

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

package/esm/utils/RootClose.js

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

package/esm/utils/SimpleMap.js

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

package/esm/utils/api.js

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

package/esm/utils/arraySlice.js

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

package/esm/utils/attachmentAdpator.js

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

package/esm/utils/autobind.js

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

package/esm/utils/browser.d.ts

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

package/esm/utils/browser.js

@@ -0,0 +1,11 @@
+/**
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
+ */
+
+var chromeVersion = (function getChromeVersion() {
+    var raw = navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./);
+    return raw ? parseInt(raw[2], 10) : false;
+})();
+
+export { chromeVersion };

package/esm/utils/columnsSplit.js

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

package/esm/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/esm/utils/concatData.js

@@ -0,0 +1,39 @@
+/**
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
+ */
+
+import { __assign } from 'tslib';
+import { getVariable } from './getVariable.js';
+import { setVariable } from './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 = __assign({}, data);
+    var modified = false;
+    origin &&
+        keys.forEach(function (key) {
+            var prev = getVariable(origin, key);
+            var next = getVariable(data, key);
+            var args = [];
+            typeof prev !== 'undefined' && args.push(prev);
+            typeof next !== 'undefined' && args.push(next);
+            modified = true;
+            setVariable(newData, key, [].concat.apply([], args));
+        });
+    return modified ? newData : data;
+}
+
+export { concatData };

package/esm/utils/dataMapping.js

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

package/esm/utils/date.js

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

package/esm/utils/debug.js

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

package/esm/utils/decodeEntity.js

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

package/esm/utils/dom.js

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

package/esm/utils/errors.js

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

package/esm/utils/escapeHtml.js

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

package/esm/utils/filter-schema.js

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

package/esm/utils/filter.js

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

package/esm/utils/formatDuration.js

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

package/esm/utils/formula.js

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

package/esm/utils/getVariable.js

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

package/esm/utils/grammar.js

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