amis-core 6.9.0-rc.9 → 6.10.0-beta.0

package/esm/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.9
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -211,12 +211,14 @@ var validations = {
         return true;
     },
     isPhoneNumber: function (values, value) {
-        return (!isExisty(value) || isEmpty(value) || /^[1]([3-9])[0-9]{9}$/.test(value));
+        return (!isExisty(value) ||
+            isEmpty(value) ||
+            /^(\+\d{2}-)?[1]([3-9])[0-9]{9}$/.test(value));
     },
     isTelNumber: function (values, value) {
         return (!isExisty(value) ||
             isEmpty(value) ||
-            /^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/.test(value));
+            /^(\+\d{2}-)?(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/.test(value));
     },
     isZipcode: function (values, value) {
         return !isExisty(value) || isEmpty(value) || /^\d{6}$/.test(value);

package/esm/utils/visitedCache.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.9
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/Root.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="hoist-non-react-statics" />
 import React from 'react';
 import { RendererEnv } from './env';
 import { RendererProps } from './factory';
@@ -44,88 +43,7 @@ export interface renderChildProps extends Partial<Omit<RendererProps, 'statusSto
 export type ReactElement = React.ReactNode[] | JSX.Element | null | false;
 export declare function renderChildren(prefix: string, node: SchemaNode, props: renderChildProps): ReactElement;
 export declare function renderChild(prefix: string, node: SchemaNode, props: renderChildProps): ReactElement;
-declare const _default: {
-    new (props: Omit<RootProps & {
-        scopeRef?: ((ref: any) => void) | undefined;
-    }, "statusStore">): {
-        store?: ({
-            visibleState: any;
-            disableState: any;
-            staticState: any;
-        } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-            setVisible(key: string, value?: boolean | undefined): void;
-            setDisable(key: string, value?: boolean | undefined): void;
-            setStatic(key: string, value?: boolean | undefined): void;
-            resetAll(): void;
-        } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
-            visibleState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-            disableState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-            staticState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-        }, {
-            setVisible(key: string, value?: boolean | undefined): void;
-            setDisable(key: string, value?: boolean | undefined): void;
-            setStatic(key: string, value?: boolean | undefined): void;
-            resetAll(): void;
-        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
-        ref: any;
-        childRef(ref: any): void;
-        getWrappedInstance(): any;
-        componentWillUnmount(): void;
-        render(): React.JSX.Element;
-        context: unknown;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<RootProps & {
-            scopeRef?: ((ref: any) => void) | undefined;
-        }, "statusStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
-        forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<RootProps & {
-            scopeRef?: ((ref: any) => void) | undefined;
-        }, "statusStore">>;
-        state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
-        componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Omit<RootProps & {
-            scopeRef?: ((ref: any) => void) | undefined;
-        }, "statusStore">>, nextState: Readonly<{}>, nextContext: any): boolean;
-        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<RootProps & {
-            scopeRef?: ((ref: any) => void) | undefined;
-        }, "statusStore">>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Omit<RootProps & {
-            scopeRef?: ((ref: any) => void) | undefined;
-        }, "statusStore">>, prevState: Readonly<{}>, snapshot?: any): void;
-        componentWillMount?(): void;
-        UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Omit<RootProps & {
-            scopeRef?: ((ref: any) => void) | undefined;
-        }, "statusStore">>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<RootProps & {
-            scopeRef?: ((ref: any) => void) | undefined;
-        }, "statusStore">>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Omit<RootProps & {
-            scopeRef?: ((ref: any) => void) | undefined;
-        }, "statusStore">>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<RootProps & {
-            scopeRef?: ((ref: any) => void) | undefined;
-        }, "statusStore">>, nextState: Readonly<{}>, nextContext: any): void;
-    };
-    displayName: string;
-    ComposedComponent: React.ComponentType<React.ComponentType<RootProps & {
-        scopeRef?: ((ref: any) => void) | undefined;
-    }> & {
-        ComposedComponent: React.ComponentType<RootProps>;
-    }>;
-    contextType?: React.Context<any> | undefined;
-} & import("hoist-non-react-statics").NonReactStatics<React.ComponentType<RootProps & {
+declare const _default: (props: Omit<RootProps & {
     scopeRef?: ((ref: any) => void) | undefined;
-}> & {
-    ComposedComponent: React.ComponentType<RootProps>;
-}, {}> & {
-    ComposedComponent: React.ComponentType<RootProps & {
-        scopeRef?: ((ref: any) => void) | undefined;
-    }> & {
-        ComposedComponent: React.ComponentType<RootProps>;
-    };
-};
+}, "statusStore">, ref: any) => React.JSX.Element;
 export default _default;

