amis-core 6.0.0 → 6.1.0

package/esm/store/table.d.ts

@@ -301,6 +301,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     formsRef: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IType<any, any, any>>, [undefined]>;
     maxKeepItemSelectionLength: import("mobx-state-tree").IType<number | undefined, number, number>;
     keepItemSelectionOnPageChange: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+    maxItemSelectionLength: import("mobx-state-tree").IType<number | undefined, number, number>;
     exportExcelLoading: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     searchFormExpanded: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     lazyRenderAfter: import("mobx-state-tree").IType<number | undefined, number, number>;
@@ -334,6 +335,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     getDialogScoped(): import("..").IScopedContext | null;
     getDrawerScoped(): import("..").IScopedContext | null;
 } & {
+    getSelectionUpperLimit: () => number;
     readonly columnsData: ({
         label: any;
         type: string;
@@ -573,7 +575,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -1082,7 +1085,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -1595,7 +1599,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -2104,7 +2109,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -2622,7 +2628,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -3131,7 +3138,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -3644,7 +3652,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -4153,7 +4162,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -4666,7 +4676,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -5175,7 +5186,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -5807,7 +5819,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -6316,7 +6329,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -6829,7 +6843,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -7338,7 +7353,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -7856,7 +7872,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -8365,7 +8382,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -8878,7 +8896,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -9387,7 +9406,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -9900,7 +9920,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;
@@ -10409,7 +10430,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             } & {
                 focus: () => void;
                 blur: () => void;
-                config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                    name?: string | undefined;
                     extraName?: string | undefined;
                     required?: boolean | undefined;
                     unique?: boolean | undefined;

package/esm/store/table.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __assign, __rest, __spreadArray, __read, __values } from 'tslib';
@@ -253,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;
         }
@@ -387,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,
@@ -572,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();
         },
@@ -605,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);
@@ -650,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;
@@ -798,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);
@@ -1118,10 +1133,10 @@ var TableStore = 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 = findTree(self.rows, function (a) { return a.pristine === item; });
             // 先严格比较，
             if (!resolved) {
-                resolved = self.rows.find(function (a) {
+                resolved = findTree(self.rows, function (a) {
                     var selectValue = item[valueField || 'value'];
                     var itemValue = a.pristine[valueField || 'value'];
                     return selectValue === itemValue;
@@ -1129,7 +1144,7 @@ var TableStore = iRendererStore
             }
             // 再宽松比较
             if (!resolved) {
-                resolved = self.rows.find(function (a) {
+                resolved = findTree(self.rows, function (a) {
                     var selectValue = item[valueField || 'value'];
                     var itemValue = a.pristine[valueField || 'value'];
                     return selectValue == itemValue;
@@ -1141,11 +1156,9 @@ var TableStore = 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; });
@@ -1260,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 {
@@ -1402,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.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __assign, __generator } from 'tslib';

package/esm/theme.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __assign, __extends, __spreadArray, __read } from 'tslib';

package/esm/utils/Animation.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __assign } from 'tslib';

package/esm/utils/ColorScale.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __read } from 'tslib';

package/esm/utils/DataSchema.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __spreadArray, __read } from 'tslib';

package/esm/utils/DataScope.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __values, __assign, __spreadArray, __read } from 'tslib';

package/esm/utils/RootClose.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __rest, __read } from 'tslib';

package/esm/utils/SimpleMap.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import find from 'lodash/find';

package/esm/utils/api.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator, __assign, __rest, __spreadArray, __read } from 'tslib';

package/esm/utils/arraySlice.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __values, __read, __spreadArray } from 'tslib';

package/esm/utils/attachmentAdpator.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __assign } from 'tslib';

package/esm/utils/autobind.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 var defineProperty = Object.defineProperty, getPrototypeOf = Object.getPrototypeOf;

package/esm/utils/browser.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 var chromeVersion = (function getChromeVersion() {

package/esm/utils/columnsSplit.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __spreadArray, __read } from 'tslib';

package/esm/utils/concatData.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __assign } from 'tslib';

package/esm/utils/dataMapping.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __values, __assign } from 'tslib';

package/esm/utils/date.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import moment from 'moment';

package/esm/utils/debug.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __decorate, __metadata, __values, __read, __extends } from 'tslib';

package/esm/utils/decodeEntity.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 /**

package/esm/utils/dom.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __read } from 'tslib';

package/esm/utils/errors.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends } from 'tslib';

package/esm/utils/escapeHtml.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 var entityMap = {

package/esm/utils/filter-schema.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { evalExpression, filter } from './tpl.js';

package/esm/utils/filter.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __spreadArray, __read } from 'tslib';

package/esm/utils/formatDuration.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 function formatDuration(value) {

package/esm/utils/formula.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import isObject from 'lodash/isObject';

package/esm/utils/getVariable.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { keyToPath } from './keyToPath.js';

package/esm/utils/grammar.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { memoryParse } from './memoryParse.js';