@zhubangyun/lowcode-core 6.2.30 → 6.3.20

package/es/components/react-render/index.js

@@ -19,6 +19,10 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
   _proto.render = function render() {
     var _this2 = this;
     var components = this.props.components || window._components;
+    if (!components.Page) {
+      // @ts-ignore
+      components["Page"] = Page;
+    }
     return /*#__PURE__*/React.createElement(ReactRenderFactory, _extends({
       key: this.key
     }, this.props, {
@@ -36,4 +40,10 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
     }));
   };
   return ReactRender;
-}(PureComponent);
+}(PureComponent);
+function Page(props) {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "lce-page",
+    style: props.style
+  }, props.children);
+}

package/es/utils/api/form-api/form-api.assemble-entity.d.ts

@@ -0,0 +1,2 @@
+import { IBaseEntity, Refs } from "../rest-api";
+export declare function formApiAssembleEntity(data: IBaseEntity | IBaseEntity[], refs?: Refs): void;

package/es/utils/api/form-api/form-api.assemble-entity.js

@@ -0,0 +1,95 @@
+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; }
+import { FormApiEntityMap } from "./form-api.entity-map";
+import { dataToLabel, safeGet } from "./form-api.utils";
+export function formApiAssembleEntity(data, refs) {
+  if (!data || !refs) return;
+  var dataMap = new FormApiEntityMap();
+  for (var _iterator = _createForOfIteratorHelperLoose(refs), _step; !(_step = _iterator()).done;) {
+    var ref = _step.value;
+    ref.label = ref.form.label;
+    dataMap.addEntities(ref.data);
+  }
+  assembleRefs(refs, dataMap);
+  var dataArray = Array.isArray(data) ? data : [data];
+  assembleData(dataArray, dataMap);
+}
+
+/**
+ * 装配数据
+ */
+function assembleData(data, dataMap) {
+  for (var _iterator2 = _createForOfIteratorHelperLoose(data), _step2; !(_step2 = _iterator2()).done;) {
+    var item = _step2.value;
+    assembleObject(item, dataMap, {
+      maxDepth: 5,
+      depth: 1
+    });
+  }
+}
+
+/**
+ * 装配相关数据
+ */
+function assembleRefs(refs, dataMap) {
+  for (var _iterator3 = _createForOfIteratorHelperLoose(refs), _step3; !(_step3 = _iterator3()).done;) {
+    var ref = _step3.value;
+    ref.label = ref.form.label;
+    var data = ref.data;
+    for (var _iterator4 = _createForOfIteratorHelperLoose(data), _step4; !(_step4 = _iterator4()).done;) {
+      var item = _step4.value;
+      assembleObject(item, dataMap, {
+        maxDepth: 2,
+        depth: 1
+      });
+    }
+  }
+}
+function assembleObject(values, dataMap, options) {
+  var depth = options.depth,
+    maxDepth = options.maxDepth;
+  if (options.depth >= options.maxDepth) {
+    return;
+  }
+  if (dataMap.isEntity(values)) {
+    handleEntityLabel(values);
+  }
+  for (var _i = 0, _Object$keys = Object.keys(values); _i < _Object$keys.length; _i++) {
+    var key = _Object$keys[_i];
+    var value = values[key];
+    if (Array.isArray(value)) {
+      if (dataMap.needLoad(value[0])) {
+        //需要加载的属性
+        values[key] = value.map(function (item) {
+          if (dataMap.hasEntity(item)) {
+            return dataMap.getEntity(item);
+          }
+          return item;
+        });
+      } else if (dataMap.isEntity(value[0])) {
+        //子表属性
+        for (var _iterator5 = _createForOfIteratorHelperLoose(value), _step5; !(_step5 = _iterator5()).done;) {
+          var valueElement = _step5.value;
+          assembleObject(valueElement, dataMap, {
+            maxDepth: maxDepth,
+            depth: depth + 1
+          });
+        }
+      }
+    } else if (typeof value == "object") {
+      if (dataMap.needLoad(value)) {
+        if (dataMap.hasEntity(value)) {
+          values[key] = dataMap.getEntity(value);
+        }
+      }
+    }
+  }
+}
+function handleEntityLabel(data) {
+  var _data$form;
+  var labelField = data === null || data === void 0 ? void 0 : (_data$form = data.form) === null || _data$form === void 0 ? void 0 : _data$form.labelField;
+  if (labelField) {
+    data.label = dataToLabel(safeGet(data, labelField));
+  }
+}

