amis-core 2.8.0 → 2.9.0

package/esm/store/crud.d.ts

@@ -65,10 +65,12 @@ export declare const CRUDStore: 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;
 } & {
@@ -110,6 +112,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
         isTable2?: Boolean;
     }) => Promise<any>;
     changePage: (page: number, perPage?: number | string) => void;
+    changePerPage: (perPage: number | string) => void;
     selectAction: (action: ActionObject) => void;
     saveRemote: (api: Api, data?: object, options?: fetchOptions) => Promise<any>;
     setFilterTogglable: (toggable: boolean, filterVisible?: boolean) => void;

package/esm/store/crud.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
-import { __extends, __assign, __generator, __rest, __values, __awaiter } from 'tslib';
+import { __extends, __assign, __generator, __rest, __values, __spreadArray, __read, __awaiter } from 'tslib';
 import { saveAs } from 'file-saver';
 import { types, flow, getEnv, isAlive } from 'mobx-state-tree';
 import { ServiceStore } from './service.js';
@@ -110,12 +110,14 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                             options.columns.forEach(function (column) {
                                 var value;
                                 var key = column.name;
-                                if (column.searchable &&
-                                    key &&
-                                    (value = getVariable(self.query, key))) {
-                                    items_1 = matchSorter(items_1, value, {
-                                        keys: [key]
-                                    });
+                                if ((column.searchable || column.filterable) && key) {
+                                    // value可能为null、undefined、''、0
+                                    value = getVariable(self.query, key);
+                                    if (value != null) {
+                                        items_1 = matchSorter(items_1, value, {
+                                            keys: [key]
+                                        });
+                                    }
                                 }
                             });
                         }
@@ -214,9 +216,23 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                                     if (column.searchable &&
                                         key &&
                                         (value = getVariable(self.query, key))) {
-                                        filteredItems_1 = matchSorter(filteredItems_1, value, {
-                                            keys: [key]
-                                        });
+                                        if (Array.isArray(value)) {
+                                            if (value.length > 0) {
+                                                var arr_1 = __spreadArray([], __read(filteredItems_1), false);
+                                                var arrItems_1 = [];
+                                                value.forEach(function (item) {
+                                                    arrItems_1 = __spreadArray(__spreadArray([], __read(arrItems_1), false), __read(matchSorter(arr_1, item, {
+                                                        keys: [key]
+                                                    })), false);
+                                                });
+                                                filteredItems_1 = filteredItems_1.filter(function (item) { return arrItems_1.find(function (a) { return a === item; }); });
+                                            }
+                                        }
+                                        else {
+                                            filteredItems_1 = matchSorter(filteredItems_1, value, {
+                                                keys: [key]
+                                            });
+                                        }
                                     }
                                 });
                             }
