@zhubangyun/lowcode-core 5.4.150 → 5.4.261

package/es/components/react-render/index.js

@@ -1,9 +1,11 @@
+import _ConfigProvider from "antd/es/config-provider";
 import _extends from "@babel/runtime/helpers/extends";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import { PureComponent } from 'react';
 import { createFetchHandler } from "@alilc/lowcode-datasource-fetch-handler";
 import ReactRenderFactory from "./react-render-factory";
 import utils from "../../utils";
+import zhCN from "antd/locale/zh_CN";
 export var ReactRender = /*#__PURE__*/function (_PureComponent) {
   function ReactRender() {
     var _this;
@@ -21,21 +23,23 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
     var _this2 = this;
     var components = this.props.components;
     // @ts-ignore
-    return /*#__PURE__*/React.createElement(ReactRenderFactory, _extends({
+    return /*#__PURE__*/React.createElement(_ConfigProvider, {
+      locale: zhCN
+    }, /*#__PURE__*/React.createElement(ReactRenderFactory, _extends({
       key: this.key
     }, this.props, {
       ref: function ref(node) {
         _this2.node = node === null || node === void 0 ? void 0 : node.__ref;
       },
       thisRequiredInJSE: true,
-      components: components || window.components || {},
+      components: components || window._components || {},
       appHelper: {
         utils: utils,
         requestHandlersMap: {
           fetch: createFetchHandler()
         }
       }
-    }));
+    })));
   };
   return ReactRender;
 }(PureComponent);

package/es/index.d.ts

@@ -1,3 +1,4 @@
+import "./index.less";
 import utils from "./utils";
 export { RestApi, RestFormApi, apiRequest } from "./utils/api";
 export { Layout } from "./components/layout";

package/es/index.js

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

package/es/index.less

