@zhubangyun/lowcode-core 5.12.161 → 6.2.30

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

@@ -12,14 +12,15 @@ var _restApi = require("./rest-api");
 var _formApi = require("./form-api.utils");
 var _cache = require("../cache");
 var _schemaApi = require("./schema-api");
+var _common = require("../common");
 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 _callee1(formId, fieldId, mock) {
     var key;
-    return _regenerator["default"].wrap(function (_context9) {
-      while (1) switch (_context9.prev = _context9.next) {
+    return _regenerator["default"].wrap(function (_context1) {
+      while (1) switch (_context1.prev = _context1.next) {
         case 0:
           if (typeof mock != "boolean") {
             if (typeof window.__mock == "boolean") {
@@ -29,16 +30,16 @@ function _getFormApi() {
           key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
             return !!key;
           }).join("_");
-          return _context9.abrupt("return", _cache.formApi.getInstance(key, {
+          return _context1.abrupt("return", _cache.formApi.getInstance(key, {
             mock: mock,
             fieldId: fieldId,
             formId: formId
           }));
         case 1:
         case "end":
-          return _context9.stop();
+          return _context1.stop();
       }
-    }, _callee9);
+    }, _callee1);
   }));
   return _getFormApi.apply(this, arguments);
 }
@@ -189,84 +190,204 @@ 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 searchId, url, res, _t;
       return _regenerator["default"].wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context4.next = 1;
-            return _RestApi.prototype.getById.call(this, id, options);
+            if (id) {
+              _context4.next = 1;
+              break;
+            }
+            return _context4.abrupt("return", {
+              success: false,
+              message: "数据Id不可为空!"
+            });
           case 1:
+            searchId = id;
+            if (!id.startsWith("http")) {
+              _context4.next = 2;
+              break;
+            }
+            url = new URL(searchId);
+            searchId = url.searchParams.get("dataId");
+            if (searchId) {
+              _context4.next = 2;
+              break;
+            }
+            return _context4.abrupt("return", {
+              success: false,
+              message: "数据Id不可为空!"
+            });
+          case 2:
+            _context4.prev = 2;
+            (0, _common.uuidVersion)(searchId);
+            _context4.next = 4;
+            break;
+          case 3:
+            _context4.prev = 3;
+            _t = _context4["catch"](2);
+            return _context4.abrupt("return", {
+              success: false,
+              message: "\u975E\u6CD5\u7684\u6570\u636EID:" + searchId
+            });
+          case 4:
+            _context4.next = 5;
+            return _RestApi.prototype.getById.call(this, searchId, options);
+          case 5:
             res = _context4.sent;
             (0, _formApi.assembleAssociationField)(res.data, res.refs);
             console.debug("formApi.getById", res);
             return _context4.abrupt("return", res);
-          case 2:
+          case 6:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, this);
+      }, _callee4, this, [[2, 3]]);
     }));
     function getById(_x6, _x7) {
       return _getById.apply(this, arguments);
     }
     return getById;
   }();
-  _proto.save = /*#__PURE__*/function () {
-    var _save = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(data, options) {
+  _proto.labelToValue = /*#__PURE__*/function () {
+    var _labelToValue = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(data, options) {
+      var _this3 = this;
+      var config, res;
       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));
+            config = {};
+            _context5.next = 1;
+            return this.handleRequestConfig(config);
           case 1:
+            _context5.next = 2;
+            return this.request.post("labelToValue", data, config);
+          case 2:
+            res = _context5.sent;
+            if (Array.isArray(res.data)) {
+              res.data.forEach(function (item) {
+                item.id = (0, _common.uuid)();
+                item.form = {
+                  id: _this3.formId,
+                  fieldId: _this3.fieldId
+                };
+              });
+            }
+            (0, _formApi.assembleAssociationField)(res.data, res.refs);
+            console.debug("formApi.labelToValue", res);
+            return _context5.abrupt("return", res);
+          case 3:
           case "end":
             return _context5.stop();
         }
       }, _callee5, this);
     }));
-    function save(_x8, _x9) {
-      return _save.apply(this, arguments);
+    function labelToValue(_x8, _x9) {
+      return _labelToValue.apply(this, arguments);
     }
-    return save;
+    return labelToValue;
   }();
-  _proto.create = /*#__PURE__*/function () {
-    var _create = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(data, options) {
+  _proto.save = /*#__PURE__*/function () {
+    var _save = (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));
+            return _context6.abrupt("return", _RestApi.prototype.save.call(this, (0, _formApi.convertSaveData)(data), options));
           case 1:
           case "end":
             return _context6.stop();
         }
       }, _callee6, this);
     }));
