@zhubangyun/lowcode-core 5.5.84 → 5.6.191

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

@@ -71,10 +71,11 @@ function _loadMaterials() {
               });
             }
           });
-          Object.defineProperty(window, "_components", {
-            writable: false,
-            value: components
-          });
+          window._components = components;
+          /*    Object.defineProperty(window, "_components", {
+                  writable: false,
+                  value: components
+              })*/
         case 8:
         case "end":
           return _context2.stop();

package/es/components/page-loading/index.js

@@ -1,7 +1,8 @@
 import "./index.less";
 export function PageLoading(props) {
   var loading = props.loading,
-    background = props.background,
+    _props$background = props.background,
+    background = _props$background === void 0 ? "#f1f1f1" : _props$background,
     children = props.children;
   return /*#__PURE__*/React.createElement("div", {
     className: "page-loading-wrapper",

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

@@ -1,11 +1,9 @@
-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;
@@ -22,10 +20,7 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
   _proto.render = function render() {
     var _this2 = this;
     var components = this.props.components || window._components;
-    // @ts-ignore
-    return /*#__PURE__*/React.createElement(_ConfigProvider, {
-      locale: zhCN
-    }, /*#__PURE__*/React.createElement(ReactRenderFactory, _extends({
+    return /*#__PURE__*/React.createElement(ReactRenderFactory, _extends({
       key: this.key
     }, this.props, {
       ref: function ref(node) {
@@ -39,7 +34,7 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
           fetch: createFetchHandler()
         }
       }
-    })));
+    }));
   };
   return ReactRender;
 }(PureComponent);

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

@@ -1,7 +1,9 @@
+import _ConfigProvider from "antd/es/config-provider";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import { Component, createContext, createElement, forwardRef, PureComponent } from 'react';
 import { findDOMNode } from "react-dom";
 import { adapter, addonRendererFactory, blockRendererFactory, componentRendererFactory, pageRendererFactory, rendererFactory, tempRendererFactory } from '@zhubangyun/lowcode-render-core';
+import zhCN from "antd/locale/zh_CN";
 adapter.setRuntime({
   Component: Component,
   PureComponent: PureComponent,
@@ -18,6 +20,8 @@ adapter.setRenderers({
   TempRenderer: tempRendererFactory(),
   DivRenderer: blockRendererFactory()
 });
+//todo 删除会多出一个div
+adapter.setConfigProvider(AntdConfigProvider);
 function factory() {
   var Renderer = rendererFactory();
   return /*#__PURE__*/function (_Renderer) {
@@ -40,4 +44,10 @@ function factory() {
     return ReactRenderer;
   }(Renderer);
 }
-export default factory();
+export default factory();
+function AntdConfigProvider(props) {
+  return /*#__PURE__*/React.createElement(_ConfigProvider, {
+    locale: zhCN,
+    children: props.children
+  });
+}

package/es/index.less

@@ -0,0 +1,3 @@
+[componentname="Page"] {
+  height: 100%;
+}

package/es/utils/cache/index.js

@@ -26,11 +26,15 @@ export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
             });
           case 3:
             res = _context.sent;
-            if (res.success) {
-              handleFormSchema(res.data);
+            if (!res.success) {
+              _context.next = 7;
+              break;
             }
+            _context.next = 7;
+            return handleFormSchema(res.data);
+          case 7:
             return _context.abrupt("return", res);
-          case 6:
+          case 8:
           case "end":
             return _context.stop();
         }

package/es/utils/cache/schema.js

@@ -1,25 +1,29 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import utils from "../index";
 export function handleFormSchema(_x) {
   return _handleFormSchema.apply(this, arguments);
 }
 
-/**
- * 遍历schema
- * @param schema
- * @param callback 返回true 继续往下遍历
- */
+//处理关联表单
 function _handleFormSchema() {
   _handleFormSchema = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(schema) {
-    var fdmItems, associationFields, fieldIdMap;
+    var fdmItems, 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 || {};
+          _context.next = 6;
+          return handleAssociationForm(schema);
+        case 6:
+          //初次处理
           forEachFormSchema(schema, function (field) {
             if (field.fdmSchema) {
               var _field$fdmSchema, _field$fdmSchema2;
@@ -34,11 +38,9 @@ function _handleFormSchema() {
               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) {
@@ -66,7 +68,7 @@ function _handleFormSchema() {
               return true;
             });
           });
-        case 7:
+        case 8:
         case "end":
           return _context.stop();
       }
@@ -74,6 +76,171 @@ function _handleFormSchema() {
   }));
   return _handleFormSchema.apply(this, arguments);
 }
+function handleAssociationForm(_x2) {
+  return _handleAssociationForm.apply(this, arguments);
+}
+/**
+ * 遍历schema
+ * @param schema
+ * @param callback 返回true 继续往下遍历
+ */
+function _handleAssociationForm() {
+  _handleAssociationForm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(schema) {
+    var rootSchema, associationFields, associationAttributeFields, schemaMap, getSchema, _getSchema, _loop, _ret, _i, _associationAttribute;
+    return _regeneratorRuntime.wrap(function _callee3$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          _getSchema = function _getSchema3() {
+            _getSchema = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id) {
+              var res;
+              return _regeneratorRuntime.wrap(function _callee2$(_context3) {
+                while (1) switch (_context3.prev = _context3.next) {
+                  case 0:
+                    if (!schemaMap[id]) {
+                      _context3.next = 2;
+                      break;
+                    }
+                    return _context3.abrupt("return", schemaMap[id]);
+                  case 2:
+                    _context3.next = 4;
+                    return utils.api.getSchema(id);
+                  case 4:
+                    res = _context3.sent;
+                    schemaMap[id] = res.data;
+                    return _context3.abrupt("return", schemaMap[id]);
+                  case 7:
+                  case "end":
+                    return _context3.stop();
+                }
+              }, _callee2);
+            }));
+            return _getSchema.apply(this, arguments);
+          };
+          getSchema = function _getSchema2(_x3) {
+            return _getSchema.apply(this, arguments);
+          };
+          //跟schema
+          rootSchema = new FormFieldSchema(schema.children[0], null); //关联表单单选
+          associationFields = []; //关联属性
+          associationAttributeFields = [];
+          forEachFormSchema(schema, function (field) {
+            if (field.componentName == "AssociationField") {
+              associationFields.push(field);
+            }
+            if (field.componentName == "AssociationAttributeField") {
+              associationAttributeFields.push(field);
+            }
+            return true;
+          });
+          //处理关联属性schema
+          schemaMap = {};
+          schemaMap[schema.id] = schema;
+
+          //从缓存中获取schema
+
+          //处理关联属性 赋值schema
+          _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop() {
+            var _attrField$props, _attrField$props$fiel, _findField$props, _findField$props$fiel;
+            var attrField, associationAttribute, findField, associationForm, associationFormSchema, associationAttributeField, field, key, keys;
+            return _regeneratorRuntime.wrap(function _loop$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
+                case 0:
+                  attrField = _associationAttribute[_i];
+                  associationAttribute = (_attrField$props = attrField.props) === null || _attrField$props === void 0 ? void 0 : (_attrField$props$fiel = _attrField$props.fieldProps) === null || _attrField$props$fiel === void 0 ? void 0 : _attrField$props$fiel.associationAttribute;
+                  if (associationAttribute) {
+                    _context2.next = 4;
+                    break;
+                  }
+                  return _context2.abrupt("return", {
+                    v: void 0
+                  });
+                case 4:
+                  findField = associationFields.find(function (assi) {
+                    return assi.props.fieldId == (associationAttribute === null || associationAttribute === void 0 ? void 0 : associationAttribute[0]);
+                  });
+                  associationForm = findField === null || findField === void 0 ? void 0 : (_findField$props = findField.props) === null || _findField$props === void 0 ? void 0 : (_findField$props$fiel = _findField$props.fieldProps) === null || _findField$props$fiel === void 0 ? void 0 : _findField$props$fiel.associationForm;
+                  if (associationForm) {
+                    _context2.next = 8;
+                    break;
+                  }
+                  return _context2.abrupt("return", {
+                    v: void 0
+                  });
+                case 8:
+                  _context2.next = 10;
+                  return getSchema(associationForm.id);
+                case 10:
+                  associationFormSchema = _context2.sent;
+                  //向关联属性中注册 schema 开始
+                  associationAttributeField = null;
+                  forEachFormSchema(associationFormSchema, function (field) {
+                    if (field.props.fieldId == (associationAttribute === null || associationAttribute === void 0 ? void 0 : associationAttribute[1])) {
+                      associationAttributeField = _extends({}, field);
+                      return false;
+                    }
+                    return true;
+                  });
+                  attrField.props.fieldProps.associationAttributeField = associationAttributeField;
+                  //向关联属性中注册 schema 结束
+                  //向关联表单中注册关联属性填充 开始
+                  findField.props.fieldProps.associationAttributes = findField.props.fieldProps.associationAttributes || [];
+                  field = rootSchema.findFieldById(attrField.props.fieldId);
+                  if (field) {
+                    key = field.getFieldPaths();
+                    findField.props.fieldProps.associationAttributes.push({
+                      key: key,
+                      value: associationAttribute === null || associationAttribute === void 0 ? void 0 : associationAttribute[1]
+                    });
+                    //向关联表单中注册关联属性填充 结束
+                    //设置关联属性默认值 开始
+                    keys = field.getFieldPaths().split(".");
+                    keys.pop();
+                    if (keys.length > 0) {
+                      keys = keys.map(function (item) {
+                        return "parent";
+                      });
+                      keys.push(associationAttribute[0]);
+                      keys.push(associationAttribute[1]);
+                      attrField.props.defaultValue = {
+                        "type": "express",
+                        "value": keys.join("?.")
+                      };
+                      console.log(attrField);
+                    }
+                  }
+                  //设置关联属性默认值 结束
+                case 17:
+                case "end":
+                  return _context2.stop();
+              }
+            }, _loop);
+          });
+          _i = 0, _associationAttribute = associationAttributeFields;
+        case 10:
+          if (!(_i < _associationAttribute.length)) {
+            _context4.next = 18;
+            break;
+          }
+          return _context4.delegateYield(_loop(), "t0", 12);
+        case 12:
+          _ret = _context4.t0;
+          if (!_ret) {
+            _context4.next = 15;
+            break;
+          }
+          return _context4.abrupt("return", _ret.v);
+        case 15:
+          _i++;
+          _context4.next = 10;
+          break;
+        case 18:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee3);
+  }));
+  return _handleAssociationForm.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) {
@@ -82,4 +249,55 @@ export function forEachFormSchema(schema, callback) {
       forEachFormSchema(child, callback);
     }
   });
