@zhubangyun/lowcode-core 5.6.191 → 5.6.211

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

@@ -1,4 +1,4 @@
-import { RestApi } from "./rest-api";
+import { BaseRequestOptions, ManyResult, OneResult, RestApi, RestSearchParams } from "./rest-api";
 import { AxiosRequestConfig } from "axios";
 export declare class RestFormApi<DataType> extends RestApi<DataType> {
     private readonly formId;
@@ -9,4 +9,9 @@ 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>>;
+    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>>;
+    update(id: string, data: DataType, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
 }

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

@@ -1,5 +1,8 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
+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 _regeneratorRuntime from "@babel/runtime/regenerator";
 import { RestApi } from "./rest-api";
 import { getSchema } from "./index";
@@ -105,5 +108,154 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
     }
     return handleRequestConfig;
   }();
+  _proto.search = /*#__PURE__*/function () {
+    var _search = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(params) {
+      var res;
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return _RestApi.prototype.search.call(this, params);
+          case 2:
+            res = _context3.sent;
+            res.data = assembleAssociationField(res.data, res.refs);
+            return _context3.abrupt("return", res);
+          case 5:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, this);
+    }));
+    function search(_x2) {
+      return _search.apply(this, arguments);
+    }
+    return search;
+  }();
+  _proto.getById = /*#__PURE__*/function () {
+    var _getById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(id, options) {
+      var res;
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            _context4.next = 2;
+            return _RestApi.prototype.getById.call(this, id, options);
+          case 2:
+            res = _context4.sent;
+            res.data = assembleAssociationField(res.data, res.refs);
+            return _context4.abrupt("return", res);
+          case 5:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4, this);
+    }));
+    function getById(_x3, _x4) {
+      return _getById.apply(this, arguments);
+    }
+    return getById;
+  }();
+  _proto.save = /*#__PURE__*/function () {
+    var _save = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(data, options) {
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            return _context5.abrupt("return", _RestApi.prototype.save.call(this, convertSaveData(data), options));
+          case 1:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5, this);
+    }));
+    function save(_x5, _x6) {
+      return _save.apply(this, arguments);
+    }
+    return save;
+  }();
+  _proto.create = /*#__PURE__*/function () {
+    var _create = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(data, options) {
+      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            return _context6.abrupt("return", _RestApi.prototype.create.call(this, convertSaveData(data), options));
+          case 1:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6, this);
+    }));
+    function create(_x7, _x8) {
+      return _create.apply(this, arguments);
+    }
+    return create;
+  }();
+  _proto.update = /*#__PURE__*/function () {
+    var _update = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(id, data, options) {
+      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
+          case 0:
+            return _context7.abrupt("return", _RestApi.prototype.update.call(this, id, convertSaveData(data), options));
+          case 1:
+          case "end":
+            return _context7.stop();
+        }
+      }, _callee7, this);
+    }));
+    function update(_x9, _x10, _x11) {
+      return _update.apply(this, arguments);
+    }
+    return update;
+  }();
   return RestFormApi;
-}(RestApi);
+}(RestApi);
+function convertSaveData(data) {
+  if (!data) return data;
+  return JSON.parse(JSON.stringify(data, function (key, value) {
+    if (key == "parent") {
+      return value === null || value === void 0 ? void 0 : value.id;
+    }
+    return value;
+  }));
+}
+function assembleAssociationField(data, refs) {
+  if (!data || !refs) return;
+  var fieldIdDataMap = new Map();
+  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;
+      dataMap.set(datum.id, datum);
+    }
+    for (var _iterator3 = _createForOfIteratorHelperLoose(ref.fieldIds), _step3; !(_step3 = _iterator3()).done;) {
+      var fieldId = _step3.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);
+          }
+          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);
+}

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

@@ -87,7 +87,17 @@ export interface BaseType {
 export interface BaseResult<DataType> {
     success: boolean;
     message?: string;
+    refs?: Refs;
 }
+export interface Ref {
+    form: {
+        id: string;
+        fieldId?: string;
+    };
+    fieldIds: string[];
+    data: BaseType[];
+}
+export declare type Refs = Ref[];
 export interface OneResult<DataType> extends BaseResult<DataType> {
     data: DataType & BaseType;
 }

package/es/utils/cache/schema.js

@@ -141,7 +141,7 @@ function _handleAssociationForm() {
           //处理关联属性 赋值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;
+            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:
@@ -185,31 +185,33 @@ function _handleAssociationForm() {
                   //向关联表单中注册关联属性填充 开始
                   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);
-                    }
+                  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: 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("?.")
+                                    }
+                                }*/
                   }
                   //设置关联属性默认值 结束
