amis-core 2.8.0 → 2.9.0

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -52,6 +52,7 @@ var replaceText = require('./utils/replaceText.js');
 var resizeSensor = require('./utils/resize-sensor.js');
 var resolveVariable = require('./utils/resolveVariable.js');
 var resolveVariableAndFilter = require('./utils/resolveVariableAndFilter.js');
+var resolveVariableAndFilterForAsync = require('./utils/resolveVariableAndFilterForAsync.js');
 var RootClose = require('./utils/RootClose.js');
 var scrollPosition = require('./utils/scrollPosition.js');
 var SimpleMap = require('./utils/SimpleMap.js');
@@ -65,6 +66,7 @@ var validations = require('./utils/validations.js');
 var toNumber = require('./utils/toNumber.js');
 var decodeEntity = require('./utils/decodeEntity.js');
 var styleHelper = require('./utils/style-helper.js');
+var resolveCondition = require('./utils/resolveCondition.js');
 var Animation = require('./utils/Animation.js');
 var index = require('./store/index.js');
 var mobxStateTree = require('mobx-state-tree');
@@ -127,7 +129,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
  */
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '2.8.0';
+var version = '2.9.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -233,6 +235,7 @@ exports.FormulaExec = formula.FormulaExec;
 exports.formulaExec = formula.formulaExec;
 exports.isExpression = formula.isExpression;
 exports.isNeedFormula = formula.isNeedFormula;
+exports.isNowFormula = formula.isNowFormula;
 exports.registerFormulaExec = formula.registerFormulaExec;
 exports.replaceExpression = formula.replaceExpression;
 exports.getVariable = getVariable.getVariable;
@@ -352,6 +355,7 @@ exports.getComputedStyle = resizeSensor.getComputedStyle;
 exports.resizeSensor = resizeSensor.resizeSensor;
 exports.resolveVariable = resolveVariable.resolveVariable;
 exports.resolveVariableAndFilter = resolveVariableAndFilter.resolveVariableAndFilter;
+exports.resolveVariableAndFilterForAsync = resolveVariableAndFilterForAsync.resolveVariableAndFilterForAsync;
 exports.RootClose = RootClose.RootClose;
 exports.scrollPosition = scrollPosition.scrollPosition;
 exports.SimpleMap = SimpleMap.SimpleMap;
@@ -360,6 +364,7 @@ exports.buildStyle = style.buildStyle;
 exports.tokenize = tokenize.tokenize;
 exports.register = tplBuiltin.register;
 exports.evalExpression = tpl.evalExpression;
+exports.evalExpressionWithConditionBuilder = tpl.evalExpressionWithConditionBuilder;
 exports.evalJS = tpl.evalJS;
 exports.filter = tpl.filter;
 exports.registerTplEnginer = tpl.registerTplEnginer;
@@ -380,6 +385,9 @@ exports.formatStyle = styleHelper.formatStyle;
 exports.insertCustomStyle = styleHelper.insertCustomStyle;
 exports.insertStyle = styleHelper.insertStyle;
 exports.valueMap = styleHelper.valueMap;
+exports.getConditionComputers = resolveCondition.getConditionComputers;
+exports.registerConditionComputer = resolveCondition.registerConditionComputer;
+exports.resolveCondition = resolveCondition.resolveCondition;
 exports.animation = Animation["default"];
 exports.RegisterStore = index.RegisterStore;
 exports.RendererStore = index.RendererStore;
@@ -415,6 +423,10 @@ exports.OptionsControl = Options.OptionsControl;
 exports.registerOptionsControl = Options.registerOptionsControl;
 exports.addRootWrapper = Root.addRootWrapper;
 exports.EnvContext = env.EnvContext;
