@zhubangyun/lowcode-core 5.7.301 → 5.8.290

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$children, _this$schema$children2, 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$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;
@@ -115,27 +113,38 @@ 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;
+    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:
-            _context3.next = 2;
-            return this.initialize();
-          case 2:
-            _context3.next = 4;
-            return this.request.post("search", params, {
+            searchParams = searchParams || {};
+            config = {
               params: {
                 description: this.title + "\u67E5\u8BE2",
                 formId: this.formId,
                 fieldId: this.fieldId
               }
-            });
+            };
+            _context3.next = 4;
+            return this.handleRequestConfig(config);
           case 4:
+            searchParams.filterRules = (0, _formApi.handleFilterRules)(((_searchParams = searchParams) === null || _searchParams === void 0 ? void 0 : _searchParams.filterRules) || [], {
+              filterNullValue: false
+            });
+            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", searchParams, config);
+          case 8:
             res = _context3.sent;
-            assembleAssociationField(res.data, res.refs);
+            start = Date.now();
+            (0, _formApi.assembleAssociationField)(res.data, res.refs);
+            console.debug("form.search:" + (Date.now() - start), res);
             return _context3.abrupt("return", res);
-          case 7:
+          case 13:
           case "end":
             return _context3.stop();
         }
@@ -148,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:
@@ -156,10 +165,11 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             return _RestApi.prototype.getById.call(this, id, options);
           case 2:
             res = _context4.sent;
-            assembleAssociationField(res.data, res.refs);
-            console.debug("formApi.getById", res);
+            start = Date.now();
+            (0, _formApi.assembleAssociationField)(res.data, res.refs);
+            console.debug("formApi.getById" + (Date.now() - start), res);
             return _context4.abrupt("return", res);
-          case 6:
+          case 7:
           case "end":
             return _context4.stop();
         }
@@ -175,7 +185,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();
@@ -192,7 +202,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();
@@ -209,7 +219,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();
@@ -221,100 +231,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 _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);
+  _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();
         }
-        item[fieldIdName.slice(0, -2)] = fieldValue;
-      }
-    };
-    for (var _i2 = 0, _Object$keys = Object.keys(item); _i2 < _Object$keys.length; _i2++) {
-      _loop();
+      }, _callee8, this);
+    }));
+    function serviceUpdate(_x12, _x13) {
+      return _serviceUpdate.apply(this, arguments);
     }
-  }
-}
+    return serviceUpdate;
+  }();
+  return RestFormApi;
+}(_restApi.RestApi);

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

@@ -0,0 +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 handleFilterRules(filters: FilterRule[], options: {
+    filterNullValue: boolean;
+}): FilterRule[];

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

@@ -0,0 +1,208 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.assembleAssociationField = assembleAssociationField;
+exports.assembleAssociationFieldDataV2 = assembleAssociationFieldDataV2;
+exports.assembleAssociationFieldV2 = assembleAssociationFieldV2;
+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 getDataKey(data) {
+  var key = data.form.id;
+  if (data.form.fieldId) {
+    key += "." + data.form.fieldId;
+  }
+  return key + "." + data.id;
+}
+function assembleAssociationFieldV2(data, refs) {
+  if (!data || !refs) return;
+  var dataMap = new Map();
+  for (var _iterator = _createForOfIteratorHelperLoose(refs), _step; !(_step = _iterator()).done;) {
+    var ref = _step.value;
+    for (var _iterator3 = _createForOfIteratorHelperLoose(ref.data), _step3; !(_step3 = _iterator3()).done;) {
+      var datum = _step3.value;
+      var key = getDataKey(datum);
+      dataMap.set(key, datum);
+    }
+  }
+
+  //组装refs的关联属性
+  for (var _iterator2 = _createForOfIteratorHelperLoose(dataMap.values()), _step2; !(_step2 = _iterator2()).done;) {
+    var item = _step2.value;
+    for (var _i2 = 0, _Object$keys = Object.keys(item); _i2 < _Object$keys.length; _i2++) {
+      var _key = _Object$keys[_i2];
+      // @ts-ignore
+      var value = item[_key];
+      assembleAssociationFieldDataV2(value, dataMap);
+    }
+  }
+  function loopAssembleAssociation(value) {
+    if (Array.isArray(value)) {
+      value.forEach(function (item) {
+        return loopAssembleAssociation(item);
+      });
+    } else if (value !== null && value !== void 0 && value.id) {
+      assembleAssociationFieldDataV2(value, dataMap);
+      //处理子表
+      for (var _i = 0, _Object$values = Object.values(value); _i < _Object$values.length; _i++) {
+        var subValues = _Object$values[_i];
+        if (typeof subValues == "object") {
+          loopAssembleAssociation(subValues);
+        }
+      }
+    }
+  }
+  loopAssembleAssociation(data);
+}
+function assembleAssociationFieldDataV2(data, dataMap) {
+  if (data == null) {
+    return;
+  }
+  if (Array.isArray(data)) {
+    data.forEach(function (item) {
+      return assembleAssociationFieldDataV2(item, dataMap);
+    });
+  } else {
+    var _data$form;
+    if (data !== null && data !== void 0 && (_data$form = data.form) !== null && _data$form !== void 0 && _data$form.id && data !== null && data !== void 0 && data.id) {
+      delete data._load;
+      var key = getDataKey(data);
+      var value = dataMap.get(key);
+      if (value) {
+        Object.assign(data, value);
+        delete data._load;
+      }
+    }
+  }
+}
+function assembleAssociationField(data, refs) {
+  assembleAssociationFieldV2(data, refs);
+  return;
+  if (!data || !refs) return;
+  var fieldIdDataMap = new Map();
+  for (var _iterator4 = _createForOfIteratorHelperLoose(refs), _step4; !(_step4 = _iterator4()).done;) {
+    var ref = _step4.value;
+    var dataMap = new Map();
+    for (var _iterator7 = _createForOfIteratorHelperLoose(ref.data), _step7; !(_step7 = _iterator7()).done;) {
+      var datum = _step7.value;
+      dataMap.set(datum.id, datum);
+    }
+    for (var _iterator8 = _createForOfIteratorHelperLoose(ref.fieldIds), _step8; !(_step8 = _iterator8()).done;) {
+      var fieldId = _step8.value;
+      fieldIdDataMap.set(fieldId + "Id", dataMap);
+    }
+  }
+  //组装refs的关联属性
+  for (var _iterator5 = _createForOfIteratorHelperLoose(refs), _step5; !(_step5 = _iterator5()).done;) {
+    var _ref = _step5.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 _iterator6 = _createForOfIteratorHelperLoose(values), _step6; !(_step6 = _iterator6()).done;) {
+          var value = _step6.value;
+          for (var _i3 = 0, _Object$values2 = Object.values(value); _i3 < _Object$values2.length; _i3++) {
+            var subValues = _Object$values2[_i3];
+            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 _iterator9 = _createForOfIteratorHelperLoose(arrayData), _step9; !(_step9 = _iterator9()).done;) {
+    var item = _step9.value;
+    var _loop = function _loop() {
+      var fieldIdName = _Object$keys2[_i4];
+      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 _i4 = 0, _Object$keys2 = Object.keys(item); _i4 < _Object$keys2.length; _i4++) {
+      _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;
+    }
+    return cloneRules;
+  } 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> {
@@ -80,6 +83,12 @@ export interface BaseType {
      * 修改日期
      */
     updated_at: string;
+    form: {
+        id: string;
+        fieldId?: string;
+        label: string;
+    };
+    _load?: boolean;
 }
 /**
  * 基础返回结果