-                case 17:
+                case 18:
                 case "end":
                   return _context2.stop();
               }

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

@@ -1,4 +1,5 @@
 export { showForm } from "./page-form";
+export { showFormDataManager } from "./page-form-data-manager";
 export declare function showLoading(): Promise<void>;
 export declare function hideLoading(): Promise<void>;
 export declare function openPage(url: string, target?: string): Promise<any>;

package/es/utils/page/index.js

@@ -1,6 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 export { showForm } from "./page-form";
+export { showFormDataManager } from "./page-form-data-manager";
 var timerRef;
 function debounceHide() {
   if (timerRef) {

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

@@ -0,0 +1,15 @@
+import { PageLayoutType } from "./page-layout";
+export declare type PageFormDataManagerModeType = "dataManager" | "selectOne" | "selectMore";
+export interface ShowPageFormDataManagerProps {
+    container?: HTMLDivElement;
+    layout?: PageLayoutType;
+    form?: {
+        id: string;
+        fieldId?: string;
+    };
+    mode?: PageFormDataManagerModeType;
+    onSubmitOk?: () => void;
+    onRemoveOk?: () => void;
+    onClose?: () => void | Promise<void>;
+}
+export declare function showFormDataManager(options: ShowPageFormDataManagerProps): Promise<void>;

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

@@ -0,0 +1,132 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+var _excluded = ["layout", "form", "onClose"],
+  _excluded2 = ["container", "onClose"];
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { PageLayout } from "./page-layout";
+import ReactDOM from "react-dom";
+import React, { Component } from "react";
+import { PageLoadSchema } from "./page-load-schema";
+import { ReactRender } from "../../components/react-render";
+import { openPage } from "./index";
+import { forEachFormSchema } from "../cache/schema";
+export function showFormDataManager(_x) {
+  return _showFormDataManager.apply(this, arguments);
+}
+function _showFormDataManager() {
+  _showFormDataManager = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(options) {
+    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:
+          container = options.container, onClose = options.onClose, restProps = _objectWithoutPropertiesLoose(options, _excluded2); //容器不存在需要手动取消挂载
+          unmount = !container;
+          if (container) {
+            _context2.next = 15;
+            break;
+          }
+          if (!(options.layout == "page")) {
+            _context2.next = 13;
+            break;
+          }
+          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();
+          _context2.next = 10;
+          return openPage(url, url);
+        case 10:
+          page = _context2.sent;
+          console.debug("openPage", page);
+          return _context2.abrupt("return");
+        case 13:
+          container = document.createElement("div");
+          document.body.append(container);
+        case 15:
+          ReactDOM.render( /*#__PURE__*/React.createElement(FormRender, _extends({}, restProps, {
+            onClose: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+              return _regeneratorRuntime.wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    if (unmount) {
+                      //等待动画结束
+                      setTimeout(function () {
+                        var _container;
+                        //取消挂载
+                        ReactDOM.unmountComponentAtNode(container);
+                        //移除
+                        (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
+                      }, 1000);
+                    }
+                    onClose === null || onClose === void 0 ? void 0 : onClose();
+                  case 2:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            }))
+          })), container);
+        case 16:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _showFormDataManager.apply(this, arguments);
+}
+var FormRender = /*#__PURE__*/function (_Component) {
+  function FormRender() {
+    var _this;
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _Component.call.apply(_Component, [this].concat(args)) || this;
+    _this.layoutRef = void 0;
+    return _this;
+  }
+  _inheritsLoose(FormRender, _Component);
+  var _proto = FormRender.prototype;
+  _proto.render = function render() {
+    var _this2 = this;
+    var self = this;
+    var _this$props = this.props,
+      layout = _this$props.layout,
+      form = _this$props.form,
+      onClose = _this$props.onClose,
+      restProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
+    // @ts-ignore
+    restProps.layout = layout || "drawer";
+    // @ts-ignore
+    restProps.onClose = function () {
+      var _self$layoutRef;
+      (_self$layoutRef = self.layoutRef) === null || _self$layoutRef === void 0 ? void 0 : _self$layoutRef.close();
+      onClose === null || onClose === void 0 ? void 0 : onClose();
+    };
+    return /*#__PURE__*/React.createElement(PageLayout, {
+      layout: layout,
+      ref: function ref(layout) {
+        return _this2.layoutRef = layout;
+      }
+    }, /*#__PURE__*/React.createElement(PageLoadSchema, {
+      pageId: form === null || form === void 0 ? void 0 : form.id
+    }, function (schema) {
+      var fdmSchema = schema.children[0].fdmSchema;
+      if (form !== null && form !== void 0 && form.fieldId) {
+        forEachFormSchema(schema, function (field) {
+          if (form.fieldId == field.props.fieldId) {
+            fdmSchema = field.fdmSchema;
+            return false;
+          }
+          return true;
+        });
+      }
+      return /*#__PURE__*/React.createElement(ReactRender, _extends({
+        schema: schema,
+        components: window._components || window.components || window.__components
+      }, restProps));
+    }));
+  };
+  return FormRender;
+}(Component);

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

@@ -1,4 +1,4 @@
-import { RestApi } from "./rest-api";
+import { BaseRequestOptions, ManyResult, OneResult, RestApi, RestSearchParams } from "./rest-api";
 import { AxiosRequestConfig } from "axios";
 export declare class RestFormApi<DataType> extends RestApi<DataType> {
     private readonly formId;
@@ -9,4 +9,9 @@ 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>>;
+    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>>;
+    update(id: string, data: DataType, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
 }

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

@@ -8,6 +8,9 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _restApi = require("./rest-api");
 var _index = 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; }
 var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   function RestFormApi(formId, fieldId, mock) {
     var _this;
@@ -110,5 +113,154 @@ 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 res;
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return _RestApi.prototype.search.call(this, params);
+          case 2:
+            res = _context3.sent;
+            res.data = assembleAssociationField(res.data, res.refs);
+            return _context3.abrupt("return", res);
+          case 5:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, this);
+    }));
+    function search(_x2) {
+      return _search.apply(this, arguments);
+    }
+    return search;
+  }();
+  _proto.getById = /*#__PURE__*/function () {
+    var _getById = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(id, options) {
+      var res;
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            _context4.next = 2;
+            return _RestApi.prototype.getById.call(this, id, options);
+          case 2:
+            res = _context4.sent;
+            res.data = assembleAssociationField(res.data, res.refs);
+            return _context4.abrupt("return", res);
+          case 5:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4, this);
+    }));
+    function getById(_x3, _x4) {
+      return _getById.apply(this, arguments);
+    }
+    return getById;
+  }();
+  _proto.save = /*#__PURE__*/function () {
+    var _save = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(data, options) {
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            return _context5.abrupt("return", _RestApi.prototype.save.call(this, convertSaveData(data), options));
+          case 1:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5, this);
+    }));
+    function save(_x5, _x6) {
+      return _save.apply(this, arguments);
+    }
+    return save;
+  }();
+  _proto.create = /*#__PURE__*/function () {
+    var _create = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(data, options) {
+      return _regenerator["default"].wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            return _context6.abrupt("return", _RestApi.prototype.create.call(this, convertSaveData(data), options));
+          case 1:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6, this);
+    }));
+    function create(_x7, _x8) {
+      return _create.apply(this, arguments);
+    }
+    return create;
+  }();
+  _proto.update = /*#__PURE__*/function () {
+    var _update = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(id, data, options) {
+      return _regenerator["default"].wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
+          case 0:
+            return _context7.abrupt("return", _RestApi.prototype.update.call(this, id, convertSaveData(data), options));
+          case 1:
+          case "end":
+            return _context7.stop();
+        }
+      }, _callee7, this);
+    }));
+    function update(_x9, _x10, _x11) {
+      return _update.apply(this, arguments);
+    }
+    return update;
+  }();
   return RestFormApi;
