@zhubangyun/lowcode-core 5.4.291 → 5.5.81

package/es/components/page-loading/index.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import "./index.less";
+export interface PageLadingProps {
+    loading: boolean;
+    background?: string;
+    children: any;
+}
+export declare function PageLoading(props: PageLadingProps): import("react").JSX.Element;

package/es/components/{page-lading → page-loading}/index.js

@@ -1,14 +1,19 @@
 import "./index.less";
-import { Fragment } from "react";
-export function PageLading(props) {
-  var style = props.style,
-    loading = props.loading;
-  if (!loading) {
-    return /*#__PURE__*/React.createElement(Fragment, null);
-  }
+export function PageLoading(props) {
+  var loading = props.loading,
+    background = props.background,
+    children = props.children;
   return /*#__PURE__*/React.createElement("div", {
+    className: "page-loading-wrapper",
+    style: {
+      width: "100%",
+      height: "100%"
+    }
+  }, children, loading && /*#__PURE__*/React.createElement("div", {
     className: "page-loading",
-    style: style
+    style: {
+      background: background
+    }
   }, /*#__PURE__*/React.createElement("div", {
     className: "atom-spinner"
   }, /*#__PURE__*/React.createElement("div", {
@@ -21,5 +26,5 @@ export function PageLading(props) {
     className: "spinner-line"
   }), /*#__PURE__*/React.createElement("div", {
     className: "spinner-circle"
-  }))));
+  })))));
 }

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

@@ -1,9 +1,7 @@
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
-import _ConfigProvider from "antd/es/config-provider";
-var _window$antd;
-import { Component, PureComponent, createElement, createContext, forwardRef } from 'react';
+import { Component, createContext, createElement, forwardRef, PureComponent } from 'react';
 import { findDOMNode } from "react-dom";