-}
+}
+var FormFieldSchema = /*#__PURE__*/function () {
+  function FormFieldSchema(schema, parent) {
+    var _schema$children2,
+      _this = this;
+    this.fieldId = void 0;
+    this.componentName = void 0;
+    this.parent = void 0;
+    this.schema = void 0;
+    this.children = void 0;
+    this.schema = schema;
+    this.parent = parent;
+    this.children = [];
+    this.fieldId = schema.props.fieldId;
+    this.componentName = schema.componentName;
+    (_schema$children2 = schema.children) === null || _schema$children2 === void 0 ? void 0 : _schema$children2.forEach(function (item) {
+      _this.children.push(new FormFieldSchema(item, _this));
+    });
+  }
+  var _proto = FormFieldSchema.prototype;
+  _proto.findFieldById = function findFieldById(fieldId) {
+    if (this.fieldId == fieldId) {
+      return this;
+    }
+    for (var _iterator = _createForOfIteratorHelperLoose(this.children), _step; !(_step = _iterator()).done;) {
+      var _child = _step.value;
+      if (_child.findFieldById(fieldId)) {
+        return _child.findFieldById(fieldId);
+      }
+    }
+    return null;
+  };
+  _proto.getFieldPaths = function getFieldPaths() {
+    var paths = [];
+    function loopParent(field) {
+      if (field !== null && field !== void 0 && field.parent) {
+        paths.push(field.parent);
+        loopParent(field.parent);
+      }
+    }
+    loopParent(this);
+    paths.reverse();
+    paths = paths.filter(function (item) {
+      return ["SubFormField"].includes(item.componentName);
+    });
+    paths.push(this);
+    return paths.map(function (item) {
+      return item.fieldId;
+    }).join(".");
+  };
+  return FormFieldSchema;
+}();

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

