amis-core 2.8.0 → 3.0.0

package/lib/store/combo.d.ts

@@ -1775,10 +1775,12 @@ export declare const ComboStore: 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 forms: ({
         id: string;
@@ -1834,10 +1836,12 @@ export declare const ComboStore: 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;
     } & {
@@ -7091,10 +7095,12 @@ export declare const ComboStore: 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/lib/store/combo.js

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

package/lib/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/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -118,12 +118,28 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                             options.columns.forEach(function (column) {
                                 var value;
                                 var key = column.name;
-                                if (column.searchable &&
-                                    key &&
-                                    (value = getVariable.getVariable(self.query, key))) {
-                                    items_1 = matchSorter.matchSorter(items_1, value, {
-                                        keys: [key]
-                                    });
+                                if ((column.searchable || column.filterable) && key) {
+                                    // value可能为null、undefined、''、0
+                                    value = getVariable.getVariable(self.query, key);
+                                    if (value != null) {
+                                        if (Array.isArray(value)) {
+                                            if (value.length > 0) {
+                                                var arr_1 = tslib.__spreadArray([], tslib.__read(items_1), false);
+                                                var arrItems_1 = [];
+                                                value.forEach(function (item) {
+                                                    arrItems_1 = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(arrItems_1), false), tslib.__read(matchSorter.matchSorter(arr_1, item, {
+                                                        keys: [key]
+                                                    })), false);
+                                                });
+                                                items_1 = items_1.filter(function (item) { return arrItems_1.find(function (a) { return a === item; }); });
+                                            }
+                                        }
+                                        else {
+                                            items_1 = matchSorter.matchSorter(items_1, value, {
+                                                keys: [key]
+                                            });
+                                        }
+                                    }
                                 }
                             });
                         }
@@ -222,9 +238,23 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                                     if (column.searchable &&
                                         key &&
                                         (value = getVariable.getVariable(self.query, key))) {
-                                        filteredItems_1 = matchSorter.matchSorter(filteredItems_1, value, {
-                                            keys: [key]
-                                        });
+                                        if (Array.isArray(value)) {
+                                            if (value.length > 0) {
+                                                var arr_2 = tslib.__spreadArray([], tslib.__read(filteredItems_1), false);
+                                                var arrItems_2 = [];
+                                                value.forEach(function (item) {
+                                                    arrItems_2 = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(arrItems_2), false), tslib.__read(matchSorter.matchSorter(arr_2, item, {
+                                                        keys: [key]
+                                                    })), false);
+                                                });
+                                                filteredItems_1 = filteredItems_1.filter(function (item) { return arrItems_2.find(function (a) { return a === item; }); });
+                                            }
+                                        }
+                                        else {
+                                            filteredItems_1 = matchSorter.matchSorter(filteredItems_1, value, {
+                                                keys: [key]
+                                            });
+                                        }
                                     }
                                 });
                             }
@@ -280,7 +310,10 @@ var CRUDStore = service.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;
@@ -458,6 +491,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         updateQuery: updateQuery,
         fetchInitData: fetchInitData,
         changePage: changePage,
+        changePerPage: changePerPage,
         selectAction: selectAction,
         saveRemote: saveRemote,
         setFilterTogglable: setFilterTogglable,

package/lib/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/lib/store/form.js

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

package/lib/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -140,9 +140,10 @@ var FormItemStore = node.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']
@@ -739,7 +740,7 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
                 ? tpl.evalExpression(item.visibleOn, data) !== false
                 : item.hiddenOn
                     ? tpl.evalExpression(item.hiddenOn, data) !== true
-                    : item.visible !== false || item.hidden !== true;
+                    : item.visible !== false && item.hidden !== true;
         })
             .map(function (item, index) {
             var disabled = tpl.evalExpression(item.disabledOn, data);

package/lib/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/lib/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -43,6 +43,8 @@ var iRendererStore = node.StoreNode.named('iRendererStore')
 }); })
     .actions(function (self) {
     var dialogCallbacks = new SimpleMap.SimpleMap();
+    var dialogScoped = null;
+    var drawerScoped = null;
     return {
         initData: function (data, skipSetPristine) {
             if (data === void 0) { data = {}; }
@@ -128,7 +130,7 @@ var iRendererStore = node.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 = object.createObject(proto, additonal);
@@ -145,16 +147,18 @@ var iRendererStore = node.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 = object.createObject(proto, additonal);
@@ -173,14 +177,22 @@ var iRendererStore = node.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/lib/store/index.js

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

package/lib/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/lib/store/list.js

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

package/lib/store/manager.js

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

package/lib/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/lib/store/modal.js

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

package/lib/store/node.js

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

package/lib/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/lib/store/pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -8,11 +8,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('../utils/helper.js');
+require('tslib');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
 var resolveVariable = require('../utils/resolveVariable.js');
-require('tslib');
 require('lodash/isPlainObject');
 require('../utils/filter.js');
 var iRenderer = require('./iRenderer.js');

package/lib/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/lib/store/root.js

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

package/lib/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/lib/store/service.js

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