-    function create(_x0, _x1) {
-      return _create.apply(this, arguments);
+    function save(_x0, _x1) {
+      return _save.apply(this, arguments);
     }
-    return create;
+    return save;
   }();
-  _proto.update = /*#__PURE__*/function () {
-    var _update = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(id, data, options) {
+  _proto.create = /*#__PURE__*/function () {
+    var _create = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(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));
+            return _context7.abrupt("return", _RestApi.prototype.create.call(this, (0, _formApi.convertSaveData)(data), options));
           case 1:
           case "end":
             return _context7.stop();
         }
       }, _callee7, this);
     }));
-    function update(_x10, _x11, _x12) {
+    function create(_x10, _x11) {
+      return _create.apply(this, arguments);
+    }
+    return create;
+  }();
+  _proto.update = /*#__PURE__*/function () {
+    var _update = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(id, data, options) {
+      return _regenerator["default"].wrap(function (_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
+          case 0:
+            return _context8.abrupt("return", _RestApi.prototype.update.call(this, id, (0, _formApi.convertSaveData)(data), options));
+          case 1:
+          case "end":
+            return _context8.stop();
+        }
+      }, _callee8, this);
+    }));
+    function update(_x12, _x13, _x14) {
       return _update.apply(this, arguments);
     }
     return update;
   }();
