@zhubangyun/lowcode-core 5.12.161 → 6.2.30

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

@@ -345,16 +345,98 @@ export var BaseRestApi = /*#__PURE__*/function () {
     }
     return _delete;
   }();
-  _proto.showError = /*#__PURE__*/function () {
-    var _showError = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(type, res) {
-      var msg, props, _t;
+  _proto["export"] = /*#__PURE__*/function () {
+    var _export2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(data, options) {
+      var _this$handleRequestCo8;
+      var config, res, _options$onError7, _options$onSuccess7;
       return _regeneratorRuntime.wrap(function (_context8) {
         while (1) switch (_context8.prev = _context8.next) {
+          case 0:
+            config = {};
+            _context8.next = 1;
+            return (_this$handleRequestCo8 = this.handleRequestConfig) === null || _this$handleRequestCo8 === void 0 ? void 0 : _this$handleRequestCo8.call(this, config);
+          case 1:
+            _context8.next = 2;
+            return this.request.post("/export", data, config);
+          case 2:
+            res = _context8.sent;
+            if (res.success) {
+              _context8.next = 4;
+              break;
+            }
+            this.showError("\u5BFC\u51FA\u5931\u8D25!", res).then();
+            _context8.next = 3;
+            return options === null || options === void 0 ? void 0 : (_options$onError7 = options.onError) === null || _options$onError7 === void 0 ? void 0 : _options$onError7.call(options, res);
+          case 3:
+            _context8.next = 5;
+            break;
+          case 4:
+            _context8.next = 5;
+            return options === null || options === void 0 ? void 0 : (_options$onSuccess7 = options.onSuccess) === null || _options$onSuccess7 === void 0 ? void 0 : _options$onSuccess7.call(options, res);
+          case 5:
+            return _context8.abrupt("return", res);
+          case 6:
+          case "end":
+            return _context8.stop();
+        }
+      }, _callee8, this);
+    }));
+    function _export(_x13, _x14) {
+      return _export2.apply(this, arguments);
+    }
+    return _export;
+  }();
+  _proto["import"] = /*#__PURE__*/function () {
+    var _import2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(data, options) {
+      var _this$handleRequestCo9;
+      var config, res, _options$onError8, _options$onSuccess8;
+      return _regeneratorRuntime.wrap(function (_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
+          case 0:
+            config = {};
+            _context9.next = 1;
+            return (_this$handleRequestCo9 = this.handleRequestConfig) === null || _this$handleRequestCo9 === void 0 ? void 0 : _this$handleRequestCo9.call(this, config);
+          case 1:
+            _context9.next = 2;
+            return this.request.post("import", data, config);
+          case 2:
+            res = _context9.sent;
+            if (res.success) {
+              _context9.next = 4;
+              break;
+            }
+            this.showError("\u5BFC\u5165\u5931\u8D25!", res).then();
+            _context9.next = 3;
+            return options === null || options === void 0 ? void 0 : (_options$onError8 = options.onError) === null || _options$onError8 === void 0 ? void 0 : _options$onError8.call(options, res);
+          case 3:
+            _context9.next = 5;
+            break;
+          case 4:
+            _context9.next = 5;
+            return options === null || options === void 0 ? void 0 : (_options$onSuccess8 = options.onSuccess) === null || _options$onSuccess8 === void 0 ? void 0 : _options$onSuccess8.call(options, res);
+          case 5:
+            return _context9.abrupt("return", res);
+          case 6:
+          case "end":
+            return _context9.stop();
+        }
+      }, _callee9, this);
+    }));
+    function _import(_x15, _x16) {
+      return _import2.apply(this, arguments);
+    }
+    return _import;
+  }();
+  _proto.showError = /*#__PURE__*/function () {
+    var _showError = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee0(type, res) {
+      var msg, props, _t;
+      return _regeneratorRuntime.wrap(function (_context0) {
+        while (1) switch (_context0.prev = _context0.next) {
           case 0:
             msg = res.message;
-            _context8.prev = 1;
+            _context0.prev = 1;
             if (!msg) {
-              _context8.next = 4;
+              _context0.next = 4;
               break;
             }
             props = JSON.parse(msg);
@@ -363,31 +445,31 @@ export var BaseRestApi = /*#__PURE__*/function () {
               props.title = "" + this.title + type;
             }
             if (!(props.type == "message")) {
-              _context8.next = 2;
+              _context0.next = 2;
               break;
             }
             _message.error(props);
-            return _context8.abrupt("return");
+            return _context0.abrupt("return");
           case 2:
             if (!(props.type == "modal")) {
-              _context8.next = 3;
+              _context0.next = 3;
               break;
             }
             _Modal.error(props);
-            return _context8.abrupt("return");
+            return _context0.abrupt("return");
           case 3:
             if (!(props.type == "notification")) {
-              _context8.next = 4;
+              _context0.next = 4;
               break;
             }
             _notification.error(props);
-            return _context8.abrupt("return");
+            return _context0.abrupt("return");
           case 4:
-            _context8.next = 6;
+            _context0.next = 6;
             break;
           case 5:
-            _context8.prev = 5;
-            _t = _context8["catch"](1);
+            _context0.prev = 5;
+            _t = _context0["catch"](1);
             console.error("" + this.title + type + (msg || ""));
             _Modal.error({
               title: "" + this.title + type,
@@ -399,11 +481,11 @@ export var BaseRestApi = /*#__PURE__*/function () {
             });
           case 6:
           case "end":
-            return _context8.stop();
+            return _context0.stop();
         }
-      }, _callee8, this, [[1, 5]]);
+      }, _callee0, this, [[1, 5]]);
     }));