package/lib/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.9
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -66,7 +66,6 @@ var Root = /** @class */ (function (_super) {
     ], Root.prototype, "resolveDefinitions", null);
     return Root;
 }(React__default["default"].Component));
-var StatusScopedSchemaRenderer = StatusScoped.StatusScoped(SchemaRenderer.SchemaRenderer);
 function renderChildren(prefix, node, props) {
     if (Array.isArray(node)) {
         var elemKey = props.key || props.propKey || props.id || '';
@@ -77,7 +76,7 @@ function renderChildren(prefix, node, props) {
     return renderChild(prefix, node, props);
 }
 function renderChild(prefix, node, props) {
-    var _a, _b;
+    var _a;
     if (Array.isArray(node)) {
         return renderChildren(prefix, node, props);
     }
@@ -97,6 +96,7 @@ function renderChild(prefix, node, props) {
         delete props.propsTransform;
         props = transform(props);
     }
+    var Comp = props.env.SchemaRenderer || SchemaRenderer.SchemaRenderer;
     if (['dialog', 'drawer'].includes(schema === null || schema === void 0 ? void 0 : schema.type) &&
         !(schema === null || schema === void 0 ? void 0 : schema.component) &&
         !(schema === null || schema === void 0 ? void 0 : schema.children)) {
@@ -104,9 +104,13 @@ function renderChild(prefix, node, props) {
         // 找渲染器也是在那，所以没办法在之前根据渲染器信息来包裹个组件下发 statusStore
         // 所以这里先根据 type 来处理一下
         // 等后续把状态处理再抽一层，可以把此处放到 SchemaRenderer 里面去
-        return (_J$X_(StatusScopedSchemaRenderer, tslib.__assign({ render: renderChild }, props, { key: (_a = props.key) !== null && _a !== void 0 ? _a : schema.key, schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
+        return (_J$X_(StatusScoped.StatusScopedWrapper, null, function (_a) {
+            var _b;
+            var statusStore = _a.statusStore;
+            return (_J$X_(Comp, tslib.__assign({ render: renderChild }, props, { key: (_b = props.key) !== null && _b !== void 0 ? _b : schema.key, schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || ''), statusStore: statusStore })));
+        }));
     }
-    return (_J$X_(SchemaRenderer.SchemaRenderer, tslib.__assign({ render: renderChild }, props, { key: (_b = props.key) !== null && _b !== void 0 ? _b : schema.key, schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
+    return (_J$X_(Comp, tslib.__assign({ render: renderChild }, props, { key: (_a = props.key) !== null && _a !== void 0 ? _a : schema.key, schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
 }
 var ScopedRootRenderer = StatusScoped.StatusScoped(Scoped.HocScoped(Root));
 

package/lib/RootRenderer.d.ts

@@ -30,5 +30,5 @@ export declare class RootRenderer extends React.Component<RootRendererProps> {
     renderError(): React.ReactNode;
     renderDialog(): React.ReactNode;
     renderDrawer(): React.ReactNode;
-    render(): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
+    render(): string | number | boolean | React.JSX.Element | Iterable<React.ReactNode> | null | undefined;
 }

package/lib/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.9
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -72,7 +72,9 @@ var RootRenderer = /** @class */ (function (_super) {
                     }
                 }
             });
-            return factory.loadAsyncRenderersByType(types, true);
+            return factory.hasAsyncRenderers(types)
+                ? factory.loadAsyncRenderersByType(types, true)
+                : undefined;
         });
         return _this;
     }
@@ -91,15 +93,16 @@ var RootRenderer = /** @class */ (function (_super) {
     RootRenderer.prototype.componentDidUpdate = function (prevProps) {
         var _a;
         var props = this.props;
-        if (props.data !== prevProps.data) {
-            this.store.initData(props.data);
-        }
         if (props.location !== prevProps.location) {
             this.store.updateLocation(props.location, (_a = this.props.env) === null || _a === void 0 ? void 0 : _a.parseLocation);
         }
         if (props.context !== prevProps.context) {
             this.store.updateContext(props.context);
         }
+        // 一定要最后处理，否则 downStream 里面的上层数据 context 还是老的。
+        if (props.data !== prevProps.data) {
+            this.store.initData(props.data);
+        }
     };
     RootRenderer.prototype.componentDidCatch = function (error, errorInfo) {
         var _a, _b;

package/lib/SchemaRenderer.d.ts

@@ -28,8 +28,9 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
         enter?: string;
         exit?: string;
     };
-    reaction: any;
+    toDispose: Array<() => any>;
     unbindEvent: (() => void) | undefined;
+    unbindGlobalEvent: (() => void) | undefined;
     isStatic: any;
     constructor(props: SchemaRendererProps);
     componentDidMount(): void;

package/lib/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.9
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -93,7 +93,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
         _this.rendererKey = '';
         _this.animationTimeout = {};
         _this.animationClassNames = {};
+        _this.toDispose = [];
         _this.unbindEvent = undefined;
+        _this.unbindGlobalEvent = undefined;
         _this.isStatic = undefined;
         var animations = (_a = props === null || props === void 0 ? void 0 : props.schema) === null || _a === void 0 ? void 0 : _a.animations;
         if (animations) {
@@ -121,12 +123,12 @@ var SchemaRenderer = /** @class */ (function (_super) {
         _this.addAnimationAttention = _this.addAnimationAttention.bind(_this);
         _this.removeAnimationAttention = _this.removeAnimationAttention.bind(_this);
         // 监听statusStore更新
-        _this.reaction = mobx.reaction(function () {
+        _this.toDispose.push(mobx.reaction(function () {
             var _a, _b, _c;
             var id = tpl.filter(props.schema.id, props.data);
             var name = tpl.filter(props.schema.name, props.data);
             return "".concat((_a = props.statusStore.visibleState[id]) !== null && _a !== void 0 ? _a : props.statusStore.visibleState[name]).concat((_b = props.statusStore.disableState[id]) !== null && _b !== void 0 ? _b : props.statusStore.disableState[name]).concat((_c = props.statusStore.staticState[id]) !== null && _c !== void 0 ? _c : props.statusStore.staticState[name]);
-        }, function () { return _this.forceUpdate(); });
+        }, function () { return _this.forceUpdate(); }));
         return _this;
     }
     SchemaRenderer.prototype.componentDidMount = function () {
@@ -138,8 +140,10 @@ var SchemaRenderer = /** @class */ (function (_super) {
     };
     SchemaRenderer.prototype.componentWillUnmount = function () {
         var _a, _b;
-        (_a = this.reaction) === null || _a === void 0 ? void 0 : _a.call(this);
-        (_b = this.unbindEvent) === null || _b === void 0 ? void 0 : _b.call(this);
+        this.toDispose.forEach(function (fn) { return fn(); });
+        this.toDispose = [];
+        (_a = this.unbindEvent) === null || _a === void 0 ? void 0 : _a.call(this);
+        (_b = this.unbindGlobalEvent) === null || _b === void 0 ? void 0 : _b.call(this);
         this.removeAnimationStyle();
     };
     // 限制：只有 schema 除外的 props 变化，或者 schema 里面的某个成员值发生变化才更新。
@@ -219,7 +223,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
     };
     SchemaRenderer.prototype.childRef = function (ref) {
         var _this = this;
-        var _a, _b;
+        var _a, _b, _c;
         // todo 这里有个问题，就是注意以下的这段注释
         // > // 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
         // > 而 visibleOn 和 hiddenOn 是无效的，
@@ -238,7 +242,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
         if (ref) {
             // 这里无法区分监听的是不是广播，所以又bind一下，主要是为了绑广播
             (_b = this.unbindEvent) === null || _b === void 0 ? void 0 : _b.call(this);
+            (_c = this.unbindGlobalEvent) === null || _c === void 0 ? void 0 : _c.call(this);
             this.unbindEvent = rendererEvent.bindEvent(ref);
+            this.unbindGlobalEvent = rendererEvent.bindGlobalEventForRenderer(ref);
         }
         this.cRef = ref;
     };

package/lib/Scoped.d.ts

@@ -24,7 +24,7 @@ export interface ScopedComponentType extends React.Component<RendererProps> {
     focus?: () => void;
     doAction?: (action: ActionObject, data: RendererData, throwErrors?: boolean, args?: any) => void;
     receive?: (values: RendererData, subPath?: string, replace?: boolean) => void;
-    reload?: (subPath?: string, query?: RendererData | null, ctx?: RendererData, silent?: boolean, replace?: boolean, args?: any) => void;
+    reload?: (subpath?: string, query?: any, ctx?: RendererData, silent?: boolean, replace?: boolean, args?: any) => void;
     context: any;
     setData?: (value?: object, replace?: boolean, index?: number) => void;
 }

package/lib/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.9
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/StatusScoped.d.ts

@@ -1,58 +1,12 @@
 import React from 'react';
-import hoistNonReactStatic from 'hoist-non-react-statics';
 import { IStatusStore } from './store/status';
 export interface StatusScopedProps {
     statusStore: IStatusStore;
 }
-export declare function StatusScoped<T extends React.ComponentType<React.ComponentProps<T> & StatusScopedProps>>(ComposedComponent: T): {
-    new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "statusStore">> & {}): {
-        store?: ({
-            visibleState: any;
-            disableState: any;
-            staticState: any;
-        } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-            setVisible(key: string, value?: boolean | undefined): void;
-            setDisable(key: string, value?: boolean | undefined): void;
-            setStatic(key: string, value?: boolean | undefined): void;
-            resetAll(): void;
-        } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
-            visibleState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-            disableState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-            staticState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
-        }, {
-            setVisible(key: string, value?: boolean | undefined): void;
-            setDisable(key: string, value?: boolean | undefined): void;
-            setStatic(key: string, value?: boolean | undefined): void;
-            resetAll(): void;
-        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
-        ref: any;
-        childRef(ref: any): void;
-        getWrappedInstance(): any;
-        componentWillUnmount(): void;
-        render(): React.JSX.Element;
-        context: unknown;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "statusStore">> & {}>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
-        forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "statusStore">> & {}>;
-        state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
-        componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "statusStore">> & {}>, nextState: Readonly<{}>, nextContext: any): boolean;
-        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "statusStore">> & {}>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "statusStore">> & {}>, prevState: Readonly<{}>, snapshot?: any): void;
-        componentWillMount?(): void;
-        UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "statusStore">> & {}>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "statusStore">> & {}>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "statusStore">> & {}>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "statusStore">> & {}>, nextState: Readonly<{}>, nextContext: any): void;
-    };
-    displayName: string;
-    ComposedComponent: React.ComponentType<T>;
-    contextType?: React.Context<any> | undefined;
-} & hoistNonReactStatic.NonReactStatics<T, {}> & {
-    ComposedComponent: T;
-};
+export interface StatusScopedWrapperProps {
+    children: (props: {
+        statusStore: IStatusStore;
+    }) => JSX.Element;
+}
+export declare function StatusScopedWrapper({ children }: StatusScopedWrapperProps): JSX.Element;
+export declare function StatusScoped<T extends React.ComponentType<React.ComponentProps<T> & StatusScopedProps>>(ComposedComponent: T): (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof StatusScopedProps>> & {}, ref: any) => React.JSX.Element;

package/lib/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.9
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -9,60 +9,35 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
-var hoistNonReactStatic = require('hoist-non-react-statics');
 var status = require('./store/status.js');
 var mobxStateTree = require('mobx-state-tree');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var hoistNonReactStatic__default = /*#__PURE__*/_interopDefaultLegacy(hoistNonReactStatic);
 
 var __react_jsx__ = require('react');
 var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
+function StatusScopedWrapper(_a) {
+    var children = _a.children;
+    var store = React__default["default"].useMemo(function () { return status.StatusStore.create({}); }, []);
+    React__default["default"].useEffect(function () {
+        return function () {
+            mobxStateTree.destroy(store);
+        };
+    }, []);
+    return children({ statusStore: store });
+}
 function StatusScoped(ComposedComponent) {
-    var _a;
-    var result = hoistNonReactStatic__default["default"]((_a = /** @class */ (function (_super) {
-            tslib.__extends(class_1, _super);
-            function class_1(props) {
-                var _this = _super.call(this, props) || this;
-                _this.childRef = _this.childRef.bind(_this);
-                _this.getWrappedInstance = _this.getWrappedInstance.bind(_this);
-                _this.store = status.StatusStore.create({});
-                return _this;
-            }
-            class_1.prototype.childRef = function (ref) {
-                while (ref && ref.getWrappedInstance) {
-                    ref = ref.getWrappedInstance();
-                }
-                this.ref = ref;
-            };
-            class_1.prototype.getWrappedInstance = function () {
-                return this.ref;
-            };
-            class_1.prototype.componentWillUnmount = function () {
-                this.store && mobxStateTree.destroy(this.store);
-                delete this.store;
-            };
-            class_1.prototype.render = function () {
-                var _a;
-                var injectedProps = {
-                    statusStore: this.store
-                };
-                var refConfig = ((_a = ComposedComponent.prototype) === null || _a === void 0 ? void 0 : _a.isReactComponent) ||
-                    ComposedComponent.$$typeof ===
-                        Symbol.for('react.forward_ref')
-                    ? { ref: this.childRef }
-                    : { forwardedRef: this.childRef };
-                return (_J$X_(ComposedComponent, tslib.__assign({}, this.props, injectedProps, refConfig)));
-            };
-            return class_1;
-        }(React__default["default"].Component)),
-        _a.displayName = "StatusScoped(".concat(ComposedComponent.displayName || ComposedComponent.name, ")"),
-        _a.ComposedComponent = ComposedComponent,
-        _a), ComposedComponent);
-    return result;
+    var wrapped = function (props, ref) {
+        return (_J$X_(StatusScopedWrapper, null, function (_a) {
+            var statusStore = _a.statusStore;
+            return (_J$X_(ComposedComponent, tslib.__assign({}, props, { statusStore: statusStore, ref: ref })));
+        }));
+    };
+    return React__default["default"].forwardRef(wrapped);
 }
 
 exports.StatusScoped = StatusScoped;
+exports.StatusScopedWrapper = StatusScopedWrapper;

package/lib/StyleManager.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.9
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.9
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.9
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.9
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -18,6 +18,7 @@ require('../utils/memoryParse.js');
 require('@rc-component/mini-decimal');
 var dataMapping = require('../utils/dataMapping.js');
 require('../utils/filter.js');
+var debug = require('../utils/debug.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -285,6 +286,8 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                     : mergeData;
                 (_x = console.group) === null || _x === void 0 ? void 0 : _x.call(console, "run action ".concat(action.actionType));
                 console.debug("[".concat(action.actionType, "] action args, data"), args, data);
+                debug.debug('action', "run action ".concat(action.actionType, " with args"), args);
+                debug.debug('action', "run action ".concat(action.actionType, " with data"), data);
                 stopped = false;
                 return [4 /*yield*/, actionInstrance.run(tslib.__assign(tslib.__assign(tslib.__assign({}, action), { args: args, rawData: actionConfig.data, data: action.actionType === 'reload' ? actionData : data }), key), renderer, event, mergeData)];
             case 5:

package/lib/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.9
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/BreakAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.9
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/BroadcastAction.d.ts

@@ -15,5 +15,5 @@ export interface IBroadcastAction extends ListenerAction {
  * @implements {Action}
  */
 export declare class BroadcastAction implements RendererAction {
-    run(action: IBroadcastAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void | RendererEvent<any, any>>;
+    run(action: IBroadcastAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
 }

package/lib/actions/BroadcastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.9
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -26,6 +26,7 @@ var BroadcastAction = /** @class */ (function () {
     BroadcastAction.prototype.run = function (action, renderer, event) {
         var _a, _b, _c;
         return tslib.__awaiter(this, void 0, void 0, function () {
+            var eventName;
             return tslib.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -35,10 +36,9 @@ var BroadcastAction = /** @class */ (function () {
                         }
                         // 作为一个新的事件，需要把广播动作的args参数追加到事件数据中
                         event.setData(object.createObject(event.data, (_b = action.data) !== null && _b !== void 0 ? _b : {}));
-                        return [4 /*yield*/, rendererEvent.dispatchEvent(((_c = action.args) === null || _c === void 0 ? void 0 : _c.eventName) || action.eventName, renderer, event.context.scoped, action.data, event)];
-                    case 1: 
-                    // 直接触发对应的动作
-                    return [2 /*return*/, _d.sent()];
+                        eventName = ((_c = action.args) === null || _c === void 0 ? void 0 : _c.eventName) || action.eventName;
+                        return [4 /*yield*/, rendererEvent.dispatchGlobalEvent(eventName, action.data)];
+                    case 1: return [2 /*return*/, _d.sent()];
                 }
             });
         });

package/lib/actions/CmptAction.d.ts

@@ -3,6 +3,7 @@ import { RendererAction, ListenerAction, ListenerContext } from './Action';
 export interface ICmptAction extends ListenerAction {
     actionType: string;
     args: {
+        resetPage?: boolean;
         path?: string;
         value?: string | {
             [key: string]: string;