+Object.defineProperty(exports, 'AsyncEvaluator', {
+    enumerable: true,
+    get: function () { return amisFormula.AsyncEvaluator; }
+});
 Object.defineProperty(exports, 'Evaluator', {
     enumerable: true,
     get: function () { return amisFormula.Evaluator; }
@@ -423,6 +435,10 @@ Object.defineProperty(exports, 'evaluate', {
     enumerable: true,
     get: function () { return amisFormula.evaluate; }
 });
+Object.defineProperty(exports, 'evaluateForAsync', {
+    enumerable: true,
+    get: function () { return amisFormula.evaluateForAsync; }
+});
 Object.defineProperty(exports, 'extendsFilters', {
     enumerable: true,
     get: function () { return amisFormula.extendsFilters; }

package/lib/locale.d.ts

@@ -25,7 +25,7 @@ export declare function localeable<T extends React.ComponentType<React.Component
         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 LocaleProps>> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
@@ -34,8 +34,6 @@ export declare function localeable<T extends React.ComponentType<React.Component
         readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof LocaleProps>> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }> & Readonly<{
-            children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
         refs: {

package/lib/locale.js

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

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -391,7 +391,7 @@ var Form = /** @class */ (function (_super) {
     };
     Form.prototype.emitChange = function (submit) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onChange, store, submitOnChange, dispatchEvent, data, dispatcher;
+            var _a, onChange, store, submitOnChange, dispatchEvent, data, changeProps, dispatcher;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -399,12 +399,16 @@ var Form = /** @class */ (function (_super) {
                         if (!mobxStateTree.isAlive(store)) {
                             return [2 /*return*/];
                         }
+                        changeProps = [
+                            store.data,
+                            helper.difference(store.data, store.pristine),
+                            this.props
+                        ];
                         return [4 /*yield*/, dispatchEvent('change', object.createObject(data, store.data))];
                     case 1:
                         dispatcher = _b.sent();
                         if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
-                            onChange &&
-                                onChange(store.data, helper.difference(store.data, store.pristine), this.props);
+                            onChange && onChange.apply(null, changeProps);
                         }
                         store.clearRestError();
                         (submit || (submitOnChange && store.inited)) &&
@@ -512,11 +516,12 @@ var Form = /** @class */ (function (_super) {
                                     // 走到这里代表校验成功了
                                     dispatchEvent('validateSucc', _this.props.data);
                                     if (target) {
-                                        _this.submitToTarget(target, values);
+                                        _this.submitToTarget(tpl.filter(target, values), values);
                                         dispatchEvent('submitSucc', object.createObject(_this.props.data, values));
                                     }
                                     else if (action.actionType === 'reload') {
-                                        action.target && _this.reloadTarget(action.target, values);
+                                        action.target &&
+                                            _this.reloadTarget(tpl.filter(action.target, values), values);
                                     }
                                     else if (action.actionType === 'dialog') {
                                         store.openDialog(data);
@@ -617,15 +622,12 @@ var Form = /** @class */ (function (_super) {
                                         finalRedirect && env.jumpTo(finalRedirect, action);
                                     }
                                     else if (action.reload || reload) {
-                                        _this.reloadTarget(action.reload || reload, store.data);
+                                        _this.reloadTarget(tpl.filter(action.reload || reload, store.data), store.data);
                                     }
                                     action.close && _this.closeTarget(action.close);
                                     return values;
                                 })
                                     .catch(function (reason) {
-                                    if (reason instanceof helper.SkipOperation) {
-                                        return;
-                                    }
                                     onFailed && onFailed(reason, store.errors);
                                     if (throwErrors) {
                                         throw reason;
@@ -684,7 +686,8 @@ var Form = /** @class */ (function (_super) {
                                             case 4:
                                                 redirect = action.redirect && tpl.filter(action.redirect, store.data);
                                                 redirect && env.jumpTo(redirect, action);
-                                                action.reload && this.reloadTarget(action.reload, store.data);
+                                                action.reload &&
+                                                    this.reloadTarget(tpl.filter(action.reload, store.data), store.data);
                                                 action.close && this.closeTarget(action.close);
                                                 return [2 /*return*/];
                                         }
@@ -700,7 +703,7 @@ var Form = /** @class */ (function (_super) {
                         else if (action.actionType === 'reload') {
                             store.setCurrentAction(action);
                             if (action.target) {
-                                this.reloadTarget(action.target, data);
+                                this.reloadTarget(tpl.filter(action.target, data), data);
                             }
                             else {
                                 this.receive(data);
@@ -880,8 +883,7 @@ var Form = /** @class */ (function (_super) {
              */
             disabled: disabled ||
                 control.disabled ||
-                (form.loading ? true : undefined) }, control.static || isStatic
-            ? { static: true } : {}), { btnDisabled: disabled || form.loading || form.validating, onAction: this.handleAction, onQuery: this.handleQuery, onChange: this.handleChange, onBulkChange: this.handleBulkChange, addHook: this.addHook, removeHook: this.removeHook, renderFormItems: this.renderFormItems, formItemDispatchEvent: this.formItemDispatchEvent(dispatchEvent), formPristine: form.pristine });
+                (form.loading ? true : undefined) }, (control.static || isStatic ? { static: true } : {})), { btnDisabled: disabled || form.loading || form.validating, onAction: this.handleAction, onQuery: this.handleQuery, onChange: this.handleChange, onBulkChange: this.handleBulkChange, addHook: this.addHook, removeHook: this.removeHook, renderFormItems: this.renderFormItems, formItemDispatchEvent: this.formItemDispatchEvent(dispatchEvent), formPristine: form.pristine });
         var subSchema = tslib.__assign({}, control);
         if (subSchema.$ref) {
             subSchema = tslib.__assign(tslib.__assign({}, resolveDefinitions(subSchema.$ref)), subSchema);

package/lib/renderers/Item.d.ts

@@ -461,15 +461,11 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
 export declare const detectProps: string[];
 export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (Control: FormControlComponent) => {
     new (props: Omit<any, "rootStore"> | Readonly<Omit<any, "rootStore">>): {
-        render(): JSX.Element; /**
-         * 描述标题
-         */
-        context: any;
+        render(): JSX.Element;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<any, "rootStore">> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<any, "rootStore">>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -488,15 +484,11 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
         UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): void;
     };
     new (props: Omit<any, "rootStore">, context: any): {
-        render(): JSX.Element; /**
-         * 描述标题
-         */
-        context: any;
+        render(): JSX.Element;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<any, "rootStore">> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<any, "rootStore">>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -862,7 +854,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
     ComposedComponent: React.ComponentType<any>;
 } & hoistNonReactStatic.NonReactStatics<any, {}> & {
-    ComposedComponent: any;
+    ComposedComponent: any; /**
+     * 配置 label className
+     */
 } & {
     ComposedComponent: any;
 };

package/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -49,6 +49,7 @@ require('lodash/camelCase');
 var styleHelper = require('../utils/style-helper.js');
 require('uncontrollable');
 require('../utils/validations.js');
+require('../utils/resolveCondition.js');
 require('../utils/Animation.js');
 var Overlay = require('../components/Overlay.js');
 var PopOver = require('../components/PopOver.js');

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -51,6 +51,7 @@ require('lodash/camelCase');
 require('uncontrollable');
 require('hoist-non-react-statics');
 require('../utils/validations.js');
+require('../utils/resolveCondition.js');
 require('../utils/Animation.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

package/lib/renderers/Placeholder.js

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

package/lib/renderers/builtin.js

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

package/lib/renderers/register.js

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

package/lib/renderers/wrapControl.d.ts

@@ -51,12 +51,10 @@ export interface ControlProps {
 export declare function wrapControl<T extends React.ComponentType<React.ComponentProps<T> & ControlProps>>(ComposedComponent: T): {
     new (props: Omit<any, "rootStore"> | Readonly<Omit<any, "rootStore">>): {
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<any, "rootStore">> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<any, "rootStore">>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -76,12 +74,10 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
     };
     new (props: Omit<any, "rootStore">, context: any): {
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<any, "rootStore">> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<any, "rootStore">>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -21,6 +21,7 @@ var mobxReact = require('mobx-react');
 var hoistNonReactStatic = require('hoist-non-react-statics');
 var WithRootStore = require('../WithRootStore.js');
 var table = require('../store/table.js');
+var pick = require('lodash/pick');
 var getVariable = require('../utils/getVariable.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -29,6 +30,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 var hoistNonReactStatic__default = /*#__PURE__*/_interopDefaultLegacy(hoistNonReactStatic);
+var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
 
 function wrapControl(ComposedComponent) {
     var _a;
@@ -43,7 +45,7 @@ function wrapControl(ComposedComponent) {
                     trailing: true,
                     leading: false
                 });
-                var _c = _this.props, form = _c.formStore, formItem$1 = _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$1 = _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);
@@ -74,31 +76,7 @@ function wrapControl(ComposedComponent) {
                 _this.model = model;
                 // @issue 打算干掉这个
                 formItem$1 === null || formItem$1 === void 0 ? void 0 : formItem$1.addSubFormItem(model);
-                model.config({
-                    id: id,
-                    type: type,
-                    required: required,
-                    unique: unique,
-                    value: value,
-                    isValueSchemaExp: formula.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(tslib.__assign(tslib.__assign({}, pick__default["default"](tslib.__assign(tslib.__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: required, unique: unique, value: value, isValueSchemaExp: formula.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) === combo.ComboStore.name) {
@@ -220,10 +198,12 @@ function wrapControl(ComposedComponent) {
                 else if (model &&
                     typeof props.defaultValue !== 'undefined' &&
                     formula.isExpression(props.defaultValue)) {
+                    var nowFormulaChecked = formula.isNowFormula(props.defaultValue);
                     // 渲染器中的 defaultValue 优先（备注: SchemaRenderer中会将 value 改成 defaultValue）
                     if (!isEqual__default["default"](props.defaultValue, prevProps.defaultValue) ||
                         (props.data !== prevProps.data &&
-                            formula.isNeedFormula(props.defaultValue, props.data, prevProps.data))) {
+                            (formula.isNeedFormula(props.defaultValue, props.data, prevProps.data) ||
+                                nowFormulaChecked))) {
                         var curResult = formula.FormulaExec['formula'](props.defaultValue, props.data);
                         var prevResult = formula.FormulaExec['formula'](prevProps.defaultValue, prevProps.data);
                         if (!isEqual__default["default"](curResult, prevResult) &&
@@ -234,6 +214,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) {
@@ -431,6 +419,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/lib/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/lib/store/app.js

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

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 v2.9.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 v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -118,12 +118,14 @@ 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) {
+                                        items_1 = matchSorter.matchSorter(items_1, value, {
+                                            keys: [key]
+                                        });
+                                    }
                                 }
                             });
                         }
@@ -222,9 +224,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_1 = tslib.__spreadArray([], tslib.__read(filteredItems_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);
+                                                });
+                                                filteredItems_1 = filteredItems_1.filter(function (item) { return arrItems_1.find(function (a) { return a === item; }); });
+                                            }
+                                        }
+                                        else {
+                                            filteredItems_1 = matchSorter.matchSorter(filteredItems_1, value, {
+                                                keys: [key]
+                                            });
+                                        }
                                     }
                                 });
                             }
@@ -280,7 +296,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 +477,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;
 } & {