@zhubangyun/lowcode-core 6.1.90 → 6.3.20

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

@@ -9,20 +9,42 @@ exports.convertSaveData = convertSaveData;
 exports.dataToLabel = dataToLabel;
 exports.handleEntityLabel = handleEntityLabel;
 exports.handleFilterRules = handleFilterRules;
+exports.safeGet = safeGet;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _data = require("../data");
+var _data = require("../../data");
+var _common = require("../../common");
+var _formApi = require("./form-api.assemble-entity");
+var _util = require("../../util.common");
 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;
+  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;
   }));
@@ -161,7 +183,13 @@ function valueToFormDataArray(value) {
   }
 }
 function assembleAssociationField(data, refs) {
+  var start = Date.now();
+  if ((0, _common.isLocalhost)() || (0, _util.isTemplateHost)()) {
+    (0, _formApi.formApiAssembleEntity)(data, refs);
+    return Date.now() - start;
+  }
   assembleAssociationFieldV2(data, refs);
+  return Date.now() - start;
 }
 function handleFilterRules(filters, options) {
   var filterNullValue = options.filterNullValue;
@@ -170,13 +198,19 @@ function handleFilterRules(filters, options) {
       return !!rule;
     }).map(function (rule) {
       return (0, _extends2["default"])({}, rule, {
-        value: (0, _data.transformerId)(rule.value),
+        value: (0, _data.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;
           }

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

@@ -16,5 +16,6 @@ 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>>;
+    fieldFilters(searchParams?: RestSearchParams): Promise<ManyResult<DataType>>;
     serviceUpdate(data: DataType, options?: BaseRequestOptions<DataType>): Promise<import("axios").AxiosResponse<any, any, {}>>;
 }

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

@@ -5,11 +5,10 @@ exports.__esModule = true;
 exports.RestFormApi = void 0;
 exports.getFormApi = getFormApi;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _restApi = require("./rest-api");
-var _formApi = require("./form-api.utils");
+var _formApi = require("./form-api/form-api.utils");
 var _cache = require("../cache");
 var _schemaApi = require("./schema-api");
 var _common = require("../common");
@@ -17,10 +16,10 @@ function getFormApi(_x, _x2, _x3) {
   return _getFormApi.apply(this, arguments);
 }
 function _getFormApi() {
-  _getFormApi = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee0(formId, fieldId, mock) {
+  _getFormApi = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee1(formId, fieldId, mock) {
     var key;
-    return _regenerator["default"].wrap(function (_context0) {
-      while (1) switch (_context0.prev = _context0.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") {
@@ -30,16 +29,16 @@ function _getFormApi() {
           key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
             return !!key;
           }).join("_");
-          return _context0.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 _context0.stop();
+          return _context1.stop();
       }
-    }, _callee0);
+    }, _callee1);
   }));
   return _getFormApi.apply(this, arguments);
 }
@@ -143,7 +142,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   _proto.search = /*#__PURE__*/function () {
     var _search = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(searchParams) {
       var _searchParams, _searchParams2;
-      var params, config, res, start;
+      var params, config, res;
       return _regenerator["default"].wrap(function (_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -167,14 +166,11 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             searchParams.searchFields = (0, _formApi.handleFilterRules)(((_searchParams2 = searchParams) === null || _searchParams2 === void 0 ? void 0 : _searchParams2.searchFields) || [], {
               filterNullValue: true
             });
-            config.params = (0, _extends2["default"])({}, 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();
-            (0, _formApi.assembleAssociationField)(res.data, res.refs);
+            res.assembleTime = (0, _formApi.assembleAssociationField)(res.data, res.refs);
             console.debug("form.search:", res);
             return _context3.abrupt("return", res);
           case 3:
@@ -190,22 +186,59 @@ 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);
+            res.assembleTime = (0, _formApi.assembleAssociationField)(res.data, res.refs);
+            console.debug("form.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);
@@ -236,7 +269,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
                 };
               });
             }
-            (0, _formApi.assembleAssociationField)(res.data, res.refs);
+            res.assembleTime = (0, _formApi.assembleAssociationField)(res.data, res.refs);
             console.debug("formApi.labelToValue", res);
             return _context5.abrupt("return", res);
           case 3:
@@ -301,30 +334,72 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
     }
     return update;
   }();
-  _proto.serviceUpdate = /*#__PURE__*/function () {
-    var _serviceUpdate = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(data, options) {
-      var params;
+  _proto.fieldFilters = /*#__PURE__*/function () {
+    var _fieldFilters = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(searchParams) {
+      var _searchParams3, _searchParams4;
+      var params, config;
       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.mock = true;
               params.description = (this.title || "表单") + ".\u67E5\u8BE2";
             }
-            return _context9.abrupt("return", this.request.post("serviceUpdate", data, {
+            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
+            });
+            _context9.next = 2;
+            return this.request.post("fieldFilters", searchParams, config);
+          case 2:
+            return _context9.abrupt("return", _context9.sent);
+          case 3:
           case "end":
             return _context9.stop();
         }
       }, _callee9, this);
     }));
