amis-core 3.4.0-beta.12 → 3.4.1

package/esm/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/RootRenderer.d.ts

@@ -25,5 +25,10 @@ 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 | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
+    renderRuntimeError(): React.ReactNode;
+    renderSpinner(): React.ReactNode;
+    renderError(): React.ReactNode;
+    renderDialog(): React.ReactNode;
+    renderDrawer(): React.ReactNode;
+    render(): React.JSX.Element;
 }

package/esm/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -28,9 +28,10 @@ var RootRenderer = /** @class */ (function (_super) {
             storeType: RootStore.name,
             parentId: ''
         });
-        _this.store.setContext(props.context);
+        _this.store.updateContext(props.context);
         _this.store.initData(props.data);
         _this.store.updateLocation(props.location, (_a = _this.props.env) === null || _a === void 0 ? void 0 : _a.parseLocation);
+        // 将数据里面的函数批量的绑定到 this 上
         bulkBindFunctions(_this, [
             'handleAction',
             'handleDialogConfirm',
@@ -53,7 +54,7 @@ var RootRenderer = /** @class */ (function (_super) {
             this.store.updateLocation(props.location);
         }
         if (props.context !== prevProps.context) {
-            this.store.setContext(props.context);
+            this.store.updateContext(props.context);
         }
     };
     RootRenderer.prototype.componentDidCatch = function (error, errorInfo) {
@@ -126,9 +127,9 @@ var RootRenderer = /** @class */ (function (_super) {
         else if (action.actionType === 'toast') {
             (_b = (_a = action.toast) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.forEach(function (item) {
                 env.notify(item.level || 'info', item.body
-                    ? render('body', item.body, __assign(__assign({}, _this.props), { data: ctx }))
+                    ? render('body', item.body, __assign(__assign({}, _this.props), { data: ctx, context: store.context }))
                     : '', __assign(__assign(__assign({}, action.toast), item), { title: item.title
-                        ? render('title', item.title, __assign(__assign({}, _this.props), { data: ctx }))
+                        ? render('title', item.title, __assign(__assign({}, _this.props), { data: ctx, context: store.context }))
                         : null, mobileUI: mobileUI }));
             });
         }
@@ -263,33 +264,58 @@ var RootRenderer = /** @class */ (function (_super) {
     RootRenderer.prototype.reloadTarget = function (scoped, target, data) {
         scoped.reload(target, data);
     };
-    RootRenderer.prototype.render = function () {
+    RootRenderer.prototype.renderRuntimeError = function () {
         var _a;
-        var _b = this.props, pathPrefix = _b.pathPrefix, schema = _b.schema, render = _b.render, rest = __rest(_b, ["pathPrefix", "schema", "render"]);
+        var _b = this.props, render = _b.render, rest = __rest(_b, ["render"]);
+        var store = this.store;
+        return render('error', {
+            type: 'alert',
+            level: 'danger'
+        }, __assign(__assign({}, rest), { topStore: store, body: (React.createElement(React.Fragment, null,
+                React.createElement("h3", null, (_a = store.runtimeError) === null || _a === void 0 ? void 0 : _a.toString()),
+                React.createElement("pre", null,
+                    React.createElement("code", null, store.runtimeErrorStack.componentStack)))) }));
+    };
+    RootRenderer.prototype.renderSpinner = function () {
+        var _a = this.props, render = _a.render, rest = __rest(_a, ["render"]);
+        var store = this.store;
+        return render('spinner', {
+            type: 'spinner'
+        }, __assign(__assign({}, rest), { topStore: store, show: store.loading }));
+    };
+    RootRenderer.prototype.renderError = function () {
+        var _a = this.props, render = _a.render, rest = __rest(_a, ["render"]);
+        var store = this.store;
+        return store.error
+            ? render('error', {
+                type: 'alert'
+            }, __assign(__assign({}, rest), { topStore: this.store, body: store.msg, showCloseButton: true, onClose: store.clearMessage }))
+            : null;
+    };
+    RootRenderer.prototype.renderDialog = function () {
+        var _a = this.props, render = _a.render, rest = __rest(_a, ["render"]);
+        var store = this.store;
+        return render('dialog', __assign(__assign({}, (store.action &&
+            store.action.dialog)), { type: 'dialog' }), __assign(__assign({}, rest), { key: 'dialog', topStore: this.store, data: store.dialogData, context: store.context, onConfirm: this.handleDialogConfirm, onClose: this.handleDialogClose, show: store.dialogOpen, onAction: this.handleAction }));
+    };
+    RootRenderer.prototype.renderDrawer = function () {
+        var _a = this.props, render = _a.render, rest = __rest(_a, ["render"]);
+        var store = this.store;
+        return render('drawer', __assign(__assign({}, (store.action &&
+            store.action.drawer)), { type: 'drawer' }), __assign(__assign({}, rest), { key: 'drawer', topStore: this.store, data: store.drawerData, context: store.context, onConfirm: this.handleDrawerConfirm, onClose: this.handleDrawerClose, show: store.drawerOpen, onAction: this.handleAction }));
+    };
+    RootRenderer.prototype.render = function () {
+        var _a = this.props, pathPrefix = _a.pathPrefix, schema = _a.schema, render = _a.render, rest = __rest(_a, ["pathPrefix", "schema", "render"]);
         var store = this.store;
         if (store.runtimeError) {
-            return render('error', {
-                type: 'alert',
-                level: 'danger'
-            }, __assign(__assign({}, rest), { topStore: this.store, body: (React.createElement(React.Fragment, null,
-                    React.createElement("h3", null, (_a = this.store.runtimeError) === null || _a === void 0 ? void 0 : _a.toString()),
-                    React.createElement("pre", null,
-                        React.createElement("code", null, this.store.runtimeErrorStack.componentStack)))) }));
+            this.renderRuntimeError();
         }
         return (React.createElement(React.Fragment, null,
-            render(pathPrefix, schema, __assign(__assign({}, rest), { topStore: this.store, data: this.store.downStream, onAction: this.handleAction })),
-            render('spinner', {
-                type: 'spinner'
-            }, __assign(__assign({}, rest), { topStore: this.store, show: store.loading })),
-            store.error
-                ? render('error', {
-                    type: 'alert'
-                }, __assign(__assign({}, rest), { topStore: this.store, body: store.msg, showCloseButton: true, onClose: store.clearMessage }))
-                : null,
-            render('dialog', __assign(__assign({}, (store.action &&
-                store.action.dialog)), { type: 'dialog' }), __assign(__assign({}, rest), { key: 'dialog', topStore: this.store, data: store.dialogData, onConfirm: this.handleDialogConfirm, onClose: this.handleDialogClose, show: store.dialogOpen, onAction: this.handleAction })),
-            render('drawer', __assign(__assign({}, (store.action &&
-                store.action.drawer)), { type: 'drawer' }), __assign(__assign({}, rest), { key: 'drawer', topStore: this.store, data: store.drawerData, onConfirm: this.handleDrawerConfirm, onClose: this.handleDrawerClose, show: store.drawerOpen, onAction: this.handleAction }))));
+            render(pathPrefix, schema, __assign(__assign({}, rest), { topStore: this.store, data: this.store.downStream, context: store.context, onAction: this.handleAction })),
+            this.renderSpinner(),
+            this.renderError(),
+            this.renderDialog(),
+            this.renderDrawer()));
     };
     RootRenderer.contextType = ScopedContext;
     RootRenderer = __decorate([

package/esm/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -57,7 +57,8 @@ var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'label',
     'renderLabel',
     'trackExpression',
-    'editorSetting'
+    'editorSetting',
+    'updatePristineAfterStoreDataReInit'
 ];
 var componentCache = new SimpleMap();
 var SchemaRenderer = /** @class */ (function (_super) {
@@ -176,9 +177,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
         });
     };
     SchemaRenderer.prototype.renderChild = function (region, node, subProps) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (subProps === void 0) { subProps = {}; }
-        var _c = this.props, _ = _c.schema; _c.$path; var env = _c.env, render = _c.render, rest = __rest(_c, ["schema", "$path", "env", "render"]);
+        var _e = this.props, _ = _e.schema; _e.$path; var env = _e.env, render = _e.render, rest = __rest(_e, ["schema", "$path", "env", "render"]);
         var $path = this.resolveRenderer(this.props).path;
         var omitList = RENDERER_TRANSMISSION_OMIT_PROPS.concat();
         if (this.renderer) {
@@ -186,9 +187,12 @@ var SchemaRenderer = /** @class */ (function (_super) {
             Component.propsList &&
                 omitList.push.apply(omitList, Component.propsList);
         }
-        return render("".concat($path).concat(region ? "/".concat(region) : ''), node || '', __assign(__assign(__assign(__assign({}, omit(rest, omitList)), { defaultStatic: (_a = this.isStatic) !== null && _a !== void 0 ? _a : (_.staticOn
+        return render("".concat($path).concat(region ? "/".concat(region) : ''), node || '', __assign(__assign(__assign(__assign({}, omit(rest, omitList)), { defaultStatic: (_c = (_b = (((_a = this.renderer) === null || _a === void 0 ? void 0 : _a.type) &&
+                ['drawer', 'dialog'].includes(this.renderer.type)
+                ? false
+                : undefined)) !== null && _b !== void 0 ? _b : this.isStatic) !== null && _c !== void 0 ? _c : (_.staticOn
                 ? evalExpression(_.staticOn, rest.data)
-                : (_b = _.static) !== null && _b !== void 0 ? _b : rest.defaultStatic) }), subProps), { data: subProps.data || rest.data, env: env }));
+                : (_d = _.static) !== null && _d !== void 0 ? _d : rest.defaultStatic) }), subProps), { data: subProps.data || rest.data, env: env }));
     };
     SchemaRenderer.prototype.reRender = function () {
         this.resolveRenderer(this.props, true);
@@ -296,16 +300,14 @@ var SchemaRenderer = /** @class */ (function (_super) {
         if (renderer.storeType) {
             exprProps = {};
         }
-        // style 支持公式
-        if (schema.style) {
-            // schema.style是readonly属性
-            schema = __assign(__assign({}, schema), { style: buildStyle(schema.style, detectData) });
-        }
         var isClassComponent = (_e = Component.prototype) === null || _e === void 0 ? void 0 : _e.isReactComponent;
-        var $schema = __assign(__assign({}, schema), exprProps);
         var props = __assign(__assign(__assign(__assign(__assign({}, theme.getRendererConfig(renderer.name)), restSchema), chainEvents(rest, restSchema)), exprProps), { 
             // value: defaultValue, // 备注: 此处并没有将value传递给渲染器
-            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, mobileUI: schema.useMobileUI === false ? false : rest.mobileUI });
+            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, mobileUI: schema.useMobileUI === false ? false : rest.mobileUI });
+        // style 支持公式
+        if (schema.style) {
+            props.style = buildStyle(schema.style, detectData);
+        }
         if (disable !== undefined) {
             props.disabled = disable;
         }
@@ -315,7 +317,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         // 自动解析变量模式，主要是方便直接引入第三方组件库，无需为了支持变量封装一层
         if (renderer.autoVar) {
             try {
-                for (var _k = __values(Object.keys($schema)), _l = _k.next(); !_l.done; _l = _k.next()) {
+                for (var _k = __values(Object.keys(schema)), _l = _k.next(); !_l.done; _l = _k.next()) {
                     var key = _l.value;
                     if (typeof props[key] === 'string') {
                         props[key] = resolveVariableAndFilter(props[key], props.data, '| raw');
@@ -346,12 +348,17 @@ var SchemaRenderer = /** @class */ (function (_super) {
 var PlaceholderComponent = /** @class */ (function (_super) {
     __extends(PlaceholderComponent, _super);
     function PlaceholderComponent() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.childRef = React.createRef();
+        return _this;
     }
+    PlaceholderComponent.prototype.getWrappedInstance = function () {
+        return this.childRef.current;
+    };
     PlaceholderComponent.prototype.render = function () {
         var _a = this.props, renderChildren = _a.renderChildren, rest = __rest(_a, ["renderChildren"]);
         if (typeof renderChildren === 'function') {
-            return renderChildren(rest);
+            return renderChildren(__assign(__assign({}, rest), { ref: this.childRef }));
         }
         return null;
     };

package/esm/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -39,6 +39,8 @@ import 'react-overlays/useRootClose';
 import './utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/map';
+import 'lodash/isEmpty';
 import 'uncontrollable';
 import './utils/validations.js';
 import './utils/resolveCondition.js';

package/esm/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -108,7 +108,7 @@ function HocStoreFactory(renderer) {
                                 (props.data &&
                                     prevProps.data &&
                                     props.data.__super !== prevProps.data.__super))) {
-                        store.initData(extendObject(props.data, __assign(__assign(__assign({}, (store.hasRemoteData ? store.data : null)), this.formatData(props.defaultData)), this.formatData(props.data))));
+                        store.initData(extendObject(props.data, __assign(__assign(__assign({}, (store.hasRemoteData ? store.data : null)), this.formatData(props.defaultData)), this.formatData(props.data))), props.updatePristineAfterStoreDataReInit === false);
                     }
                 }
                 else if (shouldSync === true ||
@@ -120,14 +120,14 @@ function HocStoreFactory(renderer) {
                                 isSuperDataModified(props.data, prevProps.data, store)))) {
                     if (props.store && props.store.data === props.data) {
                         store.initData(createObject(props.store.data, props.syncSuperStore === false
-                            ? __assign({}, store.data) : syncDataFromSuper(store.data, props.store.data, prevProps.scope, store, props.syncSuperStore === true)));
+                            ? __assign({}, store.data) : syncDataFromSuper(store.data, props.store.data, prevProps.scope, store, props.syncSuperStore === true)), props.updatePristineAfterStoreDataReInit === false);
                     }
                     else if (props.data && props.data.__super) {
                         store.initData(extendObject(props.data, store.hasRemoteData || store.path === 'page'
-                            ? __assign(__assign({}, store.data), props.data) : undefined));
+                            ? __assign(__assign({}, store.data), props.data) : syncDataFromSuper(props.data, props.data.__super, prevProps.data.__super, store, false)), props.updatePristineAfterStoreDataReInit === false);
                     }
                     else {
-                        store.initData(createObject(props.scope, props.data));
+                        store.initData(createObject(props.scope, props.data), props.updatePristineAfterStoreDataReInit === false);
                     }
                 }
                 else if (!props.trackExpression &&
@@ -137,8 +137,9 @@ function HocStoreFactory(renderer) {
                     // 这个用法很少，当 data.__super 值发生变化时，更新 store.data
                     if (!prevProps.data ||
                         isObjectShallowModified(props.data.__super, prevProps.data.__super, false)) {
-                        store.initData(createObject(props.data.__super, __assign(__assign({}, props.data), store.data)), store.storeType === 'FormStore' &&
-                            ((_b = prevProps.store) === null || _b === void 0 ? void 0 : _b.storeType) === 'CRUDStore');
+                        store.initData(createObject(props.data.__super, __assign(__assign({}, props.data), store.data)), props.updatePristineAfterStoreDataReInit === false ||
+                            (store.storeType === 'FormStore' &&
+                                ((_b = prevProps.store) === null || _b === void 0 ? void 0 : _b.storeType) === 'CRUDStore'));
                     }
                     // nextProps.data.__super !== props.data.__super) &&
                 }
@@ -148,7 +149,7 @@ function HocStoreFactory(renderer) {
                     prevProps.data !== props.data) {
                     // 只有父级数据变动的时候才应该进来，
                     // 目前看来这个 case 很少有情况下能进来
-                    store.initData(createObject(props.scope, __assign({}, store.data)));
+                    store.initData(createObject(props.scope, __assign({}, store.data)), props.updatePristineAfterStoreDataReInit === false);
                 }
             };
             StoreFactory.prototype.componentWillUnmount = function () {

package/esm/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -42,7 +42,7 @@ var AjaxAction = /** @class */ (function () {
                             }
                         }
                         env = event.context.env;
-                        silent = (_b = action === null || action === void 0 ? void 0 : action.options) === null || _b === void 0 ? void 0 : _b.silent;
+                        silent = ((_b = action === null || action === void 0 ? void 0 : action.options) === null || _b === void 0 ? void 0 : _b.silent) || (action === null || action === void 0 ? void 0 : action.api).silent;
                         messages = (_c = action === null || action === void 0 ? void 0 : action.api) === null || _c === void 0 ? void 0 : _c.messages;
                         api = normalizeApi(action.api);
                         // 如果没配置data数据映射，则给一个空对象，避免将当前数据域作为接口请求参数

package/esm/actions/BreakAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/BroadcastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/ContinueAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/CopyAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -33,6 +33,8 @@ import 'react-overlays/useRootClose';
 import '../utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/map';
+import 'lodash/isEmpty';
 import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';

package/esm/actions/DialogAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/DrawerAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/EmailAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/LinkAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/LoopAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/PageAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/ParallelAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/StatusAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/SwitchAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/esm/components/CustomStyle.d.ts

@@ -1,12 +1,10 @@
 import type { RendererEnv } from '../env';
-import type { CustomStyleClassName } from '../utils/style-helper';
+import { type InsertCustomStyle } from '../utils/style-helper';
 interface CustomStyleProps {
     config: {
-        themeCss: any;
-        classNames: CustomStyleClassName[];
-        id?: string;
-        defaultData?: any;
-    };
+        wrapperCustomStyle?: any;
+        componentId?: string;
+    } & InsertCustomStyle;
     env: RendererEnv;
 }
 export default function (props: CustomStyleProps): null;

package/esm/components/CustomStyle.js

@@ -1,17 +1,41 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
 import { useEffect } from 'react';
-import { insertCustomStyle } from '../utils/style-helper.js';
+import { insertCustomStyle, removeCustomStyle, insertEditCustomStyle } from '../utils/style-helper.js';
 
 function CustomStyle (props) {
-    var _a = props.config, themeCss = _a.themeCss, classNames = _a.classNames, id = _a.id, defaultData = _a.defaultData;
+    var config = props.config, env = props.env;
+    var themeCss = config.themeCss, classNames = config.classNames, id = config.id, defaultData = config.defaultData, wrapperCustomStyle = config.wrapperCustomStyle;
+    if (!themeCss && !wrapperCustomStyle) {
+        return null;
+    }
     useEffect(function () {
         var _a;
-        insertCustomStyle(themeCss, classNames, id, defaultData, (_a = props.env) === null || _a === void 0 ? void 0 : _a.customStyleClassPrefix);
-    }, [props.config.themeCss]);
+        if (themeCss && id) {
+            insertCustomStyle(themeCss, classNames, id, defaultData, env === null || env === void 0 ? void 0 : env.customStyleClassPrefix, (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env).ownerDocument);
+        }
+        return function () {
+            var _a;
+            if (id) {
+                removeCustomStyle('', id, (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env).ownerDocument);
+            }
+        };
+    }, [themeCss, id]);
+    useEffect(function () {
+        var _a;
+        if (wrapperCustomStyle && id) {
+            insertEditCustomStyle(wrapperCustomStyle, id, (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env).ownerDocument);
+        }
+        return function () {
+            var _a;
+            if (id) {
+                removeCustomStyle('wrapperCustomStyle', id, (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env).ownerDocument);
+            }
+        };
+    }, [wrapperCustomStyle, id]);
     return null;
 }
 

package/esm/components/LazyComponent.d.ts

@@ -10,7 +10,6 @@ export interface LazyComponentProps {
     placeholder?: React.ReactNode;
     unMountOnHidden?: boolean;
     childProps?: object;
-    visiblilityProps?: object;
     [propName: string]: any;
 }
 export interface LazyComponentState {
@@ -27,6 +26,6 @@ export default class LazyComponent extends React.Component<LazyComponentProps, L
     constructor(props: LazyComponentProps);
     componentDidMount(): void;
     componentWillUnmount(): void;
-    handleVisibleChange(visible: boolean): void;
+    handleVisibleChange(visible: boolean, entry?: any): void;
     render(): React.ReactNode;
 }

package/esm/components/LazyComponent.js

@@ -1,11 +1,11 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
 import { __extends, __rest, __assign } from 'tslib';
 import React from 'react';
-import VisibilitySensor from 'react-visibility-sensor';
+import { InView } from 'react-intersection-observer';
 
 /**
  * @file LazyComponent
@@ -34,7 +34,7 @@ var LazyComponent = /** @class */ (function (_super) {
     LazyComponent.prototype.componentWillUnmount = function () {
         this.mounted = false;
     };
-    LazyComponent.prototype.handleVisibleChange = function (visible) {
+    LazyComponent.prototype.handleVisibleChange = function (visible, entry) {
         var _this = this;
         this.setState({
             visible: visible
@@ -59,16 +59,20 @@ var LazyComponent = /** @class */ (function (_super) {
         });
     };
     LazyComponent.prototype.render = function () {
-        var _a = this.props, placeholder = _a.placeholder, unMountOnHidden = _a.unMountOnHidden, childProps = _a.childProps, visiblilityProps = _a.visiblilityProps, partialVisibility = _a.partialVisibility, children = _a.children, rest = __rest(_a, ["placeholder", "unMountOnHidden", "childProps", "visiblilityProps", "partialVisibility", "children"]);
+        var _a = this.props, placeholder = _a.placeholder, unMountOnHidden = _a.unMountOnHidden, childProps = _a.childProps, partialVisibility = _a.partialVisibility, children = _a.children, rest = __rest(_a, ["placeholder", "unMountOnHidden", "childProps", "partialVisibility", "children"]);
         var _b = this.state, visible = _b.visible, Component = _b.component;
         // 需要监听从可见到不可见。
         if (unMountOnHidden) {
-            return (React.createElement(VisibilitySensor, __assign({}, visiblilityProps, { partialVisibility: partialVisibility, onChange: this.handleVisibleChange }),
-                React.createElement("div", { className: "visibility-sensor" }, Component && visible ? (React.createElement(Component, __assign({}, rest, childProps))) : children && visible ? (children) : (placeholder))));
+            return (React.createElement(InView, { onChange: this.handleVisibleChange, threshold: partialVisibility ? 0 : 1 }, function (_a) {
+                var ref = _a.ref;
+                return (React.createElement("div", { ref: ref, className: "visibility-sensor ".concat(visible ? 'in' : '') }, Component && visible ? (React.createElement(Component, __assign({}, rest, childProps))) : children && visible ? (children) : (placeholder)));
+            }));
         }
         if (!visible) {
-            return (React.createElement(VisibilitySensor, __assign({}, visiblilityProps, { partialVisibility: partialVisibility, onChange: this.handleVisibleChange }),
-                React.createElement("div", { className: "visibility-sensor" }, placeholder)));
+            return (React.createElement(InView, { onChange: this.handleVisibleChange, threshold: partialVisibility ? 0 : 1 }, function (_a) {
+                var ref = _a.ref;
+                return (React.createElement("div", { ref: ref, className: "visibility-sensor" }, placeholder));
+            }));
         }
         else if (Component) {
             // 只监听不可见到可见，一旦可见了，就销毁检查。

package/esm/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0-beta.12
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -35,6 +35,8 @@ import { RootClose } from '../utils/RootClose.js';
 import '../utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/map';
+import 'lodash/isEmpty';
 import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';