@zhubangyun/lowcode-core 6.1.90 → 6.2.30

package/es/index.js

@@ -1,5 +1,4 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _message from "antd/es/message";
 import "./index.less";
 import { ReactRender } from "./components/react-render";
 import * as lodash from "lodash";
@@ -10,6 +9,9 @@ export { Layout } from "./components/layout";
 export { ReactRender } from "./components/react-render";
 import utils from "./utils/index";
 import { uniBridge } from "./utils/uni-bridge";
+import { initBarHeight } from "./init/init.bar-height";
+import { initScrollSize } from "./init/init.scroll-size";
+import { initMobileClass } from "./init/init.mobile-class";
 // @ts-ignore
 window.__ReactRender = ReactRender;
 // @ts-ignore
@@ -22,41 +24,17 @@ if (!window.utils) {
   // @ts-ignore
   window.utils = utils;
 }
-window.isMobile = utils.common.isMobile();
-if (window.isMobile) {
-  var classList = window.document.body.classList;
-  if (!classList.contains("mobile")) {
-    classList.add("mobile");
-  }
-}
-var bar_height_key = "bar_height";
+initMobileClass();
+
 // @ts-ignore
 utils.uniBridge = uniBridge;
 // @ts-ignore
 window.uniBridge = uniBridge;
-window.addEventListener("load", function () {
-  setTimeout(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var height;
-    return _regeneratorRuntime.wrap(function (_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 1;
-          return uniBridge.getBarHeight();
-        case 1:
-          height = _context.sent;
-          localStorage.setItem(bar_height_key, height);
-          updateBarHeight();
-        case 2:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })), 100);
+_message.config({
+  top: 150,
+  duration: 5,
+  maxCount: 3
 });
-function updateBarHeight() {
-  if (localStorage.getItem(bar_height_key)) {
-    document.documentElement.style.setProperty('--bar-height', localStorage.getItem(bar_height_key));
-  }
-}
-updateBarHeight();
+initBarHeight();
+initScrollSize();
 export { utils, lodash };

package/es/index.less

@@ -1,7 +1,18 @@
+:root {
+  --scroll-bar-width: 15px;
+  --scroll-bar-height: 15px;
+}
+
+.ant-table-cell-scrollbar {
+  padding: 0 !important;
+  width: var(--scroll-bar-width);
+}
+
 [componentname="Page"] {
   height: 100%;
 }
 
+
 ul {
   margin-bottom: 0;
   padding-left: 0;

package/es/init/init.bar-height.d.ts

@@ -0,0 +1 @@
+export declare function initBarHeight(): void;

package/es/init/init.bar-height.js

@@ -0,0 +1,37 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { uniBridge } from "../utils/uni-bridge";
+var bar_height_key = "bar_height";
+export function initBarHeight() {
+  updateBarHeight();
+  window.onload = function () {
+    setTimeout(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var height;
+      return _regeneratorRuntime.wrap(function (_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!window.uni) {
+              _context.next = 2;
+              break;
+            }
+            _context.next = 1;
+            return uniBridge.getBarHeight();
+          case 1:
+            height = _context.sent;
+            localStorage.setItem(bar_height_key, height);
+            updateBarHeight();
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    })), 100);
+  };
+}
+function updateBarHeight() {
+  var style = document.documentElement.style;
+  var barHeight = localStorage.getItem(bar_height_key);
+  if (barHeight) {
+    style.setProperty('--bar-height', barHeight);
+  }
+}

package/es/init/init.mobile-class.d.ts

@@ -0,0 +1 @@
+export declare function initMobileClass(): void;

package/es/init/init.mobile-class.js

@@ -0,0 +1,10 @@
+import { isMobile } from "../utils/common";
+export function initMobileClass() {
+  window.isMobile = isMobile();
+  if (window.isMobile) {
+    var classList = window.document.body.classList;
+    if (!classList.contains("mobile")) {
+      classList.add("mobile");
+    }
+  }
+}

package/es/init/init.scroll-size.d.ts

@@ -0,0 +1,5 @@
+export declare function initScrollSize(): void;
+export declare function getScrollbarSize(): {
+    width?: number;
+    height?: number;
+};

package/es/init/init.scroll-size.js

