amis-core 2.9.0 → 3.1.0

package/esm/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -348,12 +348,16 @@ var validateMessages = {
     isVariableName: 'validate.isVariableName'
 };
 function validate(value, values, rules, messages, __) {
+    var _a;
     if (__ === void 0) { __ = function (str) { return str; }; }
     var errors = [];
-    rules &&
-        Object.keys(rules).forEach(function (ruleName) {
+    if (rules) {
+        var ruleNames = Object.keys(rules);
+        var length_1 = ruleNames.length;
+        for (var index = 0; index < length_1; index++) {
+            var ruleName = ruleNames[index];
             if (!rules[ruleName] && rules[ruleName] !== 0) {
-                return;
+                continue;
             }
             else if (typeof validations[ruleName] !== 'function') {
                 throw new Error('Validation `' + ruleName + '` not exists!');
@@ -365,19 +369,30 @@ function validate(value, values, rules, messages, __) {
                 }
                 return item;
             });
-            if (!fn.apply(void 0, __spreadArray([values, value], __read(args), false))) {
+            var validateRes = fn.apply(void 0, __spreadArray([values, value], __read(args), false));
+            // addRule 允许返回
+            //   {error: true, msg: '错误提示'}
+            // 格式的信息来灵活展示错误
+            var fnResErrorMsg = '';
+            if (typeof validateRes === 'object' &&
+                validateRes.error === true) {
+                fnResErrorMsg = (_a = validateRes === null || validateRes === void 0 ? void 0 : validateRes.msg) !== null && _a !== void 0 ? _a : '';
+            }
+            if (!validateRes || fnResErrorMsg) {
                 var msgRuleName = ruleName;
                 if (Array.isArray(value)) {
                     msgRuleName = "".concat(ruleName, "Array");
                 }
-                errors.push({
-                    rule: ruleName,
-                    msg: filter(__((messages && messages[ruleName]) ||
-                        validateMessages[msgRuleName] ||
-                        validateMessages[ruleName]), __assign({}, [''].concat(args)))
-                });
+                return [{
+                        rule: ruleName,
+                        msg: filter(__((messages && messages[ruleName]) ||
+                            fnResErrorMsg ||
+                            validateMessages[msgRuleName] ||
+                            validateMessages[ruleName]), __assign({}, [''].concat(args)))
+                    }];
             }
-        });
+        }
+    }
     return errors;
 }
 function validateObject(values, rules, messages, __) {

package/lib/Root.d.ts

@@ -1,15 +1,19 @@
+/// <reference types="hoist-non-react-statics" />
 import React from 'react';
 import { RendererEnv } from './env';
 import { RendererProps } from './factory';
 import { TranslateFn } from './locale';
 import { IRendererStore } from './store';
 import { SchemaNode } from './types';
+import { StatusScopedProps } from './StatusScoped';
 export interface RootRenderProps {
     location?: Location;
     theme?: string;
+    data?: Record<string, any>;
+    locale?: string;
     [propName: string]: any;
 }
-export interface RootProps {
+export interface RootProps extends StatusScopedProps {
     schema: SchemaNode;
     rootStore: IRendererStore;
     env: RendererEnv;
@@ -25,22 +29,103 @@ export interface RootWrapperProps {
     schema: SchemaNode;
     rootStore: IRendererStore;
     theme: string;
+    data?: Record<string, any>;
+    context?: Record<string, any>;
     [propName: string]: any;
 }
 export declare function addRootWrapper(fn: (props: RootWrapperProps) => React.ReactNode): void;
 export declare class Root extends React.Component<RootProps> {
     resolveDefinitions(name: string): {} | undefined;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
-export interface renderChildProps extends Partial<RendererProps> {
+export interface renderChildProps extends Partial<Omit<RendererProps, 'statusStore'>>, StatusScopedProps {
     env: RendererEnv;
 }
 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: React.ComponentType<RootProps & {
+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 & {
     scopeRef?: ((ref: any) => void) | undefined;
 }> & {
     ComposedComponent: React.ComponentType<RootProps>;
+}, {}> & {
+    ComposedComponent: React.ComponentType<RootProps & {
+        scopeRef?: ((ref: any) => void) | undefined;
+    }> & {
+        ComposedComponent: React.ComponentType<RootProps>;
+    };
 };
 export default _default;

package/lib/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -17,6 +17,7 @@ var Scoped = require('./Scoped.js');
 var theme = require('./theme.js');
 var helper = require('./utils/helper.js');
 var WithRootStore = require('./WithRootStore.js');
+var StatusScoped = require('./StatusScoped.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -40,7 +41,7 @@ var Root = /** @class */ (function (_super) {
         return definitions && definitions[name];
     };
     Root.prototype.render = function () {
-        var _a = this.props, schema = _a.schema, rootStore = _a.rootStore, env = _a.env, pathPrefix = _a.pathPrefix, location = _a.location, data = _a.data, locale$1 = _a.locale, translate = _a.translate, rest = tslib.__rest(_a, ["schema", "rootStore", "env", "pathPrefix", "location", "data", "locale", "translate"]);
+        var _a = this.props, schema = _a.schema, rootStore = _a.rootStore, env = _a.env, pathPrefix = _a.pathPrefix, location = _a.location, data = _a.data, context = _a.context, locale$1 = _a.locale, translate = _a.translate, rest = tslib.__rest(_a, ["schema", "rootStore", "env", "pathPrefix", "location", "data", "context", "locale", "translate"]);
         var theme$1 = env.theme;
         var themeName = this.props.theme || 'cxd';
         if (themeName === 'default') {
@@ -52,7 +53,7 @@ var Root = /** @class */ (function (_super) {
                     return tslib.__assign(tslib.__assign({}, props), { children: wrapper(props) });
                 }, tslib.__assign(tslib.__assign({ pathPrefix: pathPrefix || '', schema: isPlainObject__default["default"](schema)
                         ? tslib.__assign({ type: 'page' }, schema) : schema }, rest), { render: renderChild, rootStore: rootStore, resolveDefinitions: this.resolveDefinitions, location: location, data: data, env: env, classnames: theme$1.classnames, classPrefix: theme$1.classPrefix, locale: locale$1, translate: translate, children: (React__default["default"].createElement(RootRenderer.RootRenderer, tslib.__assign({ pathPrefix: pathPrefix || '', schema: isPlainObject__default["default"](schema)
-                            ? tslib.__assign({ type: 'page' }, schema) : schema }, rest, { render: renderChild, rootStore: rootStore, resolveDefinitions: this.resolveDefinitions, location: location, data: data, env: env, classnames: theme$1.classnames, classPrefix: theme$1.classPrefix, locale: locale$1, translate: translate }))) })).children))));
+                            ? tslib.__assign({ type: 'page' }, schema) : schema }, rest, { render: renderChild, rootStore: rootStore, resolveDefinitions: this.resolveDefinitions, location: location, data: data, context: context, env: env, classnames: theme$1.classnames, classPrefix: theme$1.classPrefix, locale: locale$1, translate: translate }))) })).children))));
     };
     tslib.__decorate([
         helper.autobind,
@@ -62,6 +63,7 @@ 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 || '';
@@ -91,9 +93,18 @@ function renderChild(prefix, node, props) {
         delete props.propsTransform;
         props = transform(props);
     }
+    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)) {
+        // 因为状态判断实在 SchemaRenderer 里面判断的
+        // 找渲染器也是在那，所以没办法在之前根据渲染器信息来包裹个组件下发 statusStore
+        // 所以这里先根据 type 来处理一下
+        // 等后续把状态处理再抽一层，可以把此处放到 SchemaRenderer 里面去
+        return (React__default["default"].createElement(StatusScopedSchemaRenderer, tslib.__assign({ render: renderChild }, props, { schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
+    }
     return (React__default["default"].createElement(SchemaRenderer.SchemaRenderer, tslib.__assign({ render: renderChild }, props, { schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
 }
-var ScopedRootRenderer = Scoped.HocScoped(Root);
+var ScopedRootRenderer = StatusScoped.StatusScoped(Scoped.HocScoped(Root));
 
 exports.Root = Root;
 exports.addRootWrapper = addRootWrapper;

package/lib/RootRenderer.d.ts

@@ -5,6 +5,8 @@ import { IRootStore } from './store/root';
 import { ActionObject } from './types';
 export interface RootRendererProps extends RootProps {
     location?: any;
+    data?: Record<string, any>;
+    context?: Record<string, any>;
     render: (region: string, schema: any, props: any) => React.ReactNode;
 }
 export declare class RootRenderer extends React.Component<RootRendererProps> {
@@ -23,5 +25,5 @@ export declare class RootRenderer extends React.Component<RootRendererProps> {
     handleDrawerClose(): void;
     openFeedback(dialog: any, ctx: any): Promise<unknown>;
     reloadTarget(scoped: IScopedContext, target: string, data?: any): void;
-    render(): string | number | boolean | JSX.Element | React.ReactFragment | null | undefined;
+    render(): string | number | boolean | React.JSX.Element | React.ReactFragment | null | undefined;
 }

package/lib/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -39,6 +39,7 @@ var RootRenderer = /** @class */ (function (_super) {
             storeType: root.RootStore.name,
             parentId: ''
         });
+        _this.store.setContext(props.context);
         _this.store.initData(props.data);
         _this.store.updateLocation(props.location, (_a = _this.props.env) === null || _a === void 0 ? void 0 : _a.parseLocation);
         helper.bulkBindFunctions(_this, [
@@ -62,8 +63,13 @@ var RootRenderer = /** @class */ (function (_super) {
         if (props.location !== prevProps.location) {
             this.store.updateLocation(props.location);
         }
+        if (props.context !== prevProps.context) {
+            this.store.setContext(props.context);
+        }
     };
     RootRenderer.prototype.componentDidCatch = function (error, errorInfo) {
+        var _a, _b;
+        (_b = (_a = this.props.env) === null || _a === void 0 ? void 0 : _a.errorCatcher) === null || _b === void 0 ? void 0 : _b.call(_a, error, errorInfo);
         this.store.setRuntimeError(error, errorInfo);
     };
     RootRenderer.prototype.componentWillUnmount = function () {
@@ -160,7 +166,7 @@ var RootRenderer = /** @class */ (function (_super) {
                             redirect = action.redirect && tpl.filter(action.redirect, store.data);
                             redirect && env.jumpTo(redirect, action);
                             action.reload &&
-                                this.reloadTarget(delegate || this.context, tpl.filter(action.reload, ctx), store.data);
+                                this.reloadTarget(delegate || this.context, Scoped.filterTarget(action.reload, ctx), store.data);
                             return [2 /*return*/];
                     }
                 });

package/lib/SchemaRenderer.d.ts

@@ -3,11 +3,13 @@ import { RendererConfig, RendererEnv, RendererProps } from './factory';
 import { IScopedContext } from './Scoped';
 import { Schema, SchemaNode } from './types';
 import { RendererEvent } from './utils/renderer-event';
-interface SchemaRendererProps extends Partial<RendererProps> {
+import { StatusScopedProps } from './StatusScoped';
+interface SchemaRendererProps extends Partial<Omit<RendererProps, 'statusStore'>>, StatusScopedProps {
     schema: Schema;
     $path: string;
     env: RendererEnv;
 }
+export declare const RENDERER_TRANSMISSION_OMIT_PROPS: string[];
 export declare class SchemaRenderer extends React.Component<SchemaRendererProps, any> {
     static displayName: string;
     static contextType: React.Context<IScopedContext>;
@@ -31,7 +33,7 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
     renderChild(region: string, node?: SchemaNode, subProps?: {
         data?: object;
         [propName: string]: any;
-    }): JSX.Element;
+    }): any;
     reRender(): void;
     render(): JSX.Element | null;
 }

package/lib/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -28,6 +28,7 @@ require('lodash/isPlainObject');
 var resolveVariableAndFilter = require('./utils/resolveVariableAndFilter.js');
 require('./utils/filter.js');
 var style = require('./utils/style.js');
+var tpl = require('./utils/tpl.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -35,7 +36,7 @@ var difference__default = /*#__PURE__*/_interopDefaultLegacy(difference);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var defaultOmitList = [
+var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'type',
     'name',
     '$ref',
@@ -60,7 +61,9 @@ var defaultOmitList = [
     'mode',
     'body',
     'id',
-    'inputOnly'
+    'inputOnly',
+    'label',
+    'renderLabel'
 ];
 var componentCache = new SimpleMap.SimpleMap();
 var SchemaRenderer = /** @class */ (function (_super) {
@@ -74,9 +77,12 @@ var SchemaRenderer = /** @class */ (function (_super) {
         _this.reRender = _this.reRender.bind(_this);
         _this.resolveRenderer(_this.props);
         _this.dispatchEvent = _this.dispatchEvent.bind(_this);
-        // 监听topStore更新
+        // 监听statusStore更新
         _this.reaction = mobx.reaction(function () {
-            return "".concat(props.topStore.visibleState[props.schema.id || props.$path]).concat(props.topStore.disableState[props.schema.id || props.$path]).concat(props.topStore.staticState[props.schema.id || props.$path]);
+            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(); });
         return _this;
     }
@@ -178,7 +184,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         if (subProps === void 0) { subProps = {}; }
         var _a = this.props; _a.schema; _a.$path; var env = _a.env, render = _a.render, rest = tslib.__rest(_a, ["schema", "$path", "env", "render"]);
         var $path = this.resolveRenderer(this.props).path;
-        var omitList = defaultOmitList.concat();
+        var omitList = RENDERER_TRANSMISSION_OMIT_PROPS.concat();
         if (this.renderer) {
             var Component = this.renderer.component;
             Component.propsList &&
@@ -193,12 +199,12 @@ var SchemaRenderer = /** @class */ (function (_super) {
     SchemaRenderer.prototype.render = function () {
         var e_1, _a;
         var _this = this;
-        var _b, _c, _d;
-        var _e = this.props; _e.$path; var __ = _e.schema, rootStore = _e.rootStore, topStore = _e.topStore, render = _e.render, rest = tslib.__rest(_e, ["$path", "schema", "rootStore", "topStore", "render"]);
+        var _b, _c, _d, _e, _f, _g;
+        var _h = this.props; _h.$path; var __ = _h.schema, rootStore = _h.rootStore, statusStore = _h.statusStore, render = _h.render, rest = tslib.__rest(_h, ["$path", "schema", "rootStore", "statusStore", "render"]);
         if (__ == null) {
             return null;
         }
-        var _f = this.resolveRenderer(this.props), $path = _f.path, schema = _f.schema;
+        var _j = this.resolveRenderer(this.props), $path = _j.path, schema = _j.schema;
         var theme = this.props.env.theme;
         if (Array.isArray(schema)) {
             return render($path, schema, rest);
@@ -209,14 +215,16 @@ var SchemaRenderer = /** @class */ (function (_super) {
             ? filterSchema.getExprProperties(schema, detectData, undefined, rest)
             : {};
         // 控制显隐
-        var visible = mobxStateTree.isAlive(topStore)
-            ? topStore.visibleState[schema.id || $path]
+        var id = tpl.filter(schema.id, rest.data);
+        var name = tpl.filter(schema.name, rest.data);
+        var visible = mobxStateTree.isAlive(statusStore)
+            ? (_b = statusStore.visibleState[id]) !== null && _b !== void 0 ? _b : statusStore.visibleState[name]
             : undefined;
-        var disable = mobxStateTree.isAlive(topStore)
-            ? topStore.disableState[schema.id || $path]
+        var disable = mobxStateTree.isAlive(statusStore)
+            ? (_c = statusStore.disableState[id]) !== null && _c !== void 0 ? _c : statusStore.disableState[name]
             : undefined;
-        var isStatic = mobxStateTree.isAlive(topStore)
-            ? topStore.staticState[schema.id || $path]
+        var isStatic = mobxStateTree.isAlive(statusStore)
+            ? (_d = statusStore.staticState[id]) !== null && _d !== void 0 ? _d : statusStore.staticState[name]
             : undefined;
         if (visible === false ||
             (visible !== true &&
@@ -234,7 +242,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
                 ? null
                 : React__default["default"].isValidElement(schema.children)
                     ? schema.children
-                    : schema.children(tslib.__assign(tslib.__assign(tslib.__assign({}, rest), exprProps), { $path: $path, $schema: schema, render: this.renderChild, forwardedRef: this.refFn, rootStore: rootStore, topStore: topStore, dispatchEvent: this.dispatchEvent }));
+                    : schema.children(tslib.__assign(tslib.__assign(tslib.__assign({}, rest), exprProps), { $path: $path, $schema: schema, render: this.renderChild, forwardedRef: this.refFn, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent }));
         }
         else if (typeof schema.component === 'function') {
             var isSFC = !(schema.component.prototype instanceof React__default["default"].Component);
@@ -244,7 +252,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
                 ? null
                 : React__default["default"].createElement(schema.component, tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, rest), restSchema_1), exprProps), { 
                     // value: defaultValue, // 备注: 此处并没有将value传递给渲染器
-                    defaultData: defaultData_1, defaultValue: defaultValue_1, defaultActiveKey: defaultActiveKey_1, propKey: propKey_1, $path: $path, $schema: schema, ref: isSFC ? undefined : this.refFn, forwardedRef: isSFC ? this.refFn : undefined, render: this.renderChild, rootStore: rootStore, topStore: topStore, dispatchEvent: this.dispatchEvent }));
+                    defaultData: defaultData_1, defaultValue: defaultValue_1, defaultActiveKey: defaultActiveKey_1, propKey: propKey_1, $path: $path, $schema: schema, ref: isSFC ? undefined : this.refFn, forwardedRef: isSFC ? this.refFn : undefined, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent }));
         }
         else if (Object.keys(schema).length === 0) {
             return null;
@@ -267,7 +275,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
                                 return [2 /*return*/, function () { return factory.loadRenderer(schema, $path); }];
                         }
                     });
-                }); }, "$path": $path, "$schema": schema, retry: this.reRender, rootStore: rootStore, topStore: topStore, dispatchEvent: this.dispatchEvent })));
+                }); }, "$path": $path, "$schema": schema, retry: this.reRender, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent })));
         }
         var renderer = this.renderer;
         schema = factory.filterSchema(schema, renderer, rest);