@@ -0,0 +1,97 @@
+#fullscreen-loading {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  top: 0;
+  left: 0;
+  z-index: 10;
+  background: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+}
+
+.page-loading {
+  width: 100%;
+  height: 100%;
+  z-index: 10;
+  background: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+}
+
+.atom-spinner, .atom-spinner * {
+  box-sizing: border-box;
+}
+
+.atom-spinner {
+  height: 60px;
+  width: 60px;
+  overflow: hidden;
+}
+
+.atom-spinner .spinner-inner {
+  position: relative;
+  display: block;
+  height: 100%;
+  width: 100%;
+}
+
+.atom-spinner .spinner-circle {
+  display: block;
+  position: absolute;
+  color: #1677ff;
+  font-size: calc(60px * 0.24);
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.atom-spinner .spinner-line {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  border-left-width: calc(60px / 25);
+  border-top-width: calc(60px / 25);
+  border-left-color: #1677ff;
+  border-left-style: solid;
+  border-top-style: solid;
+  border-top-color: transparent;
+}
+
+.atom-spinner .spinner-line:nth-child(1) {
+  animation: atom-spinner-animation-1 1s linear infinite;
+  transform: rotateZ(120deg) rotateX(66deg) rotateZ(0deg);
+}
+
+.atom-spinner .spinner-line:nth-child(2) {
+  animation: atom-spinner-animation-2 1s linear infinite;
+  transform: rotateZ(240deg) rotateX(66deg) rotateZ(0deg);
+}
+
+.atom-spinner .spinner-line:nth-child(3) {
+  animation: atom-spinner-animation-3 1s linear infinite;
+  transform: rotateZ(360deg) rotateX(66deg) rotateZ(0deg);
+}
+
+@keyframes atom-spinner-animation-1 {
+  100% {
+    transform: rotateZ(120deg) rotateX(66deg) rotateZ(360deg);
+  }
+}
+
+@keyframes atom-spinner-animation-2 {
+  100% {
+    transform: rotateZ(240deg) rotateX(66deg) rotateZ(360deg);
+  }
+}
+
+@keyframes atom-spinner-animation-3 {
+  100% {
+    transform: rotateZ(360deg) rotateX(66deg) rotateZ(360deg);
+  }
+}

package/es/style.js

@@ -1,6 +1,7 @@
+import 'antd/es/message/style';
 import 'antd/es/drawer/style';
 import 'antd/es/modal/style';
 import 'antd/es/result/style';
-import 'antd/es/spin/style';
-import 'antd/es/message/style';
-import 'antd/es/config-provider/style';
+import 'antd/es/config-provider/style';
+
+import './index.less';

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

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

package/es/utils/api/rest-api.d.ts

@@ -5,6 +5,7 @@ export interface RestApiOptions {
      */
     timeout?: number;
     /**
+     *
      * 标题 用于message显示
      */
     title?: string;
@@ -82,6 +83,6 @@ export interface ManyResult<DataType> extends BaseResult<DataType> {
     total: number;
 }
 export interface BaseRequestOptions<DataType> {
-    onError?: (res: OneResult<DataType>) => Promise<void>;
-    onSuccess?: (res: OneResult<DataType>) => Promise<void>;
+    onError?: (res: OneResult<DataType>) => Promise<void> | void;
+    onSuccess?: (res: OneResult<DataType>) => Promise<void> | void;
 }

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

@@ -1,4 +1,5 @@
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
+import _message from "antd/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import axios from "axios";
@@ -300,8 +301,8 @@ export var BaseRestApi = /*#__PURE__*/function () {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
             console.error("{" + this.title + "}" + type + (msg || ""));
-            //message?.error(`{${this.title}}` + type + (msg || "")).then();
-          case 1:
+            _message === null || _message === void 0 ? void 0 : _message.error("{" + this.title + "}" + type + (msg || "")).then();
+          case 2:
           case "end":
             return _context7.stop();
         }

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

@@ -1,5 +1,5 @@
 import { SingletonInstanceMap } from "../common/SingletonInstanceMap";
-import { RestFormApi } from "../api/form-api";
+import { RestFormApi } from "../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 "../api/form-api";
+import { RestFormApi } from "../api";
 import { handleFormSchema } from "./schema";
 import { apiRequest } from "../api";
 export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {

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

@@ -7,6 +7,8 @@ export declare function handleFormSchema(schema: FormSchema): void;
 export declare function forEachFormSchema(schema: FormSchema, callback: (child: FormSchema, index: number, children: any[]) => boolean): void;
 export interface FormSchema {
     id?: string;
+    state: any;
+    methods: any;
     componentName: string;
     formId?: string;
     tableName?: string;
@@ -22,6 +24,8 @@ export interface FormSchemaProps {
     fieldSchema?: any;
     columnName: string;
     array: boolean;
+    layout?: "inline";
+    fdmSchema?: any;
     associationForm: {
         id: string;
         fieldId: string;

package/es/utils/cache/schema.js

@@ -1,9 +1,15 @@
 export function handleFormSchema(schema) {
   var fdmItems = [];
   var fieldIdMap = new Map();
+  schema.state = schema.state || {};
+  schema.methods = schema.methods || {};
   forEachFormSchema(schema, function (field) {
     if (field.fdmSchema) {
+      var _field$fdmSchema;
       fdmItems.push(field);
+      field.fdmSchema.props = ((_field$fdmSchema = field.fdmSchema) === null || _field$fdmSchema === void 0 ? void 0 : _field$fdmSchema.props) || {};
+      // @ts-ignore
+      field.fdmSchema.props.noContainer = true;
     }
     if (field.props.fieldId) {
       //删除children防止循环
@@ -13,13 +19,28 @@ export function handleFormSchema(schema) {
     }
     return true;
   });
+  //处理查询列
   fdmItems.forEach(function (fdmField) {
     forEachFormSchema(fdmField.fdmSchema, function (field) {
       var _field$props;
       var findSchema = fieldIdMap.get((_field$props = field.props) === null || _field$props === void 0 ? void 0 : _field$props.fieldId);
       if (findSchema) {
         field.componentName = findSchema.componentName;
-        Object.assign(field.props, findSchema.props);
+        field.props = Object.assign({}, JSON.parse(JSON.stringify(findSchema.props)), field.props);
+        if (findSchema.componentName == "SubFormField") {
+          if (findSchema.fdmSchema) {
+            var subFormFdmSchema = JSON.parse(JSON.stringify(findSchema.fdmSchema));
+            forEachFormSchema(subFormFdmSchema, function (field) {
+              if (field.componentName === "PageFdm") {
+                field.props.layout = "inline";
+              }
+              return true;
+            });
+            // @ts-ignore
+            field.props.fdmSchema = subFormFdmSchema;
+            field.children = subFormFdmSchema.children[0].children;
+          }
+        }
       }
       return true;
     });

package/es/utils/designer/assets/assets.data.base.js

@@ -18,7 +18,7 @@ var BaseAssets = {
     "library": "antd",
     "id": "antd",
     "external": true,
-    "urls": ["https://cdn.zhiyunhe.com/plugin/antd/5.17.0/antd.min.js", "https://cdn.zhiyunhe.com/plugin/antd/5.17.0/reset.min.css", "https://cdn.zhiyunhe.com/plugin/antdIcon/1.0.0/antdIcon.min.js", "https://cdn.zhiyunhe.com/plugin/lowcode/core/index.js"]
+    "urls": ["https://cdn.zhiyunhe.com/plugin/antd/latest/antd.min.js", "https://cdn.zhiyunhe.com/plugin/antd/latest/reset.css", "https://cdn.zhiyunhe.com/plugin/antdIcon/1.0.0/antdIcon.min.js", "https://cdn.zhiyunhe.com/plugin/lowcode/core/index.js"]
   }, {
     "package": "root-material",
     "version": "0.1.0",

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

@@ -99,9 +99,13 @@ export var Engine = function Engine() {
               }
             });
           case 2:
-            _context4.next = 4;
+            if (!schema) {
+              _context4.next = 5;
+              break;
+            }
+            _context4.next = 5;
             return _this.openDocument(schema);
-          case 4:
+          case 5:
           case "end":
             return _context4.stop();
         }

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

@@ -1,3 +1,5 @@
 export { showForm } from "./page-form";
+export declare function showLoading(): Promise<void>;
+export declare function hideLoading(): Promise<void>;
 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,41 +1,88 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 export { showForm } from "./page-form";
+export function showLoading() {
+  return _showLoading.apply(this, arguments);
+}
+function _showLoading() {
+  _showLoading = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var loading, div;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          loading = document.getElementById("fullscreen-loading");
+          if (loading) {
+            loading.style.display = "flex";
+          } else {
+            div = document.createElement("div");
+            div.id = "fullscreen-loading";
+            div.innerHTML = "\n                    <div class=\"atom-spinner\">\n                        <div class=\"spinner-inner\">\n                            <div class=\"spinner-line\"></div>\n                            <div class=\"spinner-line\"></div>\n                            <div class=\"spinner-line\"></div>\n                            <div class=\"spinner-circle\"></div>\n                        </div>\n                    </div>\n        ";
+            document.body.appendChild(div);
+          }
+        case 2:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _showLoading.apply(this, arguments);
+}
+export function hideLoading() {
+  return _hideLoading.apply(this, arguments);
+}
+function _hideLoading() {
+  _hideLoading = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var loading;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          loading = document.getElementById("fullscreen-loading");
+          if (loading) {
+            loading.style.display = "none";
+          }
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _hideLoading.apply(this, arguments);
+}
 export function openPage(_x, _x2) {
   return _openPage.apply(this, arguments);
 }
 function _openPage() {
-  _openPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(url, target) {
+  _openPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(url, target) {
     var _window$parent;
     var page, func;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           // @ts-ignore
           func = (_window$parent = window.parent) === null || _window$parent === void 0 ? void 0 : _window$parent.openWorkPlatformTab;
           if (!func) {
-            _context.next = 7;
+            _context3.next = 7;
             break;
           }
-          _context.next = 4;
+          _context3.next = 4;
           return func({
             value: target,
             url: url
           });
         case 4:
-          page = _context.sent;
-          _context.next = 8;
+          page = _context3.sent;
+          _context3.next = 8;
           break;
         case 7:
           page = window.open(url, target);
         case 8:
-          console.log("openPage", page);
-          return _context.abrupt("return", page);
+          console.debug("openPage", page, target);
+          return _context3.abrupt("return", page);
         case 10:
         case "end":
-          return _context.stop();
+          return _context3.stop();
       }
-    }, _callee);
+    }, _callee3);
   }));
   return _openPage.apply(this, arguments);
 }
@@ -43,11 +90,11 @@ export function closePage(_x3, _x4) {
   return _closePage.apply(this, arguments);
 }
 function _closePage() {
-  _closePage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(url, target) {
+  _closePage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(url, target) {
     var _window$parent2;
     var func;
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
           // @ts-ignore
           func = (_window$parent2 = window.parent) === null || _window$parent2 === void 0 ? void 0 : _window$parent2.closeWorkPlatformTab;
@@ -61,9 +108,9 @@ function _closePage() {
           }
         case 2:
         case "end":
-          return _context2.stop();
+          return _context4.stop();
       }
-    }, _callee2);
+    }, _callee4);
   }));
   return _closePage.apply(this, arguments);
 }

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

