@zhubangyun/lowcode-core 5.6.214 → 5.8.110

package/es/utils/data/index.js

@@ -0,0 +1,20 @@
+export function transformerId(value) {
+  if (value == null) {
+    return null;
+  }
+  if (Array.isArray(value)) {
+    return value.map(transformerId).filter(function (value) {
+      return !!value;
+    });
+  }
+  if (typeof value == "object") {
+    return (value === null || value === void 0 ? void 0 : value.id) || (value === null || value === void 0 ? void 0 : value.value) || value;
+  }
+  if (typeof value == "string") {
+    return value;
+  }
+  if (typeof value == "number") {
+    return value;
+  }
+  return (value === null || value === void 0 ? void 0 : value.id) || value.value || value;
+}

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<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

@@ -15,12 +15,14 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
       });
     };
     _this.getWith = function () {
-      return Math.min(window.innerWidth, 1440);
+      return Math.min(window.innerWidth, 1600);
     };
     _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

@@ -1,28 +1,30 @@
-#fullscreen-loading {
-  position: fixed;
-  width: 100vw;
-  height: 100vh;
-  top: 0;
-  left: 0;
+.page-loading {
+  width: 100%;
+  height: 100%;
   z-index: 10;
-  background: white;
+  background: rgba(255, 255, 255, 0.5);
   display: flex;
   justify-content: center;
   align-items: center;
   overflow: hidden;
 }
 
-.page-loading {
-  width: 100%;
-  height: 100%;
-  z-index: 10;
-  background: white;
+
+#fullscreen-loading {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  top: 0;
+  left: 0;
+  z-index: 100000;
+  background: rgba(255, 255, 255, 0.5);
   display: flex;
   justify-content: center;
   align-items: center;
   overflow: hidden;
 }
 
+
 .atom-spinner, .atom-spinner * {
   box-sizing: border-box;
 }

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,17 @@ 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"];
+window.__ReactRender = _reactRender.ReactRender;
 // @ts-ignore
-window.__ReactRender = _reactRender.ReactRender;
+if (window._) {
+  // @ts-ignore
+  window.lodash = window._;
+}
+// @ts-ignore
+if (!window.utils) {
+  // @ts-ignore
+  window.utils = _utils["default"];
+}

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.d.ts

@@ -14,4 +14,5 @@ export declare class RestFormApi<DataType> extends RestApi<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>>;
+    serviceUpdate(data: DataType, options?: BaseRequestOptions<DataType>): Promise<import("axios").AxiosResponse<any, any>>;
 }

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

@@ -8,9 +8,7 @@ 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 _formApi = require("./form-api.utils");
 var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   function RestFormApi(formId, fieldId, mock) {
     var _this;
@@ -30,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 res;
+      var _this$schema$props, res;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -47,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.label;
+            this.title = (_this$schema$props = this.schema.props) === null || _this$schema$props === void 0 ? void 0 : _this$schema$props.label;
             if (this.fieldId) {
               JSON.stringify(this.schema, function (key, value) {
                 var _value$props;
@@ -95,6 +93,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 +101,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();
         }
@@ -115,17 +114,35 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   }();
   _proto.search = /*#__PURE__*/function () {
     var _search = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(params) {
-      var res;
+      var _params, _params2;
+      var config, 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:
+            params = params || {};
+            config = {
+              params: {
+                description: this.title + "\u67E5\u8BE2",
+                formId: this.formId,
+                fieldId: this.fieldId
+              }
+            };
+            _context3.next = 4;
+            return this.handleRequestConfig(config);
+          case 4:
+            params.filterRules = (0, _formApi.handleFilterRules)(((_params = params) === null || _params === void 0 ? void 0 : _params.filterRules) || [], {
+              filterNullValue: false
+            });
+            params.searchFields = (0, _formApi.handleFilterRules)(((_params2 = params) === null || _params2 === void 0 ? void 0 : _params2.searchFields) || [], {
+              filterNullValue: true
+            });
+            _context3.next = 8;
+            return this.request.post("search", params, config);
+          case 8:
             res = _context3.sent;
-            res.data = assembleAssociationField(res.data, res.refs);
+            (0, _formApi.assembleAssociationField)(res.data, res.refs);
             return _context3.abrupt("return", res);
-          case 5:
+          case 11:
           case "end":
             return _context3.stop();
         }
@@ -146,9 +163,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);
+            (0, _formApi.assembleAssociationField)(res.data, res.refs);
+            console.debug("formApi.getById", res);
             return _context4.abrupt("return", res);
-          case 5:
+          case 6:
           case "end":
             return _context4.stop();
         }
@@ -164,7 +182,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
       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));
