@zhubangyun/lowcode-core 5.5.83 → 5.5.85

package/es/components/load-materials/index.js

@@ -8,9 +8,7 @@ export function LoadMaterials(props) {
     init = _useState[0],
     setInit = _useState[1];
   useEffect(function () {
-    initialize()["finally"](function () {
-      return setInit(true);
-    });
+    initialize().then();
   }, []);
   function initialize() {
     return _initialize.apply(this, arguments);
@@ -23,6 +21,8 @@ export function LoadMaterials(props) {
             _context.next = 2;
             return loadMaterials();
           case 2:
+            setInit(true);
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -48,12 +48,18 @@ function _loadMaterials() {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           components = {};
+          if (!window._components) {
+            _context2.next = 3;
+            break;
+          }
+          return _context2.abrupt("return");
+        case 3:
           urls = ["prop-types/15.8.1/prop-types.min.js", "lodash/4.6.1/lodash.min.js", "dayjs/dayjs.min.js", "antd/latest/reset.css", "antd/latest/antd.min.js", "antdIcon/1.0.0/antdIcon.min.js", "lowcode/core/index.js", "lowcode/core/index.css", "lowcode/materials/root/view.js", "lowcode/materials/root/view.css", "lowcode/materials/antd/view.js", "lowcode/materials/antd/view.css", "lowcode/materials/antd-pro/view.js", "lowcode/materials/antd-pro/view.css", "lowcode/icon-font/app/iconfont.js"];
-          _context2.next = 4;
+          _context2.next = 6;
           return loadPlugins(urls.map(function (url) {
             return "https://cdn.zhiyunhe.com/plugin/" + url;
           }));
-        case 4:
+        case 6:
           ["RootMaterial", "AntdMaterial", "AntdProMaterial"].forEach(function (lib) {
             var data = window[lib];
             if (data) {
@@ -66,8 +72,11 @@ function _loadMaterials() {
             }
           });
           window._components = components;
-          return _context2.abrupt("return", components);
-        case 7:
+          /*    Object.defineProperty(window, "_components", {
+                  writable: false,
+                  value: components
+              })*/
+        case 8:
         case "end":
           return _context2.stop();
       }

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

@@ -1,11 +1,9 @@
-import _ConfigProvider from "antd/es/config-provider";
 import _extends from "@babel/runtime/helpers/extends";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import { PureComponent } from 'react';
 import { createFetchHandler } from "@alilc/lowcode-datasource-fetch-handler";
 import ReactRenderFactory from "./react-render-factory";
 import utils from "../../utils";
-import zhCN from "antd/locale/zh_CN";
 export var ReactRender = /*#__PURE__*/function (_PureComponent) {
   function ReactRender() {
     var _this;
@@ -22,10 +20,7 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
   _proto.render = function render() {
     var _this2 = this;
     var components = this.props.components || window._components;
-    // @ts-ignore
-    return /*#__PURE__*/React.createElement(_ConfigProvider, {
-      locale: zhCN
-    }, /*#__PURE__*/React.createElement(ReactRenderFactory, _extends({
+    return /*#__PURE__*/React.createElement(ReactRenderFactory, _extends({
       key: this.key
     }, this.props, {
       ref: function ref(node) {
@@ -39,7 +34,7 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
           fetch: createFetchHandler()
         }
       }
-    })));
+    }));
   };
   return ReactRender;
 }(PureComponent);

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

@@ -1,7 +1,9 @@
+import _ConfigProvider from "antd/es/config-provider";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import { Component, createContext, createElement, forwardRef, PureComponent } from 'react';
 import { findDOMNode } from "react-dom";
 import { adapter, addonRendererFactory, blockRendererFactory, componentRendererFactory, pageRendererFactory, rendererFactory, tempRendererFactory } from '@zhubangyun/lowcode-render-core';
+import zhCN from "antd/locale/zh_CN";
 adapter.setRuntime({
   Component: Component,
   PureComponent: PureComponent,
@@ -18,6 +20,8 @@ adapter.setRenderers({
   TempRenderer: tempRendererFactory(),
   DivRenderer: blockRendererFactory()
 });
+//todo 删除会多出一个div
+adapter.setConfigProvider(AntdConfigProvider);
 function factory() {
   var Renderer = rendererFactory();
   return /*#__PURE__*/function (_Renderer) {
@@ -40,4 +44,10 @@ function factory() {
     return ReactRenderer;
   }(Renderer);
 }
-export default factory();
+export default factory();
+function AntdConfigProvider(props) {
+  return /*#__PURE__*/React.createElement(_ConfigProvider, {
+    locale: zhCN,
+    children: props.children
+  });
+}

package/lib/components/load-materials/index.js

@@ -15,9 +15,7 @@ function LoadMaterials(props) {
     init = _useState[0],
     setInit = _useState[1];
   (0, _react.useEffect)(function () {
-    initialize()["finally"](function () {
-      return setInit(true);
-    });
+    initialize().then();
   }, []);
   function initialize() {
     return _initialize.apply(this, arguments);
@@ -30,6 +28,8 @@ function LoadMaterials(props) {
             _context.next = 2;
             return loadMaterials();
           case 2:
+            setInit(true);
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -55,12 +55,18 @@ function _loadMaterials() {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           components = {};
+          if (!window._components) {
+            _context2.next = 3;
+            break;
+          }
+          return _context2.abrupt("return");
+        case 3:
           urls = ["prop-types/15.8.1/prop-types.min.js", "lodash/4.6.1/lodash.min.js", "dayjs/dayjs.min.js", "antd/latest/reset.css", "antd/latest/antd.min.js", "antdIcon/1.0.0/antdIcon.min.js", "lowcode/core/index.js", "lowcode/core/index.css", "lowcode/materials/root/view.js", "lowcode/materials/root/view.css", "lowcode/materials/antd/view.js", "lowcode/materials/antd/view.css", "lowcode/materials/antd-pro/view.js", "lowcode/materials/antd-pro/view.css", "lowcode/icon-font/app/iconfont.js"];
-          _context2.next = 4;
+          _context2.next = 6;
           return (0, _common.loadPlugins)(urls.map(function (url) {
             return "https://cdn.zhiyunhe.com/plugin/" + url;
           }));
-        case 4:
+        case 6:
           ["RootMaterial", "AntdMaterial", "AntdProMaterial"].forEach(function (lib) {
             var data = window[lib];
             if (data) {
@@ -73,8 +79,11 @@ function _loadMaterials() {
             }
           });
           window._components = components;
-          return _context2.abrupt("return", components);
-        case 7:
+          /*    Object.defineProperty(window, "_components", {
+                  writable: false,
+                  value: components
+              })*/
+        case 8:
         case "end":
           return _context2.stop();
       }

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

@@ -3,14 +3,12 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.ReactRender = void 0;
-var _configProvider = _interopRequireDefault(require("antd/lib/config-provider"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _react = require("react");
 var _lowcodeDatasourceFetchHandler = require("@alilc/lowcode-datasource-fetch-handler");
 var _reactRenderFactory = _interopRequireDefault(require("./react-render-factory"));
 var _utils = _interopRequireDefault(require("../../utils"));
-var _zh_CN = _interopRequireDefault(require("antd/locale/zh_CN"));
 var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
   function ReactRender() {
     var _this;
@@ -27,10 +25,7 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
   _proto.render = function render() {
     var _this2 = this;
     var components = this.props.components || window._components;
-    // @ts-ignore
-    return /*#__PURE__*/React.createElement(_configProvider["default"], {
-      locale: _zh_CN["default"]
-    }, /*#__PURE__*/React.createElement(_reactRenderFactory["default"], (0, _extends2["default"])({
+    return /*#__PURE__*/React.createElement(_reactRenderFactory["default"], (0, _extends2["default"])({
       key: this.key
     }, this.props, {
       ref: function ref(node) {
@@ -44,7 +39,7 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
           fetch: (0, _lowcodeDatasourceFetchHandler.createFetchHandler)()
         }
       }
-    })));
+    }));
   };
   return ReactRender;
 }(_react.PureComponent);

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

@@ -3,10 +3,12 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports["default"] = void 0;
+var _configProvider = _interopRequireDefault(require("antd/lib/config-provider"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _react = require("react");
 var _reactDom = require("react-dom");
 var _lowcodeRenderCore = require("@zhubangyun/lowcode-render-core");
+var _zh_CN = _interopRequireDefault(require("antd/locale/zh_CN"));
 _lowcodeRenderCore.adapter.setRuntime({
   Component: _react.Component,
   PureComponent: _react.PureComponent,
@@ -23,6 +25,8 @@ _lowcodeRenderCore.adapter.setRenderers({
   TempRenderer: (0, _lowcodeRenderCore.tempRendererFactory)(),
   DivRenderer: (0, _lowcodeRenderCore.blockRendererFactory)()
 });
+//todo 删除会多出一个div
+_lowcodeRenderCore.adapter.setConfigProvider(AntdConfigProvider);
 function factory() {
   var Renderer = (0, _lowcodeRenderCore.rendererFactory)();
   return /*#__PURE__*/function (_Renderer) {
@@ -45,4 +49,10 @@ function factory() {
     return ReactRenderer;
   }(Renderer);
 }
-var _default = exports["default"] = factory();
+var _default = exports["default"] = factory();
+function AntdConfigProvider(props) {
+  return /*#__PURE__*/React.createElement(_configProvider["default"], {
+    locale: _zh_CN["default"],
+    children: props.children
+  });
+}

package/package.json

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