@zhubangyun/lowcode-core 5.8.110 → 5.8.290

package/es/utils/cache/schema.js

@@ -1,4 +1,3 @@
-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."); }
@@ -9,32 +8,25 @@ export function handleFormSchema(_x) {
   return _handleFormSchema.apply(this, arguments);
 }
 
-//处理关联表单
+/**
+ * 处理数据管理关联属性
+ * @param rootSchema
+ * @param fdmSchema
+ */
 function _handleFormSchema() {
   _handleFormSchema = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(schema) {
-    var fdmItems, fieldIdMap;
+    var formFieldSchema, fdmItems, fieldIdMap, _i, _fdmItems, fdmField;
     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:
+          formFieldSchema = new FormFieldSchema(schema.children[0], null);
           fdmItems = [];
           fieldIdMap = new Map();
           schema.state = schema.state || {};
           schema.methods = schema.methods || {};
-          _context.next = 10;
-          return handleAssociationForm(schema);
-        case 10:
+          _context.next = 7;
+          return handleAssociationForm(formFieldSchema, schema);
+        case 7:
           //初次处理
           forEachFormSchema(schema, function (field) {
             if (field.fdmSchema) {
@@ -43,7 +35,6 @@ function _handleFormSchema() {
               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%";
-              field.fdmSchema.props.label = field.props.label;
             }
             if (field.props.fieldId) {
               //删除children防止循环
@@ -55,33 +46,57 @@ function _handleFormSchema() {
           });
 
           //处理查询列
-          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;
-                  }
+          _i = 0, _fdmItems = fdmItems;
+        case 9:
+          if (!(_i < _fdmItems.length)) {
+            _context.next = 17;
+            break;
+          }
+          fdmField = _fdmItems[_i];
+          _context.next = 13;
+          return handleFdmAssociationAttributeFields(formFieldSchema, fdmField.fdmSchema);
+        case 13:
+          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;
+                  field.children = field.children.filter(function (item) {
+                    return !item.props.hideInSubTable;
+                  });
+                  //处理子列隐藏
+                  forEachFormSchema(field, function (subField) {
+                    if (Array.isArray(subField.children)) {
+                      subField.children = subField.children.filter(function (item) {
+                        return !item.props.hideInSubTable;
+                      });
+                    }
+                    return true;
+                  });
                 }
               }
-              return true;
-            });
+            }
+            return true;
           });
-        case 12:
+        case 14:
+          _i++;
+          _context.next = 9;
+          break;
+        case 17:
         case "end":
           return _context.stop();
       }
@@ -89,159 +104,204 @@ function _handleFormSchema() {
   }));
   return _handleFormSchema.apply(this, arguments);
 }