+            return _context5.abrupt("return", _RestApi.prototype.save.call(this, (0, _formApi.convertSaveData)(data), options));
           case 1:
           case "end":
             return _context5.stop();
@@ -181,7 +199,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
       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));
+            return _context6.abrupt("return", _RestApi.prototype.create.call(this, (0, _formApi.convertSaveData)(data), options));
           case 1:
           case "end":
             return _context6.stop();
@@ -198,7 +216,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
       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));
+            return _context7.abrupt("return", _RestApi.prototype.update.call(this, id, (0, _formApi.convertSaveData)(data), options));
           case 1:
           case "end":
             return _context7.stop();
@@ -210,57 +228,22 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
     }
     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;
+  _proto.serviceUpdate = /*#__PURE__*/function () {
+    var _serviceUpdate = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(data, options) {
+      return _regenerator["default"].wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
+          case 0:
+            return _context8.abrupt("return", this.request.post("serviceUpdate", data));
+          case 1:
+          case "end":
+            return _context8.stop();
         }
-      };
-      for (var _i = 0, _Object$keys = Object.keys(value); _i < _Object$keys.length; _i++) {
-        _loop();
-      }
+      }, _callee8, this);
+    }));
+    function serviceUpdate(_x12, _x13) {
+      return _serviceUpdate.apply(this, arguments);
     }
-    return value;
-  });
-  return JSON.parse(jsonText);
-}
+    return serviceUpdate;
+  }();
+  return RestFormApi;
+}(_restApi.RestApi);

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

@@ -0,0 +1,7 @@
+import { BaseType, FilterRule, Refs } from "./rest-api";
+export declare function convertSaveData(data: any): any;
+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;

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

@@ -0,0 +1,136 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.assembleAssociationField = assembleAssociationField;
+exports.assembleAssociationFieldValue = assembleAssociationFieldValue;
+exports.convertSaveData = convertSaveData;
+exports.handleFilterRules = handleFilterRules;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _data = require("../data");
+function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function 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 _iterator4 = _createForOfIteratorHelperLoose(ref.data), _step4; !(_step4 = _iterator4()).done;) {
+      var datum = _step4.value;
+      dataMap.set(datum.id, datum);
+    }
+    for (var _iterator5 = _createForOfIteratorHelperLoose(ref.fieldIds), _step5; !(_step5 = _iterator5()).done;) {
+      var fieldId = _step5.value;
+      fieldIdDataMap.set(fieldId + "Id", dataMap);
+    }
+  }
+  //组装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);
+            }
+          }
+        }
+      }
+    }
+  }
+  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();
+    }
+  }
+}
+function handleFilterRules(filters, options) {
+  var filterNullValue = options.filterNullValue;
+  if (Array.isArray(filters)) {
+    var cloneRules = filters.filter(function (rule) {
+      return !!rule;
+    }).map(function (rule) {
+      return (0, _extends2["default"])({}, rule, {
+        value: (0, _data.transformerId)(rule.value),
+        rules: handleFilterRules(rule.rules || [], options)
+      });
+    });
+    if (filterNullValue) {
+      cloneRules = cloneRules.filter(function (rule) {
+        if (rule.value == null) {
+          if (rule.operator != "isNull" && rule.operator != "isNotNull") {
+            return false;
+          }
+        }
+        return true;
+      });
+    }
+    if (cloneRules.length == 0) {
+      return undefined;
+    }
+  } else {
+    return undefined;
+  }
+}

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

@@ -22,6 +22,8 @@ export interface RestSearchParams {
     page?: number;
     pageSize?: number;
     filterRules?: FilterRule[];
+    searchFields?: FilterRule[];
+    orderRules?: any[];
 }
 export declare abstract class BaseRestApi<DataType> {
     uri: string;
@@ -49,6 +51,7 @@ export declare abstract class BaseRestApi<DataType> {
      * 通过id删除
      */
     deleteById(id: string, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
+    delete(data: any | any[], options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
     private showError;
 }
 export declare class RestApi<DataType> extends BaseRestApi<DataType> {