amis-core 6.0.0 → 6.2.0

package/lib/store/table.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -262,11 +262,9 @@ var Row = mobxStateTree.types
     get isCheckAvaiableOnClick() {
         var _a;
         var table = mobxStateTree.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;
         }
@@ -360,7 +358,7 @@ var Row = mobxStateTree.types
         self.error = '';
         self.loaded = false;
     },
-    setDeferData: function (_a) {
+    updateData: function (_a) {
         var children = _a.children, rest = tslib.__rest(_a, ["children"]);
         self.data = tslib.__assign(tslib.__assign({}, self.data), rest);
         if (Array.isArray(children)) {
@@ -372,6 +370,7 @@ var TableStore = iRenderer.iRendererStore
     .named('TableStore')
     .props({
     columns: mobxStateTree.types.array(Column),
+    columnsKey: '',
     rows: mobxStateTree.types.array(Row),
     selectedRows: mobxStateTree.types.array(mobxStateTree.types.reference(Row)),
     expandedRows: mobxStateTree.types.array(mobxStateTree.types.string),
@@ -396,6 +395,7 @@ var TableStore = iRenderer.iRendererStore
     formsRef: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.frozen()), []),
     maxKeepItemSelectionLength: Infinity,
     keepItemSelectionOnPageChange: false,
+    maxItemSelectionLength: Infinity,
     // 导出 Excel 按钮的 loading 状态
     exportExcelLoading: false,
     searchFormExpanded: false,
@@ -581,7 +581,17 @@ var TableStore = iRenderer.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();
         },
@@ -614,6 +624,10 @@ var TableStore = iRenderer.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);
@@ -659,8 +673,8 @@ var TableStore = iRenderer.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;
@@ -807,6 +821,8 @@ var TableStore = iRenderer.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);
@@ -817,6 +833,7 @@ var TableStore = iRenderer.iRendererStore
         typeof config.tableLayout === 'string' &&
             (self.tableLayout = config.tableLayout);
         if (config.columns && Array.isArray(config.columns)) {
+            self.columnsKey = getPersistDataKey(config.columns);
             var columns = config.columns
                 .map(function (column) {
                 if ((options === null || options === void 0 ? void 0 : options.resolveDefinitions) &&
@@ -828,7 +845,7 @@ var TableStore = iRenderer.iRendererStore
             })
                 .filter(function (column) { return column; });
             // 更新列顺序，afterCreate生命周期中更新columns不会触发组件的render
-            var key = getPersistDataKey(columns);
+            var key = self.columnsKey;
             var data = localStorage.getItem(key);
             var tableMetaData = null;
             if (data) {
@@ -932,7 +949,7 @@ var TableStore = iRenderer.iRendererStore
             th.style.cssText += "".concat(typeof column.pristine.width === 'number'
                 ? "width: ".concat(column.pristine.width, "px;")
                 : column.pristine.width
-                    ? "width: ".concat(column.pristine.width, ";")
+                    ? "width: ".concat(column.pristine.width, ";min-width: ").concat(column.pristine.width, ";")
                     : '' // todo 可能需要让修改过列宽的保持相应宽度，目前这样相当于重置了
             );
         });
@@ -1127,10 +1144,10 @@ var TableStore = iRenderer.iRendererStore
     function updateSelected(selected, valueField) {
         self.selectedRows.clear();
         selected.forEach(function (item) {
-            var resolved = self.rows.find(function (a) { return a.pristine === item; });
+            var resolved = helper.findTree(self.rows, function (a) { return a.pristine === item; });
             // 先严格比较，
             if (!resolved) {
-                resolved = self.rows.find(function (a) {
+                resolved = helper.findTree(self.rows, function (a) {
                     var selectValue = item[valueField || 'value'];
                     var itemValue = a.pristine[valueField || 'value'];
                     return selectValue === itemValue;
@@ -1138,7 +1155,7 @@ var TableStore = iRenderer.iRendererStore
             }
             // 再宽松比较
             if (!resolved) {
-                resolved = self.rows.find(function (a) {
+                resolved = helper.findTree(self.rows, function (a) {
                     var selectValue = item[valueField || 'value'];
                     var itemValue = a.pristine[valueField || 'value'];
                     return selectValue == itemValue;
@@ -1150,11 +1167,9 @@ var TableStore = iRenderer.iRendererStore
     }
     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; });
@@ -1269,10 +1284,10 @@ var TableStore = iRenderer.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 {
@@ -1367,7 +1382,7 @@ var TableStore = iRenderer.iRendererStore
      * 前端持久化记录列排序，查询字段，显示列信息
      */
     function persistSaveToggledColumns() {
-        var key = getPersistDataKey(self.columnsData);
+        var key = self.columnsKey;
         localStorage.setItem(key, JSON.stringify({
             // 可显示列index
             toggledColumnIndex: self.activeToggaleColumns.map(function (item) { return item.index; }),
@@ -1411,10 +1426,11 @@ var TableStore = iRenderer.iRendererStore
     }
     function getPersistDataKey(columns) {
         // 这里的columns使用除了__开头的所有列
-        // sort保证存储和读取的key值保持一致
         return (location.pathname +
             self.path +
-            sortBy__default["default"](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;
@@ -1460,7 +1476,7 @@ var TableStore = iRenderer.iRendererStore
                 if (!mobxStateTree.isAlive(self)) {
                     return;
                 }
-                var key = getPersistDataKey(self.columnsData);
+                var key = self.columnsKey;
                 var data = localStorage.getItem(key);
                 if (data) {
                     var tableMetaData_1 = JSON.parse(data);

package/lib/store/table2.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/theme.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/Animation.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/ColorScale.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/DataSchema.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/DataScope.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/RootClose.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/SimpleMap.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/api.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -278,6 +278,7 @@ function callStrFunction(fn, argNames) {
     }
 }
 function responseAdaptor(ret, api) {
+    var _a;
     var data = ret.data;
     var hasStatusField = true;
     if (!data) {
@@ -285,7 +286,7 @@ function responseAdaptor(ret, api) {
     }
     // 返回内容是 string，说明 content-type 不是 json，这时可能是返回了纯文本或 html
     if (typeof data === 'string') {
-        var contentType = ret.headers['content-type'] || '';
+        var contentType = ((_a = ret.headers) === null || _a === void 0 ? void 0 : _a['content-type']) || '';
         // 如果是文本类型就尝试解析一下
         if (ret.headers &&
             contentType.startsWith('text/') &&

package/lib/utils/arraySlice.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/attachmentAdpator.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -16,6 +16,7 @@ var tslib = require('tslib');
  * @returns
  */
 function attachmentAdpator(response, __, api) {
+    var _a;
     if (response && response.headers && response.headers['content-disposition']) {
         var disposition = response.headers['content-disposition'];
         var filename = '';
@@ -39,7 +40,7 @@ function attachmentAdpator(response, __, api) {
                     filename = filename.replace(/\+/g, ' ');
                 }
             }
-            var type = response.headers['content-type'];
+            var type = (_a = response.headers) === null || _a === void 0 ? void 0 : _a['content-type'];
             var blob = response.data.toString() === '[object Blob]'
                 ? response.data
                 : new Blob([response.data], { type: type });

package/lib/utils/autobind.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/browser.d.ts

@@ -1 +1,2 @@
 export declare const chromeVersion: number | boolean;
+export declare const isSafari: boolean | "";

package/lib/utils/browser.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -11,5 +11,11 @@ var chromeVersion = (function getChromeVersion() {
     var raw = navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./);
     return raw ? parseInt(raw[2], 10) : false;
 })();
+var isSafari = navigator.vendor &&
+    navigator.vendor.indexOf('Apple') > -1 &&
+    navigator.userAgent &&
+    navigator.userAgent.indexOf('CriOS') == -1 &&
+    navigator.userAgent.indexOf('FxiOS') == -1;
 
 exports.chromeVersion = chromeVersion;
+exports.isSafari = isSafari;

package/lib/utils/columnsSplit.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/concatData.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/dataMapping.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/date.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/debug.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/decodeEntity.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/dom.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -134,7 +134,7 @@ function calculatePosition(placement, overlayNode, target, container, padding, c
                         ? overlayHeight
                         : overlayHeight / 2;
             // 如果还有其他可选项，则做位置判断，是否在可视区域，不完全在则继续看其他定位情况。
-            if (tests.length) {
+            if (tests.length || isAuto) {
                 var transformed = {
                     x: clip.x + positionLeft / scaleX,
                     y: clip.y + positionTop / scaleY,
@@ -158,6 +158,11 @@ function calculatePosition(placement, overlayNode, target, container, padding, c
                 if (visibleX && visibleY) {
                     break;
                 }
+                else if (isAuto && tests.length === 0) {
+                    // 如果是 auto 模式，且最后一个方向都不可见，则直接平移到可见区域
+                    visibleY || (positionTop = window.innerHeight - transformed.height);
+                    visibleX || (positionLeft = window.innerWidth - transformed.width);
+                }
             }
         }
         // todo arrow 位置支持

package/lib/utils/errors.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/escapeHtml.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/filter-schema.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/filter.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/formatDuration.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/formula.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/getVariable.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/grammar.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/handleAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

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;
@@ -383,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;