+  _proto.fieldFilters = /*#__PURE__*/function () {
+    var _fieldFilters = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(searchParams) {
+      var _searchParams3, _searchParams4;
+      var params, config, res;
+      return _regenerator["default"].wrap(function (_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
+          case 0:
+            searchParams = searchParams || {};
+            params = {
+              formId: this.formId,
+              fieldId: this.fieldId
+            };
+            if (__mock) {
+              params.description = (this.title || "表单") + ".\u67E5\u8BE2";
+            }
+            config = {
+              params: params
+            };
+            _context9.next = 1;
+            return this.handleRequestConfig(config);
+          case 1:
+            searchParams.filterRules = (0, _formApi.handleFilterRules)(((_searchParams3 = searchParams) === null || _searchParams3 === void 0 ? void 0 : _searchParams3.filterRules) || [], {
+              filterNullValue: false
+            });
+            searchParams.searchFields = (0, _formApi.handleFilterRules)(((_searchParams4 = searchParams) === null || _searchParams4 === void 0 ? void 0 : _searchParams4.searchFields) || [], {
+              filterNullValue: true
+            });
+            config.params = (0, _extends2["default"])({}, params, searchParams);
+            _context9.next = 2;
+            return this.request.get("fieldFilters", config);
+          case 2:
+            res = _context9.sent;
+            console.debug("form.fieldFilters:", res);
+            return _context9.abrupt("return", res);
+          case 3:
+          case "end":
+            return _context9.stop();
+        }
+      }, _callee9, this);
+    }));
+    function fieldFilters(_x15) {
+      return _fieldFilters.apply(this, arguments);
+    }
+    return fieldFilters;
+  }();
   _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 _callee0(data, options) {
       var params;
-      return _regenerator["default"].wrap(function (_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regenerator["default"].wrap(function (_context0) {
+        while (1) switch (_context0.prev = _context0.next) {
           case 0:
             params = {
               formId: this.formId,
@@ -276,16 +397,16 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
               params.mock = true;
               params.description = (this.title || "表单") + ".\u67E5\u8BE2";
             }
-            return _context8.abrupt("return", this.request.post("serviceUpdate", data, {
+            return _context0.abrupt("return", this.request.post("serviceUpdate", data, {
               params: params
             }));
           case 1:
           case "end":
-            return _context8.stop();
+            return _context0.stop();
         }
-      }, _callee8, this);
+      }, _callee0, this);
     }));
-    function serviceUpdate(_x13, _x14) {
+    function serviceUpdate(_x16, _x17) {
       return _serviceUpdate.apply(this, arguments);
     }
     return serviceUpdate;

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

@@ -1,6 +1,6 @@
+import { AxiosResponse } from "axios";
 export { RestApi } from "./rest-api";
 export { getFormApi, RestFormApi } from "./form-api";
-import { AxiosResponse } from "axios/index";
 export { getSchema } from "./schema-api";
 export { getUserinfo } from "./user-info";
 export * as files from "./file-api";

package/lib/utils/api/index.js

@@ -45,12 +45,14 @@ function onFulfilled(res) {
 function onRejected(error) {
   var _error$response = error.response,
     status = _error$response.status,
-    statusText = _error$response.statusText;
+    statusText = _error$response.statusText,
+    data = _error$response.data;
+  console.error("请求失败!", error);
   if (status == 400) {
     return error.response.data || {};
   }
   return {
     success: false,
-    message: statusText
+    message: (data === null || data === void 0 ? void 0 : data.message) || statusText
   };
 }

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

@@ -36,7 +36,7 @@ export declare abstract class BaseRestApi<DataType> {
     title: string;
     request: AxiosInstance;
     protected constructor(uri: string, options?: RestApiOptions);
-    abstract handleRequestConfig(config: AxiosRequestConfig): void;
+    abstract handleRequestConfig(config: AxiosRequestConfig): Promise<void>;
     search(params?: RestSearchParams): Promise<ManyResult<DataType>>;
     /**
      * 通过id获取
@@ -58,6 +58,8 @@ export declare abstract class BaseRestApi<DataType> {
      */
     deleteById(id: string, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
     delete(data: any | any[], options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
+    export(data: any, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
+    import(data: any, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
     showError(type: string, res: BaseResult<any>): Promise<void>;
 }
 export declare class RestApi<DataType> extends BaseRestApi<DataType> {

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

@@ -350,16 +350,98 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
     }
     return _delete;
   }();
-  _proto.showError = /*#__PURE__*/function () {
-    var _showError = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(type, res) {
-      var msg, props, _t;
+  _proto["export"] = /*#__PURE__*/function () {
+    var _export2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(data, options) {
+      var _this$handleRequestCo8;
+      var config, res, _options$onError7, _options$onSuccess7;
       return _regenerator["default"].wrap(function (_context8) {
         while (1) switch (_context8.prev = _context8.next) {
+          case 0:
+            config = {};
+            _context8.next = 1;
+            return (_this$handleRequestCo8 = this.handleRequestConfig) === null || _this$handleRequestCo8 === void 0 ? void 0 : _this$handleRequestCo8.call(this, config);
+          case 1:
+            _context8.next = 2;
+            return this.request.post("/export", data, config);
+          case 2:
+            res = _context8.sent;
+            if (res.success) {
+              _context8.next = 4;
+              break;
+            }
+            this.showError("\u5BFC\u51FA\u5931\u8D25!", res).then();
+            _context8.next = 3;
+            return options === null || options === void 0 ? void 0 : (_options$onError7 = options.onError) === null || _options$onError7 === void 0 ? void 0 : _options$onError7.call(options, res);
+          case 3:
+            _context8.next = 5;
+            break;
+          case 4:
+            _context8.next = 5;
+            return options === null || options === void 0 ? void 0 : (_options$onSuccess7 = options.onSuccess) === null || _options$onSuccess7 === void 0 ? void 0 : _options$onSuccess7.call(options, res);
+          case 5:
+            return _context8.abrupt("return", res);
+          case 6:
+          case "end":
+            return _context8.stop();
+        }
+      }, _callee8, this);
+    }));
+    function _export(_x13, _x14) {
+      return _export2.apply(this, arguments);
+    }
+    return _export;
+  }();
+  _proto["import"] = /*#__PURE__*/function () {
+    var _import2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(data, options) {
+      var _this$handleRequestCo9;
+      var config, res, _options$onError8, _options$onSuccess8;
+      return _regenerator["default"].wrap(function (_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
+          case 0:
+            config = {};
+            _context9.next = 1;
+            return (_this$handleRequestCo9 = this.handleRequestConfig) === null || _this$handleRequestCo9 === void 0 ? void 0 : _this$handleRequestCo9.call(this, config);
+          case 1:
+            _context9.next = 2;
+            return this.request.post("import", data, config);
+          case 2:
+            res = _context9.sent;
+            if (res.success) {
+              _context9.next = 4;
+              break;
+            }
+            this.showError("\u5BFC\u5165\u5931\u8D25!", res).then();
+            _context9.next = 3;
+            return options === null || options === void 0 ? void 0 : (_options$onError8 = options.onError) === null || _options$onError8 === void 0 ? void 0 : _options$onError8.call(options, res);
+          case 3:
+            _context9.next = 5;
+            break;
+          case 4:
+            _context9.next = 5;
+            return options === null || options === void 0 ? void 0 : (_options$onSuccess8 = options.onSuccess) === null || _options$onSuccess8 === void 0 ? void 0 : _options$onSuccess8.call(options, res);
+          case 5:
+            return _context9.abrupt("return", res);
+          case 6:
+          case "end":
+            return _context9.stop();
+        }
+      }, _callee9, this);
+    }));
+    function _import(_x15, _x16) {
+      return _import2.apply(this, arguments);
+    }
+    return _import;
+  }();
+  _proto.showError = /*#__PURE__*/function () {
+    var _showError = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee0(type, res) {
+      var msg, props, _t;
+      return _regenerator["default"].wrap(function (_context0) {
+        while (1) switch (_context0.prev = _context0.next) {
           case 0:
             msg = res.message;
-            _context8.prev = 1;
+            _context0.prev = 1;
             if (!msg) {
-              _context8.next = 4;
+              _context0.next = 4;
               break;
             }
             props = JSON.parse(msg);
@@ -368,31 +450,31 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
               props.title = "" + this.title + type;
             }
             if (!(props.type == "message")) {
-              _context8.next = 2;
+              _context0.next = 2;
               break;
             }
             _message2["default"].error(props);
-            return _context8.abrupt("return");
+            return _context0.abrupt("return");
           case 2:
             if (!(props.type == "modal")) {
-              _context8.next = 3;
+              _context0.next = 3;
               break;
             }
             _modal["default"].error(props);
-            return _context8.abrupt("return");
+            return _context0.abrupt("return");
           case 3:
             if (!(props.type == "notification")) {
-              _context8.next = 4;
+              _context0.next = 4;
               break;
             }
             _notification2["default"].error(props);
-            return _context8.abrupt("return");
+            return _context0.abrupt("return");
           case 4:
-            _context8.next = 6;
+            _context0.next = 6;
             break;
           case 5:
-            _context8.prev = 5;
-            _t = _context8["catch"](1);
+            _context0.prev = 5;
+            _t = _context0["catch"](1);
             console.error("" + this.title + type + (msg || ""));
             _modal["default"].error({
               title: "" + this.title + type,
@@ -404,11 +486,11 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
             });
           case 6:
           case "end":
-            return _context8.stop();
+            return _context0.stop();
         }
-      }, _callee8, this, [[1, 5]]);
+      }, _callee0, this, [[1, 5]]);
     }));
