@zhubangyun/lowcode-core 5.6.214 → 5.8.110

package/es/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/es/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/es/index.js

@@ -1,13 +1,23 @@
 import "./index.less";
 import utils from "./utils";
 import { ReactRender } from "./components/react-render";
+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";
-// @ts-ignore
-window.utils = utils;
+
 // @ts-ignore
 window.__ReactRender = ReactRender;
-export { utils };
+// @ts-ignore
+if (window._) {
+  // @ts-ignore
+  window.lodash = window._;
+}
+// @ts-ignore
+if (!window.utils) {
+  // @ts-ignore
+  window.utils = utils;
+}
+export { utils, lodash };

package/es/style.js

@@ -1,6 +1,7 @@
+import 'antd/es/notification/style';
+import 'antd/es/modal/style';
 import 'antd/es/message/style';
 import 'antd/es/drawer/style';
-import 'antd/es/modal/style';
 import 'antd/es/result/style';
 import 'antd/es/config-provider/style';
 

package/es/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/es/utils/api/form-api.js

@@ -1,11 +1,9 @@
 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";
+import { assembleAssociationField, convertSaveData, handleFilterRules } from "./form-api.utils";
 export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   function RestFormApi(formId, fieldId, mock) {
     var _this;
@@ -25,7 +23,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   _proto.initialize = /*#__PURE__*/function () {
     var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _this2 = this;
-      var res;
+      var _this$schema$props, res;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -42,7 +40,7 @@ export var 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;
@@ -90,6 +88,7 @@ export var 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;
@@ -97,7 +96,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             if (this.mock) {
               config.params.mock = this.mock;
             }
-          case 6:
+          case 7:
           case "end":
             return _context2.stop();
         }
@@ -110,17 +109,35 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   }();
   _proto.search = /*#__PURE__*/function () {
     var _search = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(params) {
-      var res;
+      var _params, _params2;
+      var config, 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:
+            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 = handleFilterRules(((_params = params) === null || _params === void 0 ? void 0 : _params.filterRules) || [], {
+              filterNullValue: false
+            });
+            params.searchFields = 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);
+            assembleAssociationField(res.data, res.refs);
             return _context3.abrupt("return", res);
-          case 5:
+          case 11:
           case "end":
             return _context3.stop();
         }
@@ -141,9 +158,10 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             return _RestApi.prototype.getById.call(this, id, options);
           case 2:
             res = _context4.sent;
-            res.data = assembleAssociationField(res.data, res.refs);
+            assembleAssociationField(res.data, res.refs);
+            console.debug("formApi.getById", res);
             return _context4.abrupt("return", res);
-          case 5:
+          case 6:
           case "end":
             return _context4.stop();
         }
@@ -205,57 +223,22 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
     }
     return update;
   }();
