@zhubangyun/lowcode-core 5.4.102 → 5.4.104

package/es/style.js

@@ -1,5 +1,4 @@
-import 'antd/es/drawer/style';
-import 'antd/es/modal/style';
 import 'antd/es/result/style';
 import 'antd/es/spin/style';
+import 'antd/es/message/style';
 import 'antd/es/config-provider/style';

package/es/utils/common/SingletonInstanceMap.js

@@ -12,15 +12,16 @@ export var SingletonInstanceMap = /*#__PURE__*/function () {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            console.log("getInstance", key, options);
             self = this;
             if (!this.valueMap.has(key)) {
-              _context2.next = 5;
+              _context2.next = 6;
               break;
             }
             return _context2.abrupt("return", Promise.resolve(this.valueMap.get(key)));
-          case 5:
+          case 6:
             if (!this.lockMap.get(key)) {
-              _context2.next = 9;
+              _context2.next = 10;
               break;
             }
             return _context2.abrupt("return", new Promise(function (resolve, reject) {
@@ -36,29 +37,30 @@ export var SingletonInstanceMap = /*#__PURE__*/function () {
                 }, _callee);
               })), 500);
             }));
-          case 9:
-            _context2.prev = 9;
+          case 10:
+            _context2.prev = 10;
             this.lockMap.set(key, true);
-            _context2.next = 13;
+            console.log("getInstance.createInstance", key, options);
+            _context2.next = 15;
             return this.createInstance(key, options);
-          case 13:
+          case 15:
             value = _context2.sent;
             this.valueMap.set(key, value);
             this.lockMap.set(key, false);
             return _context2.abrupt("return", Promise.resolve(value));
-          case 19:
-            _context2.prev = 19;
-            _context2.t0 = _context2["catch"](9);
+          case 21:
+            _context2.prev = 21;
+            _context2.t0 = _context2["catch"](10);
             throw _context2.t0;
-          case 22:
-            _context2.prev = 22;
+          case 24:
+            _context2.prev = 24;
             this.lockMap.set(key, false);
-            return _context2.finish(22);
-          case 25:
+            return _context2.finish(24);
+          case 27:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, this, [[9, 19, 22, 25]]);
+      }, _callee2, this, [[10, 21, 24, 27]]);
     }));
     function getInstance(_x, _x2) {
       return _getInstance.apply(this, arguments);

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

@@ -44,9 +44,10 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             _context.prev = 12;
             _context.t0 = _context["catch"](4);
             console.log("获取schema失败!", {
-              id: this.formId,
+              formId: this.formId,
+              field: this.fieldId,
               mock: this.mock
-            });
+            }, _context.t0);
             throw _context.t0;
           case 16:
             return _context.abrupt("return", this.initialized);

package/es/utils/index.d.ts

@@ -1,11 +1,9 @@
-import * as cache from "./cache";
 import * as common from "./common";
 import * as api from "./api";
 import * as designer from "./designer";
 import * as page from "./page";
 declare const _default: {
     api: typeof api;
-    cache: typeof cache;
     page: typeof page;
     designer: typeof designer;
     common: typeof common;

package/es/utils/index.js

@@ -1,11 +1,9 @@
-import * as cache from "./cache";
 import * as common from "./common";
 import * as api from "./api";
 import * as designer from "./designer";
 import * as page from "./page";
 export default {
   api: api,
-  cache: cache,
   page: page,
   designer: designer,
   common: common

package/es/utils/page/page.form.js

@@ -2,9 +2,9 @@ import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["container", "onClose"];
+var _excluded = ["container", "onClose"],
+  _excluded2 = ["layout", "form"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { PageLayout } from "./page.layout";
 import ReactDOM from "react-dom";
 import { Component } from "react";
 import { PageLoadSchema } from "./page.load-schema";
@@ -52,15 +52,18 @@ var FormRender = /*#__PURE__*/function (_Component) {
   _inheritsLoose(FormRender, _Component);
   var _proto = FormRender.prototype;
   _proto.render = function render() {
-    var _this = this;
-    return /*#__PURE__*/React.createElement(PageLayout, null, /*#__PURE__*/React.createElement(PageLoadSchema, {
-      pageId: this.props.form.id
+    var _this$props = this.props,
+      layout = _this$props.layout,
+      form = _this$props.form,
+      restProps = _objectWithoutPropertiesLoose(_this$props, _excluded2);
+    return /*#__PURE__*/React.createElement(PageLoadSchema, {
+      pageId: form.id
     }, function (schema) {
       return /*#__PURE__*/React.createElement(ReactRender, _extends({
         schema: schema,
         components: window.__components
-      }, _this.props));
-    }));
+      }, restProps));
+    });
   };
   return FormRender;
 }(Component);

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

