amis-core 3.5.3 → 3.6.0

package/esm/components/PopOver.d.ts

@@ -46,9 +46,13 @@ export declare class PopOver extends React.PureComponent<PopOverProps, PopOverSt
     };
     parent: HTMLElement;
     wrapperRef: React.RefObject<HTMLDivElement>;
+    isRootClosed: boolean;
     componentDidMount(): void;
     componentDidUpdate(): void;
     componentWillUnmount(): void;
+    handleRootMouseDownCapture(e: MouseEvent): void;
+    handleRootMouseUpCapture(e: MouseEvent): void;
+    handleRootMouseUp(e: MouseEvent): void;
     mayUpdateOffset(): void;
     render(): React.JSX.Element;
 }

package/esm/components/PopOver.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
-import { __extends, __rest, __assign } from 'tslib';
+import { __extends, __rest, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import { findDOMNode } from 'react-dom';
 import { themeable } from '../theme.js';
@@ -18,7 +18,7 @@ import 'moment';
 import '../utils/debug.js';
 import '../utils/errors.js';
 import '../utils/tpl.js';
-import { preventDefault, camel } from '../utils/helper.js';
+import { preventDefault, camel, autobind } from '../utils/helper.js';
 import '../utils/filter.js';
 import 'lodash/isObject';
 import 'lodash/isString';
@@ -57,6 +57,7 @@ var PopOver = /** @class */ (function (_super) {
             yOffset: 0
         };
         _this.wrapperRef = React.createRef();
+        _this.isRootClosed = false;
         return _this;
     }
     PopOver.prototype.componentDidMount = function () {
@@ -71,6 +72,14 @@ var PopOver = /** @class */ (function (_super) {
                 capture: false
             });
         }
+        // 从弹窗中处理复制过来的，如果要修改，请同步修改
+        // 因为 overlay 功能其实是用 postion: fixed 来实现的
+        // 目的是加一个蒙层监听蒙层点击然后关闭弹窗。意图就是 closeOnOutside
+        // 但是如果上层有个 translateZ 之类的样式就会影响 fixed 的定位，导致功能失效
+        // 所以这里兜底加了个 closeOnOutside 的功能
+        document.body.addEventListener('mousedown', this.handleRootMouseDownCapture, true);
+        document.body.addEventListener('mouseup', this.handleRootMouseUpCapture, true);
+        document.body.addEventListener('mouseup', this.handleRootMouseUp);
     };
     PopOver.prototype.componentDidUpdate = function () {
         this.mayUpdateOffset();
@@ -80,6 +89,42 @@ var PopOver = /** @class */ (function (_super) {
         if (this.wrapperRef && this.wrapperRef.current) {
             this.wrapperRef.current.removeEventListener('touchmove', preventDefault);
         }
+        document.body.removeEventListener('mouseup', this.handleRootMouseUp);
+        document.body.removeEventListener('mousedown', this.handleRootMouseDownCapture, true);
+        document.body.removeEventListener('mouseup', this.handleRootMouseUpCapture, true);
+    };
+    PopOver.prototype.handleRootMouseDownCapture = function (e) {
+        var target = e.target;
+        var _a = this.props, closeOnOutside = _a.overlay, ns = _a.classPrefix;
+        var isLeftButton = (e.button === 1 && window.event !== null) || e.button === 0;
+        this.isRootClosed = !!(isLeftButton &&
+            closeOnOutside &&
+            target &&
+            this.wrapperRef.current &&
+            ((!this.wrapperRef.current.contains(target) &&
+                !target.closest('[role=dialog]')) ||
+                (target.matches(".".concat(ns, "Modal")) && target === this.wrapperRef.current))); // 干脆过滤掉来自弹框里面的点击
+    };
+    PopOver.prototype.handleRootMouseUpCapture = function (e) {
+        // mousedown 的时候不在弹窗里面，则不需要判断了
+        if (!this.isRootClosed) {
+            return;
+        }
+        // 再判断 mouseup 的时候是不是在弹窗里面
+        this.handleRootMouseDownCapture(e);
+    };
+    PopOver.prototype.handleRootMouseUp = function (e) {
+        var onHide = this.props.onHide;
+        if (this.isRootClosed && !e.defaultPrevented) {
+            // 因为原来 overlay 是不会让别的部分还有点击事件的，所以这里要阻止默认事件
+            // 参考：https://stackoverflow.com/questions/8643739/cancel-click-event-in-the-mouseup-event-handler
+            var captureClick_1 = function (e) {
+                e.stopPropagation();
+                window.removeEventListener('click', captureClick_1, true);
+            };
+            window.addEventListener('click', captureClick_1, true);
+            onHide === null || onHide === void 0 ? void 0 : onHide();
+        }
     };
     PopOver.prototype.mayUpdateOffset = function () {
         var offset;
@@ -118,6 +163,24 @@ var PopOver = /** @class */ (function (_super) {
         overlay: false,
         placement: 'auto'
     };
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [MouseEvent]),
+        __metadata("design:returntype", void 0)
+    ], PopOver.prototype, "handleRootMouseDownCapture", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [MouseEvent]),
+        __metadata("design:returntype", void 0)
+    ], PopOver.prototype, "handleRootMouseUpCapture", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [MouseEvent]),
+        __metadata("design:returntype", void 0)
+    ], PopOver.prototype, "handleRootMouseUp", null);
     return PopOver;
 }(React.PureComponent));
 var PopOver$1 = themeable(PopOver);

