@zhubangyun/lowcode-core 5.4.115 → 5.4.120

package/es/index.d.ts

@@ -1,6 +1,5 @@
 import utils from "./utils";
-export { RestApi } from "./utils/api/RestApi";
-export { RestFormApi } from "./utils/form/form.api";
+export { RestApi, RestFormApi, apiRequest } from "./utils/api";
 export { Layout } from "./components/layout";
 export { ReactRender } from "./components/react-render";
 export { utils };

package/es/index.js

@@ -1,8 +1,7 @@
 import utils from "./utils";
-export { RestApi } from "./utils/api/RestApi";
-export { RestFormApi } from "./utils/form/form.api";
+export { RestApi, RestFormApi, apiRequest } from "./utils/api";
 export { Layout } from "./components/layout";
 export { ReactRender } from "./components/react-render";
 // @ts-ignore
-window.utils = window.utils || utils;
+window.utils = utils;
 export { utils };

package/{lib/utils/form/form.api.d.ts → es/utils/api/form-api.d.ts}

@@ -1,8 +1,8 @@
-import { RestApi } from "../api/RestApi";
+import { RestApi } from "./rest-api";
 import { AxiosRequestConfig } from "axios";
 export declare class RestFormApi<DataType> extends RestApi<DataType> {
     private readonly formId;
-    private readonly fieldId;
+    private readonly fieldId?;
     private readonly mock;
     private initialized;
     private schema;

package/es/utils/{form/form.api.js → api/form-api.js}

@@ -1,11 +1,12 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { RestApi } from "../api/RestApi";
-import { getSchema } from "../api";
+import { RestApi } from "./rest-api";
+import { getSchema } from "./index";
 export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   function RestFormApi(formId, fieldId, mock) {
     var _this;
+    console.log(formId, fieldId);
     _this = _RestApi.call(this, "forms", {}) || this;
     _this.formId = void 0;
     _this.fieldId = void 0;
@@ -13,7 +14,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
     _this.initialized = false;
     _this.schema = void 0;
     _this.formId = formId;
-    _this.fieldId = formId;
+    _this.fieldId = fieldId;
     _this.mock = !!mock;
     return _this;
   }
@@ -72,8 +73,12 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
           case 2:
             config.params = config.params || {};
             config.params.formId = this.formId;
-            config.params.fieldId = this.fieldId;
-            config.params.mock = this.mock;
+            if (this.fieldId) {
+              config.params.fieldId = this.fieldId;
+            }
+            if (this.mock) {
+              config.params.mock = this.mock;
+            }
           case 6:
           case "end":
             return _context2.stop();

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

@@ -1,6 +1,8 @@
-import { OneResult } from "./RestApi";
-import { RestFormApi } from "../form/form.api";
-export { loadUserInfo } from "./UserInfo";
+import { OneResult } from "./rest-api";
+export { RestApi } from "./rest-api";
+import { RestFormApi } from "./form-api";
+export { loadUserInfo } from "./user-info";
+export { RestFormApi } from "./form-api";
 export declare const apiRequest: import("axios").AxiosInstance;
 export declare function getSchema(pageId: string, mock?: boolean): Promise<OneResult<any>>;
 export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): Promise<RestFormApi<any>>;

package/es/utils/api/index.js

@@ -1,9 +1,11 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import axios from "axios";
-import { onFulfilled, onRejected } from "./Request";
+import { onFulfilled, onRejected } from "./request";
 import { formApi, schema } from "../cache";
