amis-core 2.8.0 → 3.0.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>>;
@@ -239,10 +239,12 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
     updateData(data?: object, tag?: object | undefined, replace?: boolean | 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): void;
+    openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
     closeDialog(result?: any): void;
-    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
     closeDrawer(result?: any): void;
+    getDialogScoped(): import("..").IScopedContext | null;
+    getDrawerScoped(): import("..").IScopedContext | null;
 } & {
     readonly columnsData: ({
         label: any;
@@ -267,7 +269,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<{
@@ -293,7 +295,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>>)[];
@@ -352,10 +354,12 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             updateData(data?: object, tag?: object | undefined, replace?: boolean | 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): void;
+            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
             closeDialog(result?: any): void;
-            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
             closeDrawer(result?: any): void;
+            getDialogScoped(): import("..").IScopedContext | null;
+            getDrawerScoped(): import("..").IScopedContext | null;
         } & {
             readonly loading: boolean;
         } & {
@@ -5609,10 +5613,12 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
             updateData(data?: object, tag?: object | undefined, replace?: boolean | 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): void;
+            openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
             closeDialog(result?: any): void;
-            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+            openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
             closeDrawer(result?: any): void;
+            getDialogScoped(): import("..").IScopedContext | null;
+            getDrawerScoped(): import("..").IScopedContext | null;
         } & {
             readonly loading: boolean;
         } & {
@@ -10835,7 +10841,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<{
@@ -10861,7 +10867,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>>)[];
@@ -10888,7 +10894,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<{
@@ -10914,7 +10920,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>>)[];
@@ -10942,7 +10948,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<{
@@ -10968,7 +10974,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>>)[];
@@ -10995,7 +11001,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<{
@@ -11021,7 +11027,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>>)[];
@@ -11048,7 +11054,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<{
@@ -11074,7 +11080,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>>)[];
@@ -11101,7 +11107,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<{
@@ -11127,7 +11133,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>>)[];
@@ -11154,7 +11160,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<{
@@ -11180,7 +11186,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>>)[];
@@ -11207,7 +11213,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<{
@@ -11233,7 +11239,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>>)[];
@@ -11260,7 +11266,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<{
@@ -11286,7 +11292,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>>)[];
@@ -12107,7 +12113,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.8.0
+ * amis-core v3.0.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();
@@ -826,10 +827,20 @@ var TableStore = iRenderer.iRendererStore
             (self.expandConfig &&
                 self.expandConfig.expand === 'all' &&
                 !self.expandConfig.accordion)) {
-            self.expandedRows.replace(self.rows.map(function (item) { return item.id; }));
+            self.expandedRows.replace(getExpandAllRows(self.rows));
         }
         self.dragging = false;
     }
+    // 获取所有层级的子节点id
+    function getExpandAllRows(arr) {
+        return arr.reduce(function (result, current) {
+            result.push(current.id);
+            if (current.children && current.children.length) {
+                result = result.concat(getExpandAllRows(current.children));
+            }
+            return result;
+        }, []);
+    }
     // 尽可能的复用 row
     function replaceRow(arr, reUseRow) {
         if (reUseRow === false) {
@@ -1076,10 +1087,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); });
@@ -1091,6 +1104,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值保持一致
@@ -1124,6 +1146,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;
@@ -161,10 +160,12 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
     updateData(data?: object, tag?: object | undefined, replace?: boolean | 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): void;
+    openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
     closeDialog(result?: any): void;
-    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
     closeDrawer(result?: any): void;
+    getDialogScoped(): import("..").IScopedContext | null;
+    getDrawerScoped(): import("..").IScopedContext | null;
 } & {
     readonly loading: boolean;
 } & {
@@ -265,7 +266,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;
@@ -455,14 +456,15 @@ 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;
+    updateSelected: (selectedKeys: Array<any>) => void;
+    updateSelectedAll: () => void;
     updateExpanded: (expandedRowKeys: Array<any>, keyField?: string) => void;
     exchange: (fromIndex: number, toIndex: number, item?: IRow2) => void;
     reset: () => void;

package/lib/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.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: 'key'
 })
     .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,32 +355,33 @@ 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();

package/lib/theme.d.ts