package/esm/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/index.d.ts

@@ -39,6 +39,7 @@ import type { FilterContext } from 'amis-formula';
 import LazyComponent from './components/LazyComponent';
 import Overlay from './components/Overlay';
 import PopOver from './components/PopOver';
+import ErrorBoundary from './components/ErrorBoundary';
 import { FormRenderer } from './renderers/Form';
 import type { FormHorizontal, FormSchemaBase } from './renderers/Form';
 import { enableDebug, disableDebug } from './utils/index';
@@ -49,5 +50,5 @@ import type { IItem } from './store/list';
 import CustomStyle from './components/CustomStyle';
 import { StatusScoped } from './StatusScoped';
 export declare const version = "__buildVersion";
-export { clearStoresCache, updateEnv, Renderer, RendererProps, RenderOptions, RendererEnv, EnvContext, RegisterStore, FormItem, FormItemWrap, FormItemProps, OptionsControl, FormRenderer, FormHorizontal, utils, getRendererByName, registerRenderer, unRegisterRenderer, getRenderers, registerFormItem, getFormItemByName, registerOptionsControl, resolveRenderer, filterSchema, Scoped, ScopedContext, IScopedContext, StatusScoped, setDefaultTheme, theme, themeable, ThemeProps, getTheme, classPrefix, getClassPrefix, classnames, makeClassnames, getDefaultLocale, setDefaultLocale, registerLocale, makeTranslator, extendLocale, removeLocaleData, localeable, LocaleProps, TranslateFn, ClassNamesFn, parse, lexer, Evaluator, AsyncEvaluator, FilterContext, filters, getFilters, registerFilter, extendsFilters, registerFunction, evaluate, evaluateForAsync, LazyComponent, Overlay, PopOver, addSchemaFilter, OptionsControlProps, FormOptionsControl, FormControlProps, FormBaseControl, extendDefaultEnv, addRootWrapper, RendererConfig, styleMap, RENDERER_TRANSMISSION_OMIT_PROPS, ScopedComponentType, IItem, IColumn, IRow, IColumn2, IRow2, OnEventProps, FormSchemaBase, filterTarget, CustomStyle, enableDebug, disableDebug };
+export { clearStoresCache, updateEnv, Renderer, RendererProps, RenderOptions, RendererEnv, EnvContext, RegisterStore, FormItem, FormItemWrap, FormItemProps, OptionsControl, FormRenderer, FormHorizontal, utils, getRendererByName, registerRenderer, unRegisterRenderer, getRenderers, registerFormItem, getFormItemByName, registerOptionsControl, resolveRenderer, filterSchema, Scoped, ScopedContext, IScopedContext, StatusScoped, setDefaultTheme, theme, themeable, ThemeProps, getTheme, classPrefix, getClassPrefix, classnames, makeClassnames, getDefaultLocale, setDefaultLocale, registerLocale, makeTranslator, extendLocale, removeLocaleData, localeable, LocaleProps, TranslateFn, ClassNamesFn, parse, lexer, Evaluator, AsyncEvaluator, FilterContext, filters, getFilters, registerFilter, extendsFilters, registerFunction, evaluate, evaluateForAsync, LazyComponent, Overlay, PopOver, ErrorBoundary, addSchemaFilter, OptionsControlProps, FormOptionsControl, FormControlProps, FormBaseControl, extendDefaultEnv, addRootWrapper, RendererConfig, styleMap, RENDERER_TRANSMISSION_OMIT_PROPS, ScopedComponentType, IItem, IColumn, IRow, IColumn2, IRow2, OnEventProps, FormSchemaBase, filterTarget, CustomStyle, enableDebug, disableDebug };
 export declare function render(schema: Schema, props?: RootRenderProps, options?: RenderOptions, pathPrefix?: string): JSX.Element;

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -24,7 +24,7 @@ export { DebugWrapper, JsonView, debug, disableDebug, enableDebug, traceProps, w
 export { calculatePosition, getContainer, getStyleNumber, ownerDocument, renderTextByKeyword } from './utils/dom.js';
 export { ServerError } from './utils/errors.js';
 export { escapeHtml } from './utils/escapeHtml.js';
-export { filterClassNameObject, getExprProperties } from './utils/filter-schema.js';
+export { filterClassNameObject, getExprProperties, hasExprPropertiesChanged } from './utils/filter-schema.js';
 import './utils/filter.js';
 export { formatDuration } from './utils/formatDuration.js';
 export { FormulaExec, formulaExec, isExpression, isNeedFormula, registerFormulaExec, replaceExpression } from './utils/formula.js';
@@ -112,6 +112,7 @@ export { AsyncEvaluator, Evaluator, evaluate, evaluateForAsync, extendsFilters,
 export { default as LazyComponent } from './components/LazyComponent.js';
 export { default as Overlay } from './components/Overlay.js';
 export { default as PopOver } from './components/PopOver.js';
+export { default as ErrorBoundary } from './components/ErrorBoundary.js';
 export { FormRenderer } from './renderers/Form.js';
 export { RENDERER_TRANSMISSION_OMIT_PROPS } from './SchemaRenderer.js';
 export { default as CustomStyle } from './components/CustomStyle.js';
@@ -140,7 +141,7 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = getClassPrefix();
 // @ts-ignore
-var version = '3.5.3';
+var version = '3.6.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }

package/esm/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/Form.d.ts

@@ -355,7 +355,7 @@ export default class Form extends React.Component<FormProps, object> {
     removeHook(fn: () => any, type?: string): void;
     handleChange(value: any, name: string, submit: boolean, changePristine?: boolean): void;
     formItemDispatchEvent(type: string, data: any): any;
-    emitChange(submit: boolean): Promise<void>;
+    emitChange(submit: boolean, skipIfNothingChanges?: boolean): Promise<void>;
     handleBulkChange(values: Object, submit: boolean): void;
     handleFormSubmit(e: React.UIEvent<any>): any;
     handleReset(action: any): (data: any) => void;

package/esm/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -101,6 +101,12 @@ var Form = /** @class */ (function (_super) {
                 return form.items.forEach(function (item) { return item.unique && item.syncOptions(undefined, form.data); });
             });
         }
+        // withStore 里面与上层数据会做同步
+        // 这个时候变更的数据没有同步 onChange 出去，出现数据不一致的问题。
+        // https://github.com/baidu/amis/issues/8773
+        _this.toDispose.push(reaction(function () { return store.initedAt; }, function () {
+            store.inited && _this.emitChange(!!_this.props.submitOnChange, true);
+        }));
         return _this;
     }
     Form.prototype.componentDidMount = function () {
@@ -472,9 +478,10 @@ var Form = /** @class */ (function (_super) {
         var dispatchEvent = this.props.dispatchEvent;
         return dispatchEvent(type, data);
     };
-    Form.prototype.emitChange = function (submit) {
+    Form.prototype.emitChange = function (submit, skipIfNothingChanges) {
+        if (skipIfNothingChanges === void 0) { skipIfNothingChanges = false; }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, onChange, store, submitOnChange, dispatchEvent, data, changeProps, dispatcher;
+            var _a, onChange, store, submitOnChange, dispatchEvent, data, diff, changeProps, dispatcher;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -482,11 +489,11 @@ var Form = /** @class */ (function (_super) {
                         if (!isAlive(store)) {
                             return [2 /*return*/];
                         }
-                        changeProps = [
-                            store.data,
-                            difference(store.data, store.pristine),
-                            this.props
-                        ];
+                        diff = difference(store.data, store.pristine);
+                        if (skipIfNothingChanges && !Object.keys(diff).length) {
+                            return [2 /*return*/];
+                        }
+                        changeProps = [store.data, diff, this.props];
                         return [4 /*yield*/, dispatchEvent('change', createObject(data, store.data))];
                     case 1:
                         dispatcher = _b.sent();

package/esm/renderers/Item.d.ts

@@ -515,6 +515,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -533,9 +536,15 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
+        /**
+         * @deprecated 用 description 代替
+         */
         readonly stores: {
             [propName: string]: {
                 id: string;
@@ -553,6 +562,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
+                /**
+                 * 配置当前表单项展示模式
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -571,6 +583,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
+                /**
+                 * 配置当前表单项展示模式
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -598,6 +613,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -616,6 +634,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -635,6 +656,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -653,6 +677,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
@@ -679,6 +706,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -697,9 +727,15 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
+        /**
+         * @deprecated 用 description 代替
+         */
         readonly stores: {
             [propName: string]: {
                 id: string;
@@ -717,6 +753,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
+                /**
+                 * 配置当前表单项展示模式
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -735,6 +774,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
+                /**
+                 * 配置当前表单项展示模式
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -762,6 +804,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -780,6 +825,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -799,6 +847,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -817,6 +868,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;

package/esm/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/Options.d.ts

@@ -64,6 +64,10 @@ export interface FormOptionsControl extends FormBaseControl {
      * @default ''
      */
     resetValue?: string;
+    /**
+     * 懒加载字段
+     */
+    deferField?: string;
     /**
      * 延时加载的 API，当选项中有 defer: true 的选项时，点开会通过此接口扩充。
      */

package/esm/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -517,12 +517,12 @@ function registerOptionsControl(config) {
             if (idx === void 0) { idx = -1; }
             if (skipForm === void 0) { skipForm = false; }
             return __awaiter(this, void 0, void 0, function () {
-                var _c, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, model, createBtnLabel, env, __, parent, ctx, result, _d, payload, e_1, isPrevented, options;
+                var _c, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, deferField, model, createBtnLabel, env, __, parent, ctx, result, _d, payload, e_1, isPrevented, options;
                 var _e;
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
-                            _c = this.props, addControls = _c.addControls, addDialog = _c.addDialog, disabled = _c.disabled, labelField = _c.labelField, onOpenDialog = _c.onOpenDialog, optionLabel = _c.optionLabel, addApi = _c.addApi, source = _c.source, data = _c.data, valueField = _c.valueField, model = _c.formItem, createBtnLabel = _c.createBtnLabel, env = _c.env, __ = _c.translate;
+                            _c = this.props, addControls = _c.addControls, addDialog = _c.addDialog, disabled = _c.disabled, labelField = _c.labelField, onOpenDialog = _c.onOpenDialog, optionLabel = _c.optionLabel, addApi = _c.addApi, source = _c.source, data = _c.data, valueField = _c.valueField, deferField = _c.deferField, model = _c.formItem, createBtnLabel = _c.createBtnLabel, env = _c.env, __ = _c.translate;
                             // 禁用或者没有配置 name
                             if (disabled || !model) {
                                 return [2 /*return*/];
@@ -607,7 +607,8 @@ function registerOptionsControl(config) {
                             if (isPrevented) {
                                 return [2 /*return*/];
                             }
-                            if (!(parent === null || parent === void 0 ? void 0 : parent.defer)) return [3 /*break*/, 10];
+                            if (!(((parent === null || parent === void 0 ? void 0 : parent.hasOwnProperty(deferField)) && parent[deferField]) ||
+                                (parent === null || parent === void 0 ? void 0 : parent.defer))) return [3 /*break*/, 10];
                             return [4 /*yield*/, this.deferLoad(parent)];
                         case 9:
                             _f.sent();

package/esm/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -549,9 +549,7 @@ function wrapControl(ComposedComponent) {
                     formItem: this.model,
                     formMode: control.mode || formMode,
                     ref: this.controlRef,
-                    data: model
-                        ? model.getMergedData(data || (store === null || store === void 0 ? void 0 : store.data))
-                        : data || (store === null || store === void 0 ? void 0 : store.data),
+                    data: data || (store === null || store === void 0 ? void 0 : store.data),
                     name: (_c = model === null || model === void 0 ? void 0 : model.name) !== null && _c !== void 0 ? _c : control.name,
                     value: value,
                     changeMotivation: model === null || model === void 0 ? void 0 : model.changeMotivation,
@@ -564,8 +562,8 @@ function wrapControl(ComposedComponent) {
                     prinstine: model ? model.prinstine : undefined,
                     setPrinstineValue: this.setPrinstineValue,
                     onValidate: this.validate,
-                    onFlushChange: this.flushChange,
-                    render: this.renderChild // 如果覆盖，那么用的就是 form 上的 render，这个里面用到的 data 是比较旧的。
+                    onFlushChange: this.flushChange
+                    // render: this.renderChild // 如果覆盖，那么用的就是 form 上的 render，这个里面用到的 data 是比较旧的。
                     // !没了这个， tree 里的 options 渲染会出问题
                     // todo 理论上不应该影响，待确认
                     // _filteredOptions: this.model?.filteredOptions

package/esm/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.3
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/crud.d.ts

@@ -1,11 +1,17 @@
 import { Instance } from 'mobx-state-tree';
 import { Api, fetchOptions, ActionObject } from '../types';
+import type { MatchSorterOptions } from 'match-sorter';
 interface MatchFunc {
     (items: any, itemsRaw: any, 
     /** 相关配置 */
     options?: {
         query: Record<string, any>;
         columns: any;
+        /**
+         * match-sorter 匹配函数
+         * @doc https://github.com/kentcdodds/match-sorter
+         */
+        matchSorter: (items: any[], value: string, options?: MatchSorterOptions<any>) => any[];
     }): any;
 }
 export declare const CRUDStore: import("mobx-state-tree").IModelType<{
@@ -120,7 +126,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
         columns?: Array<any>;
         isTable2?: Boolean;
     }) => Promise<any>;
-    changePage: (page: number, perPage?: number | string) => void;
+    changePage: (page: number | string, perPage?: number | string) => void;
     changePerPage: (perPage: number | string) => void;
     selectAction: (action: ActionObject) => void;
     saveRemote: (api: Api, data?: object, options?: fetchOptions) => Promise<any>;
@@ -138,6 +144,8 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
         api?: Api | undefined;
         data?: any;
         filename?: string | undefined;
+        pageField?: string | undefined;
+        perPageField?: string | undefined;
     }) => Promise<void>;
     updateColumns: (columns: Array<any>) => void;
     updateTotal: (total: number) => void;