@zhubangyun/lowcode-core 5.5.81 → 5.5.83

package/es/components/load-materials/index.d.ts

@@ -0,0 +1,5 @@
+interface LoadMaterialsProps {
+    children: any;
+}
+export declare function LoadMaterials(props: LoadMaterialsProps): any;
+export {};

package/es/components/load-materials/index.js

@@ -0,0 +1,77 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import React, { useEffect, useState } from "react";
+import { PageLoading } from "../page-loading";
+import { loadPlugins } from "../../utils/common";
+export function LoadMaterials(props) {
+  var _useState = useState(false),
+    init = _useState[0],
+    setInit = _useState[1];
+  useEffect(function () {
+    initialize()["finally"](function () {
+      return setInit(true);
+    });
+  }, []);
+  function initialize() {
+    return _initialize.apply(this, arguments);
+  }
+  function _initialize() {
+    _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return loadMaterials();
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return _initialize.apply(this, arguments);
+  }
+  if (init) {
+    return props.children;
+  } else {
+    return /*#__PURE__*/React.createElement(PageLoading, {
+      loading: true
+    });
+  }
+}
+function loadMaterials() {
+  return _loadMaterials.apply(this, arguments);
+}
+function _loadMaterials() {
+  _loadMaterials = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var components, urls;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          components = {};
+          urls = ["prop-types/15.8.1/prop-types.min.js", "lodash/4.6.1/lodash.min.js", "dayjs/dayjs.min.js", "antd/latest/reset.css", "antd/latest/antd.min.js", "antdIcon/1.0.0/antdIcon.min.js", "lowcode/core/index.js", "lowcode/core/index.css", "lowcode/materials/root/view.js", "lowcode/materials/root/view.css", "lowcode/materials/antd/view.js", "lowcode/materials/antd/view.css", "lowcode/materials/antd-pro/view.js", "lowcode/materials/antd-pro/view.css", "lowcode/icon-font/app/iconfont.js"];
+          _context2.next = 4;
+          return loadPlugins(urls.map(function (url) {
+            return "https://cdn.zhiyunhe.com/plugin/" + url;
+          }));
+        case 4:
+          ["RootMaterial", "AntdMaterial", "AntdProMaterial"].forEach(function (lib) {
+            var data = window[lib];
+            if (data) {
+              Object.entries(data).forEach(function (_ref) {
+                var key = _ref[0],
+                  value = _ref[1];
+                // @ts-ignore
+                components[key] = value;
+              });
+            }
+          });
+          window._components = components;
+          return _context2.abrupt("return", components);
+        case 7:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _loadMaterials.apply(this, arguments);
+}

package/es/components/page-loading/index.d.ts

@@ -3,6 +3,6 @@ import "./index.less";
 export interface PageLadingProps {
     loading: boolean;
     background?: string;
-    children: any;
+    children?: any;
 }
 export declare function PageLoading(props: PageLadingProps): import("react").JSX.Element;

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

@@ -13,7 +13,7 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
       args[_key] = arguments[_key];
     }
     _this = _PureComponent.call.apply(_PureComponent, [this].concat(args)) || this;
-    _this.key = Date.now().toString(36);
+    _this.key = Date.now().toString(36) + Math.random().toString(36);
     _this.node = void 0;
     return _this;
   }