@@ -294,11 +302,11 @@ var SchemaRenderer = /** @class */ (function (_super) {
             // schema.style是readonly属性
             schema = tslib.__assign(tslib.__assign({}, schema), { style: style.buildStyle(schema.style, detectData) });
         }
-        var isClassComponent = (_b = Component.prototype) === null || _b === void 0 ? void 0 : _b.isReactComponent;
+        var isClassComponent = (_e = Component.prototype) === null || _e === void 0 ? void 0 : _e.isReactComponent;
         var $schema = tslib.__assign(tslib.__assign({}, schema), exprProps);
         var props = tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, theme.getRendererConfig(renderer.name)), restSchema), helper.chainEvents(rest, restSchema)), exprProps), { 
             // value: defaultValue, // 备注: 此处并没有将value传递给渲染器
-            defaultData: (_c = restSchema.defaultData) !== null && _c !== void 0 ? _c : defaultData, defaultValue: (_d = restSchema.defaultValue) !== null && _d !== void 0 ? _d : defaultValue, defaultActiveKey: defaultActiveKey, propKey: propKey, $path: $path, $schema: $schema, ref: this.refFn, render: this.renderChild, rootStore: rootStore, topStore: topStore, dispatchEvent: this.dispatchEvent });
+            defaultData: (_f = restSchema.defaultData) !== null && _f !== void 0 ? _f : defaultData, defaultValue: (_g = restSchema.defaultValue) !== null && _g !== void 0 ? _g : defaultValue, defaultActiveKey: defaultActiveKey, propKey: propKey, $path: $path, $schema: $schema, ref: this.refFn, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent });
         if (disable !== undefined) {
             props.disabled = disable;
         }