-function handleAssociationForm(_x2) {
+function handleFdmAssociationAttributeFields(_x2, _x3) {
+  return _handleFdmAssociationAttributeFields.apply(this, arguments);
+} //处理关联表单
+function _handleFdmAssociationAttributeFields() {
+  _handleFdmAssociationAttributeFields = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(rootSchema, fdmSchema) {
+    var associationAttributeFields, _i2, _associationAttribute, _attrField$props, attrField, associationAttribute, cloneSchema;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          //关联属性
+          associationAttributeFields = [];
+          forEachFormSchema(fdmSchema, function (field) {
+            if (field.componentName == "FdmAssociationFieldColumn") {
+              associationAttributeFields.push(field);
+            }
+            return true;
+          });
+          _i2 = 0, _associationAttribute = associationAttributeFields;
+        case 3:
+          if (!(_i2 < _associationAttribute.length)) {
+            _context2.next = 13;
+            break;
+          }
+          attrField = _associationAttribute[_i2];
+          associationAttribute = (_attrField$props = attrField.props) === null || _attrField$props === void 0 ? void 0 : _attrField$props.associationAttribute;
+          _context2.next = 8;
+          return cloneAssociationAttributeFieldSchema(rootSchema, associationAttribute);
+        case 8:
+          cloneSchema = _context2.sent;
+          if (cloneSchema) {
+            //向关联属性中注册 fieldSchema 架构会将 associationAttributeField schema 转换成 jsx
+            attrField.componentName = cloneSchema.componentName;
+            attrField.props = Object.assign({}, JSON.parse(JSON.stringify(cloneSchema.props)), attrField.props);
+            attrField.props.fieldId = associationAttribute.join(".");
+          }
+        case 10:
+          _i2++;
+          _context2.next = 3;
+          break;
+        case 13:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _handleFdmAssociationAttributeFields.apply(this, arguments);
+}
+function handleAssociationForm(_x4, _x5) {
   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) {
+  _handleAssociationForm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(rootSchema, schema) {
+    var associationAttributeFields, _i3, _associationAttribute2, _attrField$props2, _attrField$props2$fie, attrField, associationAttribute, cloneSchema;
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.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 = [];
+          //关联属性
+          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, associationField, depth1, depth2;
-            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);
-                  associationField = rootSchema.findFieldById(associationAttribute[0]);
-                  if (field && associationField) {
-                    depth1 = field.getFieldPaths().split(".").length;
-                    depth2 = associationField.getFieldPaths().split(".").length;
-                    attrField.props.fieldProps.associationDepth = depth1 - depth2;
-                    findField.props.fieldProps.associationAttributes.push({
-                      key: field.getFieldPaths(),
-                      value: associationAttribute === null || associationAttribute === void 0 ? void 0 : associationAttribute[1]
-                    });
-                    //向关联表单中注册关联属性填充 结束
-                  }
-                  //设置关联属性默认值 结束
-                case 18:
-                case "end":
-                  return _context2.stop();
-              }
-            }, _loop);
-          });
-          _i = 0, _associationAttribute = associationAttributeFields;
-        case 10:
-          if (!(_i < _associationAttribute.length)) {
-            _context4.next = 18;
+          _i3 = 0, _associationAttribute2 = associationAttributeFields;
+        case 3:
+          if (!(_i3 < _associationAttribute2.length)) {
+            _context3.next = 13;
             break;
           }
-          return _context4.delegateYield(_loop(), "t0", 12);
-        case 12:
-          _ret = _context4.t0;
-          if (!_ret) {
-            _context4.next = 15;
-            break;
+          attrField = _associationAttribute2[_i3];
+          associationAttribute = (_attrField$props2 = attrField.props) === null || _attrField$props2 === void 0 ? void 0 : (_attrField$props2$fie = _attrField$props2.fieldProps) === null || _attrField$props2$fie === void 0 ? void 0 : _attrField$props2$fie.associationAttribute;
+          _context3.next = 8;
+          return cloneAssociationAttributeFieldSchema(rootSchema, associationAttribute);
+        case 8:
+          cloneSchema = _context3.sent;
+          if (cloneSchema) {
+            //向关联属性中注册 fieldSchema 架构会将 associationAttributeField schema 转换成 jsx
+            attrField.props.fieldProps.associationAttributeField = cloneSchema;
           }
-          return _context4.abrupt("return", _ret.v);
-        case 15:
-          _i++;
-          _context4.next = 10;
+        case 10:
+          _i3++;
+          _context3.next = 3;
           break;
-        case 18:
+        case 13:
         case "end":
-          return _context4.stop();
+          return _context3.stop();
       }
     }, _callee3);
   }));
   return _handleAssociationForm.apply(this, arguments);
 }
