@zhubangyun/lowcode-core 5.6.213 → 5.7.301

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

@@ -5,7 +5,7 @@
   top: 0;
   left: 0;
   z-index: 10;
-  background: white;
+  background: rgba(255, 255, 255, 0.5);
   display: flex;
   justify-content: center;
   align-items: center;
@@ -16,7 +16,7 @@
   width: 100%;
   height: 100%;
   z-index: 10;
-  background: white;
+  background: rgba(255, 255, 255, 0.5);
   display: flex;
   justify-content: center;
   align-items: center;

package/es/index.d.ts

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

package/es/index.js

@@ -1,6 +1,7 @@
 import "./index.less";
 import utils from "./utils";
 import { ReactRender } from "./components/react-render";
+import * as lodash from "lodash";
 export { LoadMaterials } from "./components/load-materials";
 export { PageLoading } from "./components/page-loading";
 export { RestApi, RestFormApi, apiRequest } from "./utils/api";
@@ -10,4 +11,9 @@ export { ReactRender } from "./components/react-render";
 window.utils = utils;
 // @ts-ignore
 window.__ReactRender = ReactRender;
-export { utils };
+// @ts-ignore
+if (window._) {
+  // @ts-ignore
+  window.lodash = window._;
+}
+export { utils, lodash };

package/es/style.js

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

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

@@ -90,6 +90,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             return this.initialize();
           case 2:
             config.params = config.params || {};
+            config.params.description = "" + this.title;
             config.params.formId = this.formId;
             if (this.fieldId) {
               config.params.fieldId = this.fieldId;
@@ -97,7 +98,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             if (this.mock) {
               config.params.mock = this.mock;
             }
-          case 6:
+          case 7:
           case "end":
             return _context2.stop();
         }
@@ -115,12 +116,21 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             _context3.next = 2;
-            return _RestApi.prototype.search.call(this, params);
+            return this.initialize();
           case 2:
+            _context3.next = 4;
+            return this.request.post("search", params, {
+              params: {
+                description: this.title + "\u67E5\u8BE2",
+                formId: this.formId,
+                fieldId: this.fieldId
+              }
+            });
+          case 4:
             res = _context3.sent;
-            res.data = assembleAssociationField(res.data, res.refs);
+            assembleAssociationField(res.data, res.refs);
             return _context3.abrupt("return", res);
-          case 5:
+          case 7:
           case "end":
             return _context3.stop();
         }
@@ -141,9 +151,10 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             return _RestApi.prototype.getById.call(this, id, options);
           case 2:
             res = _context4.sent;
-            res.data = assembleAssociationField(res.data, res.refs);
+            assembleAssociationField(res.data, res.refs);
+            console.debug("formApi.getById", res);
             return _context4.abrupt("return", res);
-          case 5:
+          case 6:
           case "end":
             return _context4.stop();
         }