package/es/utils/api/form-api/form-api.entity-map.d.ts

@@ -0,0 +1,12 @@
+import { IBaseEntity } from "../rest-api";
+export declare class FormApiEntityMap {
+    dataMap: Map<string, IBaseEntity>;
+    hasEntity(entity: IBaseEntity): boolean;
+    getEntity(entity: IBaseEntity): IBaseEntity;
+    addEntity(entity: IBaseEntity): void;
+    addEntities(entities: IBaseEntity[]): void;
+    isEntity(value: any): boolean;
+    needLoad(entity: IBaseEntity): boolean;
+    destroy(): void;
+    private createEntityKey;
+}

package/es/utils/api/form-api/form-api.entity-map.js

@@ -0,0 +1,50 @@
+export var FormApiEntityMap = /*#__PURE__*/function () {
+  function FormApiEntityMap() {
+    this.dataMap = new Map();
+  }
+  var _proto = FormApiEntityMap.prototype;
+  _proto.hasEntity = function hasEntity(entity) {
+    var key = this.createEntityKey(entity);
+    return this.dataMap.has(key);
+  };
+  _proto.getEntity = function getEntity(entity) {
+    var key = this.createEntityKey(entity);
+    return this.dataMap.get(key);
+  };
+  _proto.addEntity = function addEntity(entity) {
+    var key = this.createEntityKey(entity);
+    this.dataMap.set(key, entity);
+  };
+  _proto.addEntities = function addEntities(entities) {
+    var _this = this;
+    entities === null || entities === void 0 ? void 0 : entities.forEach(function (item) {
+      return _this.addEntity(item);
+    });
+  };
+  _proto.isEntity = function isEntity(value) {
+    if (value == null) {
+      return false;
+    } else if (Array.isArray(value)) {
+      return false;
+    } else if (typeof value == "object") {
+      var _value$form;
+      return !!value.id && !!((_value$form = value.form) !== null && _value$form !== void 0 && _value$form.id);
+    }
+    return false;
+  };
+  _proto.needLoad = function needLoad(entity) {
+    return this.isEntity(entity) && entity._load == false;
+  };
+  _proto.destroy = function destroy() {
+    this.dataMap.clear();
+  };
+  _proto.createEntityKey = function createEntityKey(entity) {
+    var _entity$form, _entity$form2;
+    var key = (_entity$form = entity.form) === null || _entity$form === void 0 ? void 0 : _entity$form.id;
+    if ((_entity$form2 = entity.form) !== null && _entity$form2 !== void 0 && _entity$form2.fieldId) {
+      key += "." + entity.form.fieldId;
+    }
+    return key + "." + entity.id;
+  };
+  return FormApiEntityMap;
+}();

package/es/utils/api/{form-api.utils.d.ts → form-api/form-api.utils.d.ts}

@@ -1,4 +1,4 @@
-import { FilterRule, IBaseEntity, Refs } from "./rest-api";
+import { FilterRule, IBaseEntity, Refs } from "../rest-api";
 export declare function convertSaveData(data: any): any;
 export declare function dataToLabel(value: any): any;
 export declare function assembleAssociationFieldV2(data: IBaseEntity | IBaseEntity[], refs?: Refs): void;
@@ -9,7 +9,8 @@ export declare function assembleAssociationFieldV2(data: IBaseEntity | IBaseEnti
  */
 export declare function assembleAssociationFieldDataV2(data: IBaseEntity | IBaseEntity[], dataMap: Map<string, IBaseEntity>): void;
 export declare function handleEntityLabel(data: IBaseEntity | IBaseEntity[]): void;
-export declare function assembleAssociationField(data: IBaseEntity | IBaseEntity[], refs?: Refs): void;
+export declare function assembleAssociationField(data: IBaseEntity | IBaseEntity[], refs?: Refs): number;
 export declare function handleFilterRules(filters: FilterRule[], options: {
     filterNullValue: boolean;
 }): FilterRule[];
+export declare function safeGet(value: any, key: string | null): any;

package/es/utils/api/{form-api.utils.js → form-api/form-api.utils.js}

@@ -2,16 +2,37 @@ import _extends from "@babel/runtime/helpers/extends";
 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; }