-  return RestFormApi;
-}(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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(data, options) {
+      return _regeneratorRuntime.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);

package/es/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/es/utils/api/form-api.utils.js

@@ -0,0 +1,128 @@
+import _extends from "@babel/runtime/helpers/extends";
+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 { transformerId } from "../data";
+export 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;
+  }));
+}
+export 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);
+}
+export 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();
+    }
+  }
+}
+export function handleFilterRules(filters, options) {
+  var filterNullValue = options.filterNullValue;
+  if (Array.isArray(filters)) {
+    var cloneRules = filters.filter(function (rule) {
+      return !!rule;
+    }).map(function (rule) {
+      return _extends({}, rule, {
+        value: 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/es/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> {

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

@@ -1,9 +1,12 @@
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
+import _notification from "antd/es/notification";
+import _Modal from "antd/es/modal";
 import _message from "antd/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import axios from "axios";
 import { onFulfilled, onRejected } from "./index";
+import { transformerId } from "../data";
 export var BaseRestApi = /*#__PURE__*/function () {
   function BaseRestApi(uri, options) {
     this.uri = void 0;
@@ -114,7 +117,7 @@ export var BaseRestApi = /*#__PURE__*/function () {
             return (_this$handleRequestCo3 = this.handleRequestConfig) === null || _this$handleRequestCo3 === void 0 ? void 0 : _this$handleRequestCo3.call(this, config);
           case 3:
             _context3.next = 5;
-            return this.request.post("", data, config);
+            return this.request.post("save", data, config);
           case 5:
             res = _context3.sent;
             if (res.success) {
@@ -284,26 +287,130 @@ export var BaseRestApi = /*#__PURE__*/function () {
     }
     return deleteById;
   }();
-  _proto.showError = /*#__PURE__*/function () {
-    var _showError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(type, msg) {
+  _proto["delete"] = /*#__PURE__*/function () {
+    var _delete2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(data, options) {
+      var _this$handleRequestCo7;
+      var config, arrayData, idValue, res, _options$onError6, _options$onSuccess6;
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            console.error("{" + this.title + "}" + type + (msg || ""));
-            _message === null || _message === void 0 ? void 0 : _message.error("{" + this.title + "}" + type + (msg || "")).then();
-          case 2:
+            config = {};
+            _context7.next = 3;
+            return (_this$handleRequestCo7 = this.handleRequestConfig) === null || _this$handleRequestCo7 === void 0 ? void 0 : _this$handleRequestCo7.call(this, config);
+          case 3:
+            arrayData = [];
+            idValue = transformerId(data);
+            if (!Array.isArray(idValue)) {
+              arrayData.push(idValue);
+            } else {
+              arrayData = idValue;
+            }
+            arrayData = arrayData.filter(function (item) {
+              return !!item;
+            });
+            if (!(arrayData.length == 0)) {
+              _context7.next = 9;
+              break;
+            }
+            throw new Error("删除对象不可为空!");
+          case 9:
+            _context7.next = 11;
+            return this.request.post("remove", arrayData, config);
+          case 11:
+            res = _context7.sent;
+            if (res.success) {
+              _context7.next = 18;
+              break;
+            }
+            this.showError("\u5220\u9664\u5931\u8D25!", res.message).then();
+            _context7.next = 16;
+            return options === null || options === void 0 ? void 0 : (_options$onError6 = options.onError) === null || _options$onError6 === void 0 ? void 0 : _options$onError6.call(options, res);
+          case 16:
+            _context7.next = 20;
+            break;
+          case 18:
+            _context7.next = 20;
+            return options === null || options === void 0 ? void 0 : (_options$onSuccess6 = options.onSuccess) === null || _options$onSuccess6 === void 0 ? void 0 : _options$onSuccess6.call(options, res);
+          case 20:
+            return _context7.abrupt("return", res);
+          case 21:
           case "end":
             return _context7.stop();
         }
       }, _callee7, this);
     }));
-    function showError(_x13, _x14) {
+    function _delete(_x13, _x14) {
+      return _delete2.apply(this, arguments);
+    }
+    return _delete;
+  }();
+  _proto.showError = /*#__PURE__*/function () {
+    var _showError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(type, msg) {
+      var props;
+      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
+          case 0:
+            _context8.prev = 0;
+            if (!msg) {
+              _context8.next = 18;
+              break;
+            }
+            props = JSON.parse(msg);
+            props.content = props.message;
+            if (props.title) {
+              props.title = "" + this.title + type;
+            }
+            if (!(props.type == "message")) {
+              _context8.next = 10;
+              break;
+            }
+            _message.error(props);
+            return _context8.abrupt("return");
+          case 10:
+            if (!(props.type == "modal")) {
+              _context8.next = 15;
+              break;
+            }
+            _Modal.error(props);
+            return _context8.abrupt("return");
+          case 15:
+            if (!(props.type == "notification")) {
+              _context8.next = 18;
+              break;
+            }
+            _notification.error(props);
+            return _context8.abrupt("return");
+          case 18:
+            _context8.next = 23;
+            break;
+          case 20:
+            _context8.prev = 20;
+            _context8.t0 = _context8["catch"](0);
+            console.log("`showError`解析异常:", _context8.t0);
+          case 23:
+            console.error("{" + this.title + "}" + type + (msg || ""));
+            _message === null || _message === void 0 ? void 0 : _message.error("{" + this.title + "}" + type + (msg || "")).then();
+          case 25:
+          case "end":
+            return _context8.stop();
+        }
+      }, _callee8, this, [[0, 20]]);
+    }));
+    function showError(_x15, _x16) {
       return _showError.apply(this, arguments);
     }
     return showError;
   }();
   return BaseRestApi;
 }();
+function getStringId(item) {
+  if (typeof (item === null || item === void 0 ? void 0 : item.id) === "string") {
+    return item.id;
+  } else if (typeof item === "string") {
+    return item;
+  }
+  return null;
+}
 export var RestApi = /*#__PURE__*/function (_BaseRestApi2) {
   function RestApi(uri, options) {
     return _BaseRestApi2.call(this, uri, options) || this;
@@ -311,16 +418,16 @@ export var RestApi = /*#__PURE__*/function (_BaseRestApi2) {
   _inheritsLoose(RestApi, _BaseRestApi2);
   var _proto2 = RestApi.prototype;
   _proto2.handleRequestConfig = /*#__PURE__*/function () {
-    var _handleRequestConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(config) {
-      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+    var _handleRequestConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(config) {
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
-      }, _callee8);
+      }, _callee9);
     }));
-    function handleRequestConfig(_x15) {
+    function handleRequestConfig(_x17) {
       return _handleRequestConfig.apply(this, arguments);
     }
     return handleRequestConfig;

package/es/utils/cache/schema.js

@@ -16,13 +16,25 @@ function _handleFormSchema() {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          if (!(schema.type !== "form")) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return");
+        case 2:
+          if (schema !== null && schema !== void 0 && schema.componentName) {
+            _context.next = 4;
+            break;
+          }
+          return _context.abrupt("return");
+        case 4:
           fdmItems = [];
           fieldIdMap = new Map();
           schema.state = schema.state || {};
           schema.methods = schema.methods || {};
-          _context.next = 6;
+          _context.next = 10;
           return handleAssociationForm(schema);
-        case 6:
+        case 10:
           //初次处理
           forEachFormSchema(schema, function (field) {
             if (field.fdmSchema) {
@@ -69,7 +81,7 @@ function _handleFormSchema() {
               return true;
             });
           });
-        case 8:
+        case 12:
         case "end":
           return _context.stop();
       }

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

@@ -0,0 +1 @@
+export declare function transformerId(value: any): any;