@@ -21,7 +21,7 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
   var _proto = ReactRender.prototype;
   _proto.render = function render() {
     var _this2 = this;
-    var components = this.props.components;
+    var components = this.props.components || window._components;
     // @ts-ignore
     return /*#__PURE__*/React.createElement(_ConfigProvider, {
       locale: zhCN
@@ -32,7 +32,7 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
         _this2.node = node === null || node === void 0 ? void 0 : node.__ref;
       },
       thisRequiredInJSE: true,
-      components: components || window._components || {},
+      components: components,
       appHelper: {
         utils: utils,
         requestHandlersMap: {

package/es/index.d.ts

@@ -1,5 +1,6 @@
 import "./index.less";
 import utils from "./utils";
+export { LoadMaterials } from "./components/load-materials";
 export { PageLoading } from "./components/page-loading";
 export { RestApi, RestFormApi, apiRequest } from "./utils/api";
 export { Layout } from "./components/layout";

package/es/index.js

@@ -1,6 +1,7 @@
 import "./index.less";
 import utils from "./utils";
 import { ReactRender } from "./components/react-render";
+export { LoadMaterials } from "./components/load-materials";
 export { PageLoading } from "./components/page-loading";
 export { RestApi, RestFormApi, apiRequest } from "./utils/api";
 export { Layout } from "./components/layout";

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

@@ -1,33 +1,7 @@
-export declare function handleFormSchema(schema: any): void;
+export declare function handleFormSchema(schema: any): Promise<void>;
 /**
  * 遍历schema
  * @param schema
  * @param callback 返回true 继续往下遍历
  */
-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;
-    schemaName?: string;
-    columnName?: string;
-    fdmSchema?: any;
-    props: FormSchemaProps;
-    children?: FormSchema[];
-}
-export interface FormSchemaProps {
-    fieldId: string;
-    label: string;
-    fieldSchema?: any;
-    columnName: string;
-    array: boolean;
-    layout?: "inline";
-    fdmSchema?: any;
-    associationForm: {
-        id: string;
-        fieldId: string;
-    };
-}
+export declare function forEachFormSchema(schema: any, callback: (child: any, index: number, children: any[]) => boolean): void;

package/es/utils/cache/schema.js

@@ -1,54 +1,7 @@
-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, _field$fdmSchema2;
-      fdmItems.push(field);
-      field.fdmSchema.props = ((_field$fdmSchema = field.fdmSchema) === null || _field$fdmSchema === void 0 ? void 0 : _field$fdmSchema.props) || {};
-      field.fdmSchema.props.style = ((_field$fdmSchema2 = field.fdmSchema) === null || _field$fdmSchema2 === void 0 ? void 0 : _field$fdmSchema2.props.style) || {};
-      field.fdmSchema.props.style.height = "100%";
-      // @ts-ignore
-      field.fdmSchema.props.noContainer = true;
-    }
-    if (field.props.fieldId) {
-      //删除children防止循环
-      var copyField = JSON.parse(JSON.stringify(field));
-      delete copyField.children;
-      fieldIdMap.set(field.props.fieldId, copyField);
-    }
-    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;
-        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;
-            console.log(subFormFdmSchema);
-          }
-        }
-      }
-      return true;
-    });
-  });
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+export function handleFormSchema(_x) {
+  return _handleFormSchema.apply(this, arguments);
 }
 
 /**
@@ -56,6 +9,71 @@ export function handleFormSchema(schema) {
  * @param schema
  * @param callback 返回true 继续往下遍历
  */