-import { adapter, pageRendererFactory, componentRendererFactory, blockRendererFactory, addonRendererFactory, tempRendererFactory, rendererFactory } from '@zhubangyun/lowcode-render-core';
+import { adapter, addonRendererFactory, blockRendererFactory, componentRendererFactory, pageRendererFactory, rendererFactory, tempRendererFactory } from '@zhubangyun/lowcode-render-core';
 adapter.setRuntime({
   Component: Component,
   PureComponent: PureComponent,
@@ -20,11 +18,6 @@ adapter.setRenderers({
   TempRenderer: tempRendererFactory(),
   DivRenderer: blockRendererFactory()
 });
-// @ts-ignore
-adapter.setConfigProvider(((_window$antd = window.antd) === null || _window$antd === void 0 ? void 0 : _window$antd.ConfigProvider) || _ConfigProvider);
-
-// @ts-ignore
-window.___adapter = adapter;
 function factory() {
   var Renderer = rendererFactory();
   return /*#__PURE__*/function (_Renderer) {

package/es/index.d.ts

@@ -1,5 +1,6 @@
 import "./index.less";
 import utils from "./utils";
+export { PageLoading } from "./components/page-loading";
 export { RestApi, RestFormApi, apiRequest } from "./utils/api";
 export { Layout } from "./components/layout";
 export { ReactRender } from "./components/react-render";

package/es/index.js

@@ -1,6 +1,7 @@
 import "./index.less";
 import utils from "./utils";
 import { ReactRender } from "./components/react-render";
+export { PageLoading } from "./components/page-loading";
 export { RestApi, RestFormApi, apiRequest } from "./utils/api";
 export { Layout } from "./components/layout";
 export { ReactRender } from "./components/react-render";

package/es/utils/api/rest-api.d.ts

@@ -19,9 +19,9 @@ export interface FilterRule {
 }
 export declare type OperatorType = "eq" | "ne" | "gt" | "goe" | "lt" | "loe" | "like" | "notLike" | "in" | "notIn" | "isNull" | "isNotNull" | "between" | "notBetween";
 export interface RestSearchParams {
-    page: number;
-    pageSize: number;
-    filterRules: FilterRule[];
+    page?: number;
+    pageSize?: number;
+    filterRules?: FilterRule[];
 }
 export declare abstract class BaseRestApi<DataType> {
     uri: string;
@@ -29,7 +29,7 @@ export declare abstract class BaseRestApi<DataType> {
     request: AxiosInstance;
     protected constructor(uri: string, options?: RestApiOptions);
     abstract handleRequestConfig(config: AxiosRequestConfig): void;
-    search(params: RestSearchParams): Promise<ManyResult<DataType>>;
+    search(params?: RestSearchParams): Promise<ManyResult<DataType>>;
     /**
      * 通过id获取
      * @param id

package/es/utils/page/index.js

@@ -1,6 +1,18 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 export { showForm } from "./page-form";
+var timerRef;
+function debounceHide() {
+  if (timerRef) {
+    clearTimeout(timerRef);
+  }
+  timerRef = setTimeout(function () {
+    var loading = document.getElementById("fullscreen-loading");
+    if (loading) {
+      loading.style.display = "none";
+    }
+  }, 40);
+}
 export function showLoading() {
   return _showLoading.apply(this, arguments);
 }
@@ -32,15 +44,11 @@ export function hideLoading() {
 }
 function _hideLoading() {
   _hideLoading = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-    var loading;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          loading = document.getElementById("fullscreen-loading");
-          if (loading) {
-            loading.style.display = "none";
-          }
-        case 2:
+          debounceHide();
+        case 1:
         case "end":
           return _context2.stop();
       }

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

@@ -2,7 +2,7 @@ import _Result from "antd/es/result";
 import _message from "antd/es/message";
 import { useEffect, useState } from "react";
 import { getSchema } from "../api";
-import { PageLading } from "../../components/page-lading";
+import { PageLoading } from "../../components/page-loading";
 export function PageLoadSchema(props) {
   var pageId = props.pageId,
     children = props.children;
@@ -33,7 +33,7 @@ export function PageLoadSchema(props) {
     }
   }, []);
   if (loading) {
-    return /*#__PURE__*/React.createElement(PageLading, {
+    return /*#__PURE__*/React.createElement(PageLoading, {
       loading: true,
       style: {
         background: "white"

package/lib/components/page-loading/index.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import "./index.less";
+export interface PageLadingProps {
+    loading: boolean;
+    background?: string;
+    children: any;
+}
+export declare function PageLoading(props: PageLadingProps): import("react").JSX.Element;

package/lib/components/{page-lading → page-loading}/index.js

@@ -1,18 +1,23 @@
 "use strict";
 
 exports.__esModule = true;
-exports.PageLading = PageLading;
+exports.PageLoading = PageLoading;
 require("./index.less");
-var _react = require("react");
-function PageLading(props) {
-  var style = props.style,
-    loading = props.loading;
-  if (!loading) {
-    return /*#__PURE__*/React.createElement(_react.Fragment, null);
-  }
+function PageLoading(props) {
+  var loading = props.loading,
+    background = props.background,
+    children = props.children;
   return /*#__PURE__*/React.createElement("div", {
+    className: "page-loading-wrapper",
+    style: {
+      width: "100%",
+      height: "100%"
+    }
+  }, children, loading && /*#__PURE__*/React.createElement("div", {
     className: "page-loading",
-    style: style
+    style: {
+      background: background
+    }
   }, /*#__PURE__*/React.createElement("div", {
     className: "atom-spinner"
   }, /*#__PURE__*/React.createElement("div", {
@@ -25,5 +30,5 @@ function PageLading(props) {
     className: "spinner-line"
   }), /*#__PURE__*/React.createElement("div", {
     className: "spinner-circle"
-  }))));
+  })))));
 }

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

@@ -4,11 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
-var _configProvider = _interopRequireDefault(require("antd/lib/config-provider"));
 var _react = require("react");
 var _reactDom = require("react-dom");
 var _lowcodeRenderCore = require("@zhubangyun/lowcode-render-core");
-var _window$antd;
 _lowcodeRenderCore.adapter.setRuntime({
   Component: _react.Component,
   PureComponent: _react.PureComponent,
@@ -25,11 +23,6 @@ _lowcodeRenderCore.adapter.setRenderers({
   TempRenderer: (0, _lowcodeRenderCore.tempRendererFactory)(),
   DivRenderer: (0, _lowcodeRenderCore.blockRendererFactory)()
 });
-// @ts-ignore
-_lowcodeRenderCore.adapter.setConfigProvider(((_window$antd = window.antd) === null || _window$antd === void 0 ? void 0 : _window$antd.ConfigProvider) || _configProvider["default"]);
-
-// @ts-ignore
-window.___adapter = _lowcodeRenderCore.adapter;
 function factory() {
   var Renderer = (0, _lowcodeRenderCore.rendererFactory)();
   return /*#__PURE__*/function (_Renderer) {

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 import "./index.less";
 import utils from "./utils";
+export { PageLoading } from "./components/page-loading";
 export { RestApi, RestFormApi, apiRequest } from "./utils/api";
 export { Layout } from "./components/layout";
 export { ReactRender } from "./components/react-render";

package/lib/index.js

@@ -2,12 +2,14 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.apiRequest = exports.RestFormApi = exports.RestApi = exports.Layout = void 0;
+exports.apiRequest = exports.RestFormApi = exports.RestApi = exports.PageLoading = exports.Layout = void 0;
 require("./index.less");
 var _utils = _interopRequireDefault(require("./utils"));
 exports.utils = _utils["default"];
 var _reactRender = require("./components/react-render");
 exports.ReactRender = _reactRender.ReactRender;
+var _pageLoading = require("./components/page-loading");
+exports.PageLoading = _pageLoading.PageLoading;
 var _api = require("./utils/api");
 exports.RestApi = _api.RestApi;
 exports.RestFormApi = _api.RestFormApi;

package/lib/utils/api/rest-api.d.ts

@@ -19,9 +19,9 @@ export interface FilterRule {
 }
 export declare type OperatorType = "eq" | "ne" | "gt" | "goe" | "lt" | "loe" | "like" | "notLike" | "in" | "notIn" | "isNull" | "isNotNull" | "between" | "notBetween";
 export interface RestSearchParams {
-    page: number;
-    pageSize: number;
-    filterRules: FilterRule[];
+    page?: number;
+    pageSize?: number;
+    filterRules?: FilterRule[];
 }
 export declare abstract class BaseRestApi<DataType> {
     uri: string;
@@ -29,7 +29,7 @@ export declare abstract class BaseRestApi<DataType> {
     request: AxiosInstance;
     protected constructor(uri: string, options?: RestApiOptions);
     abstract handleRequestConfig(config: AxiosRequestConfig): void;
-    search(params: RestSearchParams): Promise<ManyResult<DataType>>;
+    search(params?: RestSearchParams): Promise<ManyResult<DataType>>;
     /**
      * 通过id获取
      * @param id

package/lib/utils/page/index.js

@@ -11,6 +11,18 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _pageForm = require("./page-form");
 exports.showForm = _pageForm.showForm;
+var timerRef;
+function debounceHide() {
+  if (timerRef) {
+    clearTimeout(timerRef);
+  }
+  timerRef = setTimeout(function () {
+    var loading = document.getElementById("fullscreen-loading");
+    if (loading) {
+      loading.style.display = "none";
+    }
+  }, 40);
+}
 function showLoading() {
   return _showLoading.apply(this, arguments);
 }
@@ -42,15 +54,11 @@ function hideLoading() {
 }
 function _hideLoading() {
   _hideLoading = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-    var loading;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          loading = document.getElementById("fullscreen-loading");
-          if (loading) {
-            loading.style.display = "none";
-          }
-        case 2:
+          debounceHide();
+        case 1:
         case "end":
           return _context2.stop();
       }

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

@@ -7,7 +7,7 @@ var _result = _interopRequireDefault(require("antd/lib/result"));
 var _message2 = _interopRequireDefault(require("antd/lib/message"));
 var _react = require("react");
 var _api = require("../api");
-var _pageLading = require("../../components/page-lading");
+var _pageLoading = require("../../components/page-loading");
 function PageLoadSchema(props) {
   var pageId = props.pageId,
     children = props.children;
@@ -38,7 +38,7 @@ function PageLoadSchema(props) {
     }
   }, []);
   if (loading) {
-    return /*#__PURE__*/React.createElement(_pageLading.PageLading, {
+    return /*#__PURE__*/React.createElement(_pageLoading.PageLoading, {
       loading: true,
       style: {
         background: "white"

package/package.json

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

package/es/components/page-lading/index.d.ts

@@ -1,7 +0,0 @@
-import "./index.less";
-import { CSSProperties } from "react";
-export interface PageLadingProps {
-    style?: CSSProperties;
-    loading: boolean;
-}
-export declare function PageLading(props: PageLadingProps): import("react").JSX.Element;

package/lib/components/page-lading/index.d.ts

@@ -1,7 +0,0 @@
-import "./index.less";
-import { CSSProperties } from "react";
-export interface PageLadingProps {
-    style?: CSSProperties;
-    loading: boolean;
-}
-export declare function PageLading(props: PageLadingProps): import("react").JSX.Element;