@zhubangyun/lowcode-core 5.10.211 → 5.10.221

package/es/components/react-render/index.d.ts

@@ -3,5 +3,5 @@ import { IRendererProps } from "@zhubangyun/lowcode-render-core/lib/types";
 export declare class ReactRender extends PureComponent<IRendererProps & {}> {
     key: string;
     node: any;
-    render(utils?: any): import("react").JSX.Element;
+    render(): import("react").JSX.Element;
 }

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

@@ -16,11 +16,8 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
   }
   _inheritsLoose(ReactRender, _PureComponent);
   var _proto = ReactRender.prototype;
-  _proto.render = function render(utils) {
+  _proto.render = function render() {
     var _this2 = this;
-    if (utils === void 0) {
-      utils = window.utils;
-    }
     var components = this.props.components || window._components;
     return /*#__PURE__*/React.createElement(ReactRenderFactory, _extends({
       key: this.key
@@ -31,7 +28,7 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
       thisRequiredInJSE: true,
       components: components,
       appHelper: {
-        utils: utils,
+        utils: window.utils,
         requestHandlersMap: {
           fetch: createFetchHandler()
         }

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

@@ -23,15 +23,12 @@ function _getFormApi() {
           key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
             return !!key;
           }).join("_");
-          _context9.next = 4;
-          return formApi.getInstance(key, {
+          return _context9.abrupt("return", formApi.getInstance(key, {
             mock: mock,
             fieldId: fieldId,
             formId: formId
-          });
-        case 4:
-          return _context9.abrupt("return", _context9.sent);
-        case 5:
+          }));
+        case 3:
         case "end":
           return _context9.stop();
       }

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

@@ -12,6 +12,7 @@ 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

@@ -50,7 +50,13 @@ export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
 export var schema = new SchemaCache();
 export var FormApiCache = /*#__PURE__*/function (_SingletonInstanceMap2) {
   function FormApiCache() {
-    return _SingletonInstanceMap2.apply(this, arguments) || this;
+    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;

package/es/utils/page/page-load-schema.js

@@ -38,7 +38,7 @@ export function PageLoadSchema(props) {
     }
   }, []);
   if (cache) {
-    return children(cache.data);
+    return children(schema);
   }
   if (loading) {
     return /*#__PURE__*/React.createElement(PageLoading, {

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

@@ -36,8 +36,8 @@ export function renderElement(options) {
                 _onClose === null || _onClose === void 0 ? void 0 : _onClose();
               }
             }));
-            console.log("渲染", container, root, element);
             root.render(element);
+            return _context.abrupt("return", element);
           case 8:
           case "end":
             return _context.stop();

package/lib/components/react-render/index.d.ts

@@ -3,5 +3,5 @@ import { IRendererProps } from "@zhubangyun/lowcode-render-core/lib/types";
 export declare class ReactRender extends PureComponent<IRendererProps & {}> {
     key: string;
     node: any;
-    render(utils?: any): import("react").JSX.Element;
+    render(): import("react").JSX.Element;
 }

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

@@ -21,11 +21,8 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
   }
   (0, _inheritsLoose2["default"])(ReactRender, _PureComponent);
   var _proto = ReactRender.prototype;
-  _proto.render = function render(utils) {
+  _proto.render = function render() {
     var _this2 = this;
-    if (utils === void 0) {
-      utils = window.utils;
-    }
     var components = this.props.components || window._components;
     return /*#__PURE__*/React.createElement(_reactRenderFactory["default"], (0, _extends2["default"])({
       key: this.key
@@ -36,7 +33,7 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
       thisRequiredInJSE: true,
       components: components,
       appHelper: {
-        utils: utils,
+        utils: window.utils,
         requestHandlersMap: {
           fetch: (0, _lowcodeDatasourceFetchHandler.createFetchHandler)()
         }

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

@@ -29,15 +29,12 @@ function _getFormApi() {
           key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
             return !!key;
           }).join("_");
-          _context9.next = 4;
-          return _cache.formApi.getInstance(key, {
+          return _context9.abrupt("return", _cache.formApi.getInstance(key, {
             mock: mock,
             fieldId: fieldId,
             formId: formId
-          });
-        case 4:
-          return _context9.abrupt("return", _context9.sent);
-        case 5:
+          }));
+        case 3:
         case "end":
           return _context9.stop();
       }

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

@@ -12,6 +12,7 @@ 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

@@ -54,7 +54,13 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
 var schema = exports.schema = new SchemaCache();
 var FormApiCache = exports.FormApiCache = /*#__PURE__*/function (_SingletonInstanceMap2) {
   function FormApiCache() {
-    return _SingletonInstanceMap2.apply(this, arguments) || this;
+    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;

package/lib/utils/page/page-load-schema.js

@@ -43,7 +43,7 @@ function PageLoadSchema(props) {
     }
   }, []);
   if (cache) {
-    return children(cache.data);
+    return children(schema);
   }
   if (loading) {
     return /*#__PURE__*/React.createElement(_pageLoading.PageLoading, {

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

@@ -41,8 +41,8 @@ function renderElement(options) {
                 _onClose === null || _onClose === void 0 ? void 0 : _onClose();
               }
             }));
-            console.log("渲染", container, root, element);
             root.render(element);
+            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.211",
+  "version": "5.10.221",
   "description": "低代码核心",
   "files": [
     "lib",