@@ -33,7 +33,9 @@ function _showForm() {
           paths = window.location.pathname.split("/");
           mode = options.mode, dataId = options.dataId;
           params = new URLSearchParams();
-          params.set("dataId", dataId || "");
+          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();
           _context2.next = 11;
           return openPage(url, url);
@@ -114,7 +116,7 @@ var FormRender = /*#__PURE__*/function (_Component) {
     }, function (schema) {
       return /*#__PURE__*/React.createElement(ReactRender, _extends({
         schema: schema,
-        components: window.__components
+        components: window._components || window.components || window.__components
       }, restProps));
     }));
   };

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

@@ -14,6 +14,7 @@ export declare class PageLayout extends Component<PageLayoutProps, PageLayoutSta
     constructor(props: any);
     componentDidMount(): void;
     componentWillUnmount(): void;
+    getWith: () => number;
     handleResize: () => void;
     render(): any;
 }

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

@@ -1,5 +1,4 @@
 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";
@@ -15,12 +14,15 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
         open: false
       });
     };
+    _this.getWith = function () {
+      return Math.min(window.innerWidth, 1440);
+    };
     _this.handleResize = function () {
       _this.setState({
-        width: Math.min(window.innerWidth, 1200)
+        width: _this.getWith()
       });
     };
-    _this.state.width = Math.min(window.innerWidth, 1200);
+    _this.state.width = _this.getWith();
     return _this;
   }
   _inheritsLoose(PageLayout, _Component);