-}(_restApi.RestApi);
+}(_restApi.RestApi);
+function convertSaveData(data) {
+  if (!data) return data;
+  return JSON.parse(JSON.stringify(data, function (key, value) {
+    if (key == "parent") {
+      return value === null || value === void 0 ? void 0 : value.id;
+    }
+    return value;
+  }));
+}
+function assembleAssociationField(data, refs) {
+  if (!data || !refs) return;
+  var fieldIdDataMap = new Map();
+  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;
+      dataMap.set(datum.id, datum);
+    }
+    for (var _iterator3 = _createForOfIteratorHelperLoose(ref.fieldIds), _step3; !(_step3 = _iterator3()).done;) {
+      var fieldId = _step3.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);
+          }
+          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);
+}

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

@@ -87,7 +87,17 @@ export interface BaseType {
 export interface BaseResult<DataType> {
     success: boolean;
     message?: string;
+    refs?: Refs;
 }
+export interface Ref {
+    form: {
+        id: string;
+        fieldId?: string;
+    };
+    fieldIds: string[];
+    data: BaseType[];
+}
+export declare type Refs = Ref[];
 export interface OneResult<DataType> extends BaseResult<DataType> {
     data: DataType & BaseType;
 }

package/lib/utils/cache/schema.js

@@ -145,7 +145,7 @@ function _handleAssociationForm() {
           //处理关联属性 赋值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;
+            var attrField, associationAttribute, findField, associationForm, associationFormSchema, associationAttributeField, field, associationField, depth1, depth2;
             return _regenerator["default"].wrap(function _loop$(_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
@@ -189,31 +189,33 @@ function _handleAssociationForm() {
                   //向关联表单中注册关联属性填充 开始
                   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);
-                    }
+                  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: 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("?.")
+                                    }
+                                }*/
                   }
                   //设置关联属性默认值 结束
