@zhubangyun/lowcode-core 5.10.220 → 5.10.221

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

@@ -1,6 +1,6 @@
 import { BaseRequestOptions, ManyResult, OneResult, RestApi, RestSearchParams } from "./rest-api";
 import { AxiosRequestConfig } from "axios";
-export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): RestFormApi<any>;
+export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): Promise<RestFormApi<any>>;
 export declare class RestFormApi<DataType> extends RestApi<DataType> {
     private readonly formId;
     private readonly fieldId?;

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

@@ -1,25 +1,40 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 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 { getSchema } from "./index";
 import { assembleAssociationField, convertSaveData, handleFilterRules } from "./form-api.utils";
 import { formApi } from "../cache";
-export function getFormApi(formId, fieldId, mock) {
-  if (typeof mock != "boolean") {
-    if (typeof window.__mock == "boolean") {
-      mock = window.__mock;
-    }
-  }
-  var key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
-    return !!key;
-  }).join("_");
-  return formApi.getInstance(key, {
-    mock: mock,
-    fieldId: fieldId,
-    formId: formId
-  });
+export function getFormApi(_x, _x2, _x3) {
+  return _getFormApi.apply(this, arguments);
+}
+function _getFormApi() {
+  _getFormApi = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(formId, fieldId, mock) {
+    var key;
+    return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
+        case 0:
+          if (typeof mock != "boolean") {
+            if (typeof window.__mock == "boolean") {
+              mock = window.__mock;
+            }
+          }
+          key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
+            return !!key;
+          }).join("_");
+          return _context9.abrupt("return", formApi.getInstance(key, {
+            mock: mock,
+            fieldId: fieldId,
+            formId: formId
+          }));
+        case 3:
+        case "end":
+          return _context9.stop();
+      }
+    }, _callee9);
+  }));
+  return _getFormApi.apply(this, arguments);
 }
 export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   function RestFormApi(formId, fieldId, mock) {
@@ -121,7 +136,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee2, this);
     }));
-    function handleRequestConfig(_x) {
+    function handleRequestConfig(_x4) {
       return _handleRequestConfig.apply(this, arguments);
     }
     return handleRequestConfig;
@@ -169,7 +184,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee3, this);
     }));
-    function search(_x2) {
+    function search(_x5) {
       return _search.apply(this, arguments);
     }
     return search;
@@ -194,7 +209,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee4, this);
     }));
-    function getById(_x3, _x4) {
+    function getById(_x6, _x7) {
       return _getById.apply(this, arguments);
     }
     return getById;
@@ -211,7 +226,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee5, this);
     }));
-    function save(_x5, _x6) {
+    function save(_x8, _x9) {
       return _save.apply(this, arguments);
     }
     return save;
@@ -228,7 +243,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee6, this);
     }));
-    function create(_x7, _x8) {
+    function create(_x10, _x11) {
       return _create.apply(this, arguments);
     }
     return create;
@@ -245,7 +260,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee7, this);
     }));
-    function update(_x9, _x10, _x11) {
+    function update(_x12, _x13, _x14) {
       return _update.apply(this, arguments);
     }
     return update;
@@ -262,7 +277,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee8, this);
     }));
-    function serviceUpdate(_x12, _x13) {
+    function serviceUpdate(_x15, _x16) {
       return _serviceUpdate.apply(this, arguments);
     }
     return serviceUpdate;

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

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

package/es/utils/cache/index.js

@@ -48,22 +48,44 @@ export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
   return SchemaCache;
 }(SingletonInstanceMap);
 export var schema = new SchemaCache();
-export var FormApiCache = /*#__PURE__*/function () {
+export var FormApiCache = /*#__PURE__*/function (_SingletonInstanceMap2) {
   function FormApiCache() {
-    this.apiMap = new Map();
+    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;
   }
+  _inheritsLoose(FormApiCache, _SingletonInstanceMap2);
   var _proto2 = FormApiCache.prototype;
-  _proto2.getInstance = function getInstance(key, options) {
-    if (this.apiMap.has(key)) {
-      return this.apiMap.get(key);
+  _proto2.createInstance = /*#__PURE__*/function () {
+    var _createInstance2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(key, options) {
+      var _options, formId, fieldId, mock, formApi;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (options === void 0) {
+              options = {};
+            }
+            _options = options, formId = _options.formId, fieldId = _options.fieldId, mock = _options.mock;
+            formApi = new RestFormApi(formId, fieldId, mock);
+            _context2.next = 5;
+            return formApi.initialize();
+          case 5:
+            return _context2.abrupt("return", formApi);
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    function createInstance(_x3, _x4) {
+      return _createInstance2.apply(this, arguments);
     }
-    var formId = options.formId,
-      fieldId = options.fieldId,
-      mock = options.mock;
-    var formApi = new RestFormApi(formId, fieldId, mock);
-    this.apiMap.set(key, formApi);
-    return formApi;
-  };
+    return createInstance;
+  }();
   return FormApiCache;
-}();
+}(SingletonInstanceMap);
 export var formApi = new FormApiCache();

package/es/utils/page/page-render.js

@@ -37,7 +37,8 @@ export function renderElement(options) {
               }
             }));
             root.render(element);
-          case 7:
+            return _context.abrupt("return", element);
+          case 8:
           case "end":
             return _context.stop();
         }

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

@@ -1,6 +1,6 @@
 import { BaseRequestOptions, ManyResult, OneResult, RestApi, RestSearchParams } from "./rest-api";
 import { AxiosRequestConfig } from "axios";
