amis-core 2.8.0 → 3.0.0

package/esm/renderers/wrapControl.js

@@ -1,15 +1,15 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
-import { __extends, __awaiter, __generator, __assign } from 'tslib';
+import { __extends, __assign, __awaiter, __generator } from 'tslib';
 import React from 'react';
 import debounce from 'lodash/debounce';
 import isEqual from 'lodash/isEqual';
 import { ComboStore } from '../store/combo.js';
 import { guid, promisify, anyChanged } from '../utils/helper.js';
-import { isExpression, FormulaExec, replaceExpression, isNeedFormula } from '../utils/formula.js';
+import { isExpression, FormulaExec, replaceExpression, isNowFormula, isNeedFormula } from '../utils/formula.js';
 import { ScopedContext } from '../Scoped.js';
 import { FormItemStore } from '../store/formItem.js';
 import { isAlive } from 'mobx-state-tree';
@@ -17,6 +17,7 @@ import { observer } from 'mobx-react';
 import hoistNonReactStatic from 'hoist-non-react-statics';
 import { withRootStore } from '../WithRootStore.js';
 import { TableStore } from '../store/table.js';
+import pick from 'lodash/pick';
 import { getVariable } from '../utils/getVariable.js';
 
 function wrapControl(ComposedComponent) {
@@ -32,7 +33,7 @@ function wrapControl(ComposedComponent) {
                     trailing: true,
                     leading: false
                 });
-                var _c = _this.props, form = _c.formStore, formItem = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, _d = _c.$schema, name = _d.name, id = _d.id, type = _d.type, required = _d.required, validations = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, multiple = _d.multiple, delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label;
+                var _c = _this.props, form = _c.formStore, formItem = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, _d = _c.$schema, name = _d.name, id = _d.id, type = _d.type, required = _d.required, validations = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value; _d.multiple; var delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label;
                 _this.getValue = _this.getValue.bind(_this);
                 _this.setValue = _this.setValue.bind(_this);
                 _this.handleChange = _this.handleChange.bind(_this);
