@zhubangyun/lowcode-core 5.10.83 → 5.10.91

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

@@ -10,6 +10,9 @@ export function LoadMaterials(props) {
   useEffect(function () {
     initialize().then();
   }, []);
+  if (window._components) {
+    return props.children;
+  }
   function initialize() {
     return _initialize.apply(this, arguments);
   }
@@ -72,10 +75,6 @@ function _loadMaterials() {
             }
           });
           window._components = components;
-          /*    Object.defineProperty(window, "_components", {
-                  writable: false,
-                  value: components
-              })*/
         case 8:
         case "end":
           return _context2.stop();

package/es/components/log-error-content.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+export declare function LogErrorContent(props: {
+    message?: string;
+    requestId?: string;
+}): import("react").JSX.Element;

package/es/components/log-error-content.js

@@ -0,0 +1,32 @@
+import _notification from "antd/es/notification";
+import _message from "antd/es/message";
+import _Modal from "antd/es/modal";
+import _Typography from "antd/es/typography";
+export function LogErrorContent(props) {
+  var content = /*#__PURE__*/React.createElement(_Typography.Text, {
+    type: "danger",
+    style: {
+      whiteSpace: "pre-wrap"
+    }
+  }, props.message || "");
+  if (props.requestId) {
+    return /*#__PURE__*/React.createElement("div", null, content, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("a", {
+      onClick: function onClick() {
+        var _window$utils;
+        _Modal.destroyAll();
+        _message.destroy();
+        _notification.destroy();
+        (_window$utils = window.utils) === null || _window$utils === void 0 ? void 0 : _window$utils.showForm({
+          layout: "modal",
+          form: {
+            id: "form_e3dbb9076a544f86a3bb6ec113e22494"
+          },
+          mode: "detail",
+          dataId: props.requestId
+        }).then();
+      }
+    }, "\u67E5\u770B\u65E5\u5FD7")));
+  } else {
+    return content;
+  }
+}

package/es/components/typing.d.ts

@@ -1,3 +1,3 @@
-export declare type PageSize = "small" | "middle" | "larger" | "full";
+export type PageSize = "small" | "middle" | "larger" | "full";
 export declare const PageSizeEnum: Record<PageSize, string | number>;
 export declare function getPageSize(size?: PageSize): string | number;

package/es/index.js

@@ -1,5 +1,4 @@
 import "./index.less";
-// @ts-ignore
 import utils from "./utils";
 import { ReactRender } from "./components/react-render";
 import * as lodash from "lodash";

package/es/style.js

@@ -1,7 +1,7 @@
-import 'antd/es/typography/style';
 import 'antd/es/notification/style';
 import 'antd/es/modal/style';
 import 'antd/es/message/style';
+import 'antd/es/typography/style';
 import 'antd/es/drawer/style';
 import 'antd/es/result/style';
 import 'antd/es/config-provider/style';

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

