@zhubangyun/lowcode-core 5.10.83 → 5.10.211

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);
+}

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

@@ -3,19 +3,24 @@ import _message from "antd/es/message";
 import { useEffect, useState } from "react";
 import { getSchema } from "../api";
 import { PageLoading } from "../../components/page-loading";
+import { getSchemaFromCache } from "../api/schema-api";
 export function PageLoadSchema(props) {
   var pageId = props.pageId,
     children = props.children;
-  var _useState = useState(true),
+  var cache = getSchemaFromCache(pageId);
+  var _useState = useState(!cache),
     loading = _useState[0],
     setLoading = _useState[1];
-  var _useState2 = useState(),
+  var _useState2 = useState(cache === null || cache === void 0 ? void 0 : cache.data),
     schema = _useState2[0],
     setSchema = _useState2[1];
   var _useState3 = useState(),
     errorMsg = _useState3[0],
     setErrorMsg = _useState3[1];
   useEffect(function () {
+    if (cache) {
+      return;
+    }
     if (pageId) {
       getSchema(pageId).then(function (res) {
         if (res.success) {
@@ -32,6 +37,9 @@ export function PageLoadSchema(props) {
       _message.error("页面id不可为空!").then();
     }
   }, []);
+  if (cache) {
+    return children(cache.data);
+  }
   if (loading) {
     return /*#__PURE__*/React.createElement(PageLoading, {
       loading: true,

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

@@ -1,12 +1,12 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import ReactDOM from "react-dom";
 import { createElement } from "react";
+import { createRoot } from "react-dom/client";
 export function renderElement(options) {
   return new Promise( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(resolve, reject) {
-      var container, _onClose, _options$element, component, props, unmount, element;
+      var container, _onClose, _options$element, component, props, unmount, root, element;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -17,28 +17,28 @@ export function renderElement(options) {
               container = document.createElement("div");
               document.body.append(container);
             }
+            root = createRoot(container);
             element = /*#__PURE__*/createElement(component, _extends({}, props, {
               onSelectOk: function onSelectOk(data) {
                 resolve(data || null);
               },
               onClose: function onClose() {
                 resolve(false);
+                //等待动画结束
                 setTimeout(function () {
-                  ReactDOM.unmountComponentAtNode(container);
-                }, 100);
-                if (unmount) {
-                  //等待动画结束
-                  setTimeout(function () {
+                  root.unmount();
+                  if (unmount) {
                     var _container;
                     //移除
                     (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
-                  }, 1000);
-                }
+                  }
+                }, 200);
                 _onClose === null || _onClose === void 0 ? void 0 : _onClose();
               }
             }));
-            ReactDOM.render(element, container);
-          case 6:
+            console.log("渲染", container, root, element);
+            root.render(element);
+          case 8:
           case "end":
             return _context.stop();
         }

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

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

package/lib/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/lib/components/log-error-content.js

@@ -0,0 +1,37 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.LogErrorContent = LogErrorContent;
+var _notification2 = _interopRequireDefault(require("antd/lib/notification"));
+var _message2 = _interopRequireDefault(require("antd/lib/message"));
+var _modal = _interopRequireDefault(require("antd/lib/modal"));
+var _typography = _interopRequireDefault(require("antd/lib/typography"));
+function LogErrorContent(props) {
+  var content = /*#__PURE__*/React.createElement(_typography["default"].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["default"].destroyAll();
+        _message2["default"].destroy();
+        _notification2["default"].destroy();
+        (_window$utils = window.utils) === null || _window$utils === void 0 ? void 0 : _window$utils.page.showForm({
+          layout: "modal",
+          form: {
+            id: "40120d0c-2b35-4ae7-8711-acae048f1a0"
+          },
+          mode: "detail",
+          dataId: props.requestId
+        }).then();
+      }
+    }, "\u67E5\u770B\u65E5\u5FD7")));
+  } else {
+    return content;
+  }
+}

package/lib/components/react-render/index.d.ts

@@ -3,5 +3,5 @@ import { IRendererProps } from "@zhubangyun/lowcode-render-core/lib/types";
 export declare class ReactRender extends PureComponent<IRendererProps & {}> {
     key: string;
     node: any;
-    render(): import("react").JSX.Element;
+    render(utils?: any): import("react").JSX.Element;
 }

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

@@ -8,7 +8,6 @@ var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inh
 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 ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
   function ReactRender() {
     var _this;
@@ -22,8 +21,11 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
   }
   (0, _inheritsLoose2["default"])(ReactRender, _PureComponent);
   var _proto = ReactRender.prototype;
-  _proto.render = function render() {
+  _proto.render = function render(utils) {
     var _this2 = this;
+    if (utils === void 0) {
+      utils = window.utils;
+    }
     var components = this.props.components || window._components;
     return /*#__PURE__*/React.createElement(_reactRenderFactory["default"], (0, _extends2["default"])({
       key: this.key
@@ -34,7 +36,7 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
       thisRequiredInJSE: true,
       components: components,
       appHelper: {
-        utils: _utils["default"],
+        utils: utils,
         requestHandlersMap: {
           fetch: (0, _lowcodeDatasourceFetchHandler.createFetchHandler)()
         }

package/lib/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/lib/index.js

@@ -22,8 +22,6 @@ var _layout = require("./components/layout");
 exports.Layout = _layout.Layout;
 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); }
 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; }
-// @ts-ignore
-
 // @ts-ignore
 window.__ReactRender = _reactRender.ReactRender;
 // @ts-ignore

package/lib/style.js

@@ -1,7 +1,7 @@
-require('antd/lib/typography/style');
 require('antd/lib/notification/style');
 require('antd/lib/modal/style');
 require('antd/lib/message/style');
+require('antd/lib/typography/style');
 require('antd/lib/drawer/style');
 require('antd/lib/result/style');
 require('antd/lib/config-provider/style');

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

@@ -153,7 +153,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   _proto.search = /*#__PURE__*/function () {
     var _search = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(searchParams) {
       var _searchParams, _searchParams2;
-      var params, config, res;
+      var params, config, res, start;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -182,10 +182,12 @@ var RestFormApi = exports.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();
             (0, _formApi.assembleAssociationField)(res.data, res.refs);
             console.debug("form.search:", res);
             return _context3.abrupt("return", res);
-          case 15:
+          case 16:
           case "end":
             return _context3.stop();
         }
@@ -198,7 +200,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   }();
   _proto.getById = /*#__PURE__*/function () {
     var _getById = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(id, options) {
-      var res;
+      var res, start;
       return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -206,10 +208,11 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             return _RestApi.prototype.getById.call(this, id, options);
           case 2:
             res = _context4.sent;
+            start = Date.now();
             (0, _formApi.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/lib/utils/api/form-api.utils.d.ts

@@ -3,6 +3,11 @@ export declare function convertSaveData(data: any): any;
 export declare function handleEntityLabel(data: BaseType | BaseType[]): void;
 export declare function dataToLabel(value: any): any;
 export declare function assembleAssociationFieldV2(data: BaseType | BaseType[], refs?: Refs): void;
+/**
+ * 加载字段
+ * @param data
+ * @param dataMap
+ */
 export declare function assembleAssociationFieldDataV2(data: BaseType | BaseType[], dataMap: Map<string, BaseType>): void;
 export declare function assembleAssociationField(data: BaseType | BaseType[], refs?: Refs): void;
 export declare function handleFilterRules(filters: FilterRule[], options: {

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

@@ -28,9 +28,6 @@ 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;
@@ -47,7 +44,7 @@ function handleEntityLabel(data) {
     var labelField = (_item$form = item.form) === null || _item$form === void 0 ? void 0 : _item$form.labelField;
     if (labelField) {
       // @ts-ignore
-      var value = item[labelField];
+      var value = safeGet(item, labelField);
       item.label = dataToLabel(value);
     }
   }
@@ -79,18 +76,16 @@ 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);
@@ -103,33 +98,35 @@ function assembleAssociationFieldV2(data, refs) {
         return loopAssembleAssociation(item);
       });
     } else if (value !== null && value !== void 0 && value.id) {
+      handleEntityLabel(value);
       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);
         }
       }
     }
   }
   loopAssembleAssociation(data);
-  handleEntityLabel(data);
 }
+
+/**
+ * 加载字段
+ * @param data
+ * @param dataMap
+ */
 function assembleAssociationFieldDataV2(data, dataMap) {
   if (data == null) {
     return;
   }
-  try {
-    if (Array.isArray(data)) {
-      data.forEach(function (item) {
-        return assembleAssociationFieldDataV2(item, dataMap);
-      });
-    } else {
+  if (Array.isArray(data)) {
+    data.forEach(function (item) {
+      return assembleAssociationFieldDataV2(item, dataMap);
+    });
+  } else {
+    if (data._load == false) {
       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;
@@ -141,8 +138,6 @@ function assembleAssociationFieldDataV2(data, dataMap) {
         }
       }
     }
-  } catch (e) {
-    console.log("装配对象失败", data, dataMap);
   }
 }
 function assembleAssociationField(data, refs) {
@@ -176,4 +171,26 @@ function handleFilterRules(filters, options) {
   } else {
     return undefined;
   }
+}
+function safeGet(value, key) {
+  if (typeof value !== "object") {
+    return null;
+  }
+  if (typeof key !== "string") {
+    return null;
+  }
+  if (!value || !key) return undefined;
+  var paths = key.split(".");
+  function safeGetValue(v) {
+    if (typeof v !== "object") {
+      return v;
+    }
+    if (paths.length) {
+      var k = paths.shift();
+      return safeGetValue(v === null || v === void 0 ? void 0 : v[k]);
+    } else {
+      return v;
+    }
+  }
+  return safeGetValue(value);
 }

package/lib/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;
 }