@zhubangyun/lowcode-core 5.12.92 → 6.1.90

package/lib/utils/designer/engine/index.js

@@ -20,28 +20,28 @@ var Engine = exports.Engine = function Engine() {
    * 注入资产
    */
   this.injectAssets = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(types) {
+    var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(types) {
       var assetsData, asserts, _yield$assetsParse, components;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+      return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _this.assets.addDefaultAssets(types);
             assetsData = _this.assets.data; // @ts-ignore
-            _context.next = 4;
+            _context.next = 1;
             return _this._engine.injectAssets(assetsData);
-          case 4:
+          case 1:
             asserts = _context.sent;
-            _context.next = 7;
+            _context.next = 2;
             return _this._engine.material.setAssets(asserts);
-          case 7:
-            _context.next = 9;
+          case 2:
+            _context.next = 3;
             return (0, _assets2.assetsParse)(assetsData);
-          case 9:
+          case 3:
             _yield$assetsParse = _context.sent;
             components = _yield$assetsParse.components;
             // @ts-ignore
             window.components = components;
-          case 12:
+          case 4:
           case "end":
             return _context.stop();
         }
@@ -52,8 +52,8 @@ var Engine = exports.Engine = function Engine() {
     };
   }();
   this.loadIncrementalAssets = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(incrementalAssets) {
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
+    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(incrementalAssets) {
+      return _regenerator["default"].wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             return _context2.abrupt("return", _this.material.loadIncrementalAssets(incrementalAssets));
@@ -68,8 +68,8 @@ var Engine = exports.Engine = function Engine() {
     };
   }();
   this.registerPlugin = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(pluginModel, options, registerOptions) {
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
+    var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(pluginModel, options, registerOptions) {
+      return _regenerator["default"].wrap(function (_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             return _context3.abrupt("return", _this.plugins.register(pluginModel, options, registerOptions));
@@ -89,11 +89,11 @@ var Engine = exports.Engine = function Engine() {
    * @param schema
    */
   this.init = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(container, schema) {
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
+    var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(container, schema) {
+      return _regenerator["default"].wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context4.next = 2;
+            _context4.next = 1;
             return _this._engine.init(container, {
               designMode: "design",
               enableCondition: true,
@@ -103,14 +103,14 @@ var Engine = exports.Engine = function Engine() {
                 fetch: (0, _lowcodeDatasourceFetchHandler.createFetchHandler)()
               }
             });
-          case 2:
+          case 1:
             if (!schema) {
-              _context4.next = 5;
+              _context4.next = 2;
               break;
             }
-            _context4.next = 5;
+            _context4.next = 2;
             return _this.openDocument(schema);
-          case 5:
+          case 2:
           case "end":
             return _context4.stop();
         }
@@ -121,15 +121,15 @@ var Engine = exports.Engine = function Engine() {
     };
   }();
   this.openDocument = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(schema) {
-      return _regenerator["default"].wrap(function _callee5$(_context5) {
+    var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(schema) {
+      return _regenerator["default"].wrap(function (_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             if (schema === void 0) {
               schema = {};
             }
             _this._engine.project.openDocument(schema);
-          case 2:
+          case 1:
           case "end":
             return _context5.stop();
         }

package/lib/utils/designer/index.js

@@ -14,26 +14,26 @@ function initEngine() {
   return _initEngine.apply(this, arguments);
 }
 function _initEngine() {
-  _initEngine = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+  _initEngine = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
     var _window$AntdProMateri, _window$AntdProMateri2;
-    return _regenerator["default"].wrap(function _callee$(_context) {
+    return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context.next = 2;
+          _context.next = 1;
           return (0, _common.loadPlugins)(["next.min.js", "variables.css", "next.var.min.css",
           /*        "react.production.min.js",
                   "react-dom.production.min.js",*/
           "prop-types.js", "react15-polyfill.js", "lodash.min.js", "moment.min.js", "engine-core.css", "engine-core.js", "engine-ext.js", "engine-ext.css", "index.css", "index.js"].map(function (uri) {
             return "https://cdn.zhiyunhe.com/lowcode/designer/" + uri;
           }));
-        case 2:
-          _context.next = 4;
+        case 1:
+          _context.next = 2;
           return (0, _common.loadPlugins)(["https://cdn.zhiyunhe.com/plugin/dayjs/dayjs.min.js", "https://cdn.zhiyunhe.com/plugin/antd/latest/reset.css", "https://cdn.zhiyunhe.com/plugin/antd/latest/antd.min.js", "https://cdn.zhiyunhe.com/plugin/lowcode/materials/antd-pro/view.css", "https://cdn.zhiyunhe.com/plugin/lowcode/materials/antd-pro/view.js"]);
-        case 4:
+        case 2:
           //注册setter
           (_window$AntdProMateri = window.AntdProMaterial) === null || _window$AntdProMateri === void 0 ? void 0 : (_window$AntdProMateri2 = _window$AntdProMateri.registerSetters) === null || _window$AntdProMateri2 === void 0 ? void 0 : _window$AntdProMateri2.call(_window$AntdProMateri);
           return _context.abrupt("return", new _engine.Engine());
-        case 6:
+        case 3:
         case "end":
           return _context.stop();
       }

package/lib/utils/index.js

@@ -7,8 +7,7 @@ var api = _interopRequireWildcard(require("./api"));
 var designer = _interopRequireWildcard(require("./designer"));
 var page = _interopRequireWildcard(require("./page"));
 var cache = _interopRequireWildcard(require("./cache"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+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 _default = exports["default"] = {
   api: api,
   page: page,

package/lib/utils/page/index.js

@@ -39,9 +39,9 @@ function showLoading() {
   return _showLoading.apply(this, arguments);
 }
 function _showLoading() {
-  _showLoading = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+  _showLoading = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
     var loading, div;
-    return _regenerator["default"].wrap(function _callee$(_context) {
+    return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           loading = document.getElementById("fullscreen-loading");
@@ -53,7 +53,7 @@ function _showLoading() {
             div.innerHTML = "\n                    <div class=\"atom-spinner\">\n                        <div class=\"spinner-inner\">\n                            <div class=\"spinner-line\"></div>\n                            <div class=\"spinner-line\"></div>\n                            <div class=\"spinner-line\"></div>\n                            <div class=\"spinner-circle\"></div>\n                        </div>\n                    </div>\n        ";
             document.body.appendChild(div);
           }
-        case 2:
+        case 1:
         case "end":
           return _context.stop();
       }
@@ -65,16 +65,16 @@ function hideLoading() {
   return _hideLoading.apply(this, arguments);
 }
 function _hideLoading() {
-  _hideLoading = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+  _hideLoading = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
     var loading;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
+    return _regenerator["default"].wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           loading = document.getElementById("fullscreen-loading");
           if (loading) {
             loading.style.display = "none";
           }
-        case 2:
+        case 1:
         case "end":
           return _context2.stop();
       }
@@ -86,33 +86,33 @@ function openPage(_x, _x2) {
   return _openPage.apply(this, arguments);
 }
 function _openPage() {
-  _openPage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(url, target) {
+  _openPage = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(url, target) {
     var _window$parent;
     var page, func;
-    return _regenerator["default"].wrap(function _callee3$(_context3) {
+    return _regenerator["default"].wrap(function (_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           // @ts-ignore
           func = (_window$parent = window.parent) === null || _window$parent === void 0 ? void 0 : _window$parent.openWorkPlatformTab;
           if (!func) {
-            _context3.next = 7;
+            _context3.next = 2;
             break;
           }
-          _context3.next = 4;
+          _context3.next = 1;
           return func({
             value: target,
             url: url
           });
-        case 4:
+        case 1:
           page = _context3.sent;
-          _context3.next = 8;
+          _context3.next = 3;
           break;
-        case 7:
+        case 2:
           page = window.open(url, target);
-        case 8:
+        case 3:
           console.debug("openPage", page, target);
           return _context3.abrupt("return", page);
-        case 10:
+        case 4:
         case "end":
           return _context3.stop();
       }
@@ -124,10 +124,10 @@ function closePage(_x3, _x4) {
   return _closePage.apply(this, arguments);
 }
 function _closePage() {
-  _closePage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(url, target) {
+  _closePage = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(url, target) {
     var _window$parent2;
     var func;
-    return _regenerator["default"].wrap(function _callee4$(_context4) {
+    return _regenerator["default"].wrap(function (_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           // @ts-ignore
@@ -140,7 +140,7 @@ function _closePage() {
           } else {
             window.close();
           }
-        case 2:
+        case 1:
         case "end":
           return _context4.stop();
       }

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

@@ -12,18 +12,17 @@ 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 _common = require("../common");
 var _excluded = ["layout", "items", "onSelectOk", "onClose"],
   _excluded2 = ["container", "onClose"];
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+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) {
+  _showFormDataManagerGroup = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
     var container, onClose, props;
-    return _regenerator["default"].wrap(function _callee$(_context) {
+    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);
@@ -35,7 +34,7 @@ function _showFormDataManagerGroup() {
               props: props
             }
           }));
-        case 2:
+        case 1:
         case "end":
           return _context.stop();
       }
@@ -79,14 +78,17 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       onSelectOk === null || onSelectOk === void 0 ? void 0 : onSelectOk(data);
     };
     return /*#__PURE__*/_react["default"].createElement(_pageLayout.PageLayout, {
-      layout: layout,
       ref: function ref(layout) {
         return _this2.layoutRef = layout;
+      },
+      layout: layout,
+      onClose: function onClose() {
+        onSelectOk === null || onSelectOk === void 0 ? void 0 : onSelectOk(undefined);
       }
     }, /*#__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,20 +12,19 @@ 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 _schema = require("../api/schema.util");
 var _excluded = ["layout", "form", "onSelectOk", "onClose"],
   _excluded2 = ["container", "onClose"];
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+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) {
+  _showFormDataManager = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
     var container, onClose, props;
-    return _regenerator["default"].wrap(function _callee$(_context) {
+    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);
@@ -37,7 +36,7 @@ function _showFormDataManager() {
               props: props
             }
           }));
-        case 2:
+        case 1:
         case "end":
           return _context.stop();
       }
@@ -82,16 +81,19 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
     };
     var dataView = (0, _pageSchemaUtils.cloneDataView)(this.props.dataView, this.props.extraProps);
     return /*#__PURE__*/_react["default"].createElement(_pageLayout.PageLayout, {
-      layout: layout,
       ref: function ref(layout) {
         return _this2.layoutRef = layout;
+      },
+      layout: layout,
+      onClose: function onClose() {
+        onSelectOk === null || onSelectOk === void 0 ? void 0 : onSelectOk(undefined);
       }
     }, /*#__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,19 +12,18 @@ 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 _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+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 showFormGroup(_x) {
   return _showFormGroup.apply(this, arguments);
 }
 function _showFormGroup() {
-  _showFormGroup = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
+  _showFormGroup = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
     var container, onClose, props;
-    return _regenerator["default"].wrap(function _callee$(_context) {
+    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);
@@ -36,7 +35,7 @@ function _showFormGroup() {
               props: props
             }
           }));
-        case 2:
+        case 1:
         case "end":
           return _context.stop();
       }
@@ -74,17 +73,18 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
       onClose === null || onClose === void 0 ? void 0 : onClose();
     };
     return /*#__PURE__*/_react["default"].createElement(_pageLayout.PageLayout, {
-      layout: layout,
       ref: function ref(layout) {
         return _this2.layoutRef = layout;
-      }
+      },
+      layout: layout,
+      keyboard: false
     }, /*#__PURE__*/_react["default"].createElement(_pageLoadSchema.PageLoadSchema, {
       pageId: form === null || form === void 0 ? void 0 : form.id
     }, function (schema) {
       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

@@ -16,36 +16,45 @@ var _index = require("./index");
 var _pageRender = require("./page-render");
 var _excluded = ["layout", "form", "onClose"],
   _excluded2 = ["container", "onClose"];
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+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 showForm(_x) {
   return _showForm.apply(this, arguments);
 }
 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;
-    return _regenerator["default"].wrap(function _callee$(_context) {
+  _showForm = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(options) {
+    var container, onClose, props, _options$form, paths, mode, dataId, params, _options$form2, url, page;
+    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); //容器不存在需要手动取消挂载
           if (!(options.layout == "page" && !container)) {
-            _context.next = 12;
+            _context.next = 2;
             break;
           }
           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();
-          _context.next = 9;
+          url = "/" + paths[1] + "/pages?" + params.toString();
+          if (paths[1] == "workPlatform") {
+            url = "/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 9:
-          _page = _context.sent;
-          console.debug("openPage", _page);
+        case 1:
+          page = _context.sent;
+          console.debug("openPage", page);
           return _context.abrupt("return");
-        case 12:
+        case 2:
           return _context.abrupt("return", (0, _pageRender.renderElement)({
             container: container,
             onClose: onClose,
@@ -54,7 +63,7 @@ function _showForm() {
               props: props
             }
           }));
-        case 13:
+        case 3:
         case "end":
           return _context.stop();
       }
@@ -94,7 +103,8 @@ var FormRender = /*#__PURE__*/function (_Component) {
       layout: layout,
       ref: function ref(layout) {
         return _this2.layoutRef = layout;
-      }
+      },
+      onClose: onClose
     }, /*#__PURE__*/_react["default"].createElement(_pageLoadSchema.PageLoadSchema, {
       pageId: form === null || form === void 0 ? void 0 : form.id
     }, function (schema) {

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

@@ -2,6 +2,8 @@ import { Component } from "react";
 export type PageLayoutType = "page" | "modal" | "drawer";
 interface PageLayoutProps {
     layout?: PageLayoutType;
+    onClose?: (evt: any) => void;
+    keyboard?: boolean;
     children: any;
 }
 interface PageLayoutState {
@@ -10,6 +12,7 @@ interface PageLayoutState {
 }
 export declare class PageLayout extends Component<PageLayoutProps, PageLayoutState> {
     state: PageLayoutState;
+    get layout(): PageLayoutType;
     close: () => void;
     constructor(props: any);
     componentDidMount(): void;