amis-core 2.9.0 → 3.1.0

package/lib/store/table.d.ts

@@ -24,7 +24,7 @@ export declare const Column: import("mobx-state-tree").IModelType<{
     remark: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     className: import("mobx-state-tree").ITypeUnion<any, any, any>;
 }, {
-    toggleToggle(): void;
+    toggleToggle(min?: number): void;
     setToggled(value: boolean): void;
     setEnableSearch(value: boolean): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
@@ -114,7 +114,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         className: import("mobx-state-tree").ITypeUnion<any, any, any>;
     }, {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -218,6 +218,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>;
+    exportExcelLoading: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     searchFormExpanded: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
 }, {
     readonly parentStore: any;
@@ -234,6 +235,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     getValueByName(name: string, canAccessSuper?: boolean): any;
     getPristineValueByName(name: string): any;
 } & {
+    setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
@@ -269,7 +271,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: any;
         className: any;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -295,7 +297,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         className: import("mobx-state-tree").ITypeUnion<any, any, any>;
     }, {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
@@ -349,6 +351,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             getValueByName(name: string, canAccessSuper?: boolean): any;
             getPristineValueByName(name: string): any;
         } & {
+            setTopStore(value: any): void;
             initData(data?: object, skipSetPristine?: boolean): void;
             reset(): void;
             updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
@@ -5608,6 +5611,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             getValueByName(name: string, canAccessSuper?: boolean): any;
             getPristineValueByName(name: string): any;
         } & {
+            setTopStore(value: any): void;
             initData(data?: object, skipSetPristine?: boolean): void;
             reset(): void;
             updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
@@ -10841,7 +10845,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: any;
         className: any;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -10867,7 +10871,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         className: import("mobx-state-tree").ITypeUnion<any, any, any>;
     }, {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
@@ -10894,7 +10898,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: any;
         className: any;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -10920,7 +10924,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         className: import("mobx-state-tree").ITypeUnion<any, any, any>;
     }, {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
@@ -10948,7 +10952,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: any;
         className: any;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -10974,7 +10978,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         className: import("mobx-state-tree").ITypeUnion<any, any, any>;
     }, {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
@@ -11001,7 +11005,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: any;
         className: any;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -11027,7 +11031,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         className: import("mobx-state-tree").ITypeUnion<any, any, any>;
     }, {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
@@ -11054,7 +11058,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: any;
         className: any;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -11080,7 +11084,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         className: import("mobx-state-tree").ITypeUnion<any, any, any>;
     }, {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
@@ -11107,7 +11111,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: any;
         className: any;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -11133,7 +11137,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         className: import("mobx-state-tree").ITypeUnion<any, any, any>;
     }, {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
@@ -11160,7 +11164,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: any;
         className: any;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -11186,7 +11190,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         className: import("mobx-state-tree").ITypeUnion<any, any, any>;
     }, {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
@@ -11213,7 +11217,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: any;
         className: any;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -11239,7 +11243,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         className: import("mobx-state-tree").ITypeUnion<any, any, any>;
     }, {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
@@ -11266,7 +11270,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: any;
         className: any;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -11292,7 +11296,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         remark: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         className: import("mobx-state-tree").ITypeUnion<any, any, any>;
     }, {
-        toggleToggle(): void;
+        toggleToggle(min?: number): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
@@ -12113,7 +12117,8 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     stopDragging: () => void;
     exchange: (fromIndex: number, toIndex: number, item?: IRow) => void;
     addForm: (form: IFormStore, rowIndex: number) => void;
-    toggleAllColumns: () => void;
+    toggleAllColumns: (min?: number) => void;
+    toggleColumnsAtLeast: (min?: number) => void;
     persistSaveToggledColumns: () => void;
     setSearchFormExpanded: (value: any) => void;
     toggleSearchFormExpanded: () => void;

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -60,10 +60,11 @@ var Column = mobxStateTree.types
     className: mobxStateTree.types.union(mobxStateTree.types.string, mobxStateTree.types.frozen())
 })
     .actions(function (self) { return ({
-    toggleToggle: function () {
+    toggleToggle: function (min) {
+        if (min === void 0) { min = 1; }
         self.toggled = !self.toggled;
         var table = mobxStateTree.getParent(self, 2);
-        if (!table.activeToggaleColumns.length) {
+        if (table.activeToggaleColumns.length < min) {
             self.toggled = true;
         }
         table.persistSaveToggledColumns();
@@ -139,11 +140,15 @@ var Row = mobxStateTree.types
         if (self.children.length) {
             children = self.children.map(function (item) { return item.locals; });
         }
+        var table = mobxStateTree.getParent(self, self.depth * 2);
         var parent = mobxStateTree.getParent(self, 2);
         return object.createObject(object.extendObject(mobxStateTree.getParent(self, self.depth * 2).data, {
             index: self.index,
             // todo 以后再支持多层，目前先一层
-            parent: parent.storeType === Row.name ? parent.data : undefined
+            parent: parent.storeType === Row.name ? parent.data : undefined,
+            // 只有table时，也可以获取选中行
+            selectedItems: table.selectedRows.map(function (item) { return item.data; }),
+            unSelectedItems: table.unSelectedRows.map(function (item) { return item.data; })
         }), children
             ? tslib.__assign(tslib.__assign({}, self.data), { children: children }) : self.data);
     },
@@ -263,6 +268,8 @@ var TableStore = iRenderer.iRendererStore
     formsRef: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.frozen()), []),
     maxKeepItemSelectionLength: Infinity,
     keepItemSelectionOnPageChange: false,
+    // 导出 Excel 按钮的 loading 状态
+    exportExcelLoading: false,
     searchFormExpanded: false // 用来控制搜索框是否展开了，那个自动根据 searchable 生成的表单 autoGenerateFilter
 })
     .views(function (self) {
@@ -603,6 +610,8 @@ var TableStore = iRenderer.iRendererStore
         config.keepItemSelectionOnPageChange !== void 0 &&
             (self.keepItemSelectionOnPageChange =
                 config.keepItemSelectionOnPageChange);
+        config.exportExcelLoading !== undefined &&
+            (self.exportExcelLoading = config.exportExcelLoading);
         if (config.columns && Array.isArray(config.columns)) {
             var columns = config.columns
                 .filter(function (column) { return column; })
@@ -1086,10 +1095,12 @@ var TableStore = iRenderer.iRendererStore
             rowIndex: rowIndex
         });
     }
-    function toggleAllColumns() {
+    function toggleAllColumns(min) {
+        if (min === void 0) { min = 1; }
         if (self.activeToggaleColumns.length) {
             if (self.activeToggaleColumns.length === self.toggableColumns.length) {
                 self.toggableColumns.map(function (column) { return column.setToggled(false); });
+                toggleColumnsAtLeast(min);
             }
             else {
                 self.toggableColumns.map(function (column) { return column.setToggled(true); });
@@ -1101,6 +1112,15 @@ var TableStore = iRenderer.iRendererStore
         }
         persistSaveToggledColumns();
     }
+    function toggleColumnsAtLeast(min) {
+        var _a;
+        if (min === void 0) { min = 1; }
+        if (self.activeToggaleColumns.length < min) {
+            for (var i = 0; i < min; i++) {
+                (_a = self.toggableColumns[i]) === null || _a === void 0 ? void 0 : _a.setToggled(true);
+            }
+        }
+    }
     function getPersistDataKey(columns) {
         // 这里的columns使用除了__开头的所有列
         // sort保证存储和读取的key值保持一致
@@ -1134,6 +1154,7 @@ var TableStore = iRenderer.iRendererStore
         exchange: exchange,
         addForm: addForm,
         toggleAllColumns: toggleAllColumns,
+        toggleColumnsAtLeast: toggleColumnsAtLeast,
         persistSaveToggledColumns: persistSaveToggledColumns,
         setSearchFormExpanded: setSearchFormExpanded,
         toggleSearchFormExpanded: toggleSearchFormExpanded,

package/lib/store/table2.d.ts

@@ -139,8 +139,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
     pageNo: import("mobx-state-tree").IType<number | undefined, number, number>;
     pageSize: import("mobx-state-tree").IType<number | undefined, number, number>;
     dragging: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
-    keepItemSelectionOnPageChange: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
-    maxKeepItemSelectionLength: import("mobx-state-tree").IType<number | undefined, number, number>;
+    rowSelectionKeyField: import("mobx-state-tree").IType<string | undefined, string, string>;
 }, {
     readonly parentStore: any;
     readonly __: any;
@@ -156,6 +155,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
     getValueByName(name: string, canAccessSuper?: boolean): any;
     getPristineValueByName(name: string): any;
 } & {
+    setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
@@ -267,7 +267,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
         setToggled(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
     readonly dataSource: any[];
-    readonly currentSelectedRowKeys: any[];
+    readonly currentSelectedRowKeys: any;
     readonly currentExpandedKeys: any[];
     readonly unSelectedRows: ({
         storeType: string;
@@ -457,15 +457,16 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
         change(values: object, savePristine?: boolean): void;
         reset(): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>))[];
+    readonly keyField: string;
 } & {
     update: (config: Partial<STableStore2>) => void;
     persistSaveToggledColumns: () => void;
     setOrderByInfo: (key: string, direction: 'asc' | 'desc') => void;
     updateQuery: (values: object, updater?: Function, pageNoField?: string, pageSizeField?: string, replace?: boolean) => void;
     initRows: (rows: Array<any>, getEntryId?: ((entry: any, index: number) => string) | undefined, reUseRow?: boolean, keyField?: string) => void;
-    updateSelected: (selectedKeys: Array<any>, keyField?: string) => void;
-    updateSelectedAll: (keyField?: string) => void;
-    updateExpanded: (expandedRowKeys: Array<any>, keyField?: string) => void;
+    updateSelected: (selectedKeys: Array<any>) => void;
+    updateSelectedAll: () => void;
+    updateExpanded: (expandedRowKeys: Array<any>, keyField: string) => void;
     exchange: (fromIndex: number, toIndex: number, item?: IRow2) => void;
     reset: () => void;
     toggleAllColumns: () => void;

package/lib/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -158,8 +158,7 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
     pageNo: 1,
     pageSize: 10,
     dragging: false,
-    keepItemSelectionOnPageChange: false,
-    maxKeepItemSelectionLength: 0
+    rowSelectionKeyField: 'id'
 })
     .views(function (self) {
     function getToggable() {
@@ -240,6 +239,9 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
             return self.rows.map(function (item) { return item.data; });
         },
         get currentSelectedRowKeys() {
+            if (self.data && self.data.selectedItems) {
+                return (self.data.selectedItems.map(function (item) { return item[self.rowSelectionKeyField]; }) || []);
+            }
             return self.selectedRowKeys.map(function (item) { return item; });
         },
         get currentExpandedKeys() {
@@ -263,6 +265,9 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
         },
         get movedRows() {
             return getMovedRows();
+        },
+        get keyField() {
+            return self.rowSelectionKeyField;
         }
     };
 })
@@ -281,11 +286,9 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
         if (typeof config.orderBy === 'string') {
             setOrderByInfo(config.orderBy, config.order === 'desc' ? 'desc' : 'asc');
         }
-        config.maxKeepItemSelectionLength !== void 0 &&
-            (self.maxKeepItemSelectionLength = config.maxKeepItemSelectionLength);
-        config.keepItemSelectionOnPageChange !== void 0 &&
-            (self.keepItemSelectionOnPageChange =
-                config.keepItemSelectionOnPageChange);
+        if (config.rowSelectionKeyField) {
+            self.rowSelectionKeyField = config.rowSelectionKeyField;
+        }
         if (config.columns && Array.isArray(config.columns)) {
             self.columns.replace(updateColumns(config.columns));
         }
@@ -352,41 +355,42 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
             helper.isObjectShallowModified(originQuery, self.query, false) &&
             setTimeout(updater.bind(null, "?".concat(helper.qsstringify(self.query))), 4);
     }
-    function updateSelectedRows(rows, selectedKeys, keyField) {
+    function updateSelectedRows(rows, selectedKeys) {
+        var rowSelectionKeyField = self.rowSelectionKeyField;
         helper.eachTree(rows, function (item) {
-            if (~selectedKeys.indexOf(item.pristine[keyField || 'key'])) {
+            if (~selectedKeys.indexOf(item.pristine[rowSelectionKeyField])) {
                 self.selectedRows.push(item.id);
-                self.selectedRowKeys.push(item.pristine[keyField || 'key']);
+                self.selectedRowKeys.push(item.pristine[rowSelectionKeyField]);
             }
-            else if (find__default["default"](selectedKeys, function (a) { return a && a == item.pristine[keyField || 'key']; })) {
+            else if (find__default["default"](selectedKeys, function (a) { return a && a == item.pristine[rowSelectionKeyField]; })) {
                 self.selectedRows.push(item.id);
-                self.selectedRowKeys.push(item.pristine[keyField || 'key']);
+                self.selectedRowKeys.push(item.pristine[rowSelectionKeyField]);
             }
             else if (item.children) {
-                updateSelectedRows(item.children, selectedKeys, keyField);
+                updateSelectedRows(item.children, selectedKeys);
             }
         });
     }
-    function updateSelected(selectedKeys, keyField) {
+    function updateSelected(selectedKeys) {
         self.selectedRows.clear();
         self.selectedRowKeys.clear();
-        updateSelectedRows(self.rows, selectedKeys, keyField);
+        updateSelectedRows(self.rows, selectedKeys);
     }
-    function updateSelectedAll(keyField) {
+    function updateSelectedAll() {
         var selectedKeys = [];
         helper.eachTree(self.rows, function (item) {
-            return selectedKeys.push(item.pristine[keyField || 'key']);
+            return selectedKeys.push(item.pristine[self.rowSelectionKeyField]);
         });
-        updateSelectedRows(self.rows, selectedKeys, keyField);
+        updateSelectedRows(self.rows, selectedKeys);
     }
     function updateExpanded(expandedRowKeys, keyField) {
         self.expandedRowKeys.clear();
         helper.eachTree(self.rows, function (item) {
-            if (~expandedRowKeys.indexOf(item.pristine[keyField || 'key'])) {
-                self.expandedRowKeys.push(item.pristine[keyField || 'key']);
+            if (~expandedRowKeys.indexOf(item.pristine[keyField])) {
+                self.expandedRowKeys.push(item.pristine[keyField]);
             }
-            else if (find__default["default"](expandedRowKeys, function (a) { return a && a == item.pristine[keyField || 'key']; })) {
-                self.expandedRowKeys.push(item.pristine[keyField || 'key']);
+            else if (find__default["default"](expandedRowKeys, function (a) { return a && a == item.pristine[keyField]; })) {
+                self.expandedRowKeys.push(item.pristine[keyField]);
             }
         });
     }

package/lib/theme.d.ts

@@ -56,7 +56,7 @@ export declare function themeable<T extends React.ComponentType<React.ComponentP
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;

package/lib/theme.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/lib/types.d.ts

@@ -257,7 +257,7 @@ export interface Definitions {
     [propName: string]: SchemaNode;
 }
 export interface ActionObject extends ButtonObject {
-    actionType?: 'submit' | 'copy' | 'reload' | 'ajax' | 'saveAs' | 'dialog' | 'drawer' | 'jump' | 'link' | 'url' | 'email' | 'close' | 'confirm' | 'add' | 'remove' | 'delete' | 'edit' | 'cancel' | 'next' | 'prev' | 'reset' | 'validate' | 'reset-and-submit' | 'clear' | 'clear-and-submit' | 'toast' | 'goto-step' | 'goto-image' | 'expand' | 'collapse' | 'step-submit' | 'selectAll' | 'changeTabKey';
+    actionType?: 'submit' | 'copy' | 'reload' | 'ajax' | 'saveAs' | 'dialog' | 'drawer' | 'confirmDialog' | 'jump' | 'link' | 'url' | 'email' | 'close' | 'confirm' | 'add' | 'remove' | 'delete' | 'edit' | 'cancel' | 'next' | 'prev' | 'reset' | 'validate' | 'reset-and-submit' | 'clear' | 'clear-and-submit' | 'toast' | 'goto-step' | 'goto-image' | 'expand' | 'collapse' | 'step-submit' | 'selectAll' | 'changeTabKey';
     api?: BaseApiObject | string;
     asyncApi?: BaseApiObject | string;
     payload?: any;
@@ -488,6 +488,12 @@ export interface BaseSchemaWithoutType {
      */
     staticInputClassName?: SchemaClassName;
     staticSchema?: any;
+    /**
+     * 组件样式
+     */
+    style?: {
+        [propName: string]: any;
+    };
 }
 export type OperatorType = 'equal' | 'not_equal' | 'is_empty' | 'is_not_empty' | 'like' | 'not_like' | 'starts_with' | 'ends_with' | 'less' | 'less_or_equal' | 'greater' | 'greater_or_equal' | 'between' | 'not_between' | 'select_equals' | 'select_not_equals' | 'select_any_in' | 'select_not_any_in' | {
     label: string;

package/lib/utils/Animation.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/ColorScale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/DataSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/DataScope.d.ts

@@ -15,12 +15,10 @@ export declare class DataScope {
     addSchema(schema: JSONSchema): this;
     removeSchema(id: string): this;
     contains(scope: DataScope): boolean;
+    assignSchema(target: any, schema: any): any;
     getMergedSchema(): any;
-    protected buildOptions(options: Array<any>, schema: JSONSchema, path?: string, key?: string, 
-    /** 是否数组元素，数组元素的内容将获取每个成员的对应值 */
-    isArrayItem?: boolean, 
-    /** 不是所有的都可以选择，但不影响子元素 */
-    disabled?: boolean): void;
+    protected buildOptions(options: Array<any>, schema: JSONSchema, path?: string, key?: string): void;
     getDataPropsAsOptions(): any;
     getSchemaByPath(path: string): import("json-schema").JSONSchema7 | null;
+    getSchemaById(id: string): import("json-schema").JSONSchema7 | undefined;
 }