-                case 17:
+                case 18:
                 case "end":
                   return _context2.stop();
               }

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

@@ -1,4 +1,5 @@
 export { showForm } from "./page-form";
+export { showFormDataManager } from "./page-form-data-manager";
 export declare function showLoading(): Promise<void>;
 export declare function hideLoading(): Promise<void>;
 export declare function openPage(url: string, target?: string): Promise<any>;

package/lib/utils/page/index.js

@@ -5,12 +5,14 @@ exports.__esModule = true;
 exports.closePage = closePage;
 exports.hideLoading = hideLoading;
 exports.openPage = openPage;
-exports.showForm = void 0;
+exports.showFormDataManager = exports.showForm = void 0;
 exports.showLoading = showLoading;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _pageForm = require("./page-form");
 exports.showForm = _pageForm.showForm;
+var _pageFormDataManager = require("./page-form-data-manager");
+exports.showFormDataManager = _pageFormDataManager.showFormDataManager;
 var timerRef;
 function debounceHide() {
   if (timerRef) {

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

@@ -0,0 +1,15 @@
+import { PageLayoutType } from "./page-layout";
+export declare type PageFormDataManagerModeType = "dataManager" | "selectOne" | "selectMore";
+export interface ShowPageFormDataManagerProps {
+    container?: HTMLDivElement;
+    layout?: PageLayoutType;
+    form?: {
+        id: string;
+        fieldId?: string;
+    };
+    mode?: PageFormDataManagerModeType;
+    onSubmitOk?: () => void;
+    onRemoveOk?: () => void;
+    onClose?: () => void | Promise<void>;
+}
+export declare function showFormDataManager(options: ShowPageFormDataManagerProps): Promise<void>;

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

@@ -0,0 +1,139 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.showFormDataManager = showFormDataManager;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _pageLayout = require("./page-layout");
+var _reactDom = _interopRequireDefault(require("react-dom"));
+var _react = _interopRequireWildcard(require("react"));
+var _pageLoadSchema = require("./page-load-schema");
+var _reactRender = require("../../components/react-render");
+var _index = require("./index");
+var _schema = require("../cache/schema");
+var _excluded = ["layout", "form", "onClose"],
+  _excluded2 = ["container", "onClose"];
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function showFormDataManager(_x) {
+  return _showFormDataManager.apply(this, arguments);
+}
+function _showFormDataManager() {
+  _showFormDataManager = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(options) {
+    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:
+          container = options.container, onClose = options.onClose, restProps = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded2); //容器不存在需要手动取消挂载
+          unmount = !container;
+          if (container) {
+            _context2.next = 15;
+            break;
+          }
+          if (!(options.layout == "page")) {
+            _context2.next = 13;
+            break;
+          }
+          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();
+          _context2.next = 10;
+          return (0, _index.openPage)(url, url);
+        case 10:
+          page = _context2.sent;
+          console.debug("openPage", page);
+          return _context2.abrupt("return");
+        case 13:
+          container = document.createElement("div");
+          document.body.append(container);
+        case 15:
+          _reactDom["default"].render( /*#__PURE__*/_react["default"].createElement(FormRender, (0, _extends2["default"])({}, restProps, {
+            onClose: /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+              return _regenerator["default"].wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    if (unmount) {
+                      //等待动画结束
+                      setTimeout(function () {
+                        var _container;
+                        //取消挂载
+                        _reactDom["default"].unmountComponentAtNode(container);
+                        //移除
+                        (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
+                      }, 1000);
+                    }
+                    onClose === null || onClose === void 0 ? void 0 : onClose();
+                  case 2:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            }))
+          })), container);
+        case 16:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _showFormDataManager.apply(this, arguments);
+}
+var FormRender = /*#__PURE__*/function (_Component) {
+  function FormRender() {
+    var _this;
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _Component.call.apply(_Component, [this].concat(args)) || this;
+    _this.layoutRef = void 0;
+    return _this;
+  }
+  (0, _inheritsLoose2["default"])(FormRender, _Component);
+  var _proto = FormRender.prototype;
+  _proto.render = function render() {
+    var _this2 = this;
+    var self = this;
+    var _this$props = this.props,
+      layout = _this$props.layout,
+      form = _this$props.form,
+      onClose = _this$props.onClose,
+      restProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded);
+    // @ts-ignore
+    restProps.layout = layout || "drawer";
+    // @ts-ignore
+    restProps.onClose = function () {
+      var _self$layoutRef;
+      (_self$layoutRef = self.layoutRef) === null || _self$layoutRef === void 0 ? void 0 : _self$layoutRef.close();
+      onClose === null || onClose === void 0 ? void 0 : onClose();
+    };
+    return /*#__PURE__*/_react["default"].createElement(_pageLayout.PageLayout, {
+      layout: layout,
+      ref: function ref(layout) {
+        return _this2.layoutRef = layout;
+      }
+    }, /*#__PURE__*/_react["default"].createElement(_pageLoadSchema.PageLoadSchema, {
+      pageId: form === null || form === void 0 ? void 0 : form.id
+    }, function (schema) {
+      var fdmSchema = schema.children[0].fdmSchema;
+      if (form !== null && form !== void 0 && form.fieldId) {
+        (0, _schema.forEachFormSchema)(schema, function (field) {
+          if (form.fieldId == field.props.fieldId) {
+            fdmSchema = field.fdmSchema;
+            return false;
+          }
+          return true;
+        });
+      }
+      return /*#__PURE__*/_react["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({
+        schema: schema,
+        components: window._components || window.components || window.__components
+      }, restProps));
+    }));
+  };
+  return FormRender;
+}(_react.Component);