-    function serviceUpdate(_x15, _x16) {
+    function fieldFilters(_x15) {
+      return _fieldFilters.apply(this, arguments);
+    }
+    return fieldFilters;
+  }();
+  _proto.serviceUpdate = /*#__PURE__*/function () {
+    var _serviceUpdate = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee0(data, options) {
+      var params;
+      return _regenerator["default"].wrap(function (_context0) {
+        while (1) switch (_context0.prev = _context0.next) {
+          case 0:
+            params = {
+              formId: this.formId,
+              fieldId: this.fieldId
+            };
+            if (__mock) {
+              params.mock = true;
+              params.description = (this.title || "表单") + ".\u67E5\u8BE2";
+            }
+            return _context0.abrupt("return", this.request.post("serviceUpdate", data, {
+              params: params
+            }));
+          case 1:
+          case "end":
+            return _context0.stop();
+        }
+      }, _callee0, this);
+    }));
+    function serviceUpdate(_x16, _x17) {
       return _serviceUpdate.apply(this, arguments);
     }
     return serviceUpdate;

package/lib/utils/api/index.js

@@ -45,13 +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

@@ -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/lib/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/lib/utils/api/schema-api.js

@@ -17,7 +17,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 _cache.schema.getInstance(key, {
             mock: mock,

package/lib/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/lib/utils/api/schema.util.js

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 exports.findFdmSchemas = findFdmSchemas;
 exports.findFormSchemas = findFormSchemas;
+exports.findLoadRefSchemas = findLoadRefSchemas;
 exports.forEachSchema = forEachSchema;
 /**
  * 遍历schema
@@ -28,6 +29,16 @@ function findFormSchemas(schema) {
   });
   return schemas;
 }
+function findLoadRefSchemas(schema) {
+  var schemas = [];
+  forEachSchema(schema, function (child) {
+    if (["ProcessGroupField"].includes(child.componentName)) {
+      schemas.push(child);
+    }
+    return true;
+  });
+  return schemas;
+}
 function findFdmSchemas(schema) {
   var schemas = [];
   if (!schema) {

package/lib/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/lib/utils/cache/index.js

@@ -9,6 +9,9 @@ var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inh
 var _SingletonInstanceMap3 = require("../common/SingletonInstanceMap");
 var _api = require("../api");
 var _schema = require("../api/schema.util");
+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 SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
   function SchemaCache() {
     return _SingletonInstanceMap.apply(this, arguments) || this;
@@ -17,28 +20,24 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
   var _proto = SchemaCache.prototype;
   _proto.createInstance = /*#__PURE__*/function () {
     var _createInstance = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].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 _regenerator["default"].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 _api.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) {
@@ -51,29 +50,29 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
             permission = null; //处理打印
             workflow = null;
             if (location.pathname.startsWith("/print")) {
-              _context.next = 7;
+              _context.next = 6;
               break;
             }
-            _context.next = 3;
+            _context.next = 2;
             return _api.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 _api.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:
             (0, _schema.findFormSchemas)(schema).forEach(function (formSchema) {
               handleCommonSchema(formSchema);
               (0, _schema.findFdmSchemas)(formSchema.fdmSchema).forEach(function (fdmSchema) {
@@ -87,13 +86,43 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
                 fdmSchema.props.formElement = cloneSchema;
               });
             });
+            refs = (0, _schema.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);
@@ -105,13 +134,7 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
 var schema = exports.schema = new SchemaCache();
 var FormApiCache = exports.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;
   }
   (0, _inheritsLoose2["default"])(FormApiCache, _SingletonInstanceMap2);
   var _proto2 = FormApiCache.prototype;

package/lib/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/lib/utils/cache/index_db_cache.js

@@ -0,0 +1,11 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = void 0;
+var _dexie = require("dexie");
+var db_cache = new _dexie.Dexie('cache');
+db_cache.version(1).stores({
+  page_schemas: 'page_id,schema'
+});
+var page_schemas = db_cache.page_schemas;
+var _default = exports["default"] = db_cache;

package/lib/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/lib/utils/common/index.d.ts

@@ -1,6 +1,6 @@
 export { loadPlugins } from "./LoadPlugins";
 export declare function uuid(prefix?: string, separator?: string): string;
-export declare function uuidVersion(id: string): number;
+export declare function uuidVersion(id: string): number | false;
 export declare function toArray(data: any): any[];
 export declare function isLocalhost(): boolean;
 export declare function isMobile(): boolean;

package/lib/utils/common/index.js

@@ -19,7 +19,11 @@ function uuid(prefix, separator) {
   }).join("");
 }
 function uuidVersion(id) {
-  return (0, _uuid.version)(id);
+  try {
+    return (0, _uuid.version)(id);
+  } catch (e) {
+    return false;
+  }
 }
 function toArray(data) {
   if (!data) {

package/lib/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/lib/utils/data/index.js

@@ -2,14 +2,21 @@
 
 exports.__esModule = true;
 exports.transformerId = transformerId;
-function transformerId(value) {
+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;

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

@@ -1,3 +1,4 @@
+export { createForm, getSchema } from "./page-create-element";
 export { print, getFormPrintTemplates } from "./print-form";
 export { showForm } from "./page-form";
 export { showFormGroup } from "./page-form-group";