@@ -308,8 +316,8 @@ var SchemaRenderer = /** @class */ (function (_super) {
         // 自动解析变量模式，主要是方便直接引入第三方组件库，无需为了支持变量封装一层
         if (renderer.autoVar) {
             try {
-                for (var _g = tslib.__values(Object.keys($schema)), _h = _g.next(); !_h.done; _h = _g.next()) {
-                    var key = _h.value;
+                for (var _k = tslib.__values(Object.keys($schema)), _l = _k.next(); !_l.done; _l = _k.next()) {
+                    var key = _l.value;
                     if (typeof props[key] === 'string') {
                         props[key] = resolveVariableAndFilter.resolveVariableAndFilter(props[key], props.data, '| raw');
                     }
@@ -318,7 +326,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_h && !_h.done && (_a = _g.return)) _a.call(_g);
+                    if (_l && !_l.done && (_a = _k.return)) _a.call(_k);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -351,4 +359,5 @@ var PlaceholderComponent = /** @class */ (function (_super) {
     return PlaceholderComponent;
 }(React__default["default"].Component));
 
+exports.RENDERER_TRANSMISSION_OMIT_PROPS = RENDERER_TRANSMISSION_OMIT_PROPS;
 exports.SchemaRenderer = SchemaRenderer;

package/lib/Scoped.d.ts

@@ -5,6 +5,14 @@
 import React from 'react';
 import { RendererEnv, RendererProps } from './factory';
 import { RendererData, ActionObject } from './types';
+/**
+ * target 里面可能包含 ?xxx=xxx，这种情况下，需要把 ?xxx=xxx 保留下来，然后对前面的部分进行 filter
+ * 因为后面会对 query 部分做不一样的处理。会保留原始的值。而不是会转成字符串。
+ * @param target
+ * @param data
+ * @returns
+ */
+export declare function filterTarget(target: string, data: Record<string, any>): string;
 export interface ScopedComponentType extends React.Component<RendererProps> {
     focus?: () => void;
     doAction?: (action: ActionObject, data: RendererData, throwErrors?: boolean) => void;

package/lib/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -59,7 +59,22 @@ var hoistNonReactStatic__default = /*#__PURE__*/_interopDefaultLegacy(hoistNonRe
  * @file 用来创建一个域，在这个域里面会把里面的运行时实例注册进来，方便组件之间的通信。
  * @author fex
  */
-var ScopedContext = React__default["default"].createContext(createScopedTools(''));
+/**
+ * target 里面可能包含 ?xxx=xxx，这种情况下，需要把 ?xxx=xxx 保留下来，然后对前面的部分进行 filter
+ * 因为后面会对 query 部分做不一样的处理。会保留原始的值。而不是会转成字符串。
+ * @param target
+ * @param data
+ * @returns
+ */
+function filterTarget(target, data) {
+    var idx = target.indexOf('?');
+    if (~idx) {
+        return tpl.filter(target.slice(0, idx), data) + target.slice(idx);
+    }
+    return tpl.filter(target, data, '| raw');
+}
+var rootScopedContext = createScopedTools('');
+var ScopedContext = React__default["default"].createContext(rootScopedContext);
 function createScopedTools(path, parent, env) {
     var components = [];
     var self = {
@@ -104,14 +119,14 @@ function createScopedTools(path, parent, env) {
         getComponentById: function (id) {
             var root = this;
             // 找到顶端scoped
-            while (root.parent) {
+            while (root.parent && root.parent !== rootScopedContext) {
                 root = root.parent;
             }
             // 向下查找
             var component = undefined;
             helper.findTree([root], function (item) {
                 return item.getComponents().find(function (cmpt) {
-                    if (cmpt.props.id === id) {
+                    if (tpl.filter(cmpt.props.id, cmpt.props.data) === id) {
                         component = cmpt;
                         return true;
                     }
@@ -377,3 +392,4 @@ function HocScoped(ComposedComponent) {
 exports.HocScoped = HocScoped;
 exports.ScopedContext = ScopedContext;
 exports["default"] = HocScoped;
+exports.filterTarget = filterTarget;

package/lib/StatusScoped.d.ts

@@ -0,0 +1,58 @@
+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;
+};