@@ -1,8 +1,11 @@
 import _Result from "antd/es/result";
 import _Spin from "antd/es/spin";
+import _message from "antd/es/message";
 import { useEffect, useState } from "react";
 import { getSchema } from "../api";
 export function PageLoadSchema(props) {
+  var pageId = props.pageId,
+    children = props.children;
   var _useState = useState(true),
     loading = _useState[0],
     setLoading = _useState[1];
@@ -13,14 +16,18 @@ export function PageLoadSchema(props) {
     errorMsg = _useState3[0],
     setErrorMsg = _useState3[1];
   useEffect(function () {
-    getSchema(props.pageId).then(function (res) {
-      if (res.success) {
-        setLoading(false);
-        setSchema(res.data);
-      } else {
-        setErrorMsg(res.message);
-      }
-    });
+    if (pageId) {
+      getSchema(pageId).then(function (res) {
+        if (res.success) {
+          setLoading(false);
+          setSchema(res.data);
+        } else {
+          setErrorMsg(res.message);
+        }
+      });
+    } else {
+      _message.error("页面id不可为空!").then();
+    }
   }, []);
   if (loading) {
     return /*#__PURE__*/React.createElement(_Spin, {
@@ -33,5 +40,5 @@ export function PageLoadSchema(props) {
       title: errorMsg
     });
   }
-  return props.children(schema);
+  return children(schema);
 }

package/lib/style.js

@@ -1,5 +1,4 @@
-require('antd/lib/drawer/style');
-require('antd/lib/modal/style');
 require('antd/lib/result/style');
 require('antd/lib/spin/style');
+require('antd/lib/message/style');
 require('antd/lib/config-provider/style');

package/lib/utils/common/SingletonInstanceMap.js

@@ -17,15 +17,16 @@ var SingletonInstanceMap = exports.SingletonInstanceMap = /*#__PURE__*/function
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            console.log("getInstance", key, options);
             self = this;
             if (!this.valueMap.has(key)) {
-              _context2.next = 5;
+              _context2.next = 6;
               break;
             }
             return _context2.abrupt("return", Promise.resolve(this.valueMap.get(key)));
-          case 5:
+          case 6:
             if (!this.lockMap.get(key)) {
-              _context2.next = 9;
+              _context2.next = 10;
               break;
             }
             return _context2.abrupt("return", new Promise(function (resolve, reject) {
@@ -41,29 +42,30 @@ var SingletonInstanceMap = exports.SingletonInstanceMap = /*#__PURE__*/function
                 }, _callee);
               })), 500);
             }));
-          case 9:
-            _context2.prev = 9;
+          case 10:
+            _context2.prev = 10;
             this.lockMap.set(key, true);
-            _context2.next = 13;
+            console.log("getInstance.createInstance", key, options);
+            _context2.next = 15;
             return this.createInstance(key, options);
-          case 13:
+          case 15:
             value = _context2.sent;
             this.valueMap.set(key, value);
             this.lockMap.set(key, false);
             return _context2.abrupt("return", Promise.resolve(value));
-          case 19:
-            _context2.prev = 19;
-            _context2.t0 = _context2["catch"](9);
+          case 21:
+            _context2.prev = 21;
+            _context2.t0 = _context2["catch"](10);
             throw _context2.t0;
-          case 22:
-            _context2.prev = 22;
+          case 24:
+            _context2.prev = 24;
             this.lockMap.set(key, false);
-            return _context2.finish(22);
-          case 25:
+            return _context2.finish(24);
+          case 27:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, this, [[9, 19, 22, 25]]);
+      }, _callee2, this, [[10, 21, 24, 27]]);
     }));
     function getInstance(_x, _x2) {
       return _getInstance.apply(this, arguments);

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

@@ -49,9 +49,10 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             _context.prev = 12;
             _context.t0 = _context["catch"](4);
             console.log("获取schema失败!", {
-              id: this.formId,
+              formId: this.formId,
+              field: this.fieldId,
               mock: this.mock
-            });
+            }, _context.t0);
             throw _context.t0;
           case 16:
             return _context.abrupt("return", this.initialized);