@@ -63,31 +64,7 @@ function wrapControl(ComposedComponent) {
                 _this.model = model;
                 // @issue 打算干掉这个
                 formItem === null || formItem === void 0 ? void 0 : formItem.addSubFormItem(model);
-                model.config({
-                    id: id,
-                    type: type,
-                    required: required,
-                    unique: unique,
-                    value: value,
-                    isValueSchemaExp: isExpression(value),
-                    rules: validations,
-                    messages: validationErrors,
-                    multiple: multiple,
-                    delimiter: delimiter,
-                    valueField: valueField,
-                    labelField: labelField,
-                    joinValues: joinValues,
-                    extractValue: extractValue,
-                    selectFirst: selectFirst,
-                    autoFill: autoFill,
-                    clearValueOnHidden: clearValueOnHidden,
-                    validateApi: validateApi,
-                    minLength: minLength,
-                    maxLength: maxLength,
-                    validateOnChange: validateOnChange,
-                    label: label,
-                    inputGroupControl: inputGroupControl
-                });
+                model.config(__assign(__assign({}, pick(__assign(__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: required, unique: unique, value: value, isValueSchemaExp: isExpression(value), rules: validations, messages: validationErrors, delimiter: delimiter, valueField: valueField, labelField: labelField, joinValues: joinValues, extractValue: extractValue, selectFirst: selectFirst, autoFill: autoFill, clearValueOnHidden: clearValueOnHidden, validateApi: validateApi, minLength: minLength, maxLength: maxLength, validateOnChange: validateOnChange, label: label, inputGroupControl: inputGroupControl }));
                 // issue 这个逻辑应该在 combo 里面自己实现。
                 if (_this.model.unique &&
                     ((_a = form === null || form === void 0 ? void 0 : form.parentStore) === null || _a === void 0 ? void 0 : _a.storeType) === ComboStore.name) {
@@ -209,10 +186,12 @@ function wrapControl(ComposedComponent) {
                 else if (model &&
                     typeof props.defaultValue !== 'undefined' &&
                     isExpression(props.defaultValue)) {
+                    var nowFormulaChecked = isNowFormula(props.defaultValue);
                     // 渲染器中的 defaultValue 优先（备注: SchemaRenderer中会将 value 改成 defaultValue）
                     if (!isEqual(props.defaultValue, prevProps.defaultValue) ||
                         (props.data !== prevProps.data &&
-                            isNeedFormula(props.defaultValue, props.data, prevProps.data))) {
+                            (isNeedFormula(props.defaultValue, props.data, prevProps.data) ||
+                                nowFormulaChecked))) {
                         var curResult = FormulaExec['formula'](props.defaultValue, props.data);
                         var prevResult = FormulaExec['formula'](prevProps.defaultValue, prevProps.data);
                         if (!isEqual(curResult, prevResult) &&
@@ -223,6 +202,14 @@ function wrapControl(ComposedComponent) {
                                 props.onChange(curResult, model.name, false);
                             }
                         }
+                        else if (nowFormulaChecked) {
+                            var nowData = props.data[model.name];
+                            // now 表达式，计算后的值永远相同
+                            model.changeTmpValue(nowData);
+                            if (props.onChange) {
+                                props.onChange(nowData, model.name, false);
+                            }
+                        }
                     }
                 }
                 else if (model) {
@@ -420,6 +407,10 @@ function wrapControl(ComposedComponent) {
                 if ((onFormItemChange === null || onFormItemChange === void 0 ? void 0 : onFormItemChange(value, oldValue, this.model, form)) === false) {
                     return;
                 }
+                // onFormItemChange 可能会触发组件销毁，再次读取 this.model 为 undefined
+                if (!this.model) {
+                    return;
+                }
                 var validated = this.model.validated;
                 onChange === null || onChange === void 0 ? void 0 : onChange(value, name, submitOnChange === true);
                 if (

package/esm/store/app.d.ts

@@ -54,10 +54,12 @@ export declare const AppStore: 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/app.js

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

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

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

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 v3.0.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,28 @@ 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) {
+                                        if (Array.isArray(value)) {
+                                            if (value.length > 0) {
+                                                var arr_1 = __spreadArray([], __read(items_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);
+                                                });
+                                                items_1 = items_1.filter(function (item) { return arrItems_1.find(function (a) { return a === item; }); });
+                                            }
+                                        }
+                                        else {
+                                            items_1 = matchSorter(items_1, value, {
+                                                keys: [key]
+                                            });
+                                        }
+                                    }
                                 }
                             });
                         }
@@ -214,9 +230,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_2 = __spreadArray([], __read(filteredItems_1), false);
+                                                var arrItems_2 = [];
+                                                value.forEach(function (item) {
+                                                    arrItems_2 = __spreadArray(__spreadArray([], __read(arrItems_2), false), __read(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(filteredItems_1, value, {
+                                                keys: [key]
+                                            });
+                                        }
                                     }
                                 });
                             }
@@ -272,7 +302,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 +483,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 v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.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']
@@ -728,7 +729,7 @@ var FormItemStore = StoreNode.named('FormItemStore')
                 ? evalExpression(item.visibleOn, data) !== false
                 : item.hiddenOn
                     ? evalExpression(item.hiddenOn, data) !== true
-                    : item.visible !== false || item.hidden !== true;
+                    : item.visible !== false && item.hidden !== true;
         })
             .map(function (item, index) {
             var disabled = evalExpression(item.disabledOn, data);

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 v3.0.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 v3.0.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 v3.0.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 v3.0.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 v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/node.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.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,14 +1,14 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
 import '../utils/helper.js';
+import 'tslib';
 import 'amis-formula';
 import 'moment';
 import { createObject } from '../utils/object.js';
 import { resolveVariable } from '../utils/resolveVariable.js';
-import 'tslib';
 import 'lodash/isPlainObject';
 import '../utils/filter.js';
 import { iRendererStore } from './iRenderer.js';

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 v3.0.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 v3.0.0
  * Copyright 2018-2023 fex
  */