amis-core 2.9.0 → 3.1.0

package/lib/renderers/Item.d.ts

@@ -379,7 +379,7 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
     handleAutoFill(type: string): void;
     updateAutoFillData(context: any): void;
     syncAutoFill: import("lodash").DebouncedFunc<(term: any, reload?: boolean) => void>;
-    buildSchema(): JSX.Element | {
+    buildSchema(): React.JSX.Element | {
         type: any;
         className: string;
         title: any;
@@ -456,12 +456,12 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
     static layoutRenderers: {
         [propsName: string]: (props: FormItemProps, renderControl: () => JSX.Element | null) => JSX.Element;
     };
-    render(): JSX.Element | null;
+    render(): React.JSX.Element | null;
 }
 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;
+        render(): React.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;
@@ -484,7 +484,7 @@ 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;
+        render(): React.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;
@@ -510,9 +510,6 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
     contextType: React.Context<{
         storeType: string;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        /**
-         * 只读条件
-         */
         readonly fetcher: any;
         readonly notify: any;
         readonly isCancel: (value: any) => boolean;
@@ -532,7 +529,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;
+            dispose: (callback?: (() => void) | undefined) => void; /**
+             * 当配置为水平布局的时候，用来配置具体的左右分配。
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -550,12 +549,12 @@ 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;
+            dispose: (callback?: (() => void) | undefined) => void; /**
+             * 当配置为水平布局的时候，用来配置具体的左右分配。
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
-        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>; /**
-         * 配置当前表单项展示模式
-         */
+        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         readonly stores: {
             [propName: string]: {
                 id: string;
@@ -572,7 +571,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;
+                dispose: (callback?: (() => void) | undefined) => void; /**
+                 * 当配置为水平布局的时候，用来配置具体的左右分配。
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -590,7 +591,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;
+                dispose: (callback?: (() => void) | undefined) => void; /**
+                 * 当配置为水平布局的时候，用来配置具体的左右分配。
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -600,9 +603,6 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             [propName: string]: any;
             storeType: string;
             id: string;
-            /**
-             * 表单 control 是否为 inline 模式。
-             */
             path: string;
             parentId?: string | undefined;
         }): {
@@ -620,7 +620,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;
+            dispose: (callback?: (() => void) | undefined) => void; /**
+             * 当配置为水平布局的时候，用来配置具体的左右分配。
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -638,7 +640,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;
+            dispose: (callback?: (() => void) | undefined) => void; /**
+             * 当配置为水平布局的时候，用来配置具体的左右分配。
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -657,7 +661,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;
+            dispose: (callback?: (() => void) | undefined) => void; /**
+             * 当配置为水平布局的时候，用来配置具体的左右分配。
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -675,16 +681,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;
+            dispose: (callback?: (() => void) | undefined) => void; /**
+             * 当配置为水平布局的时候，用来配置具体的左右分配。
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
     }, {
-        /**
-         * 只读条件
-         */
         readonly fetcher: any;
         readonly notify: any;
         readonly isCancel: (value: any) => boolean;
@@ -704,7 +709,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;
+            dispose: (callback?: (() => void) | undefined) => void; /**
+             * 当配置为水平布局的时候，用来配置具体的左右分配。
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -722,12 +729,12 @@ 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;
+            dispose: (callback?: (() => void) | undefined) => void; /**
+             * 当配置为水平布局的时候，用来配置具体的左右分配。
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
-        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>; /**
-         * 配置当前表单项展示模式
-         */
+        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         readonly stores: {
             [propName: string]: {
                 id: string;
@@ -744,7 +751,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;
+                dispose: (callback?: (() => void) | undefined) => void; /**
+                 * 当配置为水平布局的时候，用来配置具体的左右分配。
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -762,7 +771,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;
+                dispose: (callback?: (() => void) | undefined) => void; /**
+                 * 当配置为水平布局的时候，用来配置具体的左右分配。
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -772,9 +783,6 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             [propName: string]: any;
             storeType: string;
             id: string;
-            /**
-             * 表单 control 是否为 inline 模式。
-             */
             path: string;
             parentId?: string | undefined;
         }): {
@@ -792,7 +800,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;
+            dispose: (callback?: (() => void) | undefined) => void; /**
+             * 当配置为水平布局的时候，用来配置具体的左右分配。
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -810,7 +820,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;
+            dispose: (callback?: (() => void) | undefined) => void; /**
+             * 当配置为水平布局的时候，用来配置具体的左右分配。
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -829,7 +841,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;
+            dispose: (callback?: (() => void) | undefined) => void; /**
+             * 当配置为水平布局的时候，用来配置具体的左右分配。
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -847,16 +861,16 @@ 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;
+            dispose: (callback?: (() => void) | undefined) => void; /**
+             * 当配置为水平布局的时候，用来配置具体的左右分配。
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
     ComposedComponent: React.ComponentType<any>;
 } & hoistNonReactStatic.NonReactStatics<any, {}> & {
-    ComposedComponent: any; /**
-     * 配置 label className
-     */
+    ComposedComponent: any;
 } & {
     ComposedComponent: any;
 };

package/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -46,13 +46,13 @@ require('react-overlays/useRootClose');
 require('../utils/SimpleMap.js');
 require('lodash/mapValues');
 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');
+var CustomStyle = require('../components/CustomStyle.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -344,7 +344,8 @@ var FormItemWrap = /** @class */ (function (_super) {
             var controlSize = size || defaultSize;
             return renderControl(tslib.__assign(tslib.__assign({}, rest), { onOpenDialog: this.handleOpenDialog, type: type, classnames: cx, formItem: model, className: cx("Form-control", (_a = {
                         'is-inline': !!rest.inline && !mobileUI,
-                        'is-error': model && !model.valid
+                        'is-error': model && !model.valid,
+                        'is-full': size === 'full'
                     },
                     _a["Form-control--withSize Form-control--size".concat(helper.ucFirst(controlSize))] = sizeMutable !== false &&
                         typeof controlSize === 'string' &&
@@ -355,20 +356,8 @@ var FormItemWrap = /** @class */ (function (_super) {
         return null;
     };
     FormItemWrap.prototype.render = function () {
-        var _a = this.props, formMode = _a.formMode, inputOnly = _a.inputOnly, wrap = _a.wrap, render = _a.render, model = _a.formItem, css = _a.css, id = _a.id, labelClassName = _a.labelClassName, descriptionClassName = _a.descriptionClassName;
+        var _a = this.props, formMode = _a.formMode, inputOnly = _a.inputOnly, wrap = _a.wrap, render = _a.render, model = _a.formItem, css = _a.css, themeCss = _a.themeCss, id = _a.id, labelClassName = _a.labelClassName, descriptionClassName = _a.descriptionClassName, env = _a.env;
         var mode = this.props.mode || formMode;
-        styleHelper.insertCustomStyle(css, [
-            {
-                key: 'labelClassName',
-                value: labelClassName
-            }
-        ], id + '-label');
-        styleHelper.insertCustomStyle(css, [
-            {
-                key: 'descriptionClassName',
-                value: descriptionClassName
-            }
-        ], id + '-description');
         if (wrap === false || inputOnly) {
             return this.renderControl();
         }
@@ -384,7 +373,27 @@ var FormItemWrap = /** @class */ (function (_super) {
                     data: model.dialogData,
                     formStore: undefined
                 })
-                : null));
+                : null,
+            React__default["default"].createElement(CustomStyle["default"], { config: {
+                    themeCss: themeCss || css,
+                    classNames: [
+                        {
+                            key: 'labelClassName',
+                            value: labelClassName
+                        }
+                    ],
+                    id: id + '-label'
+                }, env: env }),
+            React__default["default"].createElement(CustomStyle["default"], { config: {
+                    themeCss: themeCss || css,
+                    classNames: [
+                        {
+                            key: 'descriptionClassName',
+                            value: descriptionClassName
+                        }
+                    ],
+                    id: id + '-description'
+                }, env: env })));
     };
     /**
      * 布局扩充点，可以自己扩充表单项的布局方式
@@ -777,7 +786,8 @@ var detectProps = [
     'embed',
     'displayMode',
     'revealPassword',
-    'loading'
+    'loading',
+    'themeCss'
 ];
 function asFormItem(config) {
     return function (Control) {
@@ -848,7 +858,8 @@ function asFormItem(config) {
                     return (React__default["default"].createElement(React__default["default"].Fragment, null,
                         React__default["default"].createElement(Control, tslib.__assign({}, rest, { useMobileUI: useMobileUI, onOpenDialog: this.handleOpenDialog, size: config.sizeMutable !== false ? undefined : size, onFocus: this.handleFocus, onBlur: this.handleBlur, type: type, classnames: cx, ref: isSFC ? undefined : this.refFn, forwardedRef: isSFC ? this.refFn : undefined, formItem: model, className: cx("Form-control", (_a = {
                                     'is-inline': !!rest.inline && !mobileUI,
-                                    'is-error': model && !model.valid
+                                    'is-error': model && !model.valid,
+                                    'is-full': size === 'full'
                                 },
                                 _a["Form-control--withSize Form-control--size".concat(helper.ucFirst(controlSize))] = config.sizeMutable !== false &&
                                     typeof controlSize === 'string' &&

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -98,6 +98,11 @@ function registerOptionsControl(config) {
                     return _this.mounted &&
                         _this.syncAutoFill(formItem.getSelectedOptions(formItem.tmpValue));
                 }));
+                if (options &&
+                    formItem.tmpValue &&
+                    formItem.getSelectedOptions(formItem.tmpValue).length) {
+                    _this.syncAutoFill(formItem.getSelectedOptions(formItem.tmpValue));
+                }
                 // 默认全选。这里会和默认值\回填值逻辑冲突，所以如果有配置source则不执行默认全选
                 if (multiple &&
                     defaultCheckAll &&
@@ -193,8 +198,8 @@ function registerOptionsControl(config) {
                     switch (_b.label) {
                         case 0:
                             _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options;
-                            return [4 /*yield*/, dispatchEvent(eventName, rendererEvent.resolveEventData(this.props, { value: eventData, options: options, items: options }, // 为了保持名字统一
-                                'value'))];
+                            return [4 /*yield*/, dispatchEvent(eventName, rendererEvent.resolveEventData(this.props, { value: eventData, options: options, items: options } // 为了保持名字统一
+                                ))];
                         case 1:
                             rendererEvent$1 = _b.sent();
                             // 返回阻塞标识
@@ -421,7 +426,9 @@ function registerOptionsControl(config) {
             else if (!formItem || !api.isEffectiveApi(source, data)) {
                 return;
             }
-            return formItem.loadOptions(source, data, undefined, false, isInit ? setPrinstineValue : onChange, setError);
+            return mobxStateTree.isAlive(formItem)
+                ? formItem.loadOptions(source, data, undefined, false, isInit ? setPrinstineValue : onChange, setError)
+                : undefined;
         };
         FormOptionsItem.prototype.deferLoad = function (option) {
             return tslib.__awaiter(this, void 0, void 0, function () {

package/lib/renderers/Placeholder.js

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

package/lib/renderers/builtin.js

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

package/lib/renderers/register.js

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

package/lib/renderers/wrapControl.d.ts

@@ -50,7 +50,7 @@ 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;
+        render(): React.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;
@@ -73,7 +73,7 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
         UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): void;
     };
     new (props: Omit<any, "rootStore">, context: any): {
-        render(): JSX.Element;
+        render(): React.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;

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -94,14 +94,14 @@ function wrapControl(ComposedComponent) {
                         : (_b = store === null || store === void 0 ? void 0 : store.getValueByName(model.name)) !== null && _b !== void 0 ? _b : formula.replaceExpression(value); // 优先使用公式表达式
                     // 同步 value
                     model.changeTmpValue(curTmpValue);
-                    if (onChange &&
-                        value !== undefined &&
-                        curTmpValue !== undefined) {
-                        // 组件默认值支持表达式需要: 避免初始化时上下文中丢失组件默认值
-                        onChange(model.tmpValue, model.name, false, true);
-                    }
                 }
                 if (onChange &&
+                    value !== undefined &&
+                    model.tmpValue !== undefined) {
+                    // 组件默认值支持表达式需要: 避免初始化时上下文中丢失组件默认值
+                    onChange(model.tmpValue, model.name, false, true);
+                }
+                else if (onChange &&
                     typeof propValue === 'undefined' &&
                     typeof (store === null || store === void 0 ? void 0 : store.getValueByName(model.name, false)) === 'undefined' &&
                     // todo 后续再优化这个判断，
@@ -136,6 +136,7 @@ function wrapControl(ComposedComponent) {
                 }
             };
             class_1.prototype.componentDidUpdate = function (prevProps) {
+                var _a, _b;
                 var props = this.props;
                 props.formStore;
                 var model = this.model;
@@ -198,29 +199,25 @@ function wrapControl(ComposedComponent) {
                 else if (model &&
                     typeof props.defaultValue !== 'undefined' &&
                     formula.isExpression(props.defaultValue)) {
-                    var nowFormulaChecked = formula.isNowFormula(props.defaultValue);
+                    var nowFormulaChecked = false;
                     // 渲染器中的 defaultValue 优先（备注: SchemaRenderer中会将 value 改成 defaultValue）
                     if (!isEqual__default["default"](props.defaultValue, prevProps.defaultValue) ||
                         (props.data !== prevProps.data &&
                             (formula.isNeedFormula(props.defaultValue, props.data, prevProps.data) ||
-                                nowFormulaChecked))) {
+                                (nowFormulaChecked = formula.isNowFormula(props.defaultValue))))) {
                         var curResult = formula.FormulaExec['formula'](props.defaultValue, props.data);
                         var prevResult = formula.FormulaExec['formula'](prevProps.defaultValue, prevProps.data);
                         if (!isEqual__default["default"](curResult, prevResult) &&
                             !isEqual__default["default"](curResult, model.tmpValue)) {
                             // 识别上下文变动、自身数值变动、公式运算结果变动
                             model.changeTmpValue(curResult);
-                            if (props.onChange) {
-                                props.onChange(curResult, model.name, false);
-                            }
+                            (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, 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);
-                            }
+                            (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, nowData, model.name, false);
                         }
                     }
                 }

package/lib/store/app.d.ts

@@ -49,6 +49,7 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
     getValueByName(name: string, canAccessSuper?: boolean): any;
     getPristineValueByName(name: string): any;
 } & {
+    setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;

package/lib/store/app.js

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

package/lib/store/combo.d.ts

@@ -1770,6 +1770,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
     getValueByName(name: string, canAccessSuper?: boolean): any;
     getPristineValueByName(name: string): any;
 } & {
+    setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
@@ -1831,6 +1832,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         getValueByName(name: string, canAccessSuper?: boolean): any;
         getPristineValueByName(name: string): any;
     } & {
+        setTopStore(value: any): void;
         initData(data?: object, skipSetPristine?: boolean): void;
         reset(): void;
         updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
@@ -7090,6 +7092,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         getValueByName(name: string, canAccessSuper?: boolean): any;
         getPristineValueByName(name: string): any;
     } & {
+        setTopStore(value: any): void;
         initData(data?: object, skipSetPristine?: boolean): void;
         reset(): void;
         updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;

package/lib/store/combo.js

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

package/lib/store/crud.d.ts

@@ -60,6 +60,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     getValueByName(name: string, canAccessSuper?: boolean): any;
     getPristineValueByName(name: string): any;
 } & {
+    setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
@@ -127,5 +128,6 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
         data?: any;
     }) => Promise<void>;
     updateColumns: (columns: Array<any>) => void;
+    updateTotal: (total: number) => void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type ICRUDStore = Instance<typeof CRUDStore>;