@@ -53,15 +55,12 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
           padding: 0
         }
       },
-      keyboard: false,
       maskClosable: false
     };
     if (layout == "modal") {
       return /*#__PURE__*/React.createElement(_Modal, restProps, children);
     } else if (layout == "drawer") {
-      return /*#__PURE__*/React.createElement(_Drawer, _extends({}, restProps, {
-        width: Math.max(1200, window.innerWidth)
-      }), children);
+      return /*#__PURE__*/React.createElement(_Drawer, restProps, children);
     }
     return children;
   };

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

@@ -1,5 +1,4 @@
 import _Result from "antd/es/result";
-import _Spin from "antd/es/spin";
 import _message from "antd/es/message";
 import { useEffect, useState } from "react";
 import { getSchema } from "../api";
@@ -26,13 +25,28 @@ export function PageLoadSchema(props) {
         }
       });
     } else {
+      setLoading(false);
+      setErrorMsg("页面id不可为空!");
+      console.error("页面id不可为空!");
       _message.error("页面id不可为空!").then();
     }
   }, []);
   if (loading) {
-    return /*#__PURE__*/React.createElement(_Spin, {
-      spinning: true
-    });
+    return /*#__PURE__*/React.createElement("div", {
+      className: "page-loading"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "atom-spinner"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "spinner-inner"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "spinner-line"
+    }), /*#__PURE__*/React.createElement("div", {
+      className: "spinner-line"
+    }), /*#__PURE__*/React.createElement("div", {
+      className: "spinner-line"
+    }), /*#__PURE__*/React.createElement("div", {
+      className: "spinner-circle"
+    }))));
   }
   if (!schema) {
     return /*#__PURE__*/React.createElement(_Result, {

package/lib/components/react-render/index.js

@@ -3,12 +3,14 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.ReactRender = void 0;
+var _configProvider = _interopRequireDefault(require("antd/lib/config-provider"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _react = require("react");
 var _lowcodeDatasourceFetchHandler = require("@alilc/lowcode-datasource-fetch-handler");
 var _reactRenderFactory = _interopRequireDefault(require("./react-render-factory"));
 var _utils = _interopRequireDefault(require("../../utils"));
+var _zh_CN = _interopRequireDefault(require("antd/locale/zh_CN"));
 var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
   function ReactRender() {
     var _this;
@@ -26,21 +28,23 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
     var _this2 = this;
     var components = this.props.components;
     // @ts-ignore
-    return /*#__PURE__*/React.createElement(_reactRenderFactory["default"], (0, _extends2["default"])({
+    return /*#__PURE__*/React.createElement(_configProvider["default"], {
+      locale: _zh_CN["default"]
+    }, /*#__PURE__*/React.createElement(_reactRenderFactory["default"], (0, _extends2["default"])({
       key: this.key
     }, this.props, {
       ref: function ref(node) {
         _this2.node = node === null || node === void 0 ? void 0 : node.__ref;
       },
       thisRequiredInJSE: true,
-      components: components || window.components || {},
+      components: components || window._components || {},
       appHelper: {
         utils: _utils["default"],
         requestHandlersMap: {
           fetch: (0, _lowcodeDatasourceFetchHandler.createFetchHandler)()
         }
       }
-    }));
+    })));
   };
   return ReactRender;
 }(_react.PureComponent);

package/lib/index.d.ts

@@ -1,3 +1,4 @@
+import "./index.less";
 import utils from "./utils";
 export { RestApi, RestFormApi, apiRequest } from "./utils/api";
 export { Layout } from "./components/layout";

package/lib/index.js

@@ -2,16 +2,19 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.apiRequest = exports.RestFormApi = exports.RestApi = exports.ReactRender = exports.Layout = void 0;
+exports.apiRequest = exports.RestFormApi = exports.RestApi = exports.Layout = void 0;
+require("./index.less");
 var _utils = _interopRequireDefault(require("./utils"));
 exports.utils = _utils["default"];
+var _reactRender = require("./components/react-render");
+exports.ReactRender = _reactRender.ReactRender;
 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 = _utils["default"];
+window.utils = _utils["default"];
+// @ts-ignore
+window.__ReactRender = _reactRender.ReactRender;

package/lib/index.less

@@ -0,0 +1,97 @@
+#fullscreen-loading {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  top: 0;
+  left: 0;
+  z-index: 10;
+  background: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+}
+
+.page-loading {
+  width: 100%;
+  height: 100%;
+  z-index: 10;
+  background: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+}
+
+.atom-spinner, .atom-spinner * {
+  box-sizing: border-box;
+}
+
+.atom-spinner {
+  height: 60px;
+  width: 60px;
+  overflow: hidden;
+}
+
+.atom-spinner .spinner-inner {
+  position: relative;
+  display: block;
+  height: 100%;
+  width: 100%;
+}
+
+.atom-spinner .spinner-circle {
+  display: block;
+  position: absolute;
+  color: #1677ff;
+  font-size: calc(60px * 0.24);
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.atom-spinner .spinner-line {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  border-left-width: calc(60px / 25);
+  border-top-width: calc(60px / 25);
+  border-left-color: #1677ff;
+  border-left-style: solid;
+  border-top-style: solid;
+  border-top-color: transparent;
+}
+
+.atom-spinner .spinner-line:nth-child(1) {
+  animation: atom-spinner-animation-1 1s linear infinite;
+  transform: rotateZ(120deg) rotateX(66deg) rotateZ(0deg);
+}
+
+.atom-spinner .spinner-line:nth-child(2) {
+  animation: atom-spinner-animation-2 1s linear infinite;
+  transform: rotateZ(240deg) rotateX(66deg) rotateZ(0deg);
+}
+
+.atom-spinner .spinner-line:nth-child(3) {
+  animation: atom-spinner-animation-3 1s linear infinite;
+  transform: rotateZ(360deg) rotateX(66deg) rotateZ(0deg);
+}
+
+@keyframes atom-spinner-animation-1 {
+  100% {
+    transform: rotateZ(120deg) rotateX(66deg) rotateZ(360deg);
+  }
+}
+
+@keyframes atom-spinner-animation-2 {
+  100% {
+    transform: rotateZ(240deg) rotateX(66deg) rotateZ(360deg);
+  }
+}
+
+@keyframes atom-spinner-animation-3 {
+  100% {
+    transform: rotateZ(360deg) rotateX(66deg) rotateZ(360deg);
+  }
+}

package/lib/style.js

@@ -1,6 +1,7 @@
+require('antd/lib/message/style');
 require('antd/lib/drawer/style');
 require('antd/lib/modal/style');
 require('antd/lib/result/style');
-require('antd/lib/spin/style');
-require('antd/lib/message/style');
-require('antd/lib/config-provider/style');
+require('antd/lib/config-provider/style');
+
+require('./index.less');

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

@@ -11,7 +11,6 @@ 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;

package/lib/utils/api/rest-api.d.ts

@@ -5,6 +5,7 @@ export interface RestApiOptions {
      */
     timeout?: number;
     /**
+     *
      * 标题 用于message显示
      */
     title?: string;
@@ -82,6 +83,6 @@ export interface ManyResult<DataType> extends BaseResult<DataType> {
     total: number;
 }
 export interface BaseRequestOptions<DataType> {
-    onError?: (res: OneResult<DataType>) => Promise<void>;
-    onSuccess?: (res: OneResult<DataType>) => Promise<void>;
+    onError?: (res: OneResult<DataType>) => Promise<void> | void;
+    onSuccess?: (res: OneResult<DataType>) => Promise<void> | void;
 }

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

@@ -5,6 +5,7 @@ exports.__esModule = true;
 exports.RestApi = exports.BaseRestApi = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
+var _message2 = _interopRequireDefault(require("antd/lib/message"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _axios = _interopRequireDefault(require("axios"));
 var _index = require("./index");
@@ -305,8 +306,8 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
             console.error("{" + this.title + "}" + type + (msg || ""));
-            //message?.error(`{${this.title}}` + type + (msg || "")).then();
-          case 1:
+            _message2["default"] === null || _message2["default"] === void 0 ? void 0 : _message2["default"].error("{" + this.title + "}" + type + (msg || "")).then();
+          case 2:
           case "end":
             return _context7.stop();
         }

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

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

package/lib/utils/cache/index.js

@@ -7,9 +7,8 @@ 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 _formApi = require("../api/form-api");
-var _schema = require("./schema");
 var _api = require("../api");
+var _schema = require("./schema");
 var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
   function SchemaCache() {
     return _SingletonInstanceMap.apply(this, arguments) || this;
@@ -65,7 +64,7 @@ var FormApiCache = exports.FormApiCache = /*#__PURE__*/function (_SingletonInsta
               options = {};
             }
             _options = options, formId = _options.formId, fieldId = _options.fieldId, mock = _options.mock;
-            formApi = new _formApi.RestFormApi(formId, fieldId, mock);
+            formApi = new _api.RestFormApi(formId, fieldId, mock);
             _context2.next = 5;
             return formApi.initialize();
           case 5:

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

@@ -7,6 +7,8 @@ export declare function handleFormSchema(schema: FormSchema): void;
 export declare function forEachFormSchema(schema: FormSchema, callback: (child: FormSchema, index: number, children: any[]) => boolean): void;
 export interface FormSchema {
     id?: string;
+    state: any;
+    methods: any;
     componentName: string;
     formId?: string;
     tableName?: string;
@@ -22,6 +24,8 @@ export interface FormSchemaProps {
     fieldSchema?: any;
     columnName: string;
     array: boolean;
+    layout?: "inline";
+    fdmSchema?: any;
     associationForm: {
         id: string;
         fieldId: string;

package/lib/utils/cache/schema.js

@@ -6,9 +6,15 @@ exports.handleFormSchema = handleFormSchema;
 function handleFormSchema(schema) {
   var fdmItems = [];
   var fieldIdMap = new Map();
+  schema.state = schema.state || {};
+  schema.methods = schema.methods || {};
   forEachFormSchema(schema, function (field) {
     if (field.fdmSchema) {
+      var _field$fdmSchema;
       fdmItems.push(field);
+      field.fdmSchema.props = ((_field$fdmSchema = field.fdmSchema) === null || _field$fdmSchema === void 0 ? void 0 : _field$fdmSchema.props) || {};
+      // @ts-ignore
+      field.fdmSchema.props.noContainer = true;
     }
     if (field.props.fieldId) {
       //删除children防止循环
@@ -18,13 +24,28 @@ function handleFormSchema(schema) {
     }
     return true;
   });
+  //处理查询列
   fdmItems.forEach(function (fdmField) {
     forEachFormSchema(fdmField.fdmSchema, function (field) {
       var _field$props;
       var findSchema = fieldIdMap.get((_field$props = field.props) === null || _field$props === void 0 ? void 0 : _field$props.fieldId);
       if (findSchema) {
         field.componentName = findSchema.componentName;
-        Object.assign(field.props, findSchema.props);
+        field.props = Object.assign({}, JSON.parse(JSON.stringify(findSchema.props)), field.props);
+        if (findSchema.componentName == "SubFormField") {
+          if (findSchema.fdmSchema) {
+            var subFormFdmSchema = JSON.parse(JSON.stringify(findSchema.fdmSchema));
+            forEachFormSchema(subFormFdmSchema, function (field) {
+              if (field.componentName === "PageFdm") {
+                field.props.layout = "inline";
+              }
+              return true;
+            });
+            // @ts-ignore
+            field.props.fdmSchema = subFormFdmSchema;
+            field.children = subFormFdmSchema.children[0].children;
+          }
+        }
       }
       return true;
     });

package/lib/utils/designer/assets/assets.data.base.js

@@ -22,7 +22,7 @@ var BaseAssets = {
     "library": "antd",
     "id": "antd",
     "external": true,
-    "urls": ["https://cdn.zhiyunhe.com/plugin/antd/5.17.0/antd.min.js", "https://cdn.zhiyunhe.com/plugin/antd/5.17.0/reset.min.css", "https://cdn.zhiyunhe.com/plugin/antdIcon/1.0.0/antdIcon.min.js", "https://cdn.zhiyunhe.com/plugin/lowcode/core/index.js"]
+    "urls": ["https://cdn.zhiyunhe.com/plugin/antd/latest/antd.min.js", "https://cdn.zhiyunhe.com/plugin/antd/latest/reset.css", "https://cdn.zhiyunhe.com/plugin/antdIcon/1.0.0/antdIcon.min.js", "https://cdn.zhiyunhe.com/plugin/lowcode/core/index.js"]
   }, {
     "package": "root-material",
     "version": "0.1.0",

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

@@ -104,9 +104,13 @@ var Engine = exports.Engine = function Engine() {
               }
             });
           case 2:
-            _context4.next = 4;
+            if (!schema) {
+              _context4.next = 5;
+              break;
+            }
+            _context4.next = 5;
             return _this.openDocument(schema);
-          case 4:
+          case 5:
           case "end":
             return _context4.stop();
         }

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

@@ -1,3 +1,5 @@
 export { showForm } from "./page-form";
+export declare function showLoading(): Promise<void>;
+export declare function hideLoading(): Promise<void>;
 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

@@ -3,47 +3,96 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.closePage = closePage;
+exports.hideLoading = hideLoading;
 exports.openPage = openPage;
 exports.showForm = void 0;
+exports.showLoading = showLoading;
 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 showLoading() {
+  return _showLoading.apply(this, arguments);
+}
+function _showLoading() {
+  _showLoading = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var loading, div;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          loading = document.getElementById("fullscreen-loading");
+          if (loading) {
+            loading.style.display = "flex";
+          } else {
+            div = document.createElement("div");
+            div.id = "fullscreen-loading";
+            div.innerHTML = "\n                    <div class=\"atom-spinner\">\n                        <div class=\"spinner-inner\">\n                            <div class=\"spinner-line\"></div>\n                            <div class=\"spinner-line\"></div>\n                            <div class=\"spinner-line\"></div>\n                            <div class=\"spinner-circle\"></div>\n                        </div>\n                    </div>\n        ";
+            document.body.appendChild(div);
+          }
+        case 2:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _showLoading.apply(this, arguments);
+}
+function hideLoading() {
+  return _hideLoading.apply(this, arguments);
+}
+function _hideLoading() {
+  _hideLoading = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var loading;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          loading = document.getElementById("fullscreen-loading");
+          if (loading) {
+            loading.style.display = "none";
+          }
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _hideLoading.apply(this, arguments);
+}
 function openPage(_x, _x2) {
   return _openPage.apply(this, arguments);
 }
 function _openPage() {
-  _openPage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(url, target) {
+  _openPage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(url, target) {
     var _window$parent;
     var page, func;
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           // @ts-ignore
           func = (_window$parent = window.parent) === null || _window$parent === void 0 ? void 0 : _window$parent.openWorkPlatformTab;
           if (!func) {
-            _context.next = 7;
+            _context3.next = 7;
             break;
           }
-          _context.next = 4;
+          _context3.next = 4;
           return func({
             value: target,
             url: url
           });
         case 4:
-          page = _context.sent;
-          _context.next = 8;
+          page = _context3.sent;
+          _context3.next = 8;
           break;
         case 7:
           page = window.open(url, target);
         case 8:
-          console.log("openPage", page);
-          return _context.abrupt("return", page);
+          console.debug("openPage", page, target);
+          return _context3.abrupt("return", page);
         case 10:
         case "end":
-          return _context.stop();
+          return _context3.stop();
       }
-    }, _callee);
+    }, _callee3);
   }));
   return _openPage.apply(this, arguments);
 }
@@ -51,11 +100,11 @@ function closePage(_x3, _x4) {
   return _closePage.apply(this, arguments);
 }
 function _closePage() {
-  _closePage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(url, target) {
+  _closePage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(url, target) {
     var _window$parent2;
     var func;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
           // @ts-ignore
           func = (_window$parent2 = window.parent) === null || _window$parent2 === void 0 ? void 0 : _window$parent2.closeWorkPlatformTab;
@@ -69,9 +118,9 @@ function _closePage() {
           }
         case 2:
         case "end":
-          return _context2.stop();
+          return _context4.stop();
       }
-    }, _callee2);
+    }, _callee4);
   }));
   return _closePage.apply(this, arguments);
 }

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

