@zhubangyun/lowcode-core 1.1.14 → 1.1.16

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

@@ -0,0 +1,9 @@
+import { PureComponent } from "react";
+export declare class ReactRender extends PureComponent<{
+    schema: any;
+    components?: any;
+}> {
+    key: string;
+    jsx: any;
+    render(): import("react").JSX.Element;
+}

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

@@ -0,0 +1,43 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
+import RendererCore from "@zhubangyun/lowcode-renderer-core";
+import { PureComponent } from "react";
+import utils from "../../utils";
+import { createFetchHandler } from "@alilc/lowcode-datasource-fetch-handler";
+export var ReactRender = /*#__PURE__*/function (_PureComponent) {
+  function ReactRender() {
+    var _this;
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _PureComponent.call.apply(_PureComponent, [this].concat(args)) || this;
+    _this.key = Date.now().toString(36);
+    _this.jsx = void 0;
+    return _this;
+  }
+  _inheritsLoose(ReactRender, _PureComponent);
+  var _proto = ReactRender.prototype;
+  _proto.render = function render() {
+    var _this2 = this;
+    var key = this.key;
+    // @ts-ignore
+    var components = this.props.components || window.components || {};
+    return /*#__PURE__*/React.createElement(RendererCore, _extends({}, this.props, {
+      key: key,
+      ref: function ref(page) {
+        _this2.jsx = page === null || page === void 0 ? void 0 : page.__ref;
+      },
+      schema: this.props.schema,
+      thisRequiredInJSE: true,
+      className: "schema-render",
+      components: components,
+      appHelper: {
+        utils: utils,
+        requestHandlersMap: {
+          fetch: createFetchHandler()
+        }
+      }
+    }));
+  };
+  return ReactRender;
+}(PureComponent);

package/es/components/schema-render/components/schema-render-base.d.ts