@@ -0,0 +1,26 @@
+var scrollbarSize = {};
+
+// @ts-ignore
+window.scrollbarSize = scrollbarSize;
+export function initScrollSize() {
+  var size = getScrollbarSize();
+  var style = document.documentElement.style;
+  style.setProperty('--scroll-bar-height', size.height + "px");
+  style.setProperty('--scroll-bar-width', size.width + "px");
+}
+export function getScrollbarSize() {
+  if (typeof scrollbarSize.height == "number" && typeof scrollbarSize.width == "number") {
+    return scrollbarSize;
+  }
+  var outer = document.createElement('div');
+  outer.style.cssText = "\n    visibility: hidden;\n    overflow: scroll;\n    position: absolute;\n    top: -9999px;\n    width: 50px;\n    height: 50px;\n  ";
+  document.body.appendChild(outer);
+  var inner = document.createElement('div');
+  inner.style.width = '100%';
+  inner.style.height = '100%';
+  outer.appendChild(inner);
+  scrollbarSize.width = outer.offsetWidth - inner.offsetWidth;
+  scrollbarSize.height = outer.offsetHeight - inner.offsetHeight;
+  document.body.removeChild(outer);
+  return scrollbarSize;
+}

package/es/style.js

@@ -1,8 +1,8 @@
+import 'antd/es/message/style';
 import 'antd/es/config-provider/style';
 
 import 'antd/es/notification/style';
 import 'antd/es/modal/style';
-import 'antd/es/message/style';
 import 'antd/es/typography/style';
 import 'antd/es/drawer/style';
 import 'antd/es/result/style';

package/es/utils/api/form-api.d.ts

@@ -16,5 +16,6 @@ export declare class RestFormApi<DataType> extends RestApi<DataType> {
     save(data: DataType, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
     create(data: DataType, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
     update(id: string, data: DataType, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
+    fieldFilters(searchParams?: RestSearchParams): Promise<ManyResult<DataType>>;
     serviceUpdate(data: DataType, options?: BaseRequestOptions<DataType>): Promise<import("axios").AxiosResponse<any, any, {}>>;
 }

package/es/utils/api/form-api.js

@@ -6,15 +6,15 @@ import { RestApi } from "./rest-api";
 import { assembleAssociationField, convertSaveData, handleFilterRules } from "./form-api.utils";
 import { formApi } from "../cache";
 import { getSchemaFromCache } from "./schema-api";
-import { uuid } from "../common";
+import { uuid, uuidVersion } from "../common";
 export function getFormApi(_x, _x2, _x3) {
   return _getFormApi.apply(this, arguments);
 }
 function _getFormApi() {
-  _getFormApi = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee0(formId, fieldId, mock) {
+  _getFormApi = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee1(formId, fieldId, mock) {
     var key;
-    return _regeneratorRuntime.wrap(function (_context0) {
-      while (1) switch (_context0.prev = _context0.next) {
+    return _regeneratorRuntime.wrap(function (_context1) {
+      while (1) switch (_context1.prev = _context1.next) {
         case 0:
           if (typeof mock != "boolean") {
             if (typeof window.__mock == "boolean") {
@@ -24,16 +24,16 @@ function _getFormApi() {
           key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
             return !!key;
           }).join("_");
-          return _context0.abrupt("return", formApi.getInstance(key, {
+          return _context1.abrupt("return", formApi.getInstance(key, {
             mock: mock,
             fieldId: fieldId,
             formId: formId
           }));
         case 1:
         case "end":
-          return _context0.stop();
+          return _context1.stop();
       }
-    }, _callee0);
+    }, _callee1);
   }));
   return _getFormApi.apply(this, arguments);
 }
@@ -184,22 +184,59 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   }();
   _proto.getById = /*#__PURE__*/function () {
     var _getById = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(id, options) {
-      var res;
+      var searchId, url, res, _t;
       return _regeneratorRuntime.wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context4.next = 1;
-            return _RestApi.prototype.getById.call(this, id, options);
+            if (id) {
+              _context4.next = 1;
+              break;
+            }
+            return _context4.abrupt("return", {
+              success: false,
+              message: "数据Id不可为空!"
+            });
           case 1:
+            searchId = id;
+            if (!id.startsWith("http")) {
+              _context4.next = 2;
+              break;
+            }
+            url = new URL(searchId);
+            searchId = url.searchParams.get("dataId");
+            if (searchId) {
+              _context4.next = 2;
+              break;
+            }
+            return _context4.abrupt("return", {
+              success: false,
+              message: "数据Id不可为空!"
+            });
+          case 2:
+            _context4.prev = 2;
+            uuidVersion(searchId);
+            _context4.next = 4;
+            break;
+          case 3:
+            _context4.prev = 3;
+            _t = _context4["catch"](2);
+            return _context4.abrupt("return", {
+              success: false,
+              message: "\u975E\u6CD5\u7684\u6570\u636EID:" + searchId
+            });
+          case 4:
+            _context4.next = 5;
+            return _RestApi.prototype.getById.call(this, searchId, options);
+          case 5:
             res = _context4.sent;
             assembleAssociationField(res.data, res.refs);
             console.debug("formApi.getById", res);
             return _context4.abrupt("return", res);
-          case 2:
+          case 6:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, this);
+      }, _callee4, this, [[2, 3]]);
     }));
     function getById(_x6, _x7) {
       return _getById.apply(this, arguments);
@@ -295,30 +332,75 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
     }
     return update;
   }();
-  _proto.serviceUpdate = /*#__PURE__*/function () {
-    var _serviceUpdate = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(data, options) {
-      var params;
+  _proto.fieldFilters = /*#__PURE__*/function () {
+    var _fieldFilters = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(searchParams) {
+      var _searchParams3, _searchParams4;
+      var params, config, res;
       return _regeneratorRuntime.wrap(function (_context9) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
+            searchParams = searchParams || {};
             params = {
               formId: this.formId,
               fieldId: this.fieldId
             };
             if (__mock) {
-              params.mock = true;
               params.description = (this.title || "表单") + ".\u67E5\u8BE2";
             }
-            return _context9.abrupt("return", this.request.post("serviceUpdate", data, {
+            config = {
               params: params
-            }));
+            };
+            _context9.next = 1;
+            return this.handleRequestConfig(config);
           case 1:
+            searchParams.filterRules = handleFilterRules(((_searchParams3 = searchParams) === null || _searchParams3 === void 0 ? void 0 : _searchParams3.filterRules) || [], {
+              filterNullValue: false
+            });
+            searchParams.searchFields = handleFilterRules(((_searchParams4 = searchParams) === null || _searchParams4 === void 0 ? void 0 : _searchParams4.searchFields) || [], {
+              filterNullValue: true
+            });
+            config.params = _extends({}, params, searchParams);
+            _context9.next = 2;
+            return this.request.get("fieldFilters", config);
+          case 2:
+            res = _context9.sent;
+            console.debug("form.fieldFilters:", res);
+            return _context9.abrupt("return", res);
+          case 3:
           case "end":
             return _context9.stop();
         }
       }, _callee9, this);
     }));