+function cloneAssociationAttributeFieldSchema(_x6, _x7) {
+  return _cloneAssociationAttributeFieldSchema.apply(this, arguments);
+}
+function _cloneAssociationAttributeFieldSchema() {
+  _cloneAssociationAttributeFieldSchema = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(rootSchema, associationAttribute) {
+    var associationFormSchema;
+    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          if (Array.isArray(associationAttribute)) {
+            _context4.next = 2;
+            break;
+          }
+          return _context4.abrupt("return", null);
+        case 2:
+          _context4.next = 4;
+          return getSchemaByAssociationFieldId(rootSchema, associationAttribute === null || associationAttribute === void 0 ? void 0 : associationAttribute[0]);
+        case 4:
+          associationFormSchema = _context4.sent;
+          if (!associationFormSchema) {
+            _context4.next = 7;
+            break;
+          }
+          return _context4.abrupt("return", findFieldSchema(associationFormSchema, associationAttribute === null || associationAttribute === void 0 ? void 0 : associationAttribute[1]));
+        case 7:
+          return _context4.abrupt("return", null);
+        case 8:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return _cloneAssociationAttributeFieldSchema.apply(this, arguments);
+}
+function getSchemaByAssociationFieldId(_x8, _x9) {
+  return _getSchemaByAssociationFieldId.apply(this, arguments);
+}
+/**
+ * 从schema中查找field
+ * @param schema
+ * @param fieldId
+ */
+function _getSchemaByAssociationFieldId() {
+  _getSchemaByAssociationFieldId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(rootSchema, associationFieldId) {
+    var lastFieldId, associationFormSchema, _findAssociationField, _findAssociationField2, _findAssociationField3, findAssociationField, formId;
+    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          if (associationFieldId) {
+            _context5.next = 2;
+            break;
+          }
+          return _context5.abrupt("return", null);
+        case 2:
+          lastFieldId = associationFieldId.split(".").pop();
+          associationFormSchema = null;
+          if (!(lastFieldId == "parent")) {
+            _context5.next = 8;
+            break;
+          }
+          associationFormSchema = rootSchema.schema;
+          _context5.next = 15;
+          break;
+        case 8:
+          findAssociationField = findFieldSchema(rootSchema.schema, lastFieldId);
+          formId = findAssociationField === null || findAssociationField === void 0 ? void 0 : (_findAssociationField = findAssociationField.props) === null || _findAssociationField === void 0 ? void 0 : (_findAssociationField2 = _findAssociationField.fieldProps) === null || _findAssociationField2 === void 0 ? void 0 : (_findAssociationField3 = _findAssociationField2.associationForm) === null || _findAssociationField3 === void 0 ? void 0 : _findAssociationField3.id;
+          if (formId) {
+            _context5.next = 12;
+            break;
+          }
+          return _context5.abrupt("return", null);
+        case 12:
+          _context5.next = 14;
+          return utils.api.getSchema(formId);
+        case 14:
+          associationFormSchema = _context5.sent.data;
+        case 15:
+          return _context5.abrupt("return", associationFormSchema);
+        case 16:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  }));
+  return _getSchemaByAssociationFieldId.apply(this, arguments);
+}
+function findFieldSchema(schema, fieldId) {
+  var associationAttributeField = null;
+  forEachFormSchema(schema, function (field) {
+    if (field.props.fieldId == fieldId) {
+      //深拷贝
+      associationAttributeField = JSON.parse(JSON.stringify(field));
+      return false;
+    }
+    return true;
+  });
+  return associationAttributeField;
+}
+
+/**
+ * 遍历schema
+ * @param schema
+ * @param callback 返回true 继续往下遍历
+ */
 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) {
@@ -301,4 +361,36 @@ var FormFieldSchema = /*#__PURE__*/function () {
     }).join(".");
   };
   return FormFieldSchema;
-}();
+}();
+export function getAdminFormSchema(_x10) {
+  return _getAdminFormSchema.apply(this, arguments);
+}
+function _getAdminFormSchema() {
+  _getAdminFormSchema = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(id) {
+    var res, schema;
+    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          _context6.next = 2;
+          return utils.api.getSchema(id, true);
+        case 2:
+          res = _context6.sent;
+          if (!res.success) {
+            _context6.next = 8;
+            break;
+          }
+          schema = JSON.parse(JSON.stringify(res.data));
+          _context6.next = 7;
+          return handleFormSchema(schema);
+        case 7:
+          return _context6.abrupt("return", schema);
+        case 8:
+          return _context6.abrupt("return", null);
+        case 9:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  }));
+  return _getAdminFormSchema.apply(this, arguments);
+}

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

@@ -61,7 +61,7 @@ function _loadMaterials() {
           }
           return _context2.abrupt("return");
         case 3:
