@zhubangyun/lowcode-core 5.4.115 → 5.4.116

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,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";
 // @ts-ignore

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

@@ -1,4 +1,4 @@
-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;

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

@@ -1,8 +1,8 @@
 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;

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 { showForm } from "./page-form";
 export interface PageShowProps {
 }

package/es/utils/page/index.js

@@ -1 +1 @@
-export { showForm } from "./page.form";
+export { showForm } from "./page-form";

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;

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

@@ -3,12 +3,12 @@ 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"];
+  _excluded2 = ["layout", "form", "onClose"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { PageLayout } from "./page.layout";
+import { PageLayout } from "./page-layout";
 import ReactDOM from "react-dom";
 import { Component } from "react";
-import { PageLoadSchema } from "./page.load-schema";
+import { PageLoadSchema } from "./page-load-schema";
 import { ReactRender } from "../../components/react-render";
 export function showForm(options) {
   var container = options.container,
@@ -22,15 +22,18 @@ export function showForm(options) {
   }
   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();
+              //等待动画结束
+              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:
@@ -43,19 +46,37 @@ export function showForm(options) {
 }
 var FormRender = /*#__PURE__*/function (_Component) {
   function FormRender() {
-    return _Component.apply(this, arguments) || this;
+    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, _excluded2);
     // @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
+      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) {

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,13 +2,13 @@
 
 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");

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

@@ -1,4 +1,4 @@
-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;

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

@@ -6,8 +6,8 @@ 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;
@@ -38,7 +38,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;
@@ -91,4 +91,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 { showForm } from "./page-form";
 export interface PageShowProps {
 }

package/lib/utils/page/index.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.showForm = void 0;
-var _page = require("./page.form");
-exports.showForm = _page.showForm;
+var _pageForm = require("./page-form");
+exports.showForm = _pageForm.showForm;

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;

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

@@ -8,13 +8,13 @@ var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inh
 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 _pageLayout = require("./page-layout");
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _react = require("react");
-var _page2 = require("./page.load-schema");
+var _pageLoadSchema = require("./page-load-schema");
 var _reactRender = require("../../components/react-render");
 var _excluded = ["container", "onClose"],
-  _excluded2 = ["layout", "form"];
+  _excluded2 = ["layout", "form", "onClose"];
 function showForm(options) {
   var container = options.container,
     onClose = options.onClose,
@@ -27,15 +27,18 @@ function showForm(options) {
   }
   _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();
+              //等待动画结束
+              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:
@@ -48,20 +51,38 @@ function showForm(options) {
 }
 var FormRender = /*#__PURE__*/function (_Component) {
   function FormRender() {
-    return _Component.apply(this, arguments) || this;
+    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, _excluded2);
     // @ts-ignore
     restProps.layout = layout || "drawer";
-    return /*#__PURE__*/React.createElement(_page.PageLayout, {
-      layout: layout
-    }, /*#__PURE__*/React.createElement(_page2.PageLoadSchema, {
+    // @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"])({

package/package.json

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