@@ -78,10 +78,11 @@ function _loadMaterials() {
               });
             }
           });
-          Object.defineProperty(window, "_components", {
-            writable: false,
-            value: components
-          });
+          window._components = components;
+          /*    Object.defineProperty(window, "_components", {
+                  writable: false,
+                  value: components
+              })*/
         case 8:
         case "end":
           return _context2.stop();

package/lib/components/page-loading/index.js

@@ -5,7 +5,8 @@ exports.PageLoading = PageLoading;
 require("./index.less");
 function PageLoading(props) {
   var loading = props.loading,
-    background = props.background,
+    _props$background = props.background,
+    background = _props$background === void 0 ? "#f1f1f1" : _props$background,
     children = props.children;
   return /*#__PURE__*/React.createElement("div", {
     className: "page-loading-wrapper",

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

@@ -3,14 +3,12 @@
 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;
@@ -27,10 +25,7 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
   _proto.render = function render() {
     var _this2 = this;
     var components = this.props.components || window._components;
-    // @ts-ignore
-    return /*#__PURE__*/React.createElement(_configProvider["default"], {
-      locale: _zh_CN["default"]
-    }, /*#__PURE__*/React.createElement(_reactRenderFactory["default"], (0, _extends2["default"])({
+    return /*#__PURE__*/React.createElement(_reactRenderFactory["default"], (0, _extends2["default"])({
       key: this.key
     }, this.props, {
       ref: function ref(node) {
@@ -44,7 +39,7 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
           fetch: (0, _lowcodeDatasourceFetchHandler.createFetchHandler)()
         }
       }
-    })));
+    }));
   };
   return ReactRender;
 }(_react.PureComponent);

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

@@ -3,10 +3,12 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports["default"] = void 0;
+var _configProvider = _interopRequireDefault(require("antd/lib/config-provider"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _react = require("react");
 var _reactDom = require("react-dom");
 var _lowcodeRenderCore = require("@zhubangyun/lowcode-render-core");
+var _zh_CN = _interopRequireDefault(require("antd/locale/zh_CN"));
 _lowcodeRenderCore.adapter.setRuntime({
   Component: _react.Component,
   PureComponent: _react.PureComponent,
@@ -23,6 +25,8 @@ _lowcodeRenderCore.adapter.setRenderers({
   TempRenderer: (0, _lowcodeRenderCore.tempRendererFactory)(),
   DivRenderer: (0, _lowcodeRenderCore.blockRendererFactory)()
 });
+//todo 删除会多出一个div
+_lowcodeRenderCore.adapter.setConfigProvider(AntdConfigProvider);
 function factory() {
   var Renderer = (0, _lowcodeRenderCore.rendererFactory)();
   return /*#__PURE__*/function (_Renderer) {
@@ -45,4 +49,10 @@ function factory() {
     return ReactRenderer;
   }(Renderer);
 }
-var _default = exports["default"] = factory();
+var _default = exports["default"] = factory();
+function AntdConfigProvider(props) {
+  return /*#__PURE__*/React.createElement(_configProvider["default"], {
+    locale: _zh_CN["default"],
+    children: props.children
+  });
+}

package/lib/index.less

@@ -0,0 +1,3 @@
+[componentname="Page"] {
+  height: 100%;
+}

package/lib/utils/cache/index.js

@@ -30,11 +30,15 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
             });
           case 3:
             res = _context.sent;
-            if (res.success) {
-              (0, _schema.handleFormSchema)(res.data);
+            if (!res.success) {
+              _context.next = 7;
+              break;
             }
+            _context.next = 7;
+            return (0, _schema.handleFormSchema)(res.data);
+          case 7:
             return _context.abrupt("return", res);
-          case 6:
+          case 8:
           case "end":
             return _context.stop();
         }

package/lib/utils/cache/schema.js

@@ -5,26 +5,29 @@ exports.__esModule = true;
 exports.forEachFormSchema = forEachFormSchema;
 exports.handleFormSchema = handleFormSchema;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _index = _interopRequireDefault(require("../index"));
+function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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;
+    var fdmItems, 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 || {};
+          _context.next = 6;
+          return handleAssociationForm(schema);
+        case 6:
+          //初次处理
           forEachFormSchema(schema, function (field) {
             if (field.fdmSchema) {
               var _field$fdmSchema, _field$fdmSchema2;
@@ -39,11 +42,9 @@ function _handleFormSchema() {
               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) {
@@ -71,7 +72,7 @@ function _handleFormSchema() {
               return true;
             });
           });
-        case 7:
+        case 8:
         case "end":
           return _context.stop();
       }
@@ -79,6 +80,171 @@ function _handleFormSchema() {
   }));
   return _handleFormSchema.apply(this, arguments);
 }
+function handleAssociationForm(_x2) {
+  return _handleAssociationForm.apply(this, arguments);
+}
+/**
+ * 遍历schema
+ * @param schema
+ * @param callback 返回true 继续往下遍历
+ */
+function _handleAssociationForm() {
+  _handleAssociationForm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(schema) {
+    var rootSchema, associationFields, associationAttributeFields, schemaMap, getSchema, _getSchema, _loop, _ret, _i, _associationAttribute;
+    return _regenerator["default"].wrap(function _callee3$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          _getSchema = function _getSchema3() {
+            _getSchema = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(id) {
+              var res;
+              return _regenerator["default"].wrap(function _callee2$(_context3) {
+                while (1) switch (_context3.prev = _context3.next) {
+                  case 0:
+                    if (!schemaMap[id]) {
+                      _context3.next = 2;
+                      break;
+                    }
+                    return _context3.abrupt("return", schemaMap[id]);
+                  case 2:
+                    _context3.next = 4;
+                    return _index["default"].api.getSchema(id);
+                  case 4:
+                    res = _context3.sent;
+                    schemaMap[id] = res.data;
+                    return _context3.abrupt("return", schemaMap[id]);
+                  case 7:
+                  case "end":
+                    return _context3.stop();
+                }
+              }, _callee2);
+            }));
+            return _getSchema.apply(this, arguments);
+          };
+          getSchema = function _getSchema2(_x3) {
+            return _getSchema.apply(this, arguments);
+          };
+          //跟schema
+          rootSchema = new FormFieldSchema(schema.children[0], null); //关联表单单选
+          associationFields = []; //关联属性
+          associationAttributeFields = [];
+          forEachFormSchema(schema, function (field) {
+            if (field.componentName == "AssociationField") {
+              associationFields.push(field);
+            }
+            if (field.componentName == "AssociationAttributeField") {
+              associationAttributeFields.push(field);
+            }
+            return true;
+          });
+          //处理关联属性schema
+          schemaMap = {};
+          schemaMap[schema.id] = schema;
+
+          //从缓存中获取schema
+
+          //处理关联属性 赋值schema
+          _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
+            var _attrField$props, _attrField$props$fiel, _findField$props, _findField$props$fiel;
+            var attrField, associationAttribute, findField, associationForm, associationFormSchema, associationAttributeField, field, key, keys;
+            return _regenerator["default"].wrap(function _loop$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
+                case 0:
+                  attrField = _associationAttribute[_i];
+                  associationAttribute = (_attrField$props = attrField.props) === null || _attrField$props === void 0 ? void 0 : (_attrField$props$fiel = _attrField$props.fieldProps) === null || _attrField$props$fiel === void 0 ? void 0 : _attrField$props$fiel.associationAttribute;
+                  if (associationAttribute) {
+                    _context2.next = 4;
+                    break;
+                  }
+                  return _context2.abrupt("return", {
+                    v: void 0
+                  });
+                case 4:
+                  findField = associationFields.find(function (assi) {
+                    return assi.props.fieldId == (associationAttribute === null || associationAttribute === void 0 ? void 0 : associationAttribute[0]);
+                  });
+                  associationForm = findField === null || findField === void 0 ? void 0 : (_findField$props = findField.props) === null || _findField$props === void 0 ? void 0 : (_findField$props$fiel = _findField$props.fieldProps) === null || _findField$props$fiel === void 0 ? void 0 : _findField$props$fiel.associationForm;
+                  if (associationForm) {
+                    _context2.next = 8;
+                    break;
+                  }
+                  return _context2.abrupt("return", {
+                    v: void 0
+                  });
+                case 8:
+                  _context2.next = 10;
+                  return getSchema(associationForm.id);
+                case 10:
+                  associationFormSchema = _context2.sent;
+                  //向关联属性中注册 schema 开始
+                  associationAttributeField = null;
+                  forEachFormSchema(associationFormSchema, function (field) {
+                    if (field.props.fieldId == (associationAttribute === null || associationAttribute === void 0 ? void 0 : associationAttribute[1])) {
+                      associationAttributeField = (0, _extends2["default"])({}, field);
+                      return false;
+                    }
+                    return true;
+                  });
+                  attrField.props.fieldProps.associationAttributeField = associationAttributeField;
+                  //向关联属性中注册 schema 结束
+                  //向关联表单中注册关联属性填充 开始
+                  findField.props.fieldProps.associationAttributes = findField.props.fieldProps.associationAttributes || [];
+                  field = rootSchema.findFieldById(attrField.props.fieldId);
+                  if (field) {
+                    key = field.getFieldPaths();
+                    findField.props.fieldProps.associationAttributes.push({
+                      key: key,
+                      value: associationAttribute === null || associationAttribute === void 0 ? void 0 : associationAttribute[1]
+                    });
+                    //向关联表单中注册关联属性填充 结束
+                    //设置关联属性默认值 开始
+                    keys = field.getFieldPaths().split(".");
+                    keys.pop();
+                    if (keys.length > 0) {
+                      keys = keys.map(function (item) {
+                        return "parent";
+                      });
+                      keys.push(associationAttribute[0]);
+                      keys.push(associationAttribute[1]);
+                      attrField.props.defaultValue = {
+                        "type": "express",
+                        "value": keys.join("?.")
+                      };
+                      console.log(attrField);
+                    }
+                  }
+                  //设置关联属性默认值 结束
+                case 17:
+                case "end":
+                  return _context2.stop();
+              }
+            }, _loop);
+          });
+          _i = 0, _associationAttribute = associationAttributeFields;
+        case 10:
+          if (!(_i < _associationAttribute.length)) {
+            _context4.next = 18;
+            break;
+          }
+          return _context4.delegateYield(_loop(), "t0", 12);
+        case 12:
+          _ret = _context4.t0;
+          if (!_ret) {
+            _context4.next = 15;
+            break;
+          }
+          return _context4.abrupt("return", _ret.v);
+        case 15:
+          _i++;
+          _context4.next = 10;
+          break;
+        case 18:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee3);
+  }));
+  return _handleAssociationForm.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) {
@@ -87,4 +253,55 @@ function forEachFormSchema(schema, callback) {
       forEachFormSchema(child, callback);
     }
   });