-export { loadUserInfo } from "./UserInfo";
+export { RestApi } from "./rest-api";
+export { loadUserInfo } from "./user-info";
+export { RestFormApi } from "./form-api";
 export var apiRequest = axios.create({
   baseURL: "/api",
   // 基础URL

package/es/utils/api/{RestApi.js → rest-api.js}

@@ -2,7 +2,7 @@ import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import axios from "axios";
-import { onFulfilled, onRejected } from "./Request";
+import { onFulfilled, onRejected } from "./request";
 export var BaseRestApi = /*#__PURE__*/function () {
   function BaseRestApi(uri, options) {
     this.uri = void 0;

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

@@ -1,5 +1,5 @@
 import { SingletonInstanceMap } from "../common/SingletonInstanceMap";
-import { RestFormApi } from "../form/form.api";
+import { RestFormApi } from "../api/form-api";
 export declare class SchemaCache extends SingletonInstanceMap<any, {
     mock?: boolean;
     pageId: string;

package/es/utils/cache/index.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { SingletonInstanceMap } from "../common/SingletonInstanceMap";
-import { RestFormApi } from "../form/form.api";
+import { RestFormApi } from "../api/form-api";
 import { handleFormSchema } from "./schema";
 import { apiRequest } from "../api";
 export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {

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

@@ -1,3 +1,3 @@
-export { showForm } from "./page.form";
-export interface PageShowProps {
-}
+export { showForm } from "./page-form";
+export declare function openPage(url: string, target?: string): Promise<any>;
+export declare function closePage(url: string, target?: string): Promise<void>;

package/es/utils/page/index.js

@@ -1 +1,69 @@
-export { showForm } from "./page.form";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+export { showForm } from "./page-form";
+export function openPage(_x, _x2) {
+  return _openPage.apply(this, arguments);
+}
+function _openPage() {
+  _openPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(url, target) {
+    var _window$parent;
+    var page, func;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          // @ts-ignore
+          func = (_window$parent = window.parent) === null || _window$parent === void 0 ? void 0 : _window$parent.openWorkPlatformTab;
+          if (!func) {
+            _context.next = 7;
+            break;
+          }
+          _context.next = 4;
+          return func({
+            value: target,
+            url: url
+          });
+        case 4:
+          page = _context.sent;
+          _context.next = 8;
+          break;
+        case 7:
+          page = window.open(url, target);
+        case 8:
+          console.log("openPage", page);
+          return _context.abrupt("return", page);
+        case 10:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _openPage.apply(this, arguments);
+}
+export function closePage(_x3, _x4) {
+  return _closePage.apply(this, arguments);
+}
+function _closePage() {
+  _closePage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(url, target) {
+    var _window$parent2;
+    var func;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          // @ts-ignore
+          func = (_window$parent2 = window.parent) === null || _window$parent2 === void 0 ? void 0 : _window$parent2.closeWorkPlatformTab;
+          if (func) {
+            func({
+              value: target,
+              url: url
+            });
+          } else {
+            window.close();
+          }
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _closePage.apply(this, arguments);
+}

package/{lib/utils/page/page.form.d.ts → es/utils/page/page-form.d.ts}

@@ -1,4 +1,4 @@
-import { PageLayoutType } from "./page.layout";
+import { PageLayoutType } from "./page-layout";
 export declare type PageFormModeType = "add" | "edit" | "detail";
 export interface ShowFormProps {
     container?: HTMLDivElement;
@@ -13,4 +13,4 @@ export interface ShowFormProps {
     onRemoveOk?: () => void;
     onClose?: () => void | Promise<void>;
 }
-export declare function showForm(options: ShowFormProps): void;
+export declare function showForm(options: ShowFormProps): Promise<void>;

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

@@ -0,0 +1,122 @@
+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", "onClose"],
+  _excluded2 = ["container", "onClose"];
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { PageLayout } from "./page-layout";
+import ReactDOM from "react-dom";
+import { Component } from "react";
+import { PageLoadSchema } from "./page-load-schema";
+import { ReactRender } from "../../components/react-render";
+import { openPage } from "./index";
+export function showForm(_x) {
+  return _showForm.apply(this, arguments);
+}
+function _showForm() {
+  _showForm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(options) {
+    var container, onClose, restProps, unmount, _options$form, paths, mode, dataId, params, page;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          container = options.container, onClose = options.onClose, restProps = _objectWithoutPropertiesLoose(options, _excluded2); //容器不存在需要手动取消挂载
+          unmount = !container;
+          console.log("showForm.options", options);
+          if (container) {
+            _context2.next = 16;
+            break;
+          }
+          if (!(options.layout == "page")) {
+            _context2.next = 14;
+            break;
+          }
+          paths = window.location.pathname.split("/");
+          mode = options.mode, dataId = options.dataId;
+          params = new URLSearchParams();
+          params.set("dataId", dataId || "");
+          _context2.next = 11;
+          return openPage("/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + params.toString());
+        case 11:
+          page = _context2.sent;
+          console.debug("openPage", page);
+          return _context2.abrupt("return");
+        case 14:
+          container = document.createElement("div");
+          document.body.append(container);
+        case 16:
+          ReactDOM.render( /*#__PURE__*/React.createElement(FormRender, _extends({}, restProps, {
+            onClose: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+              return _regeneratorRuntime.wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    if (unmount) {
+                      //等待动画结束
+                      setTimeout(function () {
+                        var _container;
+                        //取消挂载
+                        ReactDOM.unmountComponentAtNode(container);
+                        //移除
+                        (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
+                      }, 1000);
+                    }
+                    onClose === null || onClose === void 0 ? void 0 : onClose();
+                  case 2:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            }))
+          })), container);
+        case 17:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _showForm.apply(this, arguments);
+}
+var FormRender = /*#__PURE__*/function (_Component) {
+  function FormRender() {
+    var _this;
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _Component.call.apply(_Component, [this].concat(args)) || this;
+    _this.layoutRef = void 0;
+    return _this;
+  }
+  _inheritsLoose(FormRender, _Component);
+  var _proto = FormRender.prototype;
+  _proto.render = function render() {
+    var _this2 = this;
+    var self = this;
+    var _this$props = this.props,
+      layout = _this$props.layout,
+      form = _this$props.form,
+      onClose = _this$props.onClose,
+      restProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
+    // @ts-ignore
+    restProps.layout = layout || "drawer";
+    // @ts-ignore
+    restProps.onClose = function () {
+      var _self$layoutRef;
+      (_self$layoutRef = self.layoutRef) === null || _self$layoutRef === void 0 ? void 0 : _self$layoutRef.close();
+      onClose === null || onClose === void 0 ? void 0 : onClose();
+    };
+    return /*#__PURE__*/React.createElement(PageLayout, {
+      layout: layout,
+      ref: function ref(layout) {
+        return _this2.layoutRef = layout;
+      }
+    }, /*#__PURE__*/React.createElement(PageLoadSchema, {
+      pageId: form === null || form === void 0 ? void 0 : form.id
+    }, function (schema) {
+      return /*#__PURE__*/React.createElement(ReactRender, _extends({
+        schema: schema,
+        components: window.__components
+      }, restProps));
+    }));
+  };
+  return FormRender;
+}(Component);

package/{lib/utils/page/page.layout.d.ts → es/utils/page/page-layout.d.ts}

@@ -6,10 +6,15 @@ interface PageLayoutProps {
 }
 interface PageLayoutState {
     open: boolean;
+    width?: number;
 }
 export declare class PageLayout extends Component<PageLayoutProps, PageLayoutState> {
     state: PageLayoutState;
     close: () => void;
+    constructor(props: any);
+    componentDidMount(): void;
+    componentWillUnmount(): void;
+    handleResize: () => void;
     render(): any;
 }
 export {};

package/es/utils/page/{page.layout.js → page-layout.js}

@@ -1,14 +1,12 @@
 import _Drawer from "antd/es/drawer";
+import _extends from "@babel/runtime/helpers/extends";
 import _Modal from "antd/es/modal";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import React, { Component } from "react";
 export var PageLayout = /*#__PURE__*/function (_Component) {
-  function PageLayout() {
+  function PageLayout(props) {
     var _this;
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _Component.call.apply(_Component, [this].concat(args)) || this;
+    _this = _Component.call(this, props) || this;
     _this.state = {
       open: true
     };
@@ -17,10 +15,22 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
         open: false
       });
     };
+    _this.handleResize = function () {
+      _this.setState({
+        width: Math.min(window.innerWidth, 1400)
+      });
+    };
+    _this.state.width = Math.min(window.innerWidth, 1400);
     return _this;
   }
   _inheritsLoose(PageLayout, _Component);
   var _proto = PageLayout.prototype;
+  _proto.componentDidMount = function componentDidMount() {
+    window.addEventListener("resize", this.handleResize);
+  };
+  _proto.componentWillUnmount = function componentWillUnmount() {
+    window.removeEventListener("resize", this.handleResize);
+  };
   _proto.render = function render() {
     var _this$props = this.props,
       layout = _this$props.layout,
@@ -28,6 +38,8 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
     var state = this.state;
     var restProps = {
       open: state.open,
+      width: state.width,
+      onClose: this.close,
       footer: false,
       closable: false,
       styles: {
@@ -41,14 +53,15 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
           padding: 0
         }
       },
-      onClose: this.close,
       keyboard: false,
       maskClosable: false
     };
     if (layout == "modal") {
       return /*#__PURE__*/React.createElement(_Modal, restProps, children);
     } else if (layout == "drawer") {
-      return /*#__PURE__*/React.createElement(_Drawer, restProps, children);
+      return /*#__PURE__*/React.createElement(_Drawer, _extends({}, restProps, {
+        width: Math.max(1200, window.innerWidth)
+      }), children);
     }
     return children;
   };

package/lib/index.d.ts

@@ -1,6 +1,5 @@
 import utils from "./utils";
-export { RestApi } from "./utils/api/RestApi";
-export { RestFormApi } from "./utils/form/form.api";
+export { RestApi, RestFormApi, apiRequest } from "./utils/api";
 export { Layout } from "./components/layout";
 export { ReactRender } from "./components/react-render";
 export { utils };

package/lib/index.js

@@ -2,16 +2,16 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.RestFormApi = exports.RestApi = exports.ReactRender = exports.Layout = void 0;
+exports.apiRequest = exports.RestFormApi = exports.RestApi = exports.ReactRender = exports.Layout = void 0;
 var _utils = _interopRequireDefault(require("./utils"));
 exports.utils = _utils["default"];
-var _RestApi = require("./utils/api/RestApi");
-exports.RestApi = _RestApi.RestApi;
-var _form = require("./utils/form/form.api");
-exports.RestFormApi = _form.RestFormApi;
+var _api = require("./utils/api");
+exports.RestApi = _api.RestApi;
+exports.RestFormApi = _api.RestFormApi;
+exports.apiRequest = _api.apiRequest;
 var _layout = require("./components/layout");
 exports.Layout = _layout.Layout;
 var _reactRender = require("./components/react-render");
 exports.ReactRender = _reactRender.ReactRender;
 // @ts-ignore
-window.utils = window.utils || _utils["default"];
+window.utils = _utils["default"];

package/{es/utils/form/form.api.d.ts → lib/utils/api/form-api.d.ts}

@@ -1,8 +1,8 @@
-import { RestApi } from "../api/RestApi";
+import { RestApi } from "./rest-api";
 import { AxiosRequestConfig } from "axios";
 export declare class RestFormApi<DataType> extends RestApi<DataType> {
     private readonly formId;
-    private readonly fieldId;
+    private readonly fieldId?;
     private readonly mock;
     private initialized;
     private schema;

package/lib/utils/{form/form.api.js → api/form-api.js}

@@ -6,11 +6,12 @@ exports.RestFormApi = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
-var _RestApi2 = require("../api/RestApi");
-var _api = require("../api");
+var _restApi = require("./rest-api");
+var _index = require("./index");
 var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   function RestFormApi(formId, fieldId, mock) {
     var _this;
+    console.log(formId, fieldId);
     _this = _RestApi.call(this, "forms", {}) || this;
     _this.formId = void 0;
     _this.fieldId = void 0;
@@ -18,7 +19,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
     _this.initialized = false;
     _this.schema = void 0;
     _this.formId = formId;
-    _this.fieldId = formId;
+    _this.fieldId = fieldId;
     _this.mock = !!mock;
     return _this;
   }
@@ -38,7 +39,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
           case 4:
             _context.prev = 4;
             _context.next = 7;
-            return (0, _api.getSchema)(this.formId, this.mock);
+            return (0, _index.getSchema)(this.formId, this.mock);
           case 7:
             res = _context.sent;
             this.schema = res.data;
@@ -77,8 +78,12 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
           case 2:
             config.params = config.params || {};
             config.params.formId = this.formId;
-            config.params.fieldId = this.fieldId;
-            config.params.mock = this.mock;
+            if (this.fieldId) {
+              config.params.fieldId = this.fieldId;
+            }
+            if (this.mock) {
+              config.params.mock = this.mock;
+            }
           case 6:
           case "end":
             return _context2.stop();
@@ -91,4 +96,4 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
     return handleRequestConfig;
   }();
   return RestFormApi;
-}(_RestApi2.RestApi);
+}(_restApi.RestApi);

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

@@ -1,6 +1,8 @@
-import { OneResult } from "./RestApi";
-import { RestFormApi } from "../form/form.api";
-export { loadUserInfo } from "./UserInfo";
+import { OneResult } from "./rest-api";
+export { RestApi } from "./rest-api";
+import { RestFormApi } from "./form-api";
+export { loadUserInfo } from "./user-info";
+export { RestFormApi } from "./form-api";
 export declare const apiRequest: import("axios").AxiosInstance;
 export declare function getSchema(pageId: string, mock?: boolean): Promise<OneResult<any>>;
 export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): Promise<RestFormApi<any>>;

package/lib/utils/api/index.js

@@ -2,17 +2,21 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.apiRequest = void 0;
+exports.apiRequest = exports.RestFormApi = exports.RestApi = void 0;
 exports.getFormApi = getFormApi;
 exports.getSchema = getSchema;
 exports.loadUserInfo = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _axios = _interopRequireDefault(require("axios"));
-var _Request = require("./Request");
+var _request = require("./request");
 var _cache = require("../cache");
-var _UserInfo = require("./UserInfo");
-exports.loadUserInfo = _UserInfo.loadUserInfo;
+var _restApi = require("./rest-api");
+exports.RestApi = _restApi.RestApi;
+var _userInfo = require("./user-info");
+exports.loadUserInfo = _userInfo.loadUserInfo;
+var _formApi = require("./form-api");
+exports.RestFormApi = _formApi.RestFormApi;
 var apiRequest = exports.apiRequest = _axios["default"].create({
   baseURL: "/api",
   // 基础URL
@@ -22,7 +26,7 @@ var apiRequest = exports.apiRequest = _axios["default"].create({
     'Content-Type': 'application/json;charset=UTF-8'
   }
 });
-apiRequest.interceptors.response.use(_Request.onFulfilled, _Request.onRejected);
+apiRequest.interceptors.response.use(_request.onFulfilled, _request.onRejected);
 function getSchema(_x, _x2) {
   return _getSchema.apply(this, arguments);
 }

package/lib/utils/api/{RestApi.js → rest-api.js}

@@ -7,7 +7,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _axios = _interopRequireDefault(require("axios"));
-var _Request = require("./Request");
+var _request = require("./request");
 var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
   function BaseRestApi(uri, options) {
     this.uri = void 0;
@@ -24,7 +24,7 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         'Content-Type': 'application/json;charset=UTF-8'
       }
     });
-    this.request.interceptors.response.use(_Request.onFulfilled, _Request.onRejected);
+    this.request.interceptors.response.use(_request.onFulfilled, _request.onRejected);
   }
   var _proto = BaseRestApi.prototype;
   _proto.search = /*#__PURE__*/function () {

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

@@ -1,5 +1,5 @@
 import { SingletonInstanceMap } from "../common/SingletonInstanceMap";
-import { RestFormApi } from "../form/form.api";
+import { RestFormApi } from "../api/form-api";
 export declare class SchemaCache extends SingletonInstanceMap<any, {
     mock?: boolean;
     pageId: string;

package/lib/utils/cache/index.js

@@ -7,7 +7,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _SingletonInstanceMap3 = require("../common/SingletonInstanceMap");
-var _form = require("../form/form.api");
+var _formApi = require("../api/form-api");
 var _schema = require("./schema");
 var _api = require("../api");
 var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
@@ -65,7 +65,7 @@ var FormApiCache = exports.FormApiCache = /*#__PURE__*/function (_SingletonInsta
               options = {};
             }
             _options = options, formId = _options.formId, fieldId = _options.fieldId, mock = _options.mock;
-            formApi = new _form.RestFormApi(formId, fieldId, mock);
+            formApi = new _formApi.RestFormApi(formId, fieldId, mock);
             _context2.next = 5;
             return formApi.initialize();
           case 5:

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

@@ -1,3 +1,3 @@
-export { showForm } from "./page.form";
-export interface PageShowProps {
-}
+export { showForm } from "./page-form";
+export declare function openPage(url: string, target?: string): Promise<any>;
+export declare function closePage(url: string, target?: string): Promise<void>;

package/lib/utils/page/index.js

@@ -1,6 +1,77 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
+exports.closePage = closePage;
+exports.openPage = openPage;
 exports.showForm = void 0;
-var _page = require("./page.form");
-exports.showForm = _page.showForm;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _pageForm = require("./page-form");
+exports.showForm = _pageForm.showForm;
+function openPage(_x, _x2) {
+  return _openPage.apply(this, arguments);
+}
+function _openPage() {
+  _openPage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(url, target) {
+    var _window$parent;
+    var page, func;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          // @ts-ignore
+          func = (_window$parent = window.parent) === null || _window$parent === void 0 ? void 0 : _window$parent.openWorkPlatformTab;
+          if (!func) {
+            _context.next = 7;
+            break;
+          }
+          _context.next = 4;
+          return func({
+            value: target,
+            url: url
+          });
+        case 4:
+          page = _context.sent;
+          _context.next = 8;
+          break;
+        case 7:
+          page = window.open(url, target);
+        case 8:
+          console.log("openPage", page);
+          return _context.abrupt("return", page);
+        case 10:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _openPage.apply(this, arguments);
+}
+function closePage(_x3, _x4) {
+  return _closePage.apply(this, arguments);
+}
+function _closePage() {
+  _closePage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(url, target) {
+    var _window$parent2;
+    var func;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          // @ts-ignore
+          func = (_window$parent2 = window.parent) === null || _window$parent2 === void 0 ? void 0 : _window$parent2.closeWorkPlatformTab;
+          if (func) {
+            func({
+              value: target,
+              url: url
+            });
+          } else {
+            window.close();
+          }
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _closePage.apply(this, arguments);
+}

package/{es/utils/page/page.form.d.ts → lib/utils/page/page-form.d.ts}

@@ -1,4 +1,4 @@
-import { PageLayoutType } from "./page.layout";
+import { PageLayoutType } from "./page-layout";
 export declare type PageFormModeType = "add" | "edit" | "detail";
 export interface ShowFormProps {
     container?: HTMLDivElement;
@@ -13,4 +13,4 @@ export interface ShowFormProps {
     onRemoveOk?: () => void;
     onClose?: () => void | Promise<void>;
 }
-export declare function showForm(options: ShowFormProps): void;
+export declare function showForm(options: ShowFormProps): Promise<void>;

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

@@ -0,0 +1,127 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.showForm = showForm;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _pageLayout = require("./page-layout");
+var _reactDom = _interopRequireDefault(require("react-dom"));
+var _react = require("react");
+var _pageLoadSchema = require("./page-load-schema");
+var _reactRender = require("../../components/react-render");
+var _index = require("./index");
+var _excluded = ["layout", "form", "onClose"],
+  _excluded2 = ["container", "onClose"];
+function showForm(_x) {
+  return _showForm.apply(this, arguments);
+}
+function _showForm() {
+  _showForm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(options) {
+    var container, onClose, restProps, unmount, _options$form, paths, mode, dataId, params, page;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          container = options.container, onClose = options.onClose, restProps = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2); //容器不存在需要手动取消挂载
+          unmount = !container;
+          console.log("showForm.options", options);
+          if (container) {
+            _context2.next = 16;
+            break;
+          }
+          if (!(options.layout == "page")) {
+            _context2.next = 14;
+            break;
+          }
+          paths = window.location.pathname.split("/");
+          mode = options.mode, dataId = options.dataId;
+          params = new URLSearchParams();
+          params.set("dataId", dataId || "");
+          _context2.next = 11;
+          return (0, _index.openPage)("/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + params.toString());
+        case 11:
+          page = _context2.sent;
+          console.debug("openPage", page);
+          return _context2.abrupt("return");
+        case 14:
+          container = document.createElement("div");
+          document.body.append(container);
+        case 16:
+          _reactDom["default"].render( /*#__PURE__*/React.createElement(FormRender, (0, _extends2["default"])({}, restProps, {
+            onClose: /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+              return _regenerator["default"].wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    if (unmount) {
+                      //等待动画结束
+                      setTimeout(function () {
+                        var _container;
+                        //取消挂载
+                        _reactDom["default"].unmountComponentAtNode(container);
+                        //移除
+                        (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
+                      }, 1000);
+                    }
+                    onClose === null || onClose === void 0 ? void 0 : onClose();
+                  case 2:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            }))
+          })), container);
+        case 17:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _showForm.apply(this, arguments);
+}
+var FormRender = /*#__PURE__*/function (_Component) {
+  function FormRender() {
+    var _this;
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _Component.call.apply(_Component, [this].concat(args)) || this;
+    _this.layoutRef = void 0;
+    return _this;
+  }
+  (0, _inheritsLoose2["default"])(FormRender, _Component);
+  var _proto = FormRender.prototype;
+  _proto.render = function render() {
+    var _this2 = this;
+    var self = this;
+    var _this$props = this.props,
+      layout = _this$props.layout,
+      form = _this$props.form,
+      onClose = _this$props.onClose,
+      restProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded);
+    // @ts-ignore
+    restProps.layout = layout || "drawer";
+    // @ts-ignore
+    restProps.onClose = function () {
+      var _self$layoutRef;
+      (_self$layoutRef = self.layoutRef) === null || _self$layoutRef === void 0 ? void 0 : _self$layoutRef.close();
+      onClose === null || onClose === void 0 ? void 0 : onClose();
+    };
+    return /*#__PURE__*/React.createElement(_pageLayout.PageLayout, {
+      layout: layout,
+      ref: function ref(layout) {
+        return _this2.layoutRef = layout;
+      }
+    }, /*#__PURE__*/React.createElement(_pageLoadSchema.PageLoadSchema, {
+      pageId: form === null || form === void 0 ? void 0 : form.id
+    }, function (schema) {
+      return /*#__PURE__*/React.createElement(_reactRender.ReactRender, (0, _extends2["default"])({
+        schema: schema,
+        components: window.__components
+      }, restProps));
+    }));
+  };
+  return FormRender;
+}(_react.Component);

package/{es/utils/page/page.layout.d.ts → lib/utils/page/page-layout.d.ts}

@@ -6,10 +6,15 @@ interface PageLayoutProps {
 }
 interface PageLayoutState {
     open: boolean;
+    width?: number;
 }
 export declare class PageLayout extends Component<PageLayoutProps, PageLayoutState> {
     state: PageLayoutState;
     close: () => void;
+    constructor(props: any);
+    componentDidMount(): void;
+    componentWillUnmount(): void;
+    handleResize: () => void;
     render(): any;
 }
 export {};

package/lib/utils/page/{page.layout.js → page-layout.js}

@@ -4,18 +4,16 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.PageLayout = void 0;
 var _drawer = _interopRequireDefault(require("antd/lib/drawer"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _modal = _interopRequireDefault(require("antd/lib/modal"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _react = _interopRequireWildcard(require("react"));
 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; }
 var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
-  function PageLayout() {
+  function PageLayout(props) {
     var _this;
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _Component.call.apply(_Component, [this].concat(args)) || this;
+    _this = _Component.call(this, props) || this;
     _this.state = {
       open: true
     };
@@ -24,10 +22,22 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
         open: false
       });
     };
+    _this.handleResize = function () {
+      _this.setState({
+        width: Math.min(window.innerWidth, 1400)
+      });
+    };
+    _this.state.width = Math.min(window.innerWidth, 1400);
     return _this;
   }
   (0, _inheritsLoose2["default"])(PageLayout, _Component);
   var _proto = PageLayout.prototype;
+  _proto.componentDidMount = function componentDidMount() {
+    window.addEventListener("resize", this.handleResize);
+  };
+  _proto.componentWillUnmount = function componentWillUnmount() {
+    window.removeEventListener("resize", this.handleResize);
+  };
   _proto.render = function render() {
     var _this$props = this.props,
       layout = _this$props.layout,
@@ -35,6 +45,8 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
     var state = this.state;
     var restProps = {
       open: state.open,
+      width: state.width,
+      onClose: this.close,
       footer: false,
       closable: false,
       styles: {
@@ -48,14 +60,15 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
           padding: 0
         }
       },
-      onClose: this.close,
       keyboard: false,
       maskClosable: false
     };
     if (layout == "modal") {
       return /*#__PURE__*/_react["default"].createElement(_modal["default"], restProps, children);
     } else if (layout == "drawer") {
-      return /*#__PURE__*/_react["default"].createElement(_drawer["default"], restProps, children);
+      return /*#__PURE__*/_react["default"].createElement(_drawer["default"], (0, _extends2["default"])({}, restProps, {
+        width: Math.max(1200, window.innerWidth)
+      }), children);
     }
     return children;
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhubangyun/lowcode-core",
-  "version": "5.4.115",
+  "version": "5.4.120",
   "description": "低代码核心",
   "files": [
     "lib",

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

@@ -1,69 +0,0 @@
-import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
-import _extends from "@babel/runtime/helpers/extends";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["container", "onClose"],
-  _excluded2 = ["layout", "form"];
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { PageLayout } from "./page.layout";
-import ReactDOM from "react-dom";
-import { Component } from "react";
-import { PageLoadSchema } from "./page.load-schema";
-import { ReactRender } from "../../components/react-render";
-export function showForm(options) {
-  var container = options.container,
-    onClose = options.onClose,
-    restProps = _objectWithoutPropertiesLoose(options, _excluded);
-  //容器不存在需要手动取消挂载
-  var unmount = !container;
-  if (!container) {
-    container = document.createElement("div");
-    document.body.append(container);
-  }
-  ReactDOM.render( /*#__PURE__*/React.createElement(FormRender, _extends({}, restProps, {
-    onClose: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _container;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (unmount) {
-              //取消挂载
-              ReactDOM.unmountComponentAtNode(container);
-              //移除
-              (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
-            }
-            onClose === null || onClose === void 0 ? void 0 : onClose();
-          case 2:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }))
-  })), container);
-}
-var FormRender = /*#__PURE__*/function (_Component) {
-  function FormRender() {
-    return _Component.apply(this, arguments) || this;
-  }
-  _inheritsLoose(FormRender, _Component);
-  var _proto = FormRender.prototype;
-  _proto.render = function render() {
-    var _this$props = this.props,
-      layout = _this$props.layout,
-      form = _this$props.form,
-      restProps = _objectWithoutPropertiesLoose(_this$props, _excluded2);
-    // @ts-ignore
-    restProps.layout = layout || "drawer";
-    return /*#__PURE__*/React.createElement(PageLayout, {
-      layout: layout
-    }, /*#__PURE__*/React.createElement(PageLoadSchema, {
-      pageId: form === null || form === void 0 ? void 0 : form.id
-    }, function (schema) {
-      return /*#__PURE__*/React.createElement(ReactRender, _extends({
-        schema: schema,
-        components: window.__components
-      }, restProps));
-    }));
-  };
-  return FormRender;
-}(Component);

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

@@ -1,74 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-exports.__esModule = true;
-exports.showForm = showForm;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
-var _page = require("./page.layout");
-var _reactDom = _interopRequireDefault(require("react-dom"));
-var _react = require("react");
-var _page2 = require("./page.load-schema");
-var _reactRender = require("../../components/react-render");
-var _excluded = ["container", "onClose"],
-  _excluded2 = ["layout", "form"];
-function showForm(options) {
-  var container = options.container,
-    onClose = options.onClose,
-    restProps = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded);
-  //容器不存在需要手动取消挂载
-  var unmount = !container;
-  if (!container) {
-    container = document.createElement("div");
-    document.body.append(container);
-  }
-  _reactDom["default"].render( /*#__PURE__*/React.createElement(FormRender, (0, _extends2["default"])({}, restProps, {
-    onClose: /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var _container;
-      return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (unmount) {
-              //取消挂载
-              _reactDom["default"].unmountComponentAtNode(container);
-              //移除
-              (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
-            }
-            onClose === null || onClose === void 0 ? void 0 : onClose();
-          case 2:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }))
-  })), container);
-}
-var FormRender = /*#__PURE__*/function (_Component) {
-  function FormRender() {
-    return _Component.apply(this, arguments) || this;
-  }
-  (0, _inheritsLoose2["default"])(FormRender, _Component);
-  var _proto = FormRender.prototype;
-  _proto.render = function render() {
-    var _this$props = this.props,
-      layout = _this$props.layout,
-      form = _this$props.form,
-      restProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded2);
-    // @ts-ignore
-    restProps.layout = layout || "drawer";
-    return /*#__PURE__*/React.createElement(_page.PageLayout, {
-      layout: layout
-    }, /*#__PURE__*/React.createElement(_page2.PageLoadSchema, {
-      pageId: form === null || form === void 0 ? void 0 : form.id
-    }, function (schema) {
-      return /*#__PURE__*/React.createElement(_reactRender.ReactRender, (0, _extends2["default"])({
-        schema: schema,
-        components: window.__components
-      }, restProps));
-    }));
-  };
-  return FormRender;
-}(_react.Component);