package/package.json

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

package/es/utils/api/form-instance.d.ts

@@ -1,26 +0,0 @@
-import { FormInstance } from "antd/lib";
-import { NamePath, StoreValue } from "antd/es/form/interface";
-declare type NamePaths = (string | number)[];
-export declare class SubFormInstance implements FormInstance {
-    parentForm: FormInstance;
-    namePath: NamePaths;
-    constructor(form: FormInstance, namePath: NamePaths);
-    overwritePathName(name: NamePath): any[];
-    overwriteFields(fields: any[]): any[];
-    getFieldError(name: NamePath): string[];
-    getFieldValue(name: NamePath): StoreValue;
-    getFieldWarning(name: NamePath): string[];
-    getFieldsError(nameList: NamePath[] | undefined): any[];
-    getFieldsValue(nameList?: NamePath[] | true, filterFunc?: (meta: any) => boolean): any;
-    isFieldTouched(name: NamePath): boolean;
-    isFieldValidating(name: NamePath): boolean;
-    isFieldsTouched(): boolean;
-    isFieldsValidating(nameList: NamePath[]): boolean;
-    resetFields(fields: NamePath[] | undefined): void;
-    setFieldValue(name: NamePath, value: any): void;
-    setFields(fields: any[]): void;
-    setFieldsValue(values: any): void;
-    submit(): void;
-    validateFields(nameList: NamePath[] | undefined): Promise<any>;
-}
-export {};

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

