@zhubangyun/lowcode-core 5.12.161 → 6.2.30

package/lib/utils/cache/index.js

@@ -17,7 +17,7 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
   var _proto = SchemaCache.prototype;
   _proto.createInstance = /*#__PURE__*/function () {
     var _createInstance = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(key, options) {
-      var mock, pageId, schemaRes, schema, permissionRes, permission;
+      var mock, pageId, schemaRes, schema, handleCommonSchema, permission, printTemplates, workflow, cloneSchema, _t;
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -30,30 +30,70 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
             });
           case 1:
             schemaRes = _context.sent;
-            schema = schemaRes.data;
-            if (!(typeof schema == "object")) {
-              _context.next = 3;
+            if (schemaRes.succss) {
+              _context.next = 2;
               break;
             }
-            _context.next = 2;
-            return _api.apiRequest.get("pages/" + pageId + "/permission");
+            return _context.abrupt("return", schemaRes);
           case 2:
-            permissionRes = _context.sent;
-            permission = permissionRes.data;
-            if (typeof permission == "object") {
-              (0, _schema.forEachFormSchema)(schema, true, function (child) {
-                child.props = child.props || {};
-                child.props.permission = permission;
-              });
+            schema = schemaRes.data;
+            if (!(schema != null && typeof schema == "object")) {
+              _context.next = 8;
+              break;
+            }
+            handleCommonSchema = function handleCommonSchema(schema) {
+              schema.props = schema.props || {};
+              schema.props.permission = permission;
+              schema.props.printTemplates = printTemplates;
+              schema.props.workflow = workflow;
+            };
+            //处理权限
+            permission = null; //处理打印
+            workflow = null;
+            if (location.pathname.startsWith("/print")) {
+              _context.next = 7;
+              break;
             }
+            _context.next = 3;
+            return _api.apiRequest.get("pages/" + pageId + "/permission");
           case 3:
-            console.log("schemaRes", schemaRes);
+            permission = _context.sent.data;
+            if (!((schema === null || schema === void 0 ? void 0 : schema.type) == "form")) {
+              _context.next = 7;
+              break;
+            }
+            _context.prev = 4;
+            _context.next = 5;
+            return _api.apiRequest.get("pages/" + pageId + "/printTemplates");
+          case 5:
+            printTemplates = _context.sent.data;
+            _context.next = 7;
+            break;
+          case 6:
+            _context.prev = 6;
+            _t = _context["catch"](4);
+            console.log(_t);
+          case 7:
+            (0, _schema.findFormSchemas)(schema).forEach(function (formSchema) {
+              handleCommonSchema(formSchema);
+              (0, _schema.findFdmSchemas)(formSchema.fdmSchema).forEach(function (fdmSchema) {
+                handleCommonSchema(fdmSchema);
+                fdmSchema.props.form.label = formSchema.props.label;
+              });
+            });
+            cloneSchema = JSON.parse(JSON.stringify(schema));
+            (0, _schema.findFormSchemas)(schema).forEach(function (formSchema) {
+              (0, _schema.findFdmSchemas)(formSchema.fdmSchema).forEach(function (fdmSchema) {
+                fdmSchema.props.formElement = cloneSchema;
+              });
+            });
+          case 8:
             return _context.abrupt("return", schemaRes);
-          case 4:
+          case 9:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[4, 6]]);
     }));
     function createInstance(_x, _x2) {
       return _createInstance.apply(this, arguments);

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

@@ -1,3 +1,6 @@
 export { loadPlugins } from "./LoadPlugins";
 export declare function uuid(prefix?: string, separator?: string): string;
+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/lib/utils/common/index.js

@@ -1,20 +1,30 @@
 "use strict";
 
 exports.__esModule = true;
+exports.isLocalhost = isLocalhost;
+exports.isMobile = isMobile;
 exports.loadPlugins = void 0;
 exports.toArray = toArray;
 exports.uuid = uuid;
+exports.uuidVersion = uuidVersion;
 var _uuid = require("uuid");
 var _LoadPlugins = require("./LoadPlugins");
 exports.loadPlugins = _LoadPlugins.loadPlugins;
 function uuid(prefix, separator) {
   if (!prefix && !separator) {
-    return (0, _uuid.v4)();
+    return (0, _uuid.v7)();
   }
-  return [prefix, separator, (0, _uuid.v4)()].filter(function (v) {
+  return [prefix, separator, (0, _uuid.v7)()].filter(function (v) {
     return !!v;
   }).join("");
 }
+function uuidVersion(id) {
+  try {
+    return (0, _uuid.version)(id);
+  } catch (e) {
+    return false;
+  }
+}
 function toArray(data) {
   if (!data) {
     return [];
@@ -23,4 +33,11 @@ function toArray(data) {
   } else {
     return [data];
   }
+}
+function isLocalhost() {
+  return window.location.hostname == "localhost";
+}
+function isMobile() {
+  var userAgent = navigator.userAgent;
+  return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini|Mobile/i.test(userAgent);
 }

package/lib/utils/page/index.js

@@ -10,6 +10,7 @@ exports.showFormGroup = exports.showFormDataManagerGroup = exports.showFormDataM
 exports.showLoading = showLoading;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _uniBridge = require("../uni-bridge");
 var _printForm = require("./print-form");
 exports.print = _printForm.print;
 exports.getFormPrintTemplates = _printForm.getFormPrintTemplates;
@@ -44,6 +45,7 @@ function _showLoading() {
     return _regenerator["default"].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";
@@ -70,6 +72,7 @@ function _hideLoading() {
     return _regenerator["default"].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";
@@ -104,14 +107,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.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/lib/utils/page/page-form-data-manager-group.js

@@ -12,22 +12,22 @@ var _pageLayout = require("./page-layout");
 var _react = _interopRequireWildcard(require("react"));
 var _reactRender = require("../../components/react-render");
 var _pageRender = require("./page-render");
-var _uuid = require("uuid");
-var _excluded = ["layout", "items", "onSelectOk", "onClose"],
-  _excluded2 = ["container", "onClose"];
+var _common = require("../common");
+var _excluded = ["layout", "items", "onSelectOk", "container", "onClose"],
+  _excluded2 = ["onClose"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function showFormDataManagerGroup(_x) {
   return _showFormDataManagerGroup.apply(this, arguments);
 }
 function _showFormDataManagerGroup() {
   _showFormDataManagerGroup = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
-    var container, onClose, props;
+    var onClose, props;
     return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          container = options.container, onClose = options.onClose, props = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2);
+          onClose = options.onClose, props = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2);
           return _context.abrupt("return", (0, _pageRender.renderElement)({
-            container: container,
+            container: props.container,
             onClose: onClose,
             element: {
               component: FormDataManagerRender,
@@ -61,6 +61,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 = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded);
     // @ts-ignore
@@ -78,17 +79,16 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       onSelectOk === null || onSelectOk === void 0 ? void 0 : onSelectOk(data);
     };
     return /*#__PURE__*/_react["default"].createElement(_pageLayout.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["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({}, restProps, {
       components: window._components || window.components || window.__components,
       schema: {
-        id: (0, _uuid.v4)(),
+        id: (0, _common.uuid)(),
         componentName: "Page",
         props: {},
         state: {},

package/lib/utils/page/page-form-data-manager.d.ts

@@ -11,6 +11,7 @@ export interface DataView {
         id?: string;
         fieldId?: string;
     };
+    extraProps?: any;
     labelField?: string;
     secondaryLabelFields?: string[];
     fieldWidth?: Record<string, number>;

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

@@ -12,24 +12,24 @@ var _pageLayout = require("./page-layout");
 var _react = _interopRequireWildcard(require("react"));
 var _pageLoadSchema = require("./page-load-schema");
 var _reactRender = require("../../components/react-render");
-var _schema = require("../cache/schema");
 var _pageSchemaUtils = require("./page-schema-utils");
 var _pageRender = require("./page-render");
-var _excluded = ["layout", "form", "onSelectOk", "onClose"],
-  _excluded2 = ["container", "onClose"];
+var _schema = require("../api/schema.util");
+var _excluded = ["layout", "form", "onSelectOk", "onClose", "container"],
+  _excluded2 = ["onClose"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function showFormDataManager(_x) {
   return _showFormDataManager.apply(this, arguments);
 }
 function _showFormDataManager() {
   _showFormDataManager = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
-    var container, onClose, props;
+    var onClose, props;
     return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          container = options.container, onClose = options.onClose, props = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2);
+          onClose = options.onClose, props = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2);
           return _context.abrupt("return", (0, _pageRender.renderElement)({
-            container: container,
+            container: props.container,
             onClose: onClose,
             element: {
               component: FormDataManagerRender,
@@ -64,6 +64,7 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       form = _this$props.form,
       onSelectOk = _this$props.onSelectOk,
       onClose = _this$props.onClose,
+      container = _this$props.container,
       restProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded);
     // @ts-ignore
     restProps.layout = layout || "modal";
@@ -81,19 +82,18 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
     };
     var dataView = (0, _pageSchemaUtils.cloneDataView)(this.props.dataView, this.props.extraProps);
     return /*#__PURE__*/_react["default"].createElement(_pageLayout.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["default"].createElement(_pageLoadSchema.PageLoadSchema, {
       pageId: form === null || form === void 0 ? void 0 : form.id
     }, function (schema) {
       var fdmSchema = schema.children[0].fdmSchema;
       if (form !== null && form !== void 0 && form.fieldId) {
-        (0, _schema.forEachFormSchema)(schema, function (field) {
+        (0, _schema.forEachSchema)(schema, function (field) {
           if (form.fieldId == field.props.fieldId) {
             fdmSchema = field.fdmSchema;
             return false;

package/lib/utils/page/page-form-group.d.ts

@@ -7,6 +7,7 @@ export interface ShowFormGroupProps {
         id: string;
         fieldId?: string;
     };
+    extraProps?: any;
     items?: any[];
     mode?: PageFormModeType;
     onSubmitOk?: (data: any) => void;

package/lib/utils/page/page-form-group.js

@@ -12,8 +12,8 @@ var _pageLayout = require("./page-layout");
 var _pageRender = require("./page-render");
 var _react = _interopRequireWildcard(require("react"));
 var _reactRender = require("../../components/react-render");
-var _uuid = require("uuid");
 var _pageLoadSchema = require("./page-load-schema");
+var _common = require("../common");
 var _excluded = ["layout", "form", "items", "onClose"],
   _excluded2 = ["container", "onClose"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -84,7 +84,7 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
       return /*#__PURE__*/_react["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({}, restProps, {
         components: window._components || window.components || window.__components,
         schema: {
-          id: (0, _uuid.v4)(),
+          id: (0, _common.uuid)(),
           componentName: "Page",
           props: {},
           state: {},

package/lib/utils/page/page-form.d.ts

@@ -7,6 +7,7 @@ export interface ShowFormProps {
         id: string;
         fieldId?: string;
     };
+    extraProps?: any;
     mode?: PageFormModeType;
     lockMode?: boolean;
     dataId?: string;

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

@@ -22,7 +22,7 @@ function showForm(_x) {
 }
 function _showForm() {
   _showForm = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
-    var container, onClose, props, _options$form, paths, mode, dataId, params, url, page;
+    var container, onClose, props, _options$form, paths, mode, dataId, params, _options$form2, url;
     return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -34,15 +34,23 @@ function _showForm() {
           paths = window.location.pathname.split("/");
           mode = options.mode, dataId = options.dataId;
           params = new URLSearchParams();
+          if ((_options$form = options.form) !== null && _options$form !== void 0 && _options$form.id) {
+            params.set("pageId", (_options$form2 = options.form) === null || _options$form2 === void 0 ? void 0 : _options$form2.id);
+          }
+          if (mode) {
+            params.set("mode", mode);
+          }
           if (dataId) {
             params.set("dataId", dataId);
           }
-          url = "/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + 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 (0, _index.openPage)(url, url);
         case 1:
-          page = _context.sent;
-          console.debug("openPage", page);
           return _context.abrupt("return");
         case 2:
           return _context.abrupt("return", (0, _pageRender.renderElement)({

package/lib/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;
 }
@@ -12,6 +13,7 @@ interface PageLayoutState {
 }
 export declare class PageLayout extends Component<PageLayoutProps, PageLayoutState> {
     state: PageLayoutState;
+    get layout(): PageLayoutType;
     close: () => void;
     constructor(props: any);
     componentDidMount(): void;

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

@@ -7,10 +7,11 @@ var _drawer = _interopRequireDefault(require("antd/lib/drawer"));
 var _modal = _interopRequireDefault(require("antd/lib/modal"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _react = _interopRequireWildcard(require("react"));
 var _loadMaterials = require("../../components/load-materials");
-var _excluded = ["layout", "children"];
+var _excluded = ["children"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
   function PageLayout(props) {
@@ -28,7 +29,7 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
       return Math.min(window.innerWidth, 1600);
     };
     _this.handleResize = function () {
-      if (_this.props.layout == "drawer") {
+      if (_this.layout == "drawer") {
         _this.setState({
           width: _this.getWith()
         });
@@ -46,10 +47,11 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
     window.removeEventListener("resize", this.handleResize);
   };
   _proto.render = function render() {
+    var _this2 = this;
     var _this$props = this.props,
-      layout = _this$props.layout,
       children = _this$props.children,
       extraProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded);
+    var layout = this.layout;
     var state = this.state;
     var restProps = (0, _extends2["default"])({}, extraProps, {
       children: undefined,
@@ -70,19 +72,54 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
           padding: 0
         }
       },
-      maskClosable: false
+      maskClosable: isMobile
     });
     var loadChildren = /*#__PURE__*/_react["default"].createElement(LoadMaterialChildren, null, children);
     if (layout == "modal") {
       restProps.style.top = 64;
       restProps.styles.body.height = "calc(100vh - 120px)";
-      return /*#__PURE__*/_react["default"].createElement(_modal["default"], restProps, loadChildren);
+      return /*#__PURE__*/_react["default"].createElement(_modal["default"], (0, _extends2["default"])({}, 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") {
-      return /*#__PURE__*/_react["default"].createElement(_drawer["default"], restProps, loadChildren);
+      if (window.isMobile) {
+        restProps.placement = "bottom";
+      }
+      return /*#__PURE__*/_react["default"].createElement(_drawer["default"], (0, _extends2["default"])({}, restProps, {
+        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;
   };
-  return PageLayout;
+  return (0, _createClass2["default"])(PageLayout, [{
+    key: "layout",
+    get: function get() {
+      var layout = this.props.layout;
+      if (window.isMobile) {
+        if (layout == "modal") {
+          return "drawer";
+        }
+      }
+      return layout;
+    }
+  }]);
 }(_react.Component);
 function LoadMaterialChildren(props) {
   return /*#__PURE__*/_react["default"].createElement(_loadMaterials.LoadMaterials, null, props.children);

package/lib/utils/page/page-load-schema.js

@@ -7,55 +7,47 @@ var _result = _interopRequireDefault(require("antd/lib/result"));
 var _message2 = _interopRequireDefault(require("antd/lib/message"));
 var _react = require("react");
 var _api = require("../api");
-var _pageLoading = require("../../components/page-loading");
 var _schemaApi = require("../api/schema-api");
+var _index = require("./index");
 function PageLoadSchema(props) {
   var pageId = props.pageId,
     children = props.children;
   var cache = (0, _schemaApi.getSchemaFromCache)(pageId);
-  var _useState = (0, _react.useState)(!cache),
-    loading = _useState[0],
-    setLoading = _useState[1];
-  var _useState2 = (0, _react.useState)(cache === null || cache === void 0 ? void 0 : cache.data),
-    schema = _useState2[0],
-    setSchema = _useState2[1];
-  var _useState3 = (0, _react.useState)(),
-    errorMsg = _useState3[0],
-    setErrorMsg = _useState3[1];
+  var _useState = (0, _react.useState)(cache === null || cache === void 0 ? void 0 : cache.data),
+    schema = _useState[0],
+    setSchema = _useState[1];
+  var _useState2 = (0, _react.useState)(),
+    errorMsg = _useState2[0],
+    setErrorMsg = _useState2[1];
   (0, _react.useEffect)(function () {
-    if (cache) {
+    if (cache !== null && cache !== void 0 && cache.success) {
       return;
     }
     if (pageId) {
+      (0, _index.showLoading)().then();
       (0, _api.getSchema)(pageId).then(function (res) {
         if (res.success) {
-          setLoading(false);
-          setSchema(res.data);
+          setSchema(res === null || res === void 0 ? void 0 : res.data);
         } else {
-          setErrorMsg(res.message);
+          setErrorMsg(res === null || res === void 0 ? void 0 : res.message);
         }
+      })["finally"](function () {
+        (0, _index.hideLoading)().then();
       });
     } else {
-      setLoading(false);
-      setErrorMsg("页面id不可为空!");
-      console.error("页面id不可为空!");
-      _message2["default"].error("页面id不可为空!").then();
+      (0, _index.hideLoading)().then();
+      setErrorMsg("参数错误:页面id不可为空!");
+      _message2["default"].error("参数错误:页面id不可为空!").then();
     }
   }, []);
-  if (cache) {
+  if (schema) {
     return children(schema);
   }
-  if (loading) {
-    return /*#__PURE__*/React.createElement(_pageLoading.PageLoading, {
-      loading: true,
-      background: "rgba(255, 255, 255, 0)"
-    });
-  }
-  if (!schema) {
+  if (errorMsg) {
     return /*#__PURE__*/React.createElement(_result["default"], {
       status: 500,
       title: errorMsg
     });
   }
-  return children(schema);
+  return /*#__PURE__*/React.createElement(_react.Fragment, null);
 }

package/lib/utils/page/page-render.js

@@ -11,13 +11,13 @@ var _client = require("react-dom/client");
 function renderElement(options) {
   return new Promise(/*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(resolve, reject) {
-      var container, _onClose, _options$element, component, props, unmount, root, element;
+      var container, _onClose, _options$element, component, props, needUnmount, root, element;
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             container = options.container, _onClose = options.onClose;
             _options$element = options.element, component = _options$element.component, props = _options$element.props;
-            unmount = !container;
+            needUnmount = !container;
             if (!container) {
               container = document.createElement("div");
               document.body.append(container);
@@ -32,12 +32,11 @@ function renderElement(options) {
                 //等待动画结束
                 setTimeout(function () {
                   root.unmount();
-                  if (unmount) {
+                  if (needUnmount) {
                     var _container;
-                    //移除
                     (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
                   }
-                }, 200);
+                }, 150);
                 _onClose === null || _onClose === void 0 ? void 0 : _onClose();
               }
             }));

package/lib/utils/page/page-show.d.ts

@@ -4,6 +4,8 @@ export interface ShowPageProps {
     pageId: string;
     layout?: PageLayoutType;
     onClose?: () => void | Promise<void>;
+    extraProps?: any;
+    afterLoadSchema?: (schema: any) => void;
     pageRef?: (page: any) => void;
 }
 export declare function show(options: ShowPageProps): Promise<any | any[]>;