package/lib/utils/index.d.ts

@@ -1,11 +1,9 @@
-import * as cache from "./cache";
 import * as common from "./common";
 import * as api from "./api";
 import * as designer from "./designer";
 import * as page from "./page";
 declare const _default: {
     api: typeof api;
-    cache: typeof cache;
     page: typeof page;
     designer: typeof designer;
     common: typeof common;

package/lib/utils/index.js

@@ -2,7 +2,6 @@
 
 exports.__esModule = true;
 exports["default"] = void 0;
-var cache = _interopRequireWildcard(require("./cache"));
 var common = _interopRequireWildcard(require("./common"));
 var api = _interopRequireWildcard(require("./api"));
 var designer = _interopRequireWildcard(require("./designer"));
@@ -11,7 +10,6 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var _default = exports["default"] = {
   api: api,
-  cache: cache,
   page: page,
   designer: designer,
   common: common

package/lib/utils/page/page.form.js

@@ -8,12 +8,12 @@ var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inh
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
-var _page = require("./page.layout");
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _react = require("react");
-var _page2 = require("./page.load-schema");
+var _page = require("./page.load-schema");
 var _reactRender = require("../../components/react-render");
-var _excluded = ["container", "onClose"];
+var _excluded = ["container", "onClose"],
+  _excluded2 = ["layout", "form"];
 function showForm(options) {
   var container = options.container,
     onClose = options.onClose,
@@ -57,15 +57,18 @@ var FormRender = /*#__PURE__*/function (_Component) {
   (0, _inheritsLoose2["default"])(FormRender, _Component);
   var _proto = FormRender.prototype;
   _proto.render = function render() {
-    var _this = this;
-    return /*#__PURE__*/React.createElement(_page.PageLayout, null, /*#__PURE__*/React.createElement(_page2.PageLoadSchema, {
-      pageId: this.props.form.id
+    var _this$props = this.props,
+      layout = _this$props.layout,
+      form = _this$props.form,
+      restProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded2);
+    return /*#__PURE__*/React.createElement(_page.PageLoadSchema, {
+      pageId: form.id
     }, function (schema) {
       return /*#__PURE__*/React.createElement(_reactRender.ReactRender, (0, _extends2["default"])({
         schema: schema,
         components: window.__components
-      }, _this.props));
-    }));
+      }, restProps));
+    });
   };
   return FormRender;
 }(_react.Component);

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

@@ -5,9 +5,12 @@ exports.__esModule = true;
 exports.PageLoadSchema = PageLoadSchema;
 var _result = _interopRequireDefault(require("antd/lib/result"));
 var _spin = _interopRequireDefault(require("antd/lib/spin"));
+var _message2 = _interopRequireDefault(require("antd/lib/message"));
 var _react = require("react");
 var _api = require("../api");
 function PageLoadSchema(props) {
+  var pageId = props.pageId,
+    children = props.children;
   var _useState = (0, _react.useState)(true),
     loading = _useState[0],
     setLoading = _useState[1];
@@ -18,14 +21,18 @@ function PageLoadSchema(props) {
     errorMsg = _useState3[0],
     setErrorMsg = _useState3[1];
   (0, _react.useEffect)(function () {
-    (0, _api.getSchema)(props.pageId).then(function (res) {
-      if (res.success) {
-        setLoading(false);
-        setSchema(res.data);
-      } else {
-        setErrorMsg(res.message);
-      }
-    });
+    if (pageId) {
+      (0, _api.getSchema)(pageId).then(function (res) {
+        if (res.success) {
+          setLoading(false);
+          setSchema(res.data);
+        } else {
+          setErrorMsg(res.message);
+        }
+      });
+    } else {
+      _message2["default"].error("页面id不可为空!").then();
+    }
   }, []);
   if (loading) {
     return /*#__PURE__*/React.createElement(_spin["default"], {
@@ -38,5 +45,5 @@ function PageLoadSchema(props) {
       title: errorMsg
     });
   }
-  return props.children(schema);
+  return children(schema);
 }

package/package.json

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