@@ -23,8 +23,7 @@ export interface FormProps {
     onInit?: (values: any, form: FormInstance) => Promise<void>;
 }
 export interface SchemaBaseRenderProps {
-    components: any;
-    loadSchema: (props: SchemaBaseRenderProps) => Promise<void>;
+    schemaId: string;
     params?: FormProps;
 }
 export interface SchemaBaseRenderState {
@@ -37,6 +36,7 @@ export declare class SchemaRenderBase extends Component<SchemaBaseRenderProps, S
     constructor(props: Readonly<SchemaBaseRenderProps> | SchemaBaseRenderProps);
     componentDidMount(): Promise<void>;
     page: any;
+    loadSchema: () => Promise<void>;
     components: any;
     loadComponent: () => Promise<void>;
     render(): JSX.Element;

package/es/components/schema-render/components/schema-render-base.js

@@ -9,6 +9,7 @@ import ReactRenderer, { adapter } from "@zhubangyun/lowcode-renderer-core";
 import { createFetchHandler } from "@alilc/lowcode-datasource-fetch-handler";
 import utils from "../../../utils";
 import assets from "./assets";
+import demoSchema from "./demo-schema";
 import zhCN from "antd/locale/zh_CN";
 // @ts-ignore
 adapter.setConfigProvider(((_window$antd = window.antd) === null || _window$antd === void 0 ? void 0 : _window$antd.ConfigProvider) || _ConfigProvider);
@@ -22,23 +23,59 @@ export var SchemaRenderBase = /*#__PURE__*/function (_Component) {
       result: undefined
     };
     _this.page = void 0;
-    _this.components = void 0;
-    _this.loadComponent = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _yield$utils$designer, components;
+    _this.loadSchema = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var schemaId, schema;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
+            return _this.loadComponent();
+          case 2:
+            schemaId = _this.props.schemaId;
+            if (!(schemaId == "test")) {
+              _context.next = 6;
+              break;
+            }
+            _this.setState({
+              schema: demoSchema
+            });
+            return _context.abrupt("return");
+          case 6:
+            _context.next = 8;
+            return utils.common.schemaCache.get(schemaId);
+          case 8:
+            schema = _context.sent;
+            _this.setState({
+              schema: schema,
+              result: schema ? undefined : {
+                status: 404,
+                title: "404",
+                subTitle: "\u89C6\u56FE:" + schemaId + "\u4E0D\u5B58\u5728!"
+              }
+            });
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    _this.components = void 0;
+    _this.loadComponent = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var _yield$utils$designer, components;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
             return utils.designer.assetsParse(assets);
           case 2:
-            _yield$utils$designer = _context.sent;
+            _yield$utils$designer = _context2.sent;
             components = _yield$utils$designer.components;
             _this.components = components;
           case 5:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
     _this.setState({
       key: utils.common.uuid("key.")
@@ -48,16 +85,17 @@ export var SchemaRenderBase = /*#__PURE__*/function (_Component) {
   _inheritsLoose(SchemaRenderBase, _Component);
   var _proto = SchemaRenderBase.prototype;
   _proto.componentDidMount = /*#__PURE__*/function () {
-    var _componentDidMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _componentDidMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            this.components = this.props.components;
-          case 1:
+            _context3.next = 2;
+            return this.loadSchema();
+          case 2:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2, this);
+      }, _callee3, this);
     }));
     function componentDidMount() {
       return _componentDidMount.apply(this, arguments);
@@ -66,7 +104,7 @@ export var SchemaRenderBase = /*#__PURE__*/function (_Component) {
   }();
   _proto.render = function render() {
     var _this2 = this;
-    var components = this.props.components;
+    var components = this.components;
     var _this$state = this.state,
       key = _this$state.key,
       result = _this$state.result,

package/es/index.d.ts

@@ -1,8 +1,8 @@
 import utils from "./utils";
-export * from "@zhubangyun/lowcode-renderer-core";
 export { RestApi } from "./utils/common/RestApi";
 export { RestFormApi } from "./utils/common/RestFormApi";
 export { ClientCache } from "./utils/common/ClientCache";
 export { Layout } from "./components/layout";
 export { SchemaRender } from "./components/schema-render";
+export { ReactRender } from "./components/react-render";
 export { utils };

package/es/index.js

@@ -1,8 +1,8 @@
 import utils from "./utils";
-export * from "@zhubangyun/lowcode-renderer-core";
 export { RestApi } from "./utils/common/RestApi";
 export { RestFormApi } from "./utils/common/RestFormApi";
 export { ClientCache } from "./utils/common/ClientCache";
 export { Layout } from "./components/layout";
 export { SchemaRender } from "./components/schema-render";
+export { ReactRender } from "./components/react-render";
 export { utils };

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

@@ -0,0 +1,9 @@
+import { PureComponent } from "react";
+export declare class ReactRender extends PureComponent<{
+    schema: any;
+    components?: any;
+}> {
+    key: string;
+    jsx: any;
+    render(): import("react").JSX.Element;
+}

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

@@ -0,0 +1,48 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.ReactRender = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
+var _lowcodeRendererCore = _interopRequireDefault(require("@zhubangyun/lowcode-renderer-core"));
+var _react = require("react");
+var _utils = _interopRequireDefault(require("../../utils"));
+var _lowcodeDatasourceFetchHandler = require("@alilc/lowcode-datasource-fetch-handler");
+var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
+  function ReactRender() {
+    var _this;
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _PureComponent.call.apply(_PureComponent, [this].concat(args)) || this;
+    _this.key = Date.now().toString(36);
+    _this.jsx = void 0;
+    return _this;
+  }
+  (0, _inheritsLoose2["default"])(ReactRender, _PureComponent);
+  var _proto = ReactRender.prototype;
+  _proto.render = function render() {
+    var _this2 = this;
+    var key = this.key;
+    // @ts-ignore
+    var components = this.props.components || window.components || {};
+    return /*#__PURE__*/React.createElement(_lowcodeRendererCore["default"], (0, _extends2["default"])({}, this.props, {
+      key: key,
+      ref: function ref(page) {
+        _this2.jsx = page === null || page === void 0 ? void 0 : page.__ref;
+      },
+      schema: this.props.schema,
+      thisRequiredInJSE: true,
+      className: "schema-render",
+      components: components,
+      appHelper: {
+        utils: _utils["default"],
+        requestHandlersMap: {
+          fetch: (0, _lowcodeDatasourceFetchHandler.createFetchHandler)()
+        }
+      }
+    }));
+  };
+  return ReactRender;
+}(_react.PureComponent);

package/lib/components/schema-render/components/schema-render-base.d.ts

@@ -23,8 +23,7 @@ export interface FormProps {
     onInit?: (values: any, form: FormInstance) => Promise<void>;
 }
 export interface SchemaBaseRenderProps {
-    components: any;
-    loadSchema: (props: SchemaBaseRenderProps) => Promise<void>;
+    schemaId: string;
     params?: FormProps;
 }
 export interface SchemaBaseRenderState {
@@ -37,6 +36,7 @@ export declare class SchemaRenderBase extends Component<SchemaBaseRenderProps, S
     constructor(props: Readonly<SchemaBaseRenderProps> | SchemaBaseRenderProps);
     componentDidMount(): Promise<void>;
     page: any;
+    loadSchema: () => Promise<void>;
     components: any;
     loadComponent: () => Promise<void>;
     render(): JSX.Element;

package/lib/components/schema-render/components/schema-render-base.js

@@ -13,6 +13,7 @@ var _lowcodeRendererCore = _interopRequireWildcard(require("@zhubangyun/lowcode-
 var _lowcodeDatasourceFetchHandler = require("@alilc/lowcode-datasource-fetch-handler");
 var _utils = _interopRequireDefault(require("../../../utils"));
 var _assets = _interopRequireDefault(require("./assets"));
+var _demoSchema = _interopRequireDefault(require("./demo-schema"));
 var _zh_CN = _interopRequireDefault(require("antd/locale/zh_CN"));
 var _window$antd, _window$antd2;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -29,23 +30,59 @@ var SchemaRenderBase = exports.SchemaRenderBase = /*#__PURE__*/function (_Compon
       result: undefined
     };
     _this.page = void 0;
-    _this.components = void 0;
-    _this.loadComponent = /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var _yield$utils$designer, components;
+    _this.loadSchema = /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var schemaId, schema;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
+            return _this.loadComponent();
+          case 2:
+            schemaId = _this.props.schemaId;
+            if (!(schemaId == "test")) {
+              _context.next = 6;
+              break;
+            }
+            _this.setState({
+              schema: _demoSchema["default"]
+            });
+            return _context.abrupt("return");
+          case 6:
+            _context.next = 8;
+            return _utils["default"].common.schemaCache.get(schemaId);
+          case 8:
+            schema = _context.sent;
+            _this.setState({
+              schema: schema,
+              result: schema ? undefined : {
+                status: 404,
+                title: "404",
+                subTitle: "\u89C6\u56FE:" + schemaId + "\u4E0D\u5B58\u5728!"
+              }
+            });
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    _this.components = void 0;
+    _this.loadComponent = /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var _yield$utils$designer, components;
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
             return _utils["default"].designer.assetsParse(_assets["default"]);
           case 2:
-            _yield$utils$designer = _context.sent;
+            _yield$utils$designer = _context2.sent;
             components = _yield$utils$designer.components;
             _this.components = components;
           case 5:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
     _this.setState({
       key: _utils["default"].common.uuid("key.")
@@ -55,16 +92,17 @@ var SchemaRenderBase = exports.SchemaRenderBase = /*#__PURE__*/function (_Compon
   (0, _inheritsLoose2["default"])(SchemaRenderBase, _Component);
   var _proto = SchemaRenderBase.prototype;
   _proto.componentDidMount = /*#__PURE__*/function () {
-    var _componentDidMount = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _componentDidMount = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            this.components = this.props.components;
-          case 1:
+            _context3.next = 2;
+            return this.loadSchema();
+          case 2:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2, this);
+      }, _callee3, this);
     }));
     function componentDidMount() {
       return _componentDidMount.apply(this, arguments);
@@ -73,7 +111,7 @@ var SchemaRenderBase = exports.SchemaRenderBase = /*#__PURE__*/function (_Compon
   }();
   _proto.render = function render() {
     var _this2 = this;
-    var components = this.props.components;
+    var components = this.components;
     var _this$state = this.state,
       key = _this$state.key,
       result = _this$state.result,

package/lib/index.d.ts

@@ -1,8 +1,8 @@
 import utils from "./utils";
-export * from "@zhubangyun/lowcode-renderer-core";
 export { RestApi } from "./utils/common/RestApi";
 export { RestFormApi } from "./utils/common/RestFormApi";
 export { ClientCache } from "./utils/common/ClientCache";
 export { Layout } from "./components/layout";
 export { SchemaRender } from "./components/schema-render";
+export { ReactRender } from "./components/react-render";
 export { utils };

package/lib/index.js

@@ -2,24 +2,9 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-var _exportNames = {
-  RestApi: true,
-  RestFormApi: true,
-  ClientCache: true,
-  Layout: true,
-  SchemaRender: true,
-  utils: true
-};
-exports.SchemaRender = exports.RestFormApi = exports.RestApi = exports.Layout = exports.ClientCache = void 0;
+exports.SchemaRender = exports.RestFormApi = exports.RestApi = exports.ReactRender = exports.Layout = exports.ClientCache = void 0;
 var _utils = _interopRequireDefault(require("./utils"));
 exports.utils = _utils["default"];
-var _lowcodeRendererCore = require("@zhubangyun/lowcode-renderer-core");
-Object.keys(_lowcodeRendererCore).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _lowcodeRendererCore[key]) return;
-  exports[key] = _lowcodeRendererCore[key];
-});
 var _RestApi = require("./utils/common/RestApi");
 exports.RestApi = _RestApi.RestApi;
 var _RestFormApi = require("./utils/common/RestFormApi");
@@ -29,4 +14,6 @@ exports.ClientCache = _ClientCache.ClientCache;
 var _layout = require("./components/layout");
 exports.Layout = _layout.Layout;
 var _schemaRender = require("./components/schema-render");
-exports.SchemaRender = _schemaRender.SchemaRender;
+exports.SchemaRender = _schemaRender.SchemaRender;
+var _reactRender = require("./components/react-render");
+exports.ReactRender = _reactRender.ReactRender;

package/package.json

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