-export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): RestFormApi<any>;
+export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): Promise<RestFormApi<any>>;
 export declare class RestFormApi<DataType> extends RestApi<DataType> {
     private readonly formId;
     private readonly fieldId?;

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

@@ -6,26 +6,41 @@ exports.RestFormApi = void 0;
 exports.getFormApi = getFormApi;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _restApi = require("./rest-api");
 var _index = require("./index");
 var _formApi = require("./form-api.utils");
 var _cache = require("../cache");
-function getFormApi(formId, fieldId, mock) {
-  if (typeof mock != "boolean") {
-    if (typeof window.__mock == "boolean") {
-      mock = window.__mock;
-    }
-  }
-  var key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
-    return !!key;
-  }).join("_");
-  return _cache.formApi.getInstance(key, {
-    mock: mock,
-    fieldId: fieldId,
-    formId: formId
-  });
+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) {
+    var key;
+    return _regenerator["default"].wrap(function _callee9$(_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
+        case 0:
+          if (typeof mock != "boolean") {
+            if (typeof window.__mock == "boolean") {
+              mock = window.__mock;
+            }
+          }
+          key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
+            return !!key;
+          }).join("_");
+          return _context9.abrupt("return", _cache.formApi.getInstance(key, {
+            mock: mock,
+            fieldId: fieldId,
+            formId: formId
+          }));
+        case 3:
+        case "end":
+          return _context9.stop();
+      }
+    }, _callee9);
+  }));
+  return _getFormApi.apply(this, arguments);
 }
 var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   function RestFormApi(formId, fieldId, mock) {
@@ -127,7 +142,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee2, this);
     }));
-    function handleRequestConfig(_x) {
+    function handleRequestConfig(_x4) {
       return _handleRequestConfig.apply(this, arguments);
     }
     return handleRequestConfig;
@@ -175,7 +190,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee3, this);
     }));
-    function search(_x2) {
+    function search(_x5) {
       return _search.apply(this, arguments);
     }
     return search;
@@ -200,7 +215,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee4, this);
     }));
-    function getById(_x3, _x4) {
+    function getById(_x6, _x7) {
       return _getById.apply(this, arguments);
     }
     return getById;
@@ -217,7 +232,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee5, this);
     }));
-    function save(_x5, _x6) {
+    function save(_x8, _x9) {
       return _save.apply(this, arguments);
     }
     return save;
@@ -234,7 +249,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee6, this);
     }));
-    function create(_x7, _x8) {
+    function create(_x10, _x11) {
       return _create.apply(this, arguments);
     }
     return create;
@@ -251,7 +266,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee7, this);
     }));
-    function update(_x9, _x10, _x11) {
+    function update(_x12, _x13, _x14) {
       return _update.apply(this, arguments);
     }
     return update;
@@ -268,7 +283,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee8, this);
     }));
-    function serviceUpdate(_x12, _x13) {
+    function serviceUpdate(_x15, _x16) {
       return _serviceUpdate.apply(this, arguments);
     }
     return serviceUpdate;

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

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

package/lib/utils/cache/index.js

@@ -6,7 +6,7 @@ exports.schema = exports.formApi = exports.SchemaCache = exports.FormApiCache =
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
-var _SingletonInstanceMap2 = require("../common/SingletonInstanceMap");
+var _SingletonInstanceMap3 = require("../common/SingletonInstanceMap");
 var _api = require("../api");
 var _schema = require("./schema");
 var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
@@ -50,24 +50,46 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
     return createInstance;
   }();
   return SchemaCache;
-}(_SingletonInstanceMap2.SingletonInstanceMap);
+}(_SingletonInstanceMap3.SingletonInstanceMap);
 var schema = exports.schema = new SchemaCache();
-var FormApiCache = exports.FormApiCache = /*#__PURE__*/function () {
+var FormApiCache = exports.FormApiCache = /*#__PURE__*/function (_SingletonInstanceMap2) {
   function FormApiCache() {
-    this.apiMap = new Map();
+    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;
   }
+  (0, _inheritsLoose2["default"])(FormApiCache, _SingletonInstanceMap2);
   var _proto2 = FormApiCache.prototype;
-  _proto2.getInstance = function getInstance(key, options) {
-    if (this.apiMap.has(key)) {
-      return this.apiMap.get(key);
+  _proto2.createInstance = /*#__PURE__*/function () {
+    var _createInstance2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(key, options) {
+      var _options, formId, fieldId, mock, formApi;
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (options === void 0) {
+              options = {};
+            }
+            _options = options, formId = _options.formId, fieldId = _options.fieldId, mock = _options.mock;
+            formApi = new _api.RestFormApi(formId, fieldId, mock);
+            _context2.next = 5;
+            return formApi.initialize();
+          case 5:
+            return _context2.abrupt("return", formApi);
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    function createInstance(_x3, _x4) {
+      return _createInstance2.apply(this, arguments);
     }
-    var formId = options.formId,
-      fieldId = options.fieldId,
-      mock = options.mock;
-    var formApi = new _api.RestFormApi(formId, fieldId, mock);
-    this.apiMap.set(key, formApi);
-    return formApi;
-  };
+    return createInstance;
+  }();
   return FormApiCache;
-}();
+}(_SingletonInstanceMap3.SingletonInstanceMap);
 var formApi = exports.formApi = new FormApiCache();

package/lib/utils/page/page-render.js

@@ -42,7 +42,8 @@ function renderElement(options) {
               }
             }));
             root.render(element);
-          case 7:
+            return _context.abrupt("return", element);
+          case 8:
           case "end":
             return _context.stop();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhubangyun/lowcode-core",
-  "version": "5.10.220",
+  "version": "5.10.221",
   "description": "低代码核心",
   "files": [
     "lib",