@@ -57,12 +57,10 @@ export declare function themeable<T extends React.ComponentType<React.ComponentP
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        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;
-        readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;

package/lib/theme.js

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

package/lib/types.d.ts

@@ -331,7 +331,7 @@ export interface EventTrack {
      * tabChange: tab 切换
      * netError: api 报错
      */
-    eventType: 'api' | 'url' | 'link' | 'dialog' | 'drawer' | 'copy' | 'reload' | 'email' | 'prev' | 'next' | 'cancel' | 'close' | 'submit' | 'confirm' | 'reset' | 'reset-and-submit' | 'formItemChange' | 'tabChange' | 'pageHidden' | 'pageVisible';
+    eventType: 'api' | 'url' | 'link' | 'dialog' | 'drawer' | 'copy' | 'reload' | 'email' | 'prev' | 'next' | 'cancel' | 'close' | 'submit' | 'confirm' | 'reset' | 'reset-and-submit' | 'formItemChange' | 'tabChange' | 'pageLoaded' | 'pageHidden' | 'pageVisible';
     /**
      * 事件数据
      */
@@ -385,7 +385,7 @@ interface LinkItemProps {
     children?: Array<LinkItem>;
     path?: string;
     icon?: string;
-    component?: React.ReactType;
+    component?: React.ElementType;
 }
 export interface NavigationObject {
     label: string;
@@ -488,5 +488,48 @@ 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;
+    value: string;
+};
+export type ExpressionSimple = string | number | object | undefined;
+export type ExpressionValue = ExpressionSimple | {
+    type: 'value';
+    value: ExpressionSimple;
+};
+export type ExpressionFunc = {
+    type: 'func';
+    func: string;
+    args: Array<ExpressionComplex>;
+};
+export type ExpressionField = {
+    type: 'field';
+    field: string;
+};
+export type ExpressionFormula = {
+    type: 'formula';
+    value: string;
+};
+export type ExpressionComplex = ExpressionValue | ExpressionFunc | ExpressionField | ExpressionFormula;
+export interface ConditionRule {
+    id: any;
+    left?: ExpressionComplex;
+    op?: OperatorType;
+    right?: ExpressionComplex | Array<ExpressionComplex>;
+}
+export interface ConditionGroupValue {
+    id: string;
+    conjunction: 'and' | 'or';
+    not?: boolean;
+    children?: Array<ConditionRule | ConditionGroupValue>;
+}
+export interface ConditionValue extends ConditionGroupValue {
 }
 export {};

package/lib/utils/Animation.js

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

package/lib/utils/ColorScale.js

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

package/lib/utils/DataSchema.js

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

package/lib/utils/DataScope.js

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

package/lib/utils/RootClose.js

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

package/lib/utils/SimpleMap.js

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

package/lib/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -359,7 +359,10 @@ function wrapFetcher(fn, tracker) {
             api = api.requestAdaptor(api) || api;
             debug.debug('api', 'after requestAdaptor', api);
         }
-        if (api.data && (helper.hasFile(api.data) || api.dataType === 'form-data')) {
+        if (api.data &&
+            (api.data instanceof FormData ||
+                helper.hasFile(api.data) ||
+                api.dataType === 'form-data')) {
             api.data =
                 api.data instanceof FormData
                     ? api.data
@@ -380,8 +383,7 @@ function wrapFetcher(fn, tracker) {
             api.headers['Content-Type'] = 'application/json';
         }
         if (!isValidApi(api.url)) {
-            debug.warning('api', 'invalid api url', api);
-            return Promise.resolve();
+            throw new Error("invalid api url:".concat(api.url));
         }
         debug.debug('api', 'request api', api);
         tracker === null || tracker === void 0 ? void 0 : tracker({ eventType: 'api', eventData: omit__default["default"](api, ['config', 'data', 'body']) }, api.data);
@@ -532,6 +534,10 @@ function isApiOutdated(prevApi, nextApi, prevData, nextData) {
     if (!nextApi) {
         return false;
     }
+    // 通常是编辑器里加了属性，一开始没值，后来有了
+    if (prevApi === undefined && !nextApi !== undefined) {
+        return true;
+    }
     nextApi = normalizeApi(nextApi);
     if (nextApi.autoRefresh === false) {
         return false;