@@ -1,100 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-export var SubFormInstance = /*#__PURE__*/function () {
-  function SubFormInstance(form, namePath) {
-    this.parentForm = void 0;
-    this.namePath = void 0;
-    this.parentForm = form;
-    this.namePath = namePath;
-  }
-  var _proto = SubFormInstance.prototype;
-  _proto.overwritePathName = function overwritePathName(name) {
-    if (Array.isArray(name)) {
-      return [].concat(this.namePath, name);
-    } else {
-      return [].concat(this.namePath, [name]);
-    }
-  };
-  _proto.overwriteFields = function overwriteFields(fields) {
-    var _this = this;
-    return fields === null || fields === void 0 ? void 0 : fields.map(function (field) {
-      return _extends({}, field, {
-        name: _this.overwritePathName(field.name)
-      });
-    });
-  };
-  _proto.getFieldError = function getFieldError(name) {
-    return this.parentForm.getFieldError(this.overwritePathName(name));
-  };
-  _proto.getFieldValue = function getFieldValue(name) {
-    return this.parentForm.getFieldValue(this.overwritePathName(name));
-  };
-  _proto.getFieldWarning = function getFieldWarning(name) {
-    return this.parentForm.getFieldWarning(this.overwritePathName(name));
-  }
-
-  // @ts-ignore
-  ;
-  _proto.getFieldsError = function getFieldsError(nameList) {
-    var _this2 = this;
-    return this.parentForm.getFieldsError(nameList === null || nameList === void 0 ? void 0 : nameList.map(function (name) {
-      return _this2.overwritePathName(name);
-    }));
-  }
-
-  // @ts-ignore
-  ;
-  _proto.getFieldsValue = function getFieldsValue(nameList, filterFunc) {
-    var values = _extends({}, this.parentForm.getFieldValue(this.namePath));
-    values.parent = this.parentForm.getFieldsValue(true);
-    return values;
-  };
-  _proto.isFieldTouched = function isFieldTouched(name) {
-    return this.parentForm.isFieldTouched(this.overwritePathName(name));
-  };
-  _proto.isFieldValidating = function isFieldValidating(name) {
-    return this.parentForm.isFieldValidating(this.overwritePathName(name));
-  };
-  _proto.isFieldsTouched = function isFieldsTouched() {
-    return this.parentForm.isFieldsTouched();
-  };
-  // @ts-ignore
-  _proto.isFieldsValidating = function isFieldsValidating(nameList) {
-    var _this3 = this;
-    return this.parentForm.isFieldsValidating(nameList.map(function (name) {
-      return _this3.overwritePathName(name);
-    }));
-  };
-  _proto.resetFields = function resetFields(fields) {
-    if (Array.isArray(fields)) {
-      // @ts-ignore
-      this.parentForm.resetFields(this.overwriteFields(fields));
-    } else {
-      this.parentForm.resetFields();
-    }
-  };
-  _proto.setFieldValue = function setFieldValue(name, value) {
-    return this.parentForm.setFieldValue(this.overwritePathName(name), value);
-  };
-  _proto.setFields = function setFields(fields) {
-    this.parentForm.setFields(this.overwriteFields(fields));
-  };
-  _proto.setFieldsValue = function setFieldsValue(values) {
-    var _this4 = this;
-    if (!values) return;
-    //删除父值
-    delete values.parent;
-    Object.keys(values).forEach(function (name) {
-      return _this4.parentForm.setFieldValue(_this4.overwritePathName(name), values[name]);
-    });
-  };
-  _proto.submit = function submit() {
-    this.parentForm.submit();
-  }
-
-  // @ts-ignore
-  ;
-  _proto.validateFields = function validateFields(nameList) {
-    return this.parentForm.validateFields(nameList);
-  };
-  return SubFormInstance;
-}();

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

@@ -1,26 +0,0 @@
-import { FormInstance } from "antd/lib";
-import { NamePath, StoreValue } from "antd/es/form/interface";
-declare type NamePaths = (string | number)[];
-export declare class SubFormInstance implements FormInstance {
-    parentForm: FormInstance;
-    namePath: NamePaths;
-    constructor(form: FormInstance, namePath: NamePaths);
-    overwritePathName(name: NamePath): any[];
-    overwriteFields(fields: any[]): any[];
-    getFieldError(name: NamePath): string[];
-    getFieldValue(name: NamePath): StoreValue;
-    getFieldWarning(name: NamePath): string[];
-    getFieldsError(nameList: NamePath[] | undefined): any[];
-    getFieldsValue(nameList?: NamePath[] | true, filterFunc?: (meta: any) => boolean): any;
-    isFieldTouched(name: NamePath): boolean;
-    isFieldValidating(name: NamePath): boolean;
-    isFieldsTouched(): boolean;
-    isFieldsValidating(nameList: NamePath[]): boolean;
-    resetFields(fields: NamePath[] | undefined): void;
-    setFieldValue(name: NamePath, value: any): void;
-    setFields(fields: any[]): void;
-    setFieldsValue(values: any): void;
-    submit(): void;
-    validateFields(nameList: NamePath[] | undefined): Promise<any>;
-}
-export {};

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