-    function serviceUpdate(_x15, _x16) {
+    function fieldFilters(_x15) {
+      return _fieldFilters.apply(this, arguments);
+    }
+    return fieldFilters;
+  }();
+  _proto.serviceUpdate = /*#__PURE__*/function () {
+    var _serviceUpdate = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee0(data, options) {
+      var params;
+      return _regeneratorRuntime.wrap(function (_context0) {
+        while (1) switch (_context0.prev = _context0.next) {
+          case 0:
+            params = {
+              formId: this.formId,
+              fieldId: this.fieldId
+            };
+            if (__mock) {
+              params.mock = true;
+              params.description = (this.title || "表单") + ".\u67E5\u8BE2";
+            }
+            return _context0.abrupt("return", this.request.post("serviceUpdate", data, {
+              params: params
+            }));
+          case 1:
+          case "end":
+            return _context0.stop();
+        }
+      }, _callee0, this);
+    }));
+    function serviceUpdate(_x16, _x17) {
       return _serviceUpdate.apply(this, arguments);
     }
     return serviceUpdate;

package/es/utils/api/index.js

@@ -31,13 +31,14 @@ export function onFulfilled(res) {
 export function onRejected(error) {
   var _error$response = error.response,
     status = _error$response.status,
-    statusText = _error$response.statusText;
+    statusText = _error$response.statusText,
+    data = _error$response.data;
   console.error("请求失败!", error);
   if (status == 400) {
     return error.response.data || {};
   }
   return {
     success: false,
-    message: statusText
+    message: (data === null || data === void 0 ? void 0 : data.message) || statusText
   };
 }

package/es/utils/common/index.d.ts

@@ -1,6 +1,6 @@
 export { loadPlugins } from "./LoadPlugins";
 export declare function uuid(prefix?: string, separator?: string): string;
-export declare function uuidVersion(id: string): number;
+export declare function uuidVersion(id: string): number | false;
 export declare function toArray(data: any): any[];
 export declare function isLocalhost(): boolean;
 export declare function isMobile(): boolean;

package/es/utils/common/index.js

@@ -9,7 +9,11 @@ export function uuid(prefix, separator) {
   }).join("");
 }
 export function uuidVersion(id) {
-  return version(id);
+  try {
+    return version(id);
+  } catch (e) {
+    return false;
+  }
 }
 export function toArray(data) {
   if (!data) {

package/es/utils/page/index.js

@@ -1,5 +1,6 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { uniBridge } from "../uni-bridge";
 export { print, getFormPrintTemplates } from "./print-form";
 export { showForm } from "./page-form";
 export { showFormGroup } from "./page-form-group";
@@ -27,6 +28,7 @@ function _showLoading() {
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          console.log("page.show.loading");
           loading = document.getElementById("fullscreen-loading");
           if (loading) {
             loading.style.display = "flex";
@@ -53,6 +55,7 @@ function _hideLoading() {
     return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
+          console.log("page.hide.loading");
           loading = document.getElementById("fullscreen-loading");
           if (loading) {
             loading.style.display = "none";
@@ -87,14 +90,15 @@ function _openPage() {
             url: url
           });
         case 1:
-          page = _context3.sent;
-          _context3.next = 3;
-          break;
+          return _context3.abrupt("return", _context3.sent);
         case 2:
-          page = window.open(url, target);
+          if (!isMobile) {
+            _context3.next = 3;
+            break;
+          }
+          return _context3.abrupt("return", uniBridge.navigateTo(url));
         case 3:
-          console.debug("openPage", page, target);
-          return _context3.abrupt("return", page);
+          return _context3.abrupt("return", window.open(url, target));
         case 4:
         case "end":
           return _context3.stop();

package/es/utils/page/page-form-data-manager-group.js

@@ -2,8 +2,8 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-var _excluded = ["layout", "items", "onSelectOk", "onClose"],
-  _excluded2 = ["container", "onClose"];
+var _excluded = ["layout", "items", "onSelectOk", "container", "onClose"],
+  _excluded2 = ["onClose"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { PageLayout } from "./page-layout";
 import React, { Component } from "react";
@@ -15,13 +15,13 @@ export function showFormDataManagerGroup(_x) {
 }
 function _showFormDataManagerGroup() {
   _showFormDataManagerGroup = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(options) {
-    var container, onClose, props;
+    var onClose, props;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          container = options.container, onClose = options.onClose, props = _objectWithoutPropertiesLoose(options, _excluded2);
+          onClose = options.onClose, props = _objectWithoutPropertiesLoose(options, _excluded2);
           return _context.abrupt("return", renderElement({
-            container: container,
+            container: props.container,
             onClose: onClose,
             element: {
               component: FormDataManagerRender,
@@ -55,6 +55,7 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       layout = _this$props.layout,
       items = _this$props.items,
       onSelectOk = _this$props.onSelectOk,
+      container = _this$props.container,
       onClose = _this$props.onClose,
       restProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
     // @ts-ignore
@@ -72,13 +73,12 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       onSelectOk === null || onSelectOk === void 0 ? void 0 : onSelectOk(data);
     };
     return /*#__PURE__*/React.createElement(PageLayout, {
+      container: container,
       ref: function ref(layout) {
         return _this2.layoutRef = layout;
       },
       layout: layout,
-      onClose: function onClose() {
-        onSelectOk === null || onSelectOk === void 0 ? void 0 : onSelectOk(undefined);
-      }
+      onClose: onClose
     }, /*#__PURE__*/React.createElement(ReactRender, _extends({}, restProps, {
       components: window._components || window.components || window.__components,
       schema: {

package/es/utils/page/page-form-data-manager.js

@@ -2,8 +2,8 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-var _excluded = ["layout", "form", "onSelectOk", "onClose"],
-  _excluded2 = ["container", "onClose"];
+var _excluded = ["layout", "form", "onSelectOk", "onClose", "container"],
+  _excluded2 = ["onClose"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { PageLayout } from "./page-layout";
 import React, { Component } from "react";
@@ -17,13 +17,13 @@ export function showFormDataManager(_x) {
 }
 function _showFormDataManager() {
   _showFormDataManager = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(options) {
-    var container, onClose, props;
+    var onClose, props;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          container = options.container, onClose = options.onClose, props = _objectWithoutPropertiesLoose(options, _excluded2);
+          onClose = options.onClose, props = _objectWithoutPropertiesLoose(options, _excluded2);
           return _context.abrupt("return", renderElement({
-            container: container,
+            container: props.container,
             onClose: onClose,
             element: {
               component: FormDataManagerRender,
@@ -58,6 +58,7 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       form = _this$props.form,
       onSelectOk = _this$props.onSelectOk,
       onClose = _this$props.onClose,
+      container = _this$props.container,
       restProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
     // @ts-ignore
     restProps.layout = layout || "modal";
@@ -75,13 +76,12 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
     };
     var dataView = cloneDataView(this.props.dataView, this.props.extraProps);
     return /*#__PURE__*/React.createElement(PageLayout, {
+      container: container,
       ref: function ref(layout) {
         return _this2.layoutRef = layout;
       },
       layout: layout,
-      onClose: function onClose() {
-        onSelectOk === null || onSelectOk === void 0 ? void 0 : onSelectOk(undefined);
-      }
+      onClose: onClose
     }, /*#__PURE__*/React.createElement(PageLoadSchema, {
       pageId: form === null || form === void 0 ? void 0 : form.id
     }, function (schema) {

package/es/utils/page/page-form.js

@@ -16,7 +16,7 @@ export function showForm(_x) {
 }
 function _showForm() {
   _showForm = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(options) {
-    var container, onClose, props, _options$form, paths, mode, dataId, params, _options$form2, url, page;
+    var container, onClose, props, _options$form, paths, mode, dataId, params, _options$form2, url;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -37,16 +37,14 @@ function _showForm() {
           if (dataId) {
             params.set("dataId", dataId);
           }
-          url = "/" + paths[1] + "/pages?" + params.toString();
-          if (paths[1] == "workPlatform") {
-            url = "/pages?" + params.toString();
+          url = "/pages?" + params.toString();
+          if (paths[1] == "admin") {
+            url = "/admin/pages?" + params.toString();
           }
           //const url = `/${paths[1]}/${paths[2]}/${options.form?.id}/${mode}?${params.toString()}`;
           _context.next = 1;
           return openPage(url, url);
         case 1:
-          page = _context.sent;
-          console.debug("openPage", page);
           return _context.abrupt("return");
         case 2:
           return _context.abrupt("return", renderElement({

package/es/utils/page/page-layout.d.ts

@@ -1,8 +1,9 @@
 import { Component } from "react";
 export type PageLayoutType = "page" | "modal" | "drawer";
 interface PageLayoutProps {
+    container?: any;
     layout?: PageLayoutType;
-    onClose?: (evt: any) => void;
+    onClose?: () => void;
     keyboard?: boolean;
     children: any;
 }

package/es/utils/page/page-layout.js

@@ -41,6 +41,7 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
     window.removeEventListener("resize", this.handleResize);
   };
   _proto.render = function render() {
+    var _this2 = this;
     var _this$props = this.props,
       children = _this$props.children,
       extraProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
@@ -65,19 +66,38 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
           padding: 0
         }
       },
-      maskClosable: false
+      maskClosable: isMobile
     });
     var loadChildren = /*#__PURE__*/React.createElement(LoadMaterialChildren, null, children);
     if (layout == "modal") {
       restProps.style.top = 64;
       restProps.styles.body.height = "calc(100vh - 120px)";
-      return /*#__PURE__*/React.createElement(_Modal, restProps, loadChildren);
+      return /*#__PURE__*/React.createElement(_Modal, _extends({}, restProps, {
+        getContainer: function getContainer() {
+          return _this2.props.container || window.document.body;
+        },
+        afterOpenChange: function afterOpenChange(open) {
+          if (!open) {
+            var _this2$props$onClose, _this2$props;
+            (_this2$props$onClose = (_this2$props = _this2.props).onClose) === null || _this2$props$onClose === void 0 ? void 0 : _this2$props$onClose.call(_this2$props);
+          }
+        }
+      }), loadChildren);
     } else if (layout == "drawer") {
       if (window.isMobile) {
         restProps.placement = "bottom";
       }
       return /*#__PURE__*/React.createElement(_Drawer, _extends({}, restProps, {
-        height: "85vh"
+        getContainer: function getContainer() {
+          return _this2.props.container || window.document.body;
+        },
+        height: "75vh",
+        afterVisibleChange: function afterVisibleChange(open) {
+          if (!open) {
+            var _this2$props$onClose2, _this2$props2;
+            (_this2$props$onClose2 = (_this2$props2 = _this2.props).onClose) === null || _this2$props$onClose2 === void 0 ? void 0 : _this2$props$onClose2.call(_this2$props2);
+          }
+        }
       }), loadChildren);
     }
     return loadChildren;