-}
+}
+var FormFieldSchema = /*#__PURE__*/function () {
+  function FormFieldSchema(schema, parent) {
+    var _schema$children2,
+      _this = this;
+    this.fieldId = void 0;
+    this.componentName = void 0;
+    this.parent = void 0;
+    this.schema = void 0;
+    this.children = void 0;
+    this.schema = schema;
+    this.parent = parent;
+    this.children = [];
+    this.fieldId = schema.props.fieldId;
+    this.componentName = schema.componentName;
+    (_schema$children2 = schema.children) === null || _schema$children2 === void 0 ? void 0 : _schema$children2.forEach(function (item) {
+      _this.children.push(new FormFieldSchema(item, _this));
+    });
+  }
+  var _proto = FormFieldSchema.prototype;
+  _proto.findFieldById = function findFieldById(fieldId) {
+    if (this.fieldId == fieldId) {
+      return this;
+    }
+    for (var _iterator = _createForOfIteratorHelperLoose(this.children), _step; !(_step = _iterator()).done;) {
+      var _child = _step.value;
+      if (_child.findFieldById(fieldId)) {
+        return _child.findFieldById(fieldId);
+      }
+    }
+    return null;
+  };
+  _proto.getFieldPaths = function getFieldPaths() {
+    var paths = [];
+    function loopParent(field) {
+      if (field !== null && field !== void 0 && field.parent) {
+        paths.push(field.parent);
+        loopParent(field.parent);
+      }
+    }
+    loopParent(this);
+    paths.reverse();
+    paths = paths.filter(function (item) {
+      return ["SubFormField"].includes(item.componentName);
+    });
+    paths.push(this);
+    return paths.map(function (item) {
+      return item.fieldId;
+    }).join(".");
+  };
+  return FormFieldSchema;
+}();

package/package.json

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