@@ -222,40 +233,83 @@ function assembleAssociationField(data, refs) {
   for (var _iterator = _createForOfIteratorHelperLoose(refs), _step; !(_step = _iterator()).done;) {
     var ref = _step.value;
     var dataMap = new Map();
-    for (var _iterator2 = _createForOfIteratorHelperLoose(ref.data), _step2; !(_step2 = _iterator2()).done;) {
-      var datum = _step2.value;
+    for (var _iterator4 = _createForOfIteratorHelperLoose(ref.data), _step4; !(_step4 = _iterator4()).done;) {
+      var datum = _step4.value;
       dataMap.set(datum.id, datum);
     }
-    for (var _iterator3 = _createForOfIteratorHelperLoose(ref.fieldIds), _step3; !(_step3 = _iterator3()).done;) {
-      var fieldId = _step3.value;
+    for (var _iterator5 = _createForOfIteratorHelperLoose(ref.fieldIds), _step5; !(_step5 = _iterator5()).done;) {
+      var fieldId = _step5.value;
       fieldIdDataMap.set(fieldId + "Id", dataMap);
     }
   }
-  var jsonText = JSON.stringify(data, function (key, value) {
-    if (value !== null && value !== void 0 && value.id) {
-      var _loop = function _loop() {
-        var fieldIdName = _Object$keys[_i];
-        var dataMap = fieldIdDataMap.get(fieldIdName);
-        if (dataMap) {
-          var fieldIdValue = value[fieldIdName];
-          var fieldValue = null;
-          if (Array.isArray(fieldIdValue)) {
-            fieldValue = fieldIdValue.map(function (id) {
-              return dataMap.get(id);
-            }).filter(function (v) {
-              return !!v;
-            });
-          } else if (typeof fieldIdValue == "string") {
-            fieldValue = dataMap.get(fieldIdValue);
+  //组装refs的关联属性
+  for (var _iterator2 = _createForOfIteratorHelperLoose(refs), _step2; !(_step2 = _iterator2()).done;) {
+    var _ref = _step2.value;
+    var key = _ref.form.id;
+    if (_ref.form.fieldId) {
+      key += "." + _ref.form.fieldId;
+    }
+    assembleAssociationFieldValue(_ref.data, fieldIdDataMap, key);
+  }
+  function loopAssembleAssociation(values) {
+    if (!Array.isArray(values)) {
+      if (values !== null && values !== void 0 && values.id) {
+        loopAssembleAssociation([values]);
+      }
+    }
+    if (Array.isArray(values)) {
+      var _values$;
+      if ((_values$ = values[0]) !== null && _values$ !== void 0 && _values$.id) {
+        assembleAssociationFieldValue(values, fieldIdDataMap);
+        //处理子表
+        for (var _iterator3 = _createForOfIteratorHelperLoose(values), _step3; !(_step3 = _iterator3()).done;) {
+          var value = _step3.value;
+          for (var _i = 0, _Object$values = Object.values(value); _i < _Object$values.length; _i++) {
+            var subValues = _Object$values[_i];
+            if (Array.isArray(subValues)) {
+              loopAssembleAssociation(subValues);
+            }
           }
-          value[fieldIdName.slice(0, -2)] = fieldValue;
         }
-      };
-      for (var _i = 0, _Object$keys = Object.keys(value); _i < _Object$keys.length; _i++) {
-        _loop();
       }
     }
-    return value;
-  });
-  return JSON.parse(jsonText);
+  }
+  loopAssembleAssociation(data);
+}
+function assembleAssociationFieldValue(data, fieldIdDataMap, prefixKey) {
+  var arrayData = [];
+  if (Array.isArray(data)) {
+    arrayData = data;
+  } else if (typeof data == "object") {
+    arrayData = [data];
+  }
+  for (var _iterator6 = _createForOfIteratorHelperLoose(arrayData), _step6; !(_step6 = _iterator6()).done;) {
+    var item = _step6.value;
+    var _loop = function _loop() {
+      var fieldIdName = _Object$keys[_i2];
+      var fieldIdKey = fieldIdName;
+      if (prefixKey) {
+        fieldIdKey = prefixKey + "." + fieldIdName;
+      }
+      var dataMap = fieldIdDataMap.get(fieldIdKey);
+      if (dataMap) {
+        var fieldIdValue = item[fieldIdName];
+        var fieldValue = null;
+        if (Array.isArray(fieldIdValue)) {
+          // @ts-ignore
+          fieldValue = fieldIdValue.map(function (id) {
+            return dataMap.get(id);
+          }).filter(function (v) {
+            return !!v;
+          });
+        } else if (typeof fieldIdValue == "string") {
+          fieldValue = dataMap.get(fieldIdValue);
+        }
+        item[fieldIdName.slice(0, -2)] = fieldValue;
+      }
+    };
+    for (var _i2 = 0, _Object$keys = Object.keys(item); _i2 < _Object$keys.length; _i2++) {
+      _loop();
+    }
+  }
 }

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

@@ -1,4 +1,6 @@
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
+import _notification from "antd/es/notification";
+import _Modal from "antd/es/modal";
 import _message from "antd/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -286,16 +288,57 @@ export var BaseRestApi = /*#__PURE__*/function () {
   }();
   _proto.showError = /*#__PURE__*/function () {
     var _showError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(type, msg) {
+      var _JSON$parse, _type, message;
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
+            _context7.prev = 0;
+            if (!msg) {
+              _context7.next = 16;
+              break;
+            }
+            _JSON$parse = JSON.parse(msg), _type = _JSON$parse.type, message = _JSON$parse.message;
+            if (!(_type == "message")) {
+              _context7.next = 8;
+              break;
+            }
+            _message.error({
+              type: "error",
+              content: message
+            });
+            return _context7.abrupt("return");
+          case 8:
+            if (!(_type == "modal")) {
+              _context7.next = 13;
+              break;
+            }
+            _Modal.error({
+              content: message
+            });
+            return _context7.abrupt("return");
+          case 13:
+            if (!(_type == "notification")) {
+              _context7.next = 16;
+              break;
+            }
+            _notification.error({
+              message: message
+            });
+            return _context7.abrupt("return");
+          case 16:
+            _context7.next = 20;
+            break;
+          case 18:
+            _context7.prev = 18;
+            _context7.t0 = _context7["catch"](0);
+          case 20:
             console.error("{" + this.title + "}" + type + (msg || ""));
             _message === null || _message === void 0 ? void 0 : _message.error("{" + this.title + "}" + type + (msg || "")).then();
-          case 2:
+          case 22:
           case "end":
             return _context7.stop();
         }
-      }, _callee7, this);
+      }, _callee7, this, [[0, 18]]);
     }));
     function showError(_x13, _x14) {
       return _showError.apply(this, arguments);

package/es/utils/cache/schema.js

@@ -16,13 +16,25 @@ function _handleFormSchema() {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          if (!(schema.type !== "form")) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return");
+        case 2:
+          if (schema !== null && schema !== void 0 && schema.componentName) {
+            _context.next = 4;
+            break;
+          }
+          return _context.abrupt("return");
+        case 4:
           fdmItems = [];
           fieldIdMap = new Map();
           schema.state = schema.state || {};
           schema.methods = schema.methods || {};
-          _context.next = 6;
+          _context.next = 10;
           return handleAssociationForm(schema);
-        case 6:
+        case 10:
           //初次处理
           forEachFormSchema(schema, function (field) {
             if (field.fdmSchema) {
@@ -69,7 +81,7 @@ function _handleFormSchema() {
               return true;
             });
           });
-        case 8:
+        case 12:
         case "end":
           return _context.stop();
       }
@@ -191,25 +203,11 @@ function _handleAssociationForm() {
                     depth1 = field.getFieldPaths().split(".").length;
                     depth2 = associationField.getFieldPaths().split(".").length;
                     attrField.props.fieldProps.associationDepth = depth1 - depth2;
-                    /*            findField.props.fieldProps.associationAttributes.push({
-                                    key: key,
-                                    value: associationAttribute?.[1]
-                                })
-                                console.log(field.getFieldPaths())
-                                //向关联表单中注册关联属性填充 结束
-                                //设置关联属性默认值 开始
-                                let keys = field.getFieldPaths().split(".");
-                                keys.pop();
-                                attrField.props.fieldProps.associationDepth = keys.length;
-                                if (keys.length > 0) {
-                                    keys = keys.map(item => "parent");
-                                    keys.push(associationAttribute[0])
-                                    keys.push(associationAttribute[1])
-                                    attrField.props.defaultValue = {
-                                        "type": "express",
-                                        "value": keys.join("?.")
-                                    }
-                                }*/
+                    findField.props.fieldProps.associationAttributes.push({
+                      key: field.getFieldPaths(),
+                      value: associationAttribute === null || associationAttribute === void 0 ? void 0 : associationAttribute[1]
+                    });
+                    //向关联表单中注册关联属性填充 结束
                   }
                   //设置关联属性默认值 结束
                 case 18:

package/es/utils/page/page-form-data-manager.d.ts

@@ -1,5 +1,5 @@
 import { PageLayoutType } from "./page-layout";
-export declare type PageFormDataManagerModeType = "dataManager" | "selectOne" | "selectMore";
+export declare type PageFormDataManagerModeType = "associationField" | "dataManager" | "selectOne" | "selectMore";
 export interface ShowPageFormDataManagerProps {
     container?: HTMLDivElement;
     layout?: PageLayoutType;
@@ -8,6 +8,12 @@ export interface ShowPageFormDataManagerProps {
         fieldId?: string;
     };
     mode?: PageFormDataManagerModeType;
+    extraProps?: any;
     onClose?: () => void | Promise<void>;
+    onSearch?: (params: any[]) => void | Promise<void>;
+    onLoadData?: (response: {
+        data: any[];
+        total: number;
+    }) => void | Promise<void>;
 }
-export declare function showFormDataManager(options: ShowPageFormDataManagerProps): Promise<unknown>;
+export declare function showFormDataManager(options: ShowPageFormDataManagerProps): Promise<any | any[]>;

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

@@ -22,7 +22,7 @@ function _showFormDataManager() {
         case 0:
           return _context3.abrupt("return", new Promise( /*#__PURE__*/function () {
             var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve, reject) {
-              var container, onClose, restProps, unmount, _options$form, paths, mode, params, url, page;
+              var container, onClose, restProps, unmount, _options$form, paths, mode, _params, url, page;
               return _regeneratorRuntime.wrap(function _callee2$(_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
@@ -38,8 +38,8 @@ function _showFormDataManager() {
                     }
                     paths = window.location.pathname.split("/");
                     mode = options.mode;
-                    params = new URLSearchParams();
-                    url = "/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + params.toString();
+                    _params = new URLSearchParams();
+                    url = "/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + _params.toString();
                     _context2.next = 10;
                     return openPage(url, url);
                   case 10:
@@ -59,18 +59,19 @@ function _showFormDataManager() {
                           while (1) switch (_context.prev = _context.next) {
                             case 0:
                               resolve(null);
+                              setTimeout(function () {
+                                ReactDOM.unmountComponentAtNode(container);
+                              }, 10);
                               if (unmount) {
                                 //等待动画结束
                                 setTimeout(function () {
                                   var _container;
-                                  //取消挂载
-                                  ReactDOM.unmountComponentAtNode(container);
                                   //移除
                                   (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
-                                }, 1000);
+                                }, 100);
                               }
                               onClose === null || onClose === void 0 ? void 0 : onClose();
-                            case 3:
+                            case 4:
                             case "end":
                               return _context.stop();
                           }
@@ -116,8 +117,9 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       onSelectOk = _this$props.onSelectOk,
       onClose = _this$props.onClose,
       restProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
+
     // @ts-ignore
-    restProps.layout = layout || "drawer";
+    restProps.layout = layout || "modal";
     // @ts-ignore
     restProps.onClose = function () {
       var _self$layoutRef;

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

@@ -18,9 +18,11 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
       return Math.min(window.innerWidth, 1440);
     };
     _this.handleResize = function () {
-      _this.setState({
-        width: _this.getWith()
-      });
+      if (_this.props.layout == "drawer") {
+        _this.setState({
+          width: _this.getWith()
+        });
+      }
     };
     _this.state.width = _this.getWith();
     return _this;
@@ -44,6 +46,7 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
       onClose: this.close,
       footer: false,
       closable: false,
+      style: {},
       styles: {
         header: {
           display: "none"
@@ -58,6 +61,8 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
       maskClosable: false
     };
     if (layout == "modal") {
+      restProps.style.top = 64;
+      restProps.styles.body.maxHeight = "calc(100vh - 180px)";
       return /*#__PURE__*/React.createElement(_Modal, restProps, children);
     } else if (layout == "drawer") {
       return /*#__PURE__*/React.createElement(_Drawer, restProps, children);

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

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

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

@@ -5,7 +5,7 @@
   top: 0;
   left: 0;
   z-index: 10;
-  background: white;
+  background: rgba(255, 255, 255, 0.5);
   display: flex;
   justify-content: center;
   align-items: center;
@@ -16,7 +16,7 @@
   width: 100%;
   height: 100%;
   z-index: 10;
-  background: white;
+  background: rgba(255, 255, 255, 0.5);
   display: flex;
   justify-content: center;
   align-items: center;

package/lib/index.d.ts

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

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.LoadMaterials = exports.Layout = void 0;
+exports.lodash = 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 lodash = _interopRequireWildcard(require("lodash"));
+exports.lodash = lodash;
 var _loadMaterials = require("./components/load-materials");
 exports.LoadMaterials = _loadMaterials.LoadMaterials;
 var _pageLoading = require("./components/page-loading");
@@ -18,7 +20,14 @@ exports.RestFormApi = _api.RestFormApi;
 exports.apiRequest = _api.apiRequest;
 var _layout = require("./components/layout");
 exports.Layout = _layout.Layout;
+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; }
 // @ts-ignore
 window.utils = _utils["default"];
 // @ts-ignore
-window.__ReactRender = _reactRender.ReactRender;
+window.__ReactRender = _reactRender.ReactRender;
+// @ts-ignore
+if (window._) {
+  // @ts-ignore
+  window.lodash = window._;
+}

package/lib/style.js

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

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

@@ -95,6 +95,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             return this.initialize();
           case 2:
             config.params = config.params || {};
+            config.params.description = "" + this.title;
             config.params.formId = this.formId;
             if (this.fieldId) {
               config.params.fieldId = this.fieldId;
@@ -102,7 +103,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             if (this.mock) {
               config.params.mock = this.mock;
             }
-          case 6:
+          case 7:
           case "end":
             return _context2.stop();
         }
@@ -120,12 +121,21 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             _context3.next = 2;
-            return _RestApi.prototype.search.call(this, params);
+            return this.initialize();
           case 2:
+            _context3.next = 4;
+            return this.request.post("search", params, {
+              params: {
+                description: this.title + "\u67E5\u8BE2",
+                formId: this.formId,
+                fieldId: this.fieldId
+              }
+            });
+          case 4:
             res = _context3.sent;
-            res.data = assembleAssociationField(res.data, res.refs);
+            assembleAssociationField(res.data, res.refs);
             return _context3.abrupt("return", res);
-          case 5:
+          case 7:
           case "end":
             return _context3.stop();
         }
@@ -146,9 +156,10 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             return _RestApi.prototype.getById.call(this, id, options);
           case 2:
             res = _context4.sent;
-            res.data = assembleAssociationField(res.data, res.refs);
+            assembleAssociationField(res.data, res.refs);
+            console.debug("formApi.getById", res);
             return _context4.abrupt("return", res);
-          case 5:
+          case 6:
           case "end":
             return _context4.stop();
         }
@@ -227,40 +238,83 @@ function assembleAssociationField(data, refs) {
   for (var _iterator = _createForOfIteratorHelperLoose(refs), _step; !(_step = _iterator()).done;) {
     var ref = _step.value;
     var dataMap = new Map();
-    for (var _iterator2 = _createForOfIteratorHelperLoose(ref.data), _step2; !(_step2 = _iterator2()).done;) {
-      var datum = _step2.value;
+    for (var _iterator4 = _createForOfIteratorHelperLoose(ref.data), _step4; !(_step4 = _iterator4()).done;) {
+      var datum = _step4.value;
       dataMap.set(datum.id, datum);
     }
-    for (var _iterator3 = _createForOfIteratorHelperLoose(ref.fieldIds), _step3; !(_step3 = _iterator3()).done;) {
-      var fieldId = _step3.value;
+    for (var _iterator5 = _createForOfIteratorHelperLoose(ref.fieldIds), _step5; !(_step5 = _iterator5()).done;) {
+      var fieldId = _step5.value;
       fieldIdDataMap.set(fieldId + "Id", dataMap);
     }
   }
-  var jsonText = JSON.stringify(data, function (key, value) {
-    if (value !== null && value !== void 0 && value.id) {
-      var _loop = function _loop() {
-        var fieldIdName = _Object$keys[_i];
-        var dataMap = fieldIdDataMap.get(fieldIdName);
-        if (dataMap) {
-          var fieldIdValue = value[fieldIdName];
-          var fieldValue = null;
-          if (Array.isArray(fieldIdValue)) {
-            fieldValue = fieldIdValue.map(function (id) {
-              return dataMap.get(id);
-            }).filter(function (v) {
-              return !!v;
-            });
-          } else if (typeof fieldIdValue == "string") {
-            fieldValue = dataMap.get(fieldIdValue);
+  //组装refs的关联属性
+  for (var _iterator2 = _createForOfIteratorHelperLoose(refs), _step2; !(_step2 = _iterator2()).done;) {
+    var _ref = _step2.value;
+    var key = _ref.form.id;
+    if (_ref.form.fieldId) {
+      key += "." + _ref.form.fieldId;
+    }
+    assembleAssociationFieldValue(_ref.data, fieldIdDataMap, key);
+  }
+  function loopAssembleAssociation(values) {
+    if (!Array.isArray(values)) {
+      if (values !== null && values !== void 0 && values.id) {
+        loopAssembleAssociation([values]);
+      }
+    }
+    if (Array.isArray(values)) {
+      var _values$;
+      if ((_values$ = values[0]) !== null && _values$ !== void 0 && _values$.id) {
+        assembleAssociationFieldValue(values, fieldIdDataMap);
+        //处理子表
+        for (var _iterator3 = _createForOfIteratorHelperLoose(values), _step3; !(_step3 = _iterator3()).done;) {
+          var value = _step3.value;
+          for (var _i = 0, _Object$values = Object.values(value); _i < _Object$values.length; _i++) {
+            var subValues = _Object$values[_i];
+            if (Array.isArray(subValues)) {
+              loopAssembleAssociation(subValues);
+            }
           }
-          value[fieldIdName.slice(0, -2)] = fieldValue;
         }
-      };
-      for (var _i = 0, _Object$keys = Object.keys(value); _i < _Object$keys.length; _i++) {
-        _loop();
       }
     }
-    return value;
-  });
-  return JSON.parse(jsonText);
+  }
+  loopAssembleAssociation(data);
+}
+function assembleAssociationFieldValue(data, fieldIdDataMap, prefixKey) {
+  var arrayData = [];
+  if (Array.isArray(data)) {
+    arrayData = data;
+  } else if (typeof data == "object") {
+    arrayData = [data];
+  }
+  for (var _iterator6 = _createForOfIteratorHelperLoose(arrayData), _step6; !(_step6 = _iterator6()).done;) {
+    var item = _step6.value;
+    var _loop = function _loop() {
+      var fieldIdName = _Object$keys[_i2];
+      var fieldIdKey = fieldIdName;
+      if (prefixKey) {
+        fieldIdKey = prefixKey + "." + fieldIdName;
+      }
+      var dataMap = fieldIdDataMap.get(fieldIdKey);
+      if (dataMap) {
+        var fieldIdValue = item[fieldIdName];
+        var fieldValue = null;
+        if (Array.isArray(fieldIdValue)) {
+          // @ts-ignore
+          fieldValue = fieldIdValue.map(function (id) {
+            return dataMap.get(id);
+          }).filter(function (v) {
+            return !!v;
+          });
+        } else if (typeof fieldIdValue == "string") {
+          fieldValue = dataMap.get(fieldIdValue);
+        }
+        item[fieldIdName.slice(0, -2)] = fieldValue;
+      }
+    };
+    for (var _i2 = 0, _Object$keys = Object.keys(item); _i2 < _Object$keys.length; _i2++) {
+      _loop();
+    }
+  }
 }

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

@@ -5,6 +5,8 @@ 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 _notification2 = _interopRequireDefault(require("antd/lib/notification"));
+var _modal = _interopRequireDefault(require("antd/lib/modal"));
 var _message2 = _interopRequireDefault(require("antd/lib/message"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _axios = _interopRequireDefault(require("axios"));
@@ -291,16 +293,57 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
   }();
   _proto.showError = /*#__PURE__*/function () {
     var _showError = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(type, msg) {
+      var _JSON$parse, _type, message;
       return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
+            _context7.prev = 0;
+            if (!msg) {
+              _context7.next = 16;
+              break;
+            }
+            _JSON$parse = JSON.parse(msg), _type = _JSON$parse.type, message = _JSON$parse.message;
+            if (!(_type == "message")) {
+              _context7.next = 8;
+              break;
+            }
+            _message2["default"].error({
+              type: "error",
+              content: message
+            });
+            return _context7.abrupt("return");
+          case 8:
+            if (!(_type == "modal")) {
+              _context7.next = 13;
+              break;
+            }
+            _modal["default"].error({
+              content: message
+            });
+            return _context7.abrupt("return");
+          case 13:
+            if (!(_type == "notification")) {
+              _context7.next = 16;
+              break;
+            }
+            _notification2["default"].error({
+              message: message
+            });
+            return _context7.abrupt("return");
+          case 16:
+            _context7.next = 20;
+            break;
+          case 18:
+            _context7.prev = 18;
+            _context7.t0 = _context7["catch"](0);
+          case 20:
             console.error("{" + this.title + "}" + type + (msg || ""));
             _message2["default"] === null || _message2["default"] === void 0 ? void 0 : _message2["default"].error("{" + this.title + "}" + type + (msg || "")).then();
-          case 2:
+          case 22:
           case "end":
             return _context7.stop();
         }
-      }, _callee7, this);
+      }, _callee7, this, [[0, 18]]);
     }));
     function showError(_x13, _x14) {
       return _showError.apply(this, arguments);

package/lib/utils/cache/schema.js

@@ -20,13 +20,25 @@ function _handleFormSchema() {
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          if (!(schema.type !== "form")) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return");
+        case 2:
+          if (schema !== null && schema !== void 0 && schema.componentName) {
+            _context.next = 4;
+            break;
+          }
+          return _context.abrupt("return");
+        case 4:
           fdmItems = [];
           fieldIdMap = new Map();
           schema.state = schema.state || {};
           schema.methods = schema.methods || {};
-          _context.next = 6;
+          _context.next = 10;
           return handleAssociationForm(schema);
-        case 6:
+        case 10:
           //初次处理
           forEachFormSchema(schema, function (field) {
             if (field.fdmSchema) {
@@ -73,7 +85,7 @@ function _handleFormSchema() {
               return true;
             });
           });
-        case 8:
+        case 12:
         case "end":
           return _context.stop();
       }
@@ -195,25 +207,11 @@ function _handleAssociationForm() {
                     depth1 = field.getFieldPaths().split(".").length;
                     depth2 = associationField.getFieldPaths().split(".").length;
                     attrField.props.fieldProps.associationDepth = depth1 - depth2;
-                    /*            findField.props.fieldProps.associationAttributes.push({
-                                    key: key,
-                                    value: associationAttribute?.[1]
-                                })
-                                console.log(field.getFieldPaths())
-                                //向关联表单中注册关联属性填充 结束
-                                //设置关联属性默认值 开始
-                                let keys = field.getFieldPaths().split(".");
-                                keys.pop();
-                                attrField.props.fieldProps.associationDepth = keys.length;
-                                if (keys.length > 0) {
-                                    keys = keys.map(item => "parent");
-                                    keys.push(associationAttribute[0])
-                                    keys.push(associationAttribute[1])
-                                    attrField.props.defaultValue = {
-                                        "type": "express",
-                                        "value": keys.join("?.")
-                                    }
-                                }*/
+                    findField.props.fieldProps.associationAttributes.push({
+                      key: field.getFieldPaths(),
+                      value: associationAttribute === null || associationAttribute === void 0 ? void 0 : associationAttribute[1]
+                    });
+                    //向关联表单中注册关联属性填充 结束
                   }
                   //设置关联属性默认值 结束
                 case 18:

package/lib/utils/page/page-form-data-manager.d.ts

@@ -1,5 +1,5 @@
 import { PageLayoutType } from "./page-layout";
-export declare type PageFormDataManagerModeType = "dataManager" | "selectOne" | "selectMore";
+export declare type PageFormDataManagerModeType = "associationField" | "dataManager" | "selectOne" | "selectMore";
 export interface ShowPageFormDataManagerProps {
     container?: HTMLDivElement;
     layout?: PageLayoutType;
@@ -8,6 +8,12 @@ export interface ShowPageFormDataManagerProps {
         fieldId?: string;
     };
     mode?: PageFormDataManagerModeType;
+    extraProps?: any;
     onClose?: () => void | Promise<void>;
+    onSearch?: (params: any[]) => void | Promise<void>;
+    onLoadData?: (response: {
+        data: any[];
+        total: number;
+    }) => void | Promise<void>;
 }
-export declare function showFormDataManager(options: ShowPageFormDataManagerProps): Promise<unknown>;
+export declare function showFormDataManager(options: ShowPageFormDataManagerProps): Promise<any | any[]>;

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

@@ -29,7 +29,7 @@ function _showFormDataManager() {
         case 0:
           return _context3.abrupt("return", new Promise( /*#__PURE__*/function () {
             var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(resolve, reject) {
-              var container, onClose, restProps, unmount, _options$form, paths, mode, params, url, page;
+              var container, onClose, restProps, unmount, _options$form, paths, mode, _params, url, page;
               return _regenerator["default"].wrap(function _callee2$(_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
@@ -45,8 +45,8 @@ function _showFormDataManager() {
                     }
                     paths = window.location.pathname.split("/");
                     mode = options.mode;
-                    params = new URLSearchParams();
-                    url = "/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + params.toString();
+                    _params = new URLSearchParams();
+                    url = "/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + _params.toString();
                     _context2.next = 10;
                     return (0, _index.openPage)(url, url);
                   case 10:
@@ -66,18 +66,19 @@ function _showFormDataManager() {
                           while (1) switch (_context.prev = _context.next) {
                             case 0:
                               resolve(null);
+                              setTimeout(function () {
+                                _reactDom["default"].unmountComponentAtNode(container);
+                              }, 10);
                               if (unmount) {
                                 //等待动画结束
                                 setTimeout(function () {
                                   var _container;
-                                  //取消挂载
-                                  _reactDom["default"].unmountComponentAtNode(container);
                                   //移除
                                   (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
-                                }, 1000);
+                                }, 100);
                               }
                               onClose === null || onClose === void 0 ? void 0 : onClose();
-                            case 3:
+                            case 4:
                             case "end":
                               return _context.stop();
                           }
@@ -123,8 +124,9 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       onSelectOk = _this$props.onSelectOk,
       onClose = _this$props.onClose,
       restProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded);
+
     // @ts-ignore
-    restProps.layout = layout || "drawer";
+    restProps.layout = layout || "modal";
     // @ts-ignore
     restProps.onClose = function () {
       var _self$layoutRef;

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

@@ -25,9 +25,11 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
       return Math.min(window.innerWidth, 1440);
     };
     _this.handleResize = function () {
-      _this.setState({
-        width: _this.getWith()
-      });
+      if (_this.props.layout == "drawer") {
+        _this.setState({
+          width: _this.getWith()
+        });
+      }
     };
     _this.state.width = _this.getWith();
     return _this;
@@ -51,6 +53,7 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
       onClose: this.close,
       footer: false,
       closable: false,
+      style: {},
       styles: {
         header: {
           display: "none"
@@ -65,6 +68,8 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
       maskClosable: false
     };
     if (layout == "modal") {
+      restProps.style.top = 64;
+      restProps.styles.body.maxHeight = "calc(100vh - 180px)";
       return /*#__PURE__*/_react["default"].createElement(_modal["default"], restProps, children);
     } else if (layout == "drawer") {
       return /*#__PURE__*/_react["default"].createElement(_drawer["default"], restProps, children);

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

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

package/package.json

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