@@ -147,7 +147,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   _proto.search = /*#__PURE__*/function () {
     var _search = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(searchParams) {
       var _searchParams, _searchParams2;
-      var params, config, res;
+      var params, config, res, start;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -176,10 +176,12 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             return this.request.get("search", config);
           case 11:
             res = _context3.sent;
+            //const res = await this.request.post<any, ManyResult<DataType>>("search", searchParams, config);
+            start = Date.now();
             assembleAssociationField(res.data, res.refs);
             console.debug("form.search:", res);
             return _context3.abrupt("return", res);
-          case 15:
+          case 16:
           case "end":
             return _context3.stop();
         }
@@ -192,7 +194,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   }();
   _proto.getById = /*#__PURE__*/function () {
     var _getById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(id, options) {
-      var res;
+      var res, start;
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -200,10 +202,11 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             return _RestApi.prototype.getById.call(this, id, options);
           case 2:
             res = _context4.sent;
+            start = Date.now();
             assembleAssociationField(res.data, res.refs);
-            console.debug("form.getById:", res);
+            console.debug("formApi.getById", res);
             return _context4.abrupt("return", res);
-          case 6:
+          case 7:
           case "end":
             return _context4.stop();
         }

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

@@ -17,9 +17,6 @@ export function convertSaveData(data) {
 }
 function getDataKey(data) {
   var _data$form, _data$form2;
-  if (!data) {
-    return "undefined";
-  }
   var key = (_data$form = data.form) === null || _data$form === void 0 ? void 0 : _data$form.id;
   if ((_data$form2 = data.form) !== null && _data$form2 !== void 0 && _data$form2.fieldId) {
     key += "." + data.form.fieldId;
@@ -68,18 +65,16 @@ export function assembleAssociationFieldV2(data, refs) {
     var ref = _step2.value;
     for (var _iterator4 = _createForOfIteratorHelperLoose(ref.data), _step4; !(_step4 = _iterator4()).done;) {
       var datum = _step4.value;
-      if (datum) {
-        var key = getDataKey(datum);
-        dataMap.set(key, datum);
-      }
+      var key = getDataKey(datum);
+      dataMap.set(key, datum);
     }
   }
 
   //组装refs的关联属性
   for (var _iterator3 = _createForOfIteratorHelperLoose(dataMap.values()), _step3; !(_step3 = _iterator3()).done;) {
     var item = _step3.value;
-    for (var _i2 = 0, _Object$keys2 = Object.keys(item); _i2 < _Object$keys2.length; _i2++) {
-      var _key = _Object$keys2[_i2];
+    for (var _i2 = 0, _Object$keys = Object.keys(item); _i2 < _Object$keys.length; _i2++) {
+      var _key = _Object$keys[_i2];
       // @ts-ignore
       var value = item[_key];
       assembleAssociationFieldDataV2(value, dataMap);
@@ -93,14 +88,10 @@ export function assembleAssociationFieldV2(data, refs) {
       });
     } else if (value !== null && value !== void 0 && value.id) {
       assembleAssociationFieldDataV2(value, dataMap);
-      for (var _i = 0, _Object$keys = Object.keys(value); _i < _Object$keys.length; _i++) {
-        var key = _Object$keys[_i];
-        // @ts-ignore
-        var subValues = value[key];
+      //处理子表
+      for (var _i = 0, _Object$values = Object.values(value); _i < _Object$values.length; _i++) {
+        var subValues = _Object$values[_i];
         if (typeof subValues == "object") {
-          if (key == "parent") {
-            continue;
-          }
           loopAssembleAssociation(subValues);
         }
       }
@@ -113,25 +104,21 @@ export function assembleAssociationFieldDataV2(data, dataMap) {
   if (data == null) {
     return;
   }
-  try {
-    if (Array.isArray(data)) {
-      data.forEach(function (item) {
-        return assembleAssociationFieldDataV2(item, dataMap);
-      });
-    } else {
-      var _data$form3;
-      if (data !== null && data !== void 0 && (_data$form3 = data.form) !== null && _data$form3 !== void 0 && _data$form3.id && data !== null && data !== void 0 && data.id) {
+  if (Array.isArray(data)) {
+    data.forEach(function (item) {
+      return assembleAssociationFieldDataV2(item, dataMap);
+    });
+  } else {
+    var _data$form3;
+    if (data !== null && data !== void 0 && (_data$form3 = data.form) !== null && _data$form3 !== void 0 && _data$form3.id && data !== null && data !== void 0 && data.id) {
+      delete data._load;
+      var key = getDataKey(data);
+      var value = dataMap.get(key);
+      if (value) {
+        Object.assign(data, value);
         delete data._load;
-        var key = getDataKey(data);
-        var value = dataMap.get(key);
-        if (value) {
-          Object.assign(data, value);
-          delete data._load;
-        }
       }
     }
-  } catch (e) {
-    console.log("装配对象失败", data, dataMap);
   }
 }
 export function assembleAssociationField(data, refs) {

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

@@ -1,5 +1,5 @@
 import { AxiosInstance, AxiosRequestConfig } from "axios";
-export declare type ValueType = "value" | "field" | "express";
+export type ValueType = "value" | "field" | "express";
 export interface RestApiOptions {
     /**
      * 超时时间
@@ -13,13 +13,13 @@ export interface RestApiOptions {
 }
 export interface FilterRule {
     connector?: "and" | "or";
-    key?: string;
+    key: string;
     operator?: OperatorType;
     valueType?: ValueType;
     value?: any;
     rules?: FilterRule[];
 }
-export declare type OperatorType = "eq" | "ne" | "gt" | "goe" | "lt" | "loe" | "like" | "notLike" | "in" | "notIn" | "isNull" | "isNotNull" | "between" | "notBetween";
+export type OperatorType = "eq" | "ne" | "gt" | "goe" | "lt" | "loe" | "like" | "notLike" | "in" | "notIn" | "isNull" | "isNotNull" | "between" | "notBetween";
 export interface RestSearchParams {
     page?: number;
     pageSize?: number;
@@ -54,7 +54,7 @@ export declare abstract class BaseRestApi<DataType> {
      */
     deleteById(id: string, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
     delete(data: any | any[], options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
-    private showError;
+    showError(type: string, res: BaseResult<any>): Promise<void>;
 }
 export declare class RestApi<DataType> extends BaseRestApi<DataType> {
     constructor(uri: string, options?: RestApiOptions);
@@ -98,8 +98,8 @@ export interface BaseType {
  */
 export interface BaseResult<DataType> {
     success: boolean;
-    requestId?: string;
     message?: string;
+    requestId: string;
     refs?: Refs;
 }
 export interface Ref {
@@ -110,7 +110,7 @@ export interface Ref {
     fieldIds: string[];
     data: BaseType[];
 }
-export declare type Refs = Ref[];
+export type Refs = Ref[];
 export interface OneResult<DataType> extends BaseResult<DataType> {
     data: DataType & BaseType;
 }

package/es/utils/api/rest-api.js

@@ -1,5 +1,4 @@
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
-import _Typography from "antd/es/typography";
 import _notification from "antd/es/notification";
 import _Modal from "antd/es/modal";
 import _message from "antd/es/message";
@@ -8,7 +7,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import axios from "axios";
 import { onFulfilled, onRejected } from "./index";
 import { transformerId } from "../data";
-import { showForm } from "../page";
+import { LogErrorContent } from "../../components/log-error-content";
 export var BaseRestApi = /*#__PURE__*/function () {
   function BaseRestApi(uri, options) {
     this.uri = void 0;
@@ -345,72 +344,64 @@ export var BaseRestApi = /*#__PURE__*/function () {
       return _delete2.apply(this, arguments);
     }
     return _delete;
-  }() // @ts-ignore
-  ;
-  _proto.showError =
-  /*#__PURE__*/
-  function () {
+  }();
+  _proto.showError = /*#__PURE__*/function () {
     var _showError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(type, res) {
-      var msg, props, content;
+      var msg, props;
       return _regeneratorRuntime.wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
             msg = res.message;
             _context8.prev = 1;
             if (!msg) {
-              _context8.next = 21;
+              _context8.next = 19;
               break;
             }
             props = JSON.parse(msg);
-            content = /*#__PURE__*/React.createElement(ErrorContent, {
-              requestId: res.requestId,
-              message: props.message
-            });
-            props.content = content;
-            props.message = content;
+            props.content = props.message;
             if (!props.title) {
               props.title = "" + this.title + type;
             }
             if (!(props.type == "message")) {
-              _context8.next = 13;
+              _context8.next = 11;
               break;
             }
             _message.error(props);
             return _context8.abrupt("return");
-          case 13:
+          case 11:
             if (!(props.type == "modal")) {
-              _context8.next = 18;
+              _context8.next = 16;
               break;
             }
             _Modal.error(props);
             return _context8.abrupt("return");
-          case 18:
+          case 16:
             if (!(props.type == "notification")) {
-              _context8.next = 21;
+              _context8.next = 19;
               break;
             }
             _notification.error(props);
             return _context8.abrupt("return");
-          case 21:
-            _context8.next = 27;
+          case 19:
+            _context8.next = 25;
             break;
-          case 23:
-            _context8.prev = 23;
+          case 21:
+            _context8.prev = 21;
             _context8.t0 = _context8["catch"](1);
             console.error("" + this.title + type + (msg || ""));
             _Modal.error({
               title: "" + this.title + type,
               centered: true,
-              content: /*#__PURE__*/React.createElement(ErrorContent, {
+              content: /*#__PURE__*/React.createElement(LogErrorContent, {
                 requestId: res.requestId,
                 message: res.message
               })
             });
-          case 27:
+          case 25:
           case "end":
             return _context8.stop();
         }
-      }, _callee8, this, [[1, 23]]);
+      }, _callee8, this, [[1, 21]]);
     }));
     function showError(_x15, _x16) {
       return _showError.apply(this, arguments);
@@ -419,32 +410,13 @@ export var BaseRestApi = /*#__PURE__*/function () {
   }();
   return BaseRestApi;
 }();
-function ErrorContent(props) {
-  var content = /*#__PURE__*/React.createElement(_Typography.Text, {
-    type: "danger",
-    style: {
-      whiteSpace: "pre-wrap"
-    }
-  }, props.message || "");
-  if (props.requestId) {
-    return /*#__PURE__*/React.createElement("div", null, content, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("a", {
-      onClick: function onClick() {
-        _Modal.destroyAll();
-        _message.destroy();
-        _notification.destroy();
-        showForm({
-          layout: "modal",
-          form: {
-            id: "form_e3dbb9076a544f86a3bb6ec113e22494"
-          },
-          mode: "detail",
-          dataId: props.requestId
-        }).then();
-      }
-    }, "\u67E5\u770B\u65E5\u5FD7")));
-  } else {
-    return content;
+function getStringId(item) {
+  if (typeof (item === null || item === void 0 ? void 0 : item.id) === "string") {
+    return item.id;
+  } else if (typeof item === "string") {
+    return item;
   }
+  return null;
 }
 export var RestApi = /*#__PURE__*/function (_BaseRestApi2) {
   function RestApi(uri, options) {

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

@@ -1,2 +1,3 @@
 import { OneResult } from "./rest-api";
 export declare function getSchema(pageId: string, mock?: boolean): Promise<OneResult<any>>;
+export declare function getSchemaFromCache(pageId?: string, mock?: boolean): any;

package/es/utils/api/schema-api.js

@@ -10,24 +10,26 @@ function _getSchema() {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (typeof mock != "boolean") {
-            if (typeof window.__mock == "boolean") {
-              mock = window.__mock;
-            }
-          }
           key = mock ? pageId + "_mock" : pageId;
-          _context.next = 4;
+          _context.next = 3;
           return schema.getInstance(key, {
             mock: mock,
             pageId: pageId
           });
-        case 4:
+        case 3:
           return _context.abrupt("return", _context.sent);
-        case 5:
+        case 4:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
   return _getSchema.apply(this, arguments);
+}
+export function getSchemaFromCache(pageId, mock) {
+  if (!pageId) {
+    return null;
+  }
+  var key = mock ? pageId + "_mock" : pageId;
+  return schema.get(key);
 }

package/es/utils/common/LoadPlugins.js

@@ -62,10 +62,15 @@ function _loadStyle() {
         case 2:
           return _context3.abrupt("return", new Promise( /*#__PURE__*/function () {
             var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve) {
-              var target;
+              var callback, target;
               return _regeneratorRuntime.wrap(function _callee2$(_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
+                    callback = function _callback(status) {
+                      setTimeout(function () {
+                        resolve(status);
+                      }, 10);
+                    };
                     //加载式样
                     target = doc.querySelector("link[href='" + src + "']");
                     if (!target) {
@@ -73,16 +78,16 @@ function _loadStyle() {
                       target.href = src;
                       target.rel = "stylesheet";
                       target.onload = function () {
-                        resolve(true);
+                        return callback(true);
                       };
                       target.onerror = function () {
-                        resolve(false);
+                        return callback(false);
                       };
                       doc.head.appendChild(target);
                     } else {
-                      resolve(true);
+                      callback(true);
                     }
-                  case 2:
+                  case 3:
                   case "end":
                     return _context2.stop();
                 }
@@ -120,8 +125,10 @@ function _loadScript() {
               return _regeneratorRuntime.wrap(function _callee4$(_context4) {
                 while (1) switch (_context4.prev = _context4.next) {
                   case 0:
-                    callback = function _callback(status) {
-                      resolve(status);
+                    callback = function _callback2(status) {
+                      setTimeout(function () {
+                        resolve(status);
+                      }, 10);
                     };
                     //加载脚本
                     target = doc.querySelector("script[src='" + src + "']");
@@ -132,10 +139,10 @@ function _loadScript() {
                       }
                       target.src = src;
                       target.onload = function () {
-                        callback(true);
+                        return callback(true);
                       };
                       target.onerror = function () {
-                        callback(false);
+                        return callback(false);
                       };
                       doc.body.appendChild(target);
                     } else {

package/es/utils/common/SingletonInstanceMap.d.ts

@@ -2,6 +2,7 @@ export declare abstract class SingletonInstanceMap<Value, Options> {
     private readonly valueMap;
     private readonly lockMap;
     getInstance(key: string, options: Options): Promise<Value>;
+    get(key: string): Value;
     clear(): void;
     abstract createInstance(key: string, options: Options): Promise<Value>;
 }

package/es/utils/common/SingletonInstanceMap.js

@@ -65,6 +65,9 @@ export var SingletonInstanceMap = /*#__PURE__*/function () {
     }
     return getInstance;
   }();
+  _proto.get = function get(key) {
+    return this.valueMap.get(key);
+  };
   _proto.clear = function clear() {
     this.lockMap.clear();
     this.valueMap.clear();

package/es/utils/designer/assets/assets.typing.d.ts

@@ -133,7 +133,7 @@ export interface Package {
 /**
  * 复杂 urls 结构，同时兼容简单结构和多模态结构
  */
-export declare type ComplexUrls = string[] | MultiModeUrls;
+export type ComplexUrls = string[] | MultiModeUrls;
 /**
  * 多模态资源
  */
@@ -163,7 +163,7 @@ export declare enum LoadEnv {
 /**
  * 低代码设置器描述
  */
-export declare type SetterDescription = PluginDescription;
+export type SetterDescription = PluginDescription;
 /**
  * 低代码插件器描述
  */
@@ -296,7 +296,7 @@ export interface RemoteComponentDescription {
         npm?: string;
     };
 }
-export declare type ComplexUrl = string | MultiModeUrl;
+export type ComplexUrl = string | MultiModeUrl;
 export interface MultiModeUrl {
     default: string;
     [index: string]: string;

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

@@ -1,5 +1,5 @@
 import { Assets } from "./assets.typing";
-export declare type DefaultAssertsType = "page" | "antd" | "chart";
+export type DefaultAssertsType = "page" | "antd" | "chart";
 export declare class DesignerAssets {
     data: Assets;
     constructor();

package/es/utils/page/page-form-data-manager-group.d.ts

@@ -1,5 +1,5 @@
 import { PageLayoutType } from "./page-layout";
-export declare type PageFormDataManagerModeType = "page" | "selectOne" | "selectMore";
+export type PageFormDataManagerModeType = "page" | "selectOne" | "selectMore";
 export interface ShowFormDataManagerGroupProps {
     container?: HTMLDivElement;
     layout?: PageLayoutType;

package/es/utils/page/page-form-data-manager.d.ts

@@ -1,6 +1,6 @@
 import { PageLayoutType } from "./page-layout";
 import { FilterRule } from "../api/rest-api";
-export declare type PageFormDataManagerModeType = "associationField" | "dataManager" | "selectOne" | "selectMore";
+export type PageFormDataManagerModeType = "associationField" | "dataManager" | "selectOne" | "selectMore";
 export interface ShowPageFormDataManagerProps {
     container?: HTMLDivElement;
     layout?: PageLayoutType;

package/es/utils/page/page-form.d.ts

@@ -1,5 +1,5 @@
 import { PageLayoutType } from "./page-layout";
-export declare type PageFormModeType = "add" | "edit" | "detail";
+export type PageFormModeType = "add" | "edit" | "detail";
 export interface ShowFormProps {
     container?: HTMLDivElement;
     layout?: PageLayoutType;
@@ -8,6 +8,7 @@ export interface ShowFormProps {
         fieldId?: string;
     };
     mode?: PageFormModeType;
+    lockMode?: boolean;
     dataId?: string;
     onSubmitOk?: () => void;
     onRemoveOk?: () => void;

package/es/utils/page/page-layout.d.ts

@@ -1,5 +1,5 @@
 import { Component } from "react";
-export declare type PageLayoutType = "page" | "modal" | "drawer";
+export type PageLayoutType = "page" | "modal" | "drawer";
 interface PageLayoutProps {
     layout?: PageLayoutType;
     children: any;
@@ -16,6 +16,6 @@ export declare class PageLayout extends Component<PageLayoutProps, PageLayoutSta
     componentWillUnmount(): void;
     getWith: () => number;
     handleResize: () => void;
-    render(): any;
+    render(): JSX.Element;
 }
 export {};

package/es/utils/page/page-layout.js

@@ -2,6 +2,7 @@ import _Drawer from "antd/es/drawer";
 import _Modal from "antd/es/modal";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import React, { Component } from "react";
+import { LoadMaterials } from "../../components/load-materials";
 export var PageLayout = /*#__PURE__*/function (_Component) {
   function PageLayout(props) {
     var _this;
@@ -36,10 +37,9 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
     window.removeEventListener("resize", this.handleResize);
   };
   _proto.render = function render() {
-    var _this$props = this.props,
-      layout = _this$props.layout,
-      children = _this$props.children;
+    var layout = this.props.layout;
     var state = this.state;
+    var children = /*#__PURE__*/React.createElement(LoadMaterialChildren, null, this.props.children);
     var restProps = {
       open: state.open,
       width: state.width,
@@ -70,4 +70,7 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
     return children;
   };
   return PageLayout;
-}(Component);
+}(Component);
+function LoadMaterialChildren(props) {
+  return /*#__PURE__*/React.createElement(LoadMaterials, null, props.children);
+}