-    function showError(_x13, _x14) {
+    function showError(_x17, _x18) {
       return _showError.apply(this, arguments);
     }
     return showError;
@@ -430,16 +512,16 @@ var RestApi = exports.RestApi = /*#__PURE__*/function (_BaseRestApi2) {
   (0, _inheritsLoose2["default"])(RestApi, _BaseRestApi2);
   var _proto2 = RestApi.prototype;
   _proto2.handleRequestConfig = /*#__PURE__*/function () {
-    var _handleRequestConfig = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(config) {
-      return _regenerator["default"].wrap(function (_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+    var _handleRequestConfig = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee1(config) {
+      return _regenerator["default"].wrap(function (_context1) {
+        while (1) switch (_context1.prev = _context1.next) {
           case 0:
           case "end":
-            return _context9.stop();
+            return _context1.stop();
         }
-      }, _callee9);
+      }, _callee1);
     }));
-    function handleRequestConfig(_x15) {
+    function handleRequestConfig(_x19) {
       return _handleRequestConfig.apply(this, arguments);
     }
     return handleRequestConfig;

package/lib/utils/api/schema.util.d.ts

@@ -4,11 +4,11 @@
  * @param callback 返回true 继续往下遍历
  */
 export declare function forEachSchema(schema: Schema, callback: (child: Schema, index: number, children: any[]) => boolean): void;
-export declare function forEachFormSchema(schema: Schema, fdm: boolean, callback: (child: Schema) => void): void;
-interface Schema {
+export declare function findFormSchemas(schema: Schema): Schema[];
+export declare function findFdmSchemas(schema?: Schema): Schema[];
+export interface Schema {
     componentName: string;
     props: any;
     children?: Schema[];
     fdmSchema?: Schema;
 }
-export {};

package/lib/utils/api/schema.util.js

@@ -1,7 +1,8 @@
 "use strict";
 
 exports.__esModule = true;
-exports.forEachFormSchema = forEachFormSchema;
+exports.findFdmSchemas = findFdmSchemas;
+exports.findFormSchemas = findFormSchemas;
 exports.forEachSchema = forEachSchema;
 /**
  * 遍历schema
@@ -17,21 +18,26 @@ function forEachSchema(schema, callback) {
     }
   });
 }
-function forEachFormSchema(schema, fdm, callback) {
+function findFormSchemas(schema) {
+  var schemas = [];
   forEachSchema(schema, function (child) {
     if (["PageForm", "SubFormField"].includes(child.componentName)) {
-      callback(child);
-      if (fdm) {
-        if (child.fdmSchema) {
-          forEachSchema(child.fdmSchema, function (fdmChild) {
-            if (fdmChild.componentName == "PageFdm") {
-              callback(child);
-            }
-            return true;
-          });
-        }
-      }
+      schemas.push(child);
     }
     return true;
   });
+  return schemas;
+}
+function findFdmSchemas(schema) {
+  var schemas = [];
+  if (!schema) {
+    return schemas;
+  }
+  forEachSchema(schema, function (child) {
+    if (["PageFdm"].includes(child.componentName)) {
+      schemas.push(child);
+    }
+    return true;
+  });
+  return schemas;
 }