@@ -272,7 +288,10 @@ var CRUDStore = ServiceStore.named('CRUDStore')
     });
     function changePage(page, perPage) {
         self.page = page;
-        perPage && (self.perPage = parseInt(perPage, 10));
+        perPage && changePerPage(perPage);
+    }
+    function changePerPage(perPage) {
+        self.perPage = parseInt(perPage, 10);
     }
     function selectAction(action) {
         self.selectedAction = action;
@@ -450,6 +469,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
         updateQuery: updateQuery,
         fetchInitData: fetchInitData,
         changePage: changePage,
+        changePerPage: changePerPage,
         selectAction: selectAction,
         saveRemote: saveRemote,
         setFilterTogglable: setFilterTogglable,

package/esm/store/form.d.ts

@@ -59,10 +59,12 @@ export declare const FormStore: 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;
 } & {

package/esm/store/form.js

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

package/esm/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -129,9 +129,10 @@ var FormItemStore = StoreNode.named('FormItemStore')
                 ? nodeValueArray
                 : Array.isArray(value)
                     ? value
-                    : typeof value === 'string'
-                        ? value.split(self.delimiter || ',')
-                        : [value];
+                    : // 单选时不应该分割
+                        typeof value === 'string' && self.multiple
+                            ? value.split(self.delimiter || ',')
+                            : [value];
             var selected = valueArray.map(function (item) {
                 return item && item.hasOwnProperty(self.valueField || 'value')
                     ? item[self.valueField || 'value']

package/esm/store/iRenderer.d.ts

@@ -1,4 +1,5 @@
 import { Instance, SnapshotIn } from 'mobx-state-tree';
+import { IScopedContext } from '../Scoped';
 export declare const iRendererStore: import("mobx-state-tree").IModelType<{
     id: import("mobx-state-tree").ISimpleType<string>;
     path: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -37,10 +38,12 @@ export declare const iRendererStore: import("mobx-state-tree").IModelType<{
     updateData(data?: object, tag?: object, replace?: boolean): void;
     changeValue(name: string, value: any, changePristine?: boolean, force?: boolean, otherModifier?: ((data: Object) => void) | undefined): void;
     setCurrentAction(action: object): void;
-    openDialog(ctx: any, additonal?: object, callback?: ((ret: any) => void) | undefined): void;
+    openDialog(ctx: any, additonal?: object, callback?: ((ret: any) => void) | undefined, scoped?: IScopedContext): void;
     closeDialog(result?: any): void;
-    openDrawer(ctx: any, additonal?: object, callback?: ((ret: any) => void) | undefined): void;
+    openDrawer(ctx: any, additonal?: object, callback?: ((ret: any) => void) | undefined, scoped?: IScopedContext): void;
     closeDrawer(result?: any): void;
+    getDialogScoped(): IScopedContext | null;
+    getDrawerScoped(): IScopedContext | null;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type IIRendererStore = Instance<typeof iRendererStore>;
 export type SIRendererStore = SnapshotIn<typeof iRendererStore>;

package/esm/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -39,6 +39,8 @@ var iRendererStore = StoreNode.named('iRendererStore')
 }); })
     .actions(function (self) {
     var dialogCallbacks = new SimpleMap();
+    var dialogScoped = null;
+    var drawerScoped = null;
     return {
         initData: function (data, skipSetPristine) {
             if (data === void 0) { data = {}; }
@@ -124,7 +126,7 @@ var iRendererStore = StoreNode.named('iRendererStore')
         setCurrentAction: function (action) {
             self.action = action;
         },
-        openDialog: function (ctx, additonal, callback) {
+        openDialog: function (ctx, additonal, callback, scoped) {
             var proto = ctx.__super ? ctx.__super : self.data;
             if (additonal) {
                 proto = createObject(proto, additonal);
@@ -141,16 +143,18 @@ var iRendererStore = StoreNode.named('iRendererStore')
             }
             self.dialogOpen = true;
             callback && dialogCallbacks.set(self.dialogData, callback);
+            dialogScoped = scoped || null;
         },
         closeDialog: function (result) {
             var callback = dialogCallbacks.get(self.dialogData);
             self.dialogOpen = false;
+            dialogScoped = null;
             if (callback) {
                 dialogCallbacks.delete(self.dialogData);
                 setTimeout(function () { return callback(result); }, 200);
             }
         },
-        openDrawer: function (ctx, additonal, callback) {
+        openDrawer: function (ctx, additonal, callback, scoped) {
             var proto = ctx.__super ? ctx.__super : self.data;
             if (additonal) {
                 proto = createObject(proto, additonal);
@@ -169,14 +173,22 @@ var iRendererStore = StoreNode.named('iRendererStore')
             if (callback) {
                 dialogCallbacks.set(self.drawerData, callback);
             }
+            drawerScoped = scoped || null;
         },
         closeDrawer: function (result) {
             var callback = dialogCallbacks.get(self.drawerData);
             self.drawerOpen = false;
+            drawerScoped = null;
             if (callback) {
                 dialogCallbacks.delete(self.drawerData);
                 setTimeout(function () { return callback(result); }, 200);
             }
+        },
+        getDialogScoped: function () {
+            return dialogScoped;
+        },
+        getDrawerScoped: function () {
+            return drawerScoped;
         }
     };
 });

package/esm/store/index.js

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

package/esm/store/list.d.ts

@@ -104,10 +104,12 @@ export declare const ListStore: 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 allChecked: boolean;
     readonly checkableItems: ({

package/esm/store/list.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -44,10 +44,10 @@ var Item = types
             : true;
     },
     get draggable() {
-        var table = getParent(self, 2);
-        return table && table.itemDraggableOn
-            ? evalExpression(table.itemDraggableOn, self.locals)
-            : true;
+        var list = getParent(self, 2);
+        return list && list.itemDraggableOn
+            ? evalExpression(list.itemDraggableOn, self.locals)
+            : list.draggable;
     }
 }); })
     .actions(function (self) { return ({

package/esm/store/manager.js

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

package/esm/store/modal.d.ts

@@ -52,10 +52,12 @@ export declare const ModalStore: 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;
 } & {

package/esm/store/modal.js

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

package/esm/store/node.js

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

package/esm/store/pagination.d.ts

@@ -43,10 +43,12 @@ export declare const PaginationStore: 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 inputItems: any[];
     readonly locals: object;

package/esm/store/pagination.js

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

package/esm/store/root.d.ts

@@ -54,10 +54,12 @@ export declare const RootStore: 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;
 } & {

package/esm/store/root.js

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

package/esm/store/service.d.ts

@@ -48,10 +48,12 @@ export declare const ServiceStore: 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;
 } & {

package/esm/store/service.js

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

package/esm/store/table.d.ts

@@ -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;
@@ -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;
         } & {

package/esm/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -816,10 +816,20 @@ var TableStore = 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) {

package/esm/store/table2.d.ts

@@ -161,10 +161,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;
 } & {

package/esm/store/table2.js

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

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

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

package/esm/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;
@@ -489,4 +489,41 @@ export interface BaseSchemaWithoutType {
     staticInputClassName?: SchemaClassName;
     staticSchema?: 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/esm/utils/Animation.js

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

package/esm/utils/ColorScale.js

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

package/esm/utils/DataSchema.js

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

package/esm/utils/DataScope.js

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

package/esm/utils/RootClose.js

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

package/esm/utils/SimpleMap.js

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