@zhubangyun/lowcode-core 5.12.91 → 5.12.161

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

@@ -16,9 +16,9 @@ function getFormApi(_x, _x2, _x3) {
   return _getFormApi.apply(this, arguments);
 }
 function _getFormApi() {
-  _getFormApi = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(formId, fieldId, mock) {
+  _getFormApi = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(formId, fieldId, mock) {
     var key;
-    return _regenerator["default"].wrap(function _callee9$(_context9) {
+    return _regenerator["default"].wrap(function (_context9) {
       while (1) switch (_context9.prev = _context9.next) {
         case 0:
           if (typeof mock != "boolean") {
@@ -34,7 +34,7 @@ function _getFormApi() {
             fieldId: fieldId,
             formId: formId
           }));
-        case 3:
+        case 1:
         case "end":
           return _context9.stop();
       }
@@ -45,7 +45,9 @@ function _getFormApi() {
 var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   function RestFormApi(formId, fieldId, mock) {
     var _this;
-    _this = _RestApi.call(this, "表单", {}) || this;
+    _this = _RestApi.call(this, "forms", {
+      title: "表单"
+    }) || this;
     _this.formId = void 0;
     _this.fieldId = void 0;
     _this.mock = void 0;
@@ -59,10 +61,10 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   (0, _inheritsLoose2["default"])(RestFormApi, _RestApi);
   var _proto = RestFormApi.prototype;
   _proto.initialize = /*#__PURE__*/function () {
-    var _initialize = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _initialize = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _this2 = this;
       var res, _this$schema, _this$schema$children, _this$schema$children2;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+      return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!this.initialized) {
@@ -96,7 +98,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
               }
             }
             return _context.abrupt("return", this.initialized);
-          case 2:
+          case 1:
           case "end":
             return _context.stop();
         }
@@ -108,13 +110,13 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
     return initialize;
   }();
   _proto.handleRequestConfig = /*#__PURE__*/function () {
-    var _handleRequestConfig = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(config) {
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
+    var _handleRequestConfig = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(config) {
+      return _regenerator["default"].wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
+            _context2.next = 1;
             return this.initialize();
-          case 2:
+          case 1:
             config.params = config.params || {};
             if (__mock) {
               config.params.description = "" + this.title;
@@ -126,7 +128,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             if (this.mock) {
               config.params.mock = this.mock;
             }
-          case 7:
+          case 2:
           case "end":
             return _context2.stop();
         }
@@ -138,10 +140,10 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
     return handleRequestConfig;
   }();
   _proto.search = /*#__PURE__*/function () {
-    var _search = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(searchParams) {
+    var _search = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(searchParams) {
       var _searchParams, _searchParams2;
       var params, config, res, start;
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
+      return _regenerator["default"].wrap(function (_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             searchParams = searchParams || {};
@@ -155,9 +157,9 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             config = {
               params: params
             };
-            _context3.next = 6;
+            _context3.next = 1;
             return this.handleRequestConfig(config);
-          case 6:
+          case 1:
             searchParams.filterRules = (0, _formApi.handleFilterRules)(((_searchParams = searchParams) === null || _searchParams === void 0 ? void 0 : _searchParams.filterRules) || [], {
               filterNullValue: false
             });
@@ -165,16 +167,16 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
               filterNullValue: true
             });
             config.params = (0, _extends2["default"])({}, params, searchParams);
-            _context3.next = 11;
+            _context3.next = 2;
             return this.request.get("search", config);
-          case 11:
+          case 2:
             res = _context3.sent;
             //const res = await this.request.post<any, ManyResult<DataType>>("search", searchParams, config);
             start = Date.now();
             (0, _formApi.assembleAssociationField)(res.data, res.refs);
             console.debug("form.search:", res);
             return _context3.abrupt("return", res);
-          case 16:
+          case 3:
           case "end":
             return _context3.stop();
         }
@@ -186,19 +188,19 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
     return search;
   }();
   _proto.getById = /*#__PURE__*/function () {
-    var _getById = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(id, options) {
+    var _getById = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(id, options) {
       var res;
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
+      return _regenerator["default"].wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context4.next = 2;
+            _context4.next = 1;
             return _RestApi.prototype.getById.call(this, id, options);
-          case 2:
+          case 1:
             res = _context4.sent;
             (0, _formApi.assembleAssociationField)(res.data, res.refs);
             console.debug("formApi.getById", res);
             return _context4.abrupt("return", res);
-          case 6:
+          case 2:
           case "end":
             return _context4.stop();
         }
@@ -210,8 +212,8 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
     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) {
+    var _save = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(data, options) {
+      return _regenerator["default"].wrap(function (_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             return _context5.abrupt("return", _RestApi.prototype.save.call(this, (0, _formApi.convertSaveData)(data), options));
@@ -227,8 +229,8 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
     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) {
+    var _create = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(data, options) {
+      return _regenerator["default"].wrap(function (_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             return _context6.abrupt("return", _RestApi.prototype.create.call(this, (0, _formApi.convertSaveData)(data), options));
@@ -238,14 +240,14 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee6, this);
     }));
-    function create(_x10, _x11) {
+    function create(_x0, _x1) {
       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) {
+    var _update = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(id, data, options) {
+      return _regenerator["default"].wrap(function (_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
             return _context7.abrupt("return", _RestApi.prototype.update.call(this, id, (0, _formApi.convertSaveData)(data), options));
@@ -255,15 +257,15 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee7, this);
     }));
-    function update(_x12, _x13, _x14) {
+    function update(_x10, _x11, _x12) {
       return _update.apply(this, arguments);
     }
     return update;
   }();
   _proto.serviceUpdate = /*#__PURE__*/function () {
-    var _serviceUpdate = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(data, options) {
+    var _serviceUpdate = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(data, options) {
       var params;
-      return _regenerator["default"].wrap(function _callee8$(_context8) {
+      return _regenerator["default"].wrap(function (_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
             params = {
@@ -277,13 +279,13 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             return _context8.abrupt("return", this.request.post("serviceUpdate", data, {
               params: params
             }));
-          case 3:
+          case 1:
           case "end":
             return _context8.stop();
         }
       }, _callee8, this);
     }));
-    function serviceUpdate(_x15, _x16) {
+    function serviceUpdate(_x13, _x14) {
       return _serviceUpdate.apply(this, arguments);
     }
     return serviceUpdate;

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

@@ -11,13 +11,14 @@ exports.handleEntityLabel = handleEntityLabel;
 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 _createForOfIteratorHelperLoose(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (t) return (t = t.call(r)).next.bind(t); if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var o = 0; return function () { return o >= r.length ? { done: !0 } : { done: !1, value: r[o++] }; }; } 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(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+var SimpleSerialFieldNames = ["parent", "instance"];
 function convertSaveData(data) {
   if (!data) return data;
   return JSON.parse(JSON.stringify(data, function (key, value) {
-    if (key == "parent") {
+    if (SimpleSerialFieldNames.includes(key)) {
       var id = value === null || value === void 0 ? void 0 : value.id;
       return id ? {
         id: id

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

@@ -6,6 +6,6 @@ export { getUserinfo } from "./user-info";
 export * as files from "./file-api";
 export * as scrips from "./script-api";
 export declare const apiRequest: import("axios").AxiosInstance;
-export declare const request: <T = any, R = AxiosResponse<T, any>, D = any>(config: import("axios").AxiosRequestConfig<D>) => Promise<R>;
+export declare const request: <T = any, R = AxiosResponse<T, any, {}>, D = any>(config: import("axios").AxiosRequestConfig<D>) => Promise<R>;
 export declare function onFulfilled(res: AxiosResponse): any;
 export declare function onRejected(error: any): any;

package/lib/utils/api/index.js

@@ -20,8 +20,7 @@ var _files = _interopRequireWildcard(require("./file-api"));
 exports.files = _files;
 var _scrips = _interopRequireWildcard(require("./script-api"));
 exports.scrips = _scrips;
-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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var apiRequest = exports.apiRequest = _axios["default"].create({
   baseURL: "/api",
   // 基础URL