+function _handleFormSchema() {
+  _handleFormSchema = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(schema) {
+    var fdmItems, associationFields, fieldIdMap;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          fdmItems = [];
+          associationFields = [];
+          fieldIdMap = new Map();
+          schema.state = schema.state || {};
+          schema.methods = schema.methods || {};
+          forEachFormSchema(schema, function (field) {
+            if (field.fdmSchema) {
+              var _field$fdmSchema, _field$fdmSchema2;
+              fdmItems.push(field);
+              field.fdmSchema.props = ((_field$fdmSchema = field.fdmSchema) === null || _field$fdmSchema === void 0 ? void 0 : _field$fdmSchema.props) || {};
+              field.fdmSchema.props.style = ((_field$fdmSchema2 = field.fdmSchema) === null || _field$fdmSchema2 === void 0 ? void 0 : _field$fdmSchema2.props.style) || {};
+              field.fdmSchema.props.style.height = "100%";
+            }
+            if (field.props.fieldId) {
+              //删除children防止循环
+              var copyField = JSON.parse(JSON.stringify(field));
+              delete copyField.children;
+              fieldIdMap.set(field.props.fieldId, copyField);
+            }
+            if (field.componentName == "AssociationField") {
+              associationFields.push(field);
+            }
+            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;
+                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;
+            });
+          });
+        case 7:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _handleFormSchema.apply(this, arguments);
+}
 export function forEachFormSchema(schema, callback) {
   var _schema$children;
   schema === null || schema === void 0 ? void 0 : (_schema$children = schema.children) === null || _schema$children === void 0 ? void 0 : _schema$children.forEach(function (child, index, children) {

package/es/utils/page/index.js

@@ -44,11 +44,15 @@ export function hideLoading() {
 }
 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:
-          debounceHide();
-        case 1:
+          loading = document.getElementById("fullscreen-loading");
+          if (loading) {
+            loading.style.display = "none";
+          }
+        case 2:
         case "end":
           return _context2.stop();
       }

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

@@ -34,10 +34,7 @@ export function PageLoadSchema(props) {
   }, []);
   if (loading) {
     return /*#__PURE__*/React.createElement(PageLoading, {
-      loading: true,
-      style: {
-        background: "white"
-      }
+      loading: true
     });
   }
   if (!schema) {

package/lib/components/load-materials/index.d.ts

@@ -0,0 +1,5 @@
+interface LoadMaterialsProps {
+    children: any;
+}
+export declare function LoadMaterials(props: LoadMaterialsProps): any;
+export {};

package/lib/components/load-materials/index.js

@@ -0,0 +1,84 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.LoadMaterials = LoadMaterials;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _react = _interopRequireWildcard(require("react"));
+var _pageLoading = require("../page-loading");
+var _common = require("../../utils/common");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function LoadMaterials(props) {
+  var _useState = (0, _react.useState)(false),
+    init = _useState[0],
+    setInit = _useState[1];
+  (0, _react.useEffect)(function () {
+    initialize()["finally"](function () {
+      return setInit(true);
+    });
+  }, []);
+  function initialize() {
+    return _initialize.apply(this, arguments);
+  }
+  function _initialize() {
+    _initialize = (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:
+            _context.next = 2;
+            return loadMaterials();
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return _initialize.apply(this, arguments);
+  }
+  if (init) {
+    return props.children;
+  } else {
+    return /*#__PURE__*/_react["default"].createElement(_pageLoading.PageLoading, {
+      loading: true
+    });
+  }
+}
+function loadMaterials() {
+  return _loadMaterials.apply(this, arguments);
+}
+function _loadMaterials() {
+  _loadMaterials = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var components, urls;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          components = {};
+          urls = ["prop-types/15.8.1/prop-types.min.js", "lodash/4.6.1/lodash.min.js", "dayjs/dayjs.min.js", "antd/latest/reset.css", "antd/latest/antd.min.js", "antdIcon/1.0.0/antdIcon.min.js", "lowcode/core/index.js", "lowcode/core/index.css", "lowcode/materials/root/view.js", "lowcode/materials/root/view.css", "lowcode/materials/antd/view.js", "lowcode/materials/antd/view.css", "lowcode/materials/antd-pro/view.js", "lowcode/materials/antd-pro/view.css", "lowcode/icon-font/app/iconfont.js"];
+          _context2.next = 4;
+          return (0, _common.loadPlugins)(urls.map(function (url) {
+            return "https://cdn.zhiyunhe.com/plugin/" + url;
+          }));
+        case 4:
+          ["RootMaterial", "AntdMaterial", "AntdProMaterial"].forEach(function (lib) {
+            var data = window[lib];
+            if (data) {
+              Object.entries(data).forEach(function (_ref) {
+                var key = _ref[0],
+                  value = _ref[1];
+                // @ts-ignore
+                components[key] = value;
+              });
+            }
+          });
+          window._components = components;
+          return _context2.abrupt("return", components);
+        case 7:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _loadMaterials.apply(this, arguments);
+}

package/lib/components/page-loading/index.d.ts

@@ -3,6 +3,6 @@ import "./index.less";
 export interface PageLadingProps {
     loading: boolean;
     background?: string;
-    children: any;
+    children?: any;
 }
 export declare function PageLoading(props: PageLadingProps): import("react").JSX.Element;

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

@@ -18,7 +18,7 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
       args[_key] = arguments[_key];
     }
     _this = _PureComponent.call.apply(_PureComponent, [this].concat(args)) || this;
-    _this.key = Date.now().toString(36);
+    _this.key = Date.now().toString(36) + Math.random().toString(36);
     _this.node = void 0;
     return _this;
   }
@@ -26,7 +26,7 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
   var _proto = ReactRender.prototype;
   _proto.render = function render() {
     var _this2 = this;
-    var components = this.props.components;
+    var components = this.props.components || window._components;
     // @ts-ignore
     return /*#__PURE__*/React.createElement(_configProvider["default"], {
       locale: _zh_CN["default"]
@@ -37,7 +37,7 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
         _this2.node = node === null || node === void 0 ? void 0 : node.__ref;
       },
       thisRequiredInJSE: true,
-      components: components || window._components || {},
+      components: components,
       appHelper: {
         utils: _utils["default"],
         requestHandlersMap: {

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 import "./index.less";
 import utils from "./utils";
+export { LoadMaterials } from "./components/load-materials";
 export { PageLoading } from "./components/page-loading";
 export { RestApi, RestFormApi, apiRequest } from "./utils/api";
 export { Layout } from "./components/layout";

package/lib/index.js

@@ -2,12 +2,14 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.apiRequest = exports.RestFormApi = exports.RestApi = exports.PageLoading = exports.Layout = void 0;
+exports.apiRequest = exports.RestFormApi = exports.RestApi = exports.PageLoading = exports.LoadMaterials = 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 _loadMaterials = require("./components/load-materials");
+exports.LoadMaterials = _loadMaterials.LoadMaterials;
 var _pageLoading = require("./components/page-loading");
 exports.PageLoading = _pageLoading.PageLoading;
 var _api = require("./utils/api");

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

@@ -1,33 +1,7 @@
-export declare function handleFormSchema(schema: any): void;
+export declare function handleFormSchema(schema: any): Promise<void>;
 /**
  * 遍历schema
  * @param schema
  * @param callback 返回true 继续往下遍历
  */
-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;
-    schemaName?: string;
-    columnName?: string;
-    fdmSchema?: any;
-    props: FormSchemaProps;
-    children?: FormSchema[];
-}
-export interface FormSchemaProps {
-    fieldId: string;
-    label: string;
-    fieldSchema?: any;
-    columnName: string;
-    array: boolean;
-    layout?: "inline";
-    fdmSchema?: any;
-    associationForm: {
-        id: string;
-        fieldId: string;
-    };
-}
+export declare function forEachFormSchema(schema: any, callback: (child: any, index: number, children: any[]) => boolean): void;

package/lib/utils/cache/schema.js

@@ -1,66 +1,84 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.forEachFormSchema = forEachFormSchema;
 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, _field$fdmSchema2;
-      fdmItems.push(field);
-      field.fdmSchema.props = ((_field$fdmSchema = field.fdmSchema) === null || _field$fdmSchema === void 0 ? void 0 : _field$fdmSchema.props) || {};
-      field.fdmSchema.props.style = ((_field$fdmSchema2 = field.fdmSchema) === null || _field$fdmSchema2 === void 0 ? void 0 : _field$fdmSchema2.props.style) || {};
-      field.fdmSchema.props.style.height = "100%";
-      // @ts-ignore
-      field.fdmSchema.props.noContainer = true;
-    }
-    if (field.props.fieldId) {
-      //删除children防止循环
-      var copyField = JSON.parse(JSON.stringify(field));
-      delete copyField.children;
-      fieldIdMap.set(field.props.fieldId, copyField);
-    }
-    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;
-        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;
-            console.log(subFormFdmSchema);
-          }
-        }
-      }
-      return true;
-    });
-  });
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+function handleFormSchema(_x) {
+  return _handleFormSchema.apply(this, arguments);
 }