-    function showError(_x13, _x14) {
+    function showError(_x17, _x18) {
       return _showError.apply(this, arguments);
     }
     return showError;
@@ -425,16 +507,16 @@ export var RestApi = /*#__PURE__*/function (_BaseRestApi2) {
   _inheritsLoose(RestApi, _BaseRestApi2);
   var _proto2 = RestApi.prototype;
   _proto2.handleRequestConfig = /*#__PURE__*/function () {
-    var _handleRequestConfig = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(config) {
-      return _regeneratorRuntime.wrap(function (_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+    var _handleRequestConfig = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee1(config) {
+      return _regeneratorRuntime.wrap(function (_context1) {
+        while (1) switch (_context1.prev = _context1.next) {
           case 0:
           case "end":
-            return _context9.stop();
+            return _context1.stop();
         }
-      }, _callee9);
+      }, _callee1);
     }));
-    function handleRequestConfig(_x15) {
+    function handleRequestConfig(_x19) {
       return _handleRequestConfig.apply(this, arguments);
     }
     return handleRequestConfig;

package/es/utils/api/schema.util.d.ts

@@ -4,11 +4,11 @@
  * @param callback 返回true 继续往下遍历
  */
 export declare function forEachSchema(schema: Schema, callback: (child: Schema, index: number, children: any[]) => boolean): void;
-export declare function forEachFormSchema(schema: Schema, fdm: boolean, callback: (child: Schema) => void): void;
-interface Schema {
+export declare function findFormSchemas(schema: Schema): Schema[];
+export declare function findFdmSchemas(schema?: Schema): Schema[];
+export interface Schema {
     componentName: string;
     props: any;
     children?: Schema[];
     fdmSchema?: Schema;
 }
-export {};

package/es/utils/api/schema.util.js

@@ -12,21 +12,26 @@ export function forEachSchema(schema, callback) {
     }
   });
 }
-export function forEachFormSchema(schema, fdm, callback) {
+export function findFormSchemas(schema) {
+  var schemas = [];
   forEachSchema(schema, function (child) {
     if (["PageForm", "SubFormField"].includes(child.componentName)) {
-      callback(child);
-      if (fdm) {
-        if (child.fdmSchema) {
-          forEachSchema(child.fdmSchema, function (fdmChild) {
-            if (fdmChild.componentName == "PageFdm") {
-              callback(child);
-            }
-            return true;
-          });
-        }
-      }
+      schemas.push(child);
     }
     return true;
   });
+  return schemas;
+}
+export function findFdmSchemas(schema) {
+  var schemas = [];
+  if (!schema) {
+    return schemas;
+  }
+  forEachSchema(schema, function (child) {
+    if (["PageFdm"].includes(child.componentName)) {
+      schemas.push(child);
+    }
+    return true;
+  });
+  return schemas;
 }

package/es/utils/cache/index.js

@@ -3,7 +3,7 @@ import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { SingletonInstanceMap } from "../common/SingletonInstanceMap";
 import { apiRequest, RestFormApi } from "../api";
-import { forEachFormSchema } from "../api/schema.util";
+import { findFdmSchemas, findFormSchemas } from "../api/schema.util";
 export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
   function SchemaCache() {
     return _SingletonInstanceMap.apply(this, arguments) || this;
@@ -12,7 +12,7 @@ export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
   var _proto = SchemaCache.prototype;
   _proto.createInstance = /*#__PURE__*/function () {
     var _createInstance = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(key, options) {
-      var mock, pageId, schemaRes, schema, permissionRes, permission;
+      var mock, pageId, schemaRes, schema, handleCommonSchema, permission, printTemplates, workflow, cloneSchema, _t;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -25,30 +25,70 @@ export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
             });
           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 apiRequest.get("pages/" + pageId + "/permission");
+            return _context.abrupt("return", schemaRes);
           case 2:
-            permissionRes = _context.sent;
-            permission = permissionRes.data;
-            if (typeof permission == "object") {
-              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 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 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:
+            findFormSchemas(schema).forEach(function (formSchema) {
+              handleCommonSchema(formSchema);
+              findFdmSchemas(formSchema.fdmSchema).forEach(function (fdmSchema) {
+                handleCommonSchema(fdmSchema);
+                fdmSchema.props.form.label = formSchema.props.label;
+              });
+            });
+            cloneSchema = JSON.parse(JSON.stringify(schema));
+            findFormSchemas(schema).forEach(function (formSchema) {
+              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/es/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/es/utils/common/index.js

@@ -1,13 +1,20 @@
-import { v4 } from "uuid";
+import { v7, version } from "uuid";
 export { loadPlugins } from "./LoadPlugins";
 export function uuid(prefix, separator) {
   if (!prefix && !separator) {
-    return v4();
+    return v7();
   }
-  return [prefix, separator, v4()].filter(function (v) {
+  return [prefix, separator, v7()].filter(function (v) {
     return !!v;
   }).join("");
 }
+export function uuidVersion(id) {
+  try {
+    return version(id);
+  } catch (e) {
+    return false;
+  }
+}
 export function toArray(data) {
   if (!data) {
     return [];
@@ -16,4 +23,11 @@ export function toArray(data) {
   } else {
     return [data];
   }
+}
+export function isLocalhost() {
+  return window.location.hostname == "localhost";
+}
+export function isMobile() {
+  var userAgent = navigator.userAgent;
+  return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini|Mobile/i.test(userAgent);
 }

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,26 +2,26 @@ 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";
 import { ReactRender } from "../../components/react-render";
 import { renderElement } from "./page-render";
-import { v4 } from "uuid";
+import { uuid } from "../common";
 export function showFormDataManagerGroup(_x) {
   return _showFormDataManagerGroup.apply(this, arguments);
 }
 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,17 +73,16 @@ 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: {
-        id: v4(),
+        id: uuid(),
         componentName: "Page",
         props: {},
         state: {},

package/es/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/es/utils/page/page-form-data-manager.js

@@ -2,28 +2,28 @@ 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";
 import { PageLoadSchema } from "./page-load-schema";
 import { ReactRender } from "../../components/react-render";
-import { forEachFormSchema } from "../cache/schema";
 import { cloneDataView } from "./page-schema-utils";
 import { renderElement } from "./page-render";
+import { forEachSchema } from "../api/schema.util";
 export function showFormDataManager(_x) {
   return _showFormDataManager.apply(this, arguments);
 }
 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,19 +76,18 @@ 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) {
       var fdmSchema = schema.children[0].fdmSchema;
       if (form !== null && form !== void 0 && form.fieldId) {
-        forEachFormSchema(schema, function (field) {
+        forEachSchema(schema, function (field) {
           if (form.fieldId == field.props.fieldId) {
             fdmSchema = field.fdmSchema;
             return false;

package/es/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/es/utils/page/page-form-group.js

@@ -9,8 +9,8 @@ import { PageLayout } from "./page-layout";
 import { renderElement } from "./page-render";
 import React, { Component } from "react";
 import { ReactRender } from "../../components/react-render";
-import { v4 } from "uuid";
 import { PageLoadSchema } from "./page-load-schema";
+import { uuid } from "../common";
 export function showFormGroup(_x) {
   return _showFormGroup.apply(this, arguments);
 }
@@ -78,7 +78,7 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
       return /*#__PURE__*/React.createElement(ReactRender, _extends({}, restProps, {
         components: window._components || window.components || window.__components,
         schema: {
-          id: v4(),
+          id: uuid(),
           componentName: "Page",
           props: {},
           state: {},

package/es/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/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, 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:
@@ -28,15 +28,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 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;
 }
@@ -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;