@zhubangyun/lowcode-core 1.1.13 → 1.1.14

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

@@ -23,7 +23,8 @@ export interface FormProps {
     onInit?: (values: any, form: FormInstance) => Promise<void>;
 }
 export interface SchemaBaseRenderProps {
-    schemaId: string;
+    components: any;
+    loadSchema: (props: SchemaBaseRenderProps) => Promise<void>;
     params?: FormProps;
 }
 export interface SchemaBaseRenderState {
@@ -36,7 +37,6 @@ 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,7 +9,6 @@ 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);
@@ -23,79 +22,42 @@ export var SchemaRenderBase = /*#__PURE__*/function (_Component) {
       result: undefined
     };
     _this.page = void 0;
-    _this.loadSchema = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var schemaId, schema;
+    _this.components = void 0;
+    _this.loadComponent = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var _yield$utils$designer, components;
       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.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$lowcode$, components;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.next = 2;
-            return utils.lowcode.parseAssets(assets);
+            return utils.designer.assetsParse(assets);
           case 2:
-            _yield$utils$lowcode$ = _context2.sent;
-            components = _yield$utils$lowcode$.components;
+            _yield$utils$designer = _context.sent;
+            components = _yield$utils$designer.components;
             _this.components = components;
           case 5:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
-      }, _callee2);
+      }, _callee);
     }));
     _this.setState({
-      key: utils.uuid("key.")
+      key: utils.common.uuid("key.")
     });
     return _this;
   }
   _inheritsLoose(SchemaRenderBase, _Component);
   var _proto = SchemaRenderBase.prototype;
   _proto.componentDidMount = /*#__PURE__*/function () {
-    var _componentDidMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    var _componentDidMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context3.next = 2;
-            return this.loadSchema();
-          case 2:
+            this.components = this.props.components;
+          case 1:
           case "end":
-            return _context3.stop();
+            return _context2.stop();
         }
-      }, _callee3, this);
+      }, _callee2, this);
     }));
     function componentDidMount() {
       return _componentDidMount.apply(this, arguments);
@@ -104,7 +66,7 @@ export var SchemaRenderBase = /*#__PURE__*/function (_Component) {
   }();
   _proto.render = function render() {
     var _this2 = this;
-    var components = this.components;
+    var components = this.props.components;
     var _this$state = this.state,
       key = _this$state.key,
       result = _this$state.result,

package/es/index.d.ts

@@ -1,4 +1,5 @@
 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";

package/es/index.js

@@ -1,4 +1,5 @@
 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";

package/es/utils/designer/engine/index.d.ts

@@ -1,4 +1,4 @@
-import { Project, Material, Plugins } from "@alilc/lowcode-shell";
+import { Project, Material, Plugins, Skeleton } from "@alilc/lowcode-shell";
 import { DefaultAssertsType, DesignerAssets } from "../assets";
 import { IPublicTypeAssetsJson } from "@alilc/lowcode-utils";
 import { IPublicTypePlugin, IPublicTypePluginRegisterOptions } from "@alilc/lowcode-types";
@@ -7,6 +7,7 @@ export declare class Engine {
     plugins: Plugins;
     assets: DesignerAssets;
     material: Material;
+    skeleton: Skeleton;
     _engine: any;
     constructor();
     /**

package/es/utils/designer/engine/index.js

@@ -9,6 +9,7 @@ export var Engine = function Engine() {
   this.plugins = void 0;
   this.assets = void 0;
   this.material = void 0;
+  this.skeleton = void 0;
   this._engine = void 0;
   /**
    * 注入资产
@@ -134,5 +135,6 @@ export var Engine = function Engine() {
   this.project = this._engine.project;
   this.material = this._engine.material;
   this.plugins = this._engine.plugins;
+  this.skeleton = this._engine.skeleton;
   this.assets = new DesignerAssets();
 };

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

@@ -23,7 +23,8 @@ export interface FormProps {
     onInit?: (values: any, form: FormInstance) => Promise<void>;
 }
 export interface SchemaBaseRenderProps {
-    schemaId: string;
+    components: any;
+    loadSchema: (props: SchemaBaseRenderProps) => Promise<void>;
     params?: FormProps;
 }
 export interface SchemaBaseRenderState {
@@ -36,7 +37,6 @@ 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,7 +13,6 @@ 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); }
@@ -30,79 +29,42 @@ var SchemaRenderBase = exports.SchemaRenderBase = /*#__PURE__*/function (_Compon
       result: undefined
     };
     _this.page = void 0;
-    _this.loadSchema = /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var schemaId, schema;
+    _this.components = void 0;
+    _this.loadComponent = /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var _yield$utils$designer, components;
       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"].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$lowcode$, components;
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.next = 2;
-            return _utils["default"].lowcode.parseAssets(_assets["default"]);
+            return _utils["default"].designer.assetsParse(_assets["default"]);
           case 2:
-            _yield$utils$lowcode$ = _context2.sent;
-            components = _yield$utils$lowcode$.components;
+            _yield$utils$designer = _context.sent;
+            components = _yield$utils$designer.components;
             _this.components = components;
           case 5:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
-      }, _callee2);
+      }, _callee);
     }));
     _this.setState({
-      key: _utils["default"].uuid("key.")
+      key: _utils["default"].common.uuid("key.")
     });
     return _this;
   }
   (0, _inheritsLoose2["default"])(SchemaRenderBase, _Component);
   var _proto = SchemaRenderBase.prototype;
   _proto.componentDidMount = /*#__PURE__*/function () {
-    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) {
+    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) {
           case 0:
-            _context3.next = 2;
-            return this.loadSchema();
-          case 2:
+            this.components = this.props.components;
+          case 1:
           case "end":
-            return _context3.stop();
+            return _context2.stop();
         }