-
 /**
  * 遍历schema
  * @param schema
  * @param callback 返回true 继续往下遍历
  */
+function _handleFormSchema() {
+  _handleFormSchema = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(schema) {
+    var fdmItems, associationFields, fieldIdMap;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          fdmItems = [];
+          associationFields = [];
+          fieldIdMap = new Map();
+          schema.state = schema.state || {};
+          schema.methods = schema.methods || {};
+          forEachFormSchema(schema, function (field) {
+            if (field.fdmSchema) {
+              var _field$fdmSchema, _field$fdmSchema2;
+              fdmItems.push(field);
+              field.fdmSchema.props = ((_field$fdmSchema = field.fdmSchema) === null || _field$fdmSchema === void 0 ? void 0 : _field$fdmSchema.props) || {};
+              field.fdmSchema.props.style = ((_field$fdmSchema2 = field.fdmSchema) === null || _field$fdmSchema2 === void 0 ? void 0 : _field$fdmSchema2.props.style) || {};
+              field.fdmSchema.props.style.height = "100%";
+            }
+            if (field.props.fieldId) {
+              //删除children防止循环
+              var copyField = JSON.parse(JSON.stringify(field));
+              delete copyField.children;
+              fieldIdMap.set(field.props.fieldId, copyField);
+            }
+            if (field.componentName == "AssociationField") {
+              associationFields.push(field);
+            }
+            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;
+                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;
+            });
+          });
+        case 7:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _handleFormSchema.apply(this, arguments);
+}
 function forEachFormSchema(schema, callback) {
   var _schema$children;
   schema === null || schema === void 0 ? void 0 : (_schema$children = schema.children) === null || _schema$children === void 0 ? void 0 : _schema$children.forEach(function (child, index, children) {

package/lib/utils/page/index.js

@@ -54,11 +54,15 @@ function hideLoading() {
 }
 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:
-          debounceHide();
-        case 1:
+          loading = document.getElementById("fullscreen-loading");
+          if (loading) {
+            loading.style.display = "none";
+          }
+        case 2:
         case "end":
           return _context2.stop();
       }

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

@@ -39,10 +39,7 @@ function PageLoadSchema(props) {
   }, []);
   if (loading) {
     return /*#__PURE__*/React.createElement(_pageLoading.PageLoading, {
-      loading: true,
-      style: {
-        background: "white"
-      }
+      loading: true
     });
   }
   if (!schema) {

package/package.json

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