-import { transformerId } from "../data";
+import { transformerId } from "../../data";
+import { isLocalhost } from "../../common";
+import { formApiAssembleEntity } from "./form-api.assemble-entity";
+import { isTemplateHost } from "../../util.common";
 var SimpleSerialFieldNames = ["parent", "instance"];
 export function convertSaveData(data) {
   if (!data) return data;
+  var seen = new WeakSet(); // WeakSet 只存储对象，非常适合检测引用
   return JSON.parse(JSON.stringify(data, function (key, value) {
-    if (SimpleSerialFieldNames.includes(key)) {
-      var id = value === null || value === void 0 ? void 0 : value.id;
-      return id ? {
-        id: id
-      } : undefined;
+    if (value == null) {
+      return null;
+    } else if (Array.isArray(value)) {
+      return value;
+    } else if (typeof value == "object") {
+      if (SimpleSerialFieldNames.includes(key)) {
+        var id = value === null || value === void 0 ? void 0 : value.id;
+        return id ? {
+          id: id
+        } : undefined;
+      } else if (seen.has(value)) {
+        if (value.id) {
+          return {
+            id: value.id
+          };
+        } else {
+          return value;
+        }
+      } else {
+        seen.add(value);
+      }
+      return value;
     }
     return value;
   }));
@@ -150,7 +171,13 @@ function valueToFormDataArray(value) {
   }
 }
 export function assembleAssociationField(data, refs) {
+  var start = Date.now();
+  if (isLocalhost() || isTemplateHost()) {
+    formApiAssembleEntity(data, refs);
+    return Date.now() - start;
+  }
   assembleAssociationFieldV2(data, refs);
+  return Date.now() - start;
 }
 export function handleFilterRules(filters, options) {
   var filterNullValue = options.filterNullValue;
@@ -159,13 +186,19 @@ export function handleFilterRules(filters, options) {
       return !!rule;
     }).map(function (rule) {
       return _extends({}, rule, {
-        value: transformerId(rule.value),
+        value: transformerId(rule.value, {
+          includeNull: true
+        }),
         rules: handleFilterRules(rule.rules || [], options)
       });
     });
     if (filterNullValue) {
       cloneRules = cloneRules.filter(function (rule) {
         if (rule.value == null) {
+          var _rule$rules;
+          if ((_rule$rules = rule.rules) !== null && _rule$rules !== void 0 && _rule$rules.length) {
+            return true;
+          }
           if (rule.operator != "isNull" && rule.operator != "isNotNull") {
             return false;
           }
@@ -181,7 +214,7 @@ export function handleFilterRules(filters, options) {
     return undefined;
   }
 }
-function safeGet(value, key) {
+export function safeGet(value, key) {
   if (typeof value !== "object") {
     return null;
   }

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

@@ -1,9 +1,8 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { RestApi } from "./rest-api";
-import { assembleAssociationField, convertSaveData, handleFilterRules } from "./form-api.utils";
+import { assembleAssociationField, convertSaveData, handleFilterRules } from "./form-api/form-api.utils";
 import { formApi } from "../cache";
 import { getSchemaFromCache } from "./schema-api";
 import { uuid, uuidVersion } from "../common";
@@ -137,7 +136,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   _proto.search = /*#__PURE__*/function () {
     var _search = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(searchParams) {
       var _searchParams, _searchParams2;
-      var params, config, res, start;
+      var params, config, res;
       return _regeneratorRuntime.wrap(function (_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -161,14 +160,11 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             searchParams.searchFields = handleFilterRules(((_searchParams2 = searchParams) === null || _searchParams2 === void 0 ? void 0 : _searchParams2.searchFields) || [], {
               filterNullValue: true
             });
-            config.params = _extends({}, params, searchParams);
             _context3.next = 2;
-            return this.request.get("search", config);
+            return this.request.post("search", searchParams, config);
           case 2:
             res = _context3.sent;
-            //const res = await this.request.post<any, ManyResult<DataType>>("search", searchParams, config);
-            start = Date.now();
-            assembleAssociationField(res.data, res.refs);
+            res.assembleTime = assembleAssociationField(res.data, res.refs);
             console.debug("form.search:", res);
             return _context3.abrupt("return", res);
           case 3:
@@ -229,8 +225,8 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             return _RestApi.prototype.getById.call(this, searchId, options);
           case 5:
             res = _context4.sent;
-            assembleAssociationField(res.data, res.refs);
-            console.debug("formApi.getById", res);
+            res.assembleTime = assembleAssociationField(res.data, res.refs);
+            console.debug("form.getById:", res);
             return _context4.abrupt("return", res);
           case 6:
           case "end":
@@ -267,7 +263,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
                 };
               });
             }
-            assembleAssociationField(res.data, res.refs);
+            res.assembleTime = assembleAssociationField(res.data, res.refs);
             console.debug("formApi.labelToValue", res);
             return _context5.abrupt("return", res);
           case 3:
@@ -335,7 +331,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   _proto.fieldFilters = /*#__PURE__*/function () {
     var _fieldFilters = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(searchParams) {
       var _searchParams3, _searchParams4;
-      var params, config, res;
+      var params, config;
       return _regeneratorRuntime.wrap(function (_context9) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
@@ -359,13 +355,10 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             searchParams.searchFields = handleFilterRules(((_searchParams4 = searchParams) === null || _searchParams4 === void 0 ? void 0 : _searchParams4.searchFields) || [], {
               filterNullValue: true
             });
-            config.params = _extends({}, params, searchParams);
             _context9.next = 2;
-            return this.request.get("fieldFilters", config);
+            return this.request.post("fieldFilters", searchParams, config);
           case 2:
-            res = _context9.sent;
-            console.debug("form.fieldFilters:", res);
-            return _context9.abrupt("return", res);
+            return _context9.abrupt("return", _context9.sent);
           case 3:
           case "end":
             return _context9.stop();

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

@@ -1,5 +1,5 @@
 import { AxiosInstance, AxiosRequestConfig } from "axios";
-export type ValueType = "value" | "field" | "express";
+export type ValueType = "value" | "field" | "express" | "column";
 export interface RestApiOptions {
     /**
      * 超时时间
@@ -106,6 +106,7 @@ export interface BaseResult<DataType> {
     success: boolean;
     message?: string;
     requestId: string;
+    assembleTime: number;
     refs?: Refs;
 }
 export interface Ref {

package/es/utils/api/schema-api.d.ts

@@ -1,3 +1,4 @@
 import { OneResult } from "./rest-api";
+import { Schema } from "./schema.util";
 export declare function getSchema(pageId: string, mock?: boolean): Promise<OneResult<any>>;
-export declare function getSchemaFromCache(pageId?: string, mock?: boolean): any;
+export declare function getSchemaFromCache(pageId?: string, mock?: boolean): OneResult<Schema>;

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

@@ -11,7 +11,7 @@ function _getSchema() {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           mock = getMock(mock);
-          key = mock ? pageId + ":mock" : pageId;
+          key = mock ? pageId + "_mock" : pageId;
           _context.next = 1;
           return schema.getInstance(key, {
             mock: mock,

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

@@ -5,6 +5,7 @@
  */
 export declare function forEachSchema(schema: Schema, callback: (child: Schema, index: number, children: any[]) => boolean): void;
 export declare function findFormSchemas(schema: Schema): Schema[];
+export declare function findLoadRefSchemas(schema: Schema): Schema[];
 export declare function findFdmSchemas(schema?: Schema): Schema[];
 export interface Schema {
     componentName: string;

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

@@ -22,6 +22,16 @@ export function findFormSchemas(schema) {
   });
   return schemas;
 }
+export function findLoadRefSchemas(schema) {
+  var schemas = [];
+  forEachSchema(schema, function (child) {
+    if (["ProcessGroupField"].includes(child.componentName)) {
+      schemas.push(child);
+    }
+    return true;
+  });
+  return schemas;
+}
 export function findFdmSchemas(schema) {
   var schemas = [];
   if (!schema) {

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

@@ -12,7 +12,6 @@ export declare class FormApiCache extends SingletonInstanceMap<RestFormApi<any>,
     fieldId?: string;
     mock?: boolean;
 }> {
-    apiMap: Map<string, RestFormApi<any>>;
     createInstance(key: string, options?: any): Promise<RestFormApi<any>>;
 }
 export declare const formApi: FormApiCache;

package/es/utils/cache/index.js

@@ -1,9 +1,12 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+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; }
 import { SingletonInstanceMap } from "../common/SingletonInstanceMap";
 import { apiRequest, RestFormApi } from "../api";
-import { findFdmSchemas, findFormSchemas } from "../api/schema.util";
+import { findFdmSchemas, findFormSchemas, findLoadRefSchemas } from "../api/schema.util";
 export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
   function SchemaCache() {
     return _SingletonInstanceMap.apply(this, arguments) || this;
@@ -12,28 +15,24 @@ export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
   var _proto = SchemaCache.prototype;
   _proto.createInstance = /*#__PURE__*/function () {
     var _createInstance = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(key, options) {
-      var mock, pageId, schemaRes, schema, handleCommonSchema, permission, printTemplates, workflow, cloneSchema, _t;
+      var mock, pageId, params, schemaRes, schema, handleCommonSchema, permission, printTemplates, workflow, cloneSchema, refs, _iterator, _step, _ref$props, _ref$props$fieldProps, _ref$props$fieldProps2, ref, refPageId, _key, _t;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             mock = options.mock, pageId = options.pageId;
+            params = {};
+            if (mock) {
+              params.mock = mock;
+            }
             _context.next = 1;
             return apiRequest.get("pages/" + pageId + "/schema", {
-              params: {
-                mock: mock
-              }
+              params: params
             });
           case 1:
             schemaRes = _context.sent;
-            if (schemaRes.succss) {
-              _context.next = 2;
-              break;
-            }
-            return _context.abrupt("return", schemaRes);
-          case 2:
-            schema = schemaRes.data;
-            if (!(schema != null && typeof schema == "object")) {
-              _context.next = 8;
+            schema = schemaRes === null || schemaRes === void 0 ? void 0 : schemaRes.data;
+            if (!schema) {
+              _context.next = 9;
               break;
             }
             handleCommonSchema = function handleCommonSchema(schema) {
@@ -46,29 +45,29 @@ export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
             permission = null; //处理打印
             workflow = null;
             if (location.pathname.startsWith("/print")) {
-              _context.next = 7;
+              _context.next = 6;
               break;
             }
-            _context.next = 3;
+            _context.next = 2;
             return apiRequest.get("pages/" + pageId + "/permission");
-          case 3:
+          case 2:
             permission = _context.sent.data;
             if (!((schema === null || schema === void 0 ? void 0 : schema.type) == "form")) {
-              _context.next = 7;
+              _context.next = 6;
               break;
             }
-            _context.prev = 4;
-            _context.next = 5;
+            _context.prev = 3;
+            _context.next = 4;
             return apiRequest.get("pages/" + pageId + "/printTemplates");
-          case 5:
+          case 4:
             printTemplates = _context.sent.data;
-            _context.next = 7;
+            _context.next = 6;
             break;
-          case 6:
-            _context.prev = 6;
-            _t = _context["catch"](4);
+          case 5:
+            _context.prev = 5;
+            _t = _context["catch"](3);
             console.log(_t);
-          case 7:
+          case 6:
             findFormSchemas(schema).forEach(function (formSchema) {
               handleCommonSchema(formSchema);
               findFdmSchemas(formSchema.fdmSchema).forEach(function (fdmSchema) {
@@ -82,13 +81,43 @@ export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
                 fdmSchema.props.formElement = cloneSchema;
               });
             });
+            refs = findLoadRefSchemas(schema);
+            if (!refs.length) {
+              _context.next = 9;
+              break;
+            }
+            _iterator = _createForOfIteratorHelperLoose(refs);
+          case 7:
+            if ((_step = _iterator()).done) {
+              _context.next = 9;
+              break;
+            }
+            ref = _step.value;
+            refPageId = (_ref$props = ref.props) === null || _ref$props === void 0 ? void 0 : (_ref$props$fieldProps = _ref$props.fieldProps) === null || _ref$props$fieldProps === void 0 ? void 0 : (_ref$props$fieldProps2 = _ref$props$fieldProps.associationForm) === null || _ref$props$fieldProps2 === void 0 ? void 0 : _ref$props$fieldProps2.id;
+            if (!(typeof refPageId == "string" && refPageId !== pageId)) {
+              _context.next = 8;
+              break;
+            }
+            if (this.valueMap.has(refPageId)) {
+              _context.next = 8;
+              break;
+            }
+            _key = mock ? refPageId + "_mock" : refPageId;
+            _context.next = 8;
+            return this.getInstance(_key, {
+              mock: mock,
+              pageId: refPageId
+            });
           case 8:
-            return _context.abrupt("return", schemaRes);
+            _context.next = 7;
+            break;
           case 9:
+            return _context.abrupt("return", schemaRes);
+          case 10:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[4, 6]]);
+      }, _callee, this, [[3, 5]]);
     }));
     function createInstance(_x, _x2) {
       return _createInstance.apply(this, arguments);
@@ -100,13 +129,7 @@ export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
 export var schema = new SchemaCache();
 export var FormApiCache = /*#__PURE__*/function (_SingletonInstanceMap2) {
   function FormApiCache() {
-    var _this;
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _SingletonInstanceMap2.call.apply(_SingletonInstanceMap2, [this].concat(args)) || this;
-    _this.apiMap = new Map();
-    return _this;
+    return _SingletonInstanceMap2.apply(this, arguments) || this;
   }
   _inheritsLoose(FormApiCache, _SingletonInstanceMap2);
   var _proto2 = FormApiCache.prototype;

package/es/utils/cache/index_db_cache.d.ts

@@ -0,0 +1,9 @@
+import { Dexie, type EntityTable } from "dexie";
+export interface Friend {
+    page_id: string;
+    schema: any;
+}
+declare const db_cache: Dexie & {
+    page_schemas: EntityTable<Friend, 'page_id'>;
+};
+export default db_cache;

package/es/utils/cache/index_db_cache.js

@@ -0,0 +1,7 @@
+import { Dexie } from "dexie";
+var db_cache = new Dexie('cache');
+db_cache.version(1).stores({
+  page_schemas: 'page_id,schema'
+});
+var page_schemas = db_cache.page_schemas;
+export default db_cache;

package/es/utils/common/SingletonInstanceMap.d.ts

@@ -1,6 +1,6 @@
 export declare abstract class SingletonInstanceMap<Value, Options> {
-    private readonly valueMap;
-    private readonly lockMap;
+    protected readonly valueMap: Map<string, Value>;
+    protected readonly lockMap: Map<string, boolean>;
     getInstance(key: string, options: Options): Promise<Value>;
     get(key: string): Value;
     clear(): void;

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

@@ -1 +1,3 @@
-export declare function transformerId(value: any): any;
+export declare function transformerId(value: any, options?: {
+    includeNull?: boolean;
+}): any;

package/es/utils/data/index.js

@@ -1,11 +1,18 @@
-export function transformerId(value) {
+export function transformerId(value, options) {
   if (value == null) {
     return null;
   }
   if (Array.isArray(value)) {
-    return value.map(transformerId).filter(function (value) {
-      return !!value;
+    var values = value.map(function (item) {
+      return transformerId(item, options);
     });
+    if (options !== null && options !== void 0 && options.includeNull) {
+      return values;
+    } else {
+      return values.filter(function (v) {
+        return !!v;
+      });
+    }
   }
   if (typeof value == "object") {
     return (value === null || value === void 0 ? void 0 : value.id) || (value === null || value === void 0 ? void 0 : value.value) || value;