-      }, _callee3, this);
+      }, _callee2, this);
     }));
     function componentDidMount() {
       return _componentDidMount.apply(this, arguments);
@@ -111,7 +73,7 @@ var SchemaRenderBase = exports.SchemaRenderBase = /*#__PURE__*/function (_Compon
   }();
   _proto.render = function render() {
     var _this2 = this;
-    var components = this.components;
+    var components = this.props.components;
     var _this$state = this.state,
       key = _this$state.key,
       result = _this$state.result,

package/lib/index.d.ts

@@ -1,4 +1,5 @@
 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";

package/lib/index.js

@@ -2,9 +2,24 @@
 
 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;
 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");

package/lib/utils/designer/engine/index.d.ts

@@ -1,4 +1,4 @@
-import { Project, Material, Plugins } from "@alilc/lowcode-shell";
+import { Project, Material, Plugins, Skeleton } from "@alilc/lowcode-shell";
 import { DefaultAssertsType, DesignerAssets } from "../assets";
 import { IPublicTypeAssetsJson } from "@alilc/lowcode-utils";
 import { IPublicTypePlugin, IPublicTypePluginRegisterOptions } from "@alilc/lowcode-types";
@@ -7,6 +7,7 @@ export declare class Engine {
     plugins: Plugins;
     assets: DesignerAssets;
     material: Material;
+    skeleton: Skeleton;
     _engine: any;
     constructor();
     /**

package/lib/utils/designer/engine/index.js

@@ -14,6 +14,7 @@ var Engine = exports.Engine = function Engine() {
   this.plugins = void 0;
   this.assets = void 0;
   this.material = void 0;
+  this.skeleton = void 0;
   this._engine = void 0;
   /**
    * 注入资产
@@ -139,5 +140,6 @@ var Engine = exports.Engine = function Engine() {
   this.project = this._engine.project;
   this.material = this._engine.material;
   this.plugins = this._engine.plugins;
+  this.skeleton = this._engine.skeleton;
   this.assets = new _assets.DesignerAssets();
 };

package/package.json

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