-          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"];
+          urls = ["prop-types/15.8.1/prop-types.min.js", "lodash/4.17.15/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 = 6;
           return (0, _common.loadPlugins)(urls.map(function (url) {
             return "https://cdn.zhiyunhe.com/plugin/" + url;

package/lib/style.js

@@ -1,3 +1,4 @@
+require('antd/lib/typography/style');
 require('antd/lib/notification/style');
 require('antd/lib/modal/style');
 require('antd/lib/message/style');

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

@@ -9,7 +9,7 @@ export declare class RestFormApi<DataType> extends RestApi<DataType> {
     constructor(formId: string, fieldId?: string, mock?: boolean);
     initialize(): Promise<boolean>;
     handleRequestConfig(config: AxiosRequestConfig): Promise<void>;
-    search(params?: RestSearchParams): Promise<ManyResult<DataType>>;
+    search(searchParams?: RestSearchParams): Promise<ManyResult<DataType>>;
     getById(id: string, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
     save(data: DataType, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
     create(data: DataType, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;

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

@@ -28,7 +28,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   _proto.initialize = /*#__PURE__*/function () {
     var _initialize = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _this2 = this;
-      var _this$schema$props, res;
+      var _this$schema$children, _this$schema$children2, res;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -45,7 +45,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             res = _context.sent;
             this.schema = res.data;
             this.initialized = !!this.schema;
-            this.title = (_this$schema$props = this.schema.props) === null || _this$schema$props === void 0 ? void 0 : _this$schema$props.label;
+            this.title = (_this$schema$children = this.schema.children[0]) === null || _this$schema$children === void 0 ? void 0 : (_this$schema$children2 = _this$schema$children.props) === null || _this$schema$children2 === void 0 ? void 0 : _this$schema$children2.label;
             if (this.fieldId) {
               JSON.stringify(this.schema, function (key, value) {
                 var _value$props;
@@ -113,13 +113,13 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
     return handleRequestConfig;
   }();
   _proto.search = /*#__PURE__*/function () {
-    var _search = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(params) {
-      var _params, _params2;
-      var config, res;
+    var _search = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(searchParams) {
+      var _searchParams, _searchParams2;
+      var config, res, start;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            params = params || {};
+            searchParams = searchParams || {};
             config = {
               params: {
                 description: this.title + "\u67E5\u8BE2",
@@ -130,19 +130,21 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             _context3.next = 4;
             return this.handleRequestConfig(config);
           case 4:
-            params.filterRules = (0, _formApi.handleFilterRules)(((_params = params) === null || _params === void 0 ? void 0 : _params.filterRules) || [], {
+            searchParams.filterRules = (0, _formApi.handleFilterRules)(((_searchParams = searchParams) === null || _searchParams === void 0 ? void 0 : _searchParams.filterRules) || [], {
               filterNullValue: false
             });
-            params.searchFields = (0, _formApi.handleFilterRules)(((_params2 = params) === null || _params2 === void 0 ? void 0 : _params2.searchFields) || [], {
+            searchParams.searchFields = (0, _formApi.handleFilterRules)(((_searchParams2 = searchParams) === null || _searchParams2 === void 0 ? void 0 : _searchParams2.searchFields) || [], {
               filterNullValue: true
             });
             _context3.next = 8;
-            return this.request.post("search", params, config);
+            return this.request.post("search", searchParams, config);
           case 8:
             res = _context3.sent;
+            start = Date.now();
             (0, _formApi.assembleAssociationField)(res.data, res.refs);
+            console.debug("form.search:" + (Date.now() - start), res);
             return _context3.abrupt("return", res);
-          case 11:
+          case 13:
           case "end":
             return _context3.stop();
         }
@@ -155,7 +157,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   }();
   _proto.getById = /*#__PURE__*/function () {
     var _getById = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(id, options) {
-      var res;
+      var res, start;
       return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -163,10 +165,11 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             return _RestApi.prototype.getById.call(this, id, options);
           case 2:
             res = _context4.sent;
+            start = Date.now();
             (0, _formApi.assembleAssociationField)(res.data, res.refs);
-            console.debug("formApi.getById", res);
+            console.debug("formApi.getById" + (Date.now() - start), res);
             return _context4.abrupt("return", res);
-          case 6:
+          case 7:
           case "end":
             return _context4.stop();
         }

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

@@ -1,7 +1,8 @@
 import { BaseType, FilterRule, Refs } from "./rest-api";
 export declare function convertSaveData(data: any): any;
+export declare function assembleAssociationFieldV2(data: BaseType | BaseType[], refs?: Refs): void;
+export declare function assembleAssociationFieldDataV2(data: BaseType | BaseType[], dataMap: Map<string, BaseType>): void;
 export declare function assembleAssociationField(data: BaseType | BaseType[], refs?: Refs): void;
-export declare function assembleAssociationFieldValue(data: BaseType | BaseType[], fieldIdDataMap: Map<string, Map<string, BaseType>>, prefixKey?: string): void;
 export declare function handleFilterRules(filters: FilterRule[], options: {
     filterNullValue: boolean;
-}): any;
+}): FilterRule[];