@@ -1,105 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-exports.__esModule = true;
-exports.SubFormInstance = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var SubFormInstance = exports.SubFormInstance = /*#__PURE__*/function () {
-  function SubFormInstance(form, namePath) {
-    this.parentForm = void 0;
-    this.namePath = void 0;
-    this.parentForm = form;
-    this.namePath = namePath;
-  }
-  var _proto = SubFormInstance.prototype;
-  _proto.overwritePathName = function overwritePathName(name) {
-    if (Array.isArray(name)) {
-      return [].concat(this.namePath, name);
-    } else {
-      return [].concat(this.namePath, [name]);
-    }
-  };
-  _proto.overwriteFields = function overwriteFields(fields) {
-    var _this = this;
-    return fields === null || fields === void 0 ? void 0 : fields.map(function (field) {
-      return (0, _extends2["default"])({}, field, {
-        name: _this.overwritePathName(field.name)
-      });
-    });
-  };
-  _proto.getFieldError = function getFieldError(name) {
-    return this.parentForm.getFieldError(this.overwritePathName(name));
-  };
-  _proto.getFieldValue = function getFieldValue(name) {
-    return this.parentForm.getFieldValue(this.overwritePathName(name));
-  };
-  _proto.getFieldWarning = function getFieldWarning(name) {
-    return this.parentForm.getFieldWarning(this.overwritePathName(name));
-  }
-
-  // @ts-ignore
-  ;
-  _proto.getFieldsError = function getFieldsError(nameList) {
-    var _this2 = this;
-    return this.parentForm.getFieldsError(nameList === null || nameList === void 0 ? void 0 : nameList.map(function (name) {
-      return _this2.overwritePathName(name);
-    }));
-  }
-
-  // @ts-ignore
-  ;
-  _proto.getFieldsValue = function getFieldsValue(nameList, filterFunc) {
-    var values = (0, _extends2["default"])({}, this.parentForm.getFieldValue(this.namePath));
-    values.parent = this.parentForm.getFieldsValue(true);
-    return values;
-  };
-  _proto.isFieldTouched = function isFieldTouched(name) {
-    return this.parentForm.isFieldTouched(this.overwritePathName(name));
-  };
-  _proto.isFieldValidating = function isFieldValidating(name) {
-    return this.parentForm.isFieldValidating(this.overwritePathName(name));
-  };
-  _proto.isFieldsTouched = function isFieldsTouched() {
-    return this.parentForm.isFieldsTouched();
-  };
-  // @ts-ignore
-  _proto.isFieldsValidating = function isFieldsValidating(nameList) {
-    var _this3 = this;
-    return this.parentForm.isFieldsValidating(nameList.map(function (name) {
-      return _this3.overwritePathName(name);
-    }));
-  };
-  _proto.resetFields = function resetFields(fields) {
-    if (Array.isArray(fields)) {
-      // @ts-ignore
-      this.parentForm.resetFields(this.overwriteFields(fields));
-    } else {
-      this.parentForm.resetFields();
-    }
-  };
-  _proto.setFieldValue = function setFieldValue(name, value) {
-    return this.parentForm.setFieldValue(this.overwritePathName(name), value);
-  };
-  _proto.setFields = function setFields(fields) {
-    this.parentForm.setFields(this.overwriteFields(fields));
-  };
-  _proto.setFieldsValue = function setFieldsValue(values) {
-    var _this4 = this;
-    if (!values) return;
-    //删除父值
-    delete values.parent;
-    Object.keys(values).forEach(function (name) {
-      return _this4.parentForm.setFieldValue(_this4.overwritePathName(name), values[name]);
-    });
-  };
-  _proto.submit = function submit() {
-    this.parentForm.submit();
-  }
-
-  // @ts-ignore
-  ;
-  _proto.validateFields = function validateFields(nameList) {
-    return this.parentForm.validateFields(nameList);
-  };
-  return SubFormInstance;
-}();