@@ -40,7 +40,9 @@ function _showForm() {
           paths = window.location.pathname.split("/");
           mode = options.mode, dataId = options.dataId;
           params = new URLSearchParams();
-          params.set("dataId", dataId || "");
+          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();
           _context2.next = 11;
           return (0, _index.openPage)(url, url);
@@ -121,7 +123,7 @@ var FormRender = /*#__PURE__*/function (_Component) {
     }, function (schema) {
       return /*#__PURE__*/_react["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({
         schema: schema,
-        components: window.__components
+        components: window._components || window.components || window.__components
       }, restProps));
     }));
   };

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

@@ -14,6 +14,7 @@ export declare class PageLayout extends Component<PageLayoutProps, PageLayoutSta
     constructor(props: any);
     componentDidMount(): void;
     componentWillUnmount(): void;
+    getWith: () => number;
     handleResize: () => void;
     render(): any;
 }

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

@@ -4,7 +4,6 @@ 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"));
@@ -22,12 +21,15 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
         open: false
       });
     };
+    _this.getWith = function () {
+      return Math.min(window.innerWidth, 1440);
+    };
     _this.handleResize = function () {
       _this.setState({
-        width: Math.min(window.innerWidth, 1200)
+        width: _this.getWith()
       });
     };
-    _this.state.width = Math.min(window.innerWidth, 1200);
+    _this.state.width = _this.getWith();
     return _this;
   }
   (0, _inheritsLoose2["default"])(PageLayout, _Component);
@@ -60,15 +62,12 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
           padding: 0
         }
       },
-      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"], (0, _extends2["default"])({}, restProps, {
-        width: Math.max(1200, window.innerWidth)
-      }), children);
+      return /*#__PURE__*/_react["default"].createElement(_drawer["default"], restProps, children);
     }
     return children;
   };

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

@@ -4,7 +4,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.PageLoadSchema = PageLoadSchema;
 var _result = _interopRequireDefault(require("antd/lib/result"));
-var _spin = _interopRequireDefault(require("antd/lib/spin"));
 var _message2 = _interopRequireDefault(require("antd/lib/message"));
 var _react = require("react");
 var _api = require("../api");
@@ -31,13 +30,28 @@ function PageLoadSchema(props) {
         }
       });
     } else {
+      setLoading(false);
+      setErrorMsg("页面id不可为空!");
+      console.error("页面id不可为空!");
       _message2["default"].error("页面id不可为空!").then();
     }
   }, []);
   if (loading) {
-    return /*#__PURE__*/React.createElement(_spin["default"], {
-      spinning: true
-    });
+    return /*#__PURE__*/React.createElement("div", {
+      className: "page-loading"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "atom-spinner"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "spinner-inner"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "spinner-line"
+    }), /*#__PURE__*/React.createElement("div", {
+      className: "spinner-line"
+    }), /*#__PURE__*/React.createElement("div", {
+      className: "spinner-line"
+    }), /*#__PURE__*/React.createElement("div", {
+      className: "spinner-circle"
+    }))));
   }
   if (!schema) {
     return /*#__PURE__*/React.createElement(_result["default"], {

package/package.json

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

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

@@ -1,2 +0,0 @@
-export declare function onFulfilled(res: any): any;
-export declare function onRejected(error: any): any;

package/es/utils/api/Request.js

@@ -1,15 +0,0 @@
-export function onFulfilled(res) {
-  return res.data;
-}
-export function onRejected(error) {
-  var _error$response = error.response,
-    status = _error$response.status,
-    statusText = _error$response.statusText;
-  if (status == 400) {
-    return error.response.data || {};
-  }
-  return {
-    success: false,
-    message: statusText
-  };
-}

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

@@ -1,2 +0,0 @@
-export declare function onFulfilled(res: any): any;
-export declare function onRejected(error: any): any;

package/lib/utils/api/Request.js

@@ -1,20 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-exports.onFulfilled = onFulfilled;
-exports.onRejected = onRejected;
-function onFulfilled(res) {
-  return res.data;
-}
-function onRejected(error) {
-  var _error$response = error.response,
-    status = _error$response.status,
-    statusText = _error$response.statusText;
-  if (status == 400) {
-    return error.response.data || {};
-  }
-  return {
-    success: false,
-    message: statusText
-  };
-}