@zhubangyun/lowcode-core 5.10.82 → 5.10.91

package/lib/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/lib/utils/common/SingletonInstanceMap.js

@@ -70,6 +70,9 @@ var SingletonInstanceMap = exports.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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/utils/page/page-layout.js

@@ -7,6 +7,7 @@ var _drawer = _interopRequireDefault(require("antd/lib/drawer"));
 var _modal = _interopRequireDefault(require("antd/lib/modal"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _react = _interopRequireWildcard(require("react"));
+var _loadMaterials = require("../../components/load-materials");
 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; }
 var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
@@ -43,10 +44,9 @@ var PageLayout = exports.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["default"].createElement(LoadMaterialChildren, null, this.props.children);
     var restProps = {
       open: state.open,
       width: state.width,
@@ -77,4 +77,7 @@ var PageLayout = exports.PageLayout = /*#__PURE__*/function (_Component) {
     return children;
   };
   return PageLayout;
-}(_react.Component);
+}(_react.Component);
+function LoadMaterialChildren(props) {
+  return /*#__PURE__*/_react["default"].createElement(_loadMaterials.LoadMaterials, null, props.children);
+}

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

@@ -8,9 +8,11 @@ var _message2 = _interopRequireDefault(require("antd/lib/message"));
 var _react = require("react");
 var _api = require("../api");
 var _pageLoading = require("../../components/page-loading");
+var _schemaApi = require("../api/schema-api");
 function PageLoadSchema(props) {
   var pageId = props.pageId,
     children = props.children;
+  var cache = (0, _schemaApi.getSchemaFromCache)(pageId);
   var _useState = (0, _react.useState)(true),
     loading = _useState[0],
     setLoading = _useState[1];
@@ -21,6 +23,9 @@ function PageLoadSchema(props) {
     errorMsg = _useState3[0],
     setErrorMsg = _useState3[1];
   (0, _react.useEffect)(function () {
+    if (cache) {
+      return;
+    }
     if (pageId) {
       (0, _api.getSchema)(pageId).then(function (res) {
         if (res.success) {
@@ -37,6 +42,9 @@ function PageLoadSchema(props) {
       _message2["default"].error("页面id不可为空!").then();
     }
   }, []);
+  if (cache) {
+    return children(schema);
+  }
   if (loading) {
     return /*#__PURE__*/React.createElement(_pageLoading.PageLoading, {
       loading: true,

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

@@ -6,12 +6,12 @@ exports.renderElement = renderElement;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _reactDom = _interopRequireDefault(require("react-dom"));
 var _react = require("react");
+var _client = require("react-dom/client");
 function renderElement(options) {
   return new Promise( /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].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 _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -22,28 +22,27 @@ function renderElement(options) {
               container = document.createElement("div");
               document.body.append(container);
             }
+            root = (0, _client.createRoot)(container);
             element = /*#__PURE__*/(0, _react.createElement)(component, (0, _extends2["default"])({}, props, {
               onSelectOk: function onSelectOk(data) {
                 resolve(data || null);
               },
               onClose: function onClose() {
                 resolve(false);
+                //等待动画结束
                 setTimeout(function () {
-                  _reactDom["default"].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["default"].render(element, container);
-          case 6:
+            root.render(element);
+          case 7:
           case "end":
             return _context.stop();
         }

package/lib/utils/page/page-show.d.ts

@@ -1,11 +1,8 @@
 import { PageLayoutType } from "./page-layout";
 export interface ShowPageProps {
     container?: HTMLDivElement;
+    pageId: string;
     layout?: PageLayoutType;
-    form?: {
-        id: string;
-        fieldId?: string;
-    };
     onClose?: () => void | Promise<void>;
 }
 export declare function show(options: ShowPageProps): Promise<any | any[]>;

package/lib/utils/page/page-show.js

@@ -13,7 +13,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _pageLayout = require("./page-layout");
 var _pageLoadSchema = require("./page-load-schema");
 var _reactRender = require("../../components/react-render");
-var _excluded = ["layout", "form", "onClose"],
+var _excluded = ["layout", "pageId", "onClose"],
   _excluded2 = ["container", "onClose"];
 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; }
@@ -60,7 +60,7 @@ var PageRender = /*#__PURE__*/function (_Component) {
     var self = this;
     var _this$props = this.props,
       layout = _this$props.layout,
-      form = _this$props.form,
+      pageId = _this$props.pageId,
       onClose = _this$props.onClose,
       restProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded);
     // @ts-ignore
@@ -77,7 +77,7 @@ var PageRender = /*#__PURE__*/function (_Component) {
         return _this2.layoutRef = layout;
       }
     }, /*#__PURE__*/_react["default"].createElement(_pageLoadSchema.PageLoadSchema, {
-      pageId: form === null || form === void 0 ? void 0 : form.id
+      pageId: pageId
     }, function (schema) {
       return /*#__PURE__*/_react["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({
         schema: schema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhubangyun/lowcode-core",
-  "version": "5.10.082",
+  "version": "5.10.091",
   "description": "低代码核心",
   "files": [
     "lib",
@@ -12,8 +12,8 @@
     "bundle:types": "node bundle-dts.js",
     "dev": "build-scripts start --config build.dev.json",
     "build:npm": "build-scripts build",
+    "publish:npm": "build-scripts build && npm publish",
     "build:umd": "build-scripts build --config build.umd.json",
-    "publish:npm": "npm run build:npm && npm publish",
     "publish:oss": "npm run build:umd && node scripts/publishToCdn.ts"
   },
   "dependencies": {
@@ -36,8 +36,8 @@
     "@testing-library/react": "^11.2.7",
     "@types/lodash": "^4.17.13",
     "@types/node": "^13.7.1",
-    "@types/react": "^16",
-    "@types/react-dom": "^16",
+    "@types/react": "^18",
+    "@types/react-dom": "^18",
     "@types/react-router": "5.1.18",
     "@types/uuid": "^10.0.0",
     "ali-oss": "^6.20.0",
@@ -52,10 +52,10 @@
     "husky": "^7.0.4",
     "lerna": "^4.0.0",
     "prop-types": "^15.8.1",
-    "react": "^16",
-    "react-dom": "^16.14.0",
+    "react": "^18",
+    "react-dom": "^18",
     "rimraf": "^3.0.2",
-    "typescript": "4.6.2",
+    "typescript": "5.9",
     "yarn": "^1.22.17"
   },
   "publishConfig": {

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

@@ -1 +0,0 @@
-export declare function loadMaterials(): Promise<Record<string, React.FC>>;

package/es/utils/common/LoadMaterials.js

@@ -1,37 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { loadPlugins } from "./LoadPlugins";
-export function loadMaterials() {
-  return _loadMaterials.apply(this, arguments);
-}
-function _loadMaterials() {
-  _loadMaterials = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var urls, components;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          urls = ["https://cdn.zhiyunhe.com/plugin/lowcode/materials/root/view.js", "https://cdn.zhiyunhe.com/plugin/lowcode/materials/root/view.css", "https://cdn.zhiyunhe.com/plugin/lowcode/materials/antd/view.js", "https://cdn.zhiyunhe.com/plugin/lowcode/materials/antd/view.css", "https://cdn.zhiyunhe.com/plugin/lowcode/materials/antd-pro/view.js", "https://cdn.zhiyunhe.com/plugin/lowcode/materials/antd-pro/view.css"];
-          _context.next = 3;
-          return loadPlugins(urls);
-        case 3:
-          components = {};
-          ["RootMaterial", "AntdMaterial", "AntdProMaterial"].forEach(function (lib) {
-            var data = window[lib];
-            if (data) {
-              Object.entries(data).forEach(function (_ref) {
-                var key = _ref[0],
-                  value = _ref[1];
-                // @ts-ignore
-                components[key] = value;
-              });
-            }
-          });
-          return _context.abrupt("return", components);
-        case 6:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return _loadMaterials.apply(this, arguments);
-}

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

@@ -1,30 +0,0 @@
-import { FormInstance } from "antd/lib";
-export declare type ProcessScriptOptions = {
-    depth: number;
-    form: FormInstance;
-    changeValues: any;
-};
-export declare type ProcessScriptType = {
-    timing: "change" | "submit";
-    script: string;
-    nodeTitle: string;
-};
-export declare function exeProcessScript(options: ProcessScriptOptions, scriptType: ProcessScriptType): Promise<void>;
-export declare type ProcessNodeProps = {
-    type: any;
-    branchType: "condition" | "parallel";
-    nodeTitle: string;
-    message: string;
-    notFoundDataAction: "ctn" | "ins";
-    actionType?: "direct" | "business";
-    breakType: "continue" | "break" | "return" | "exception";
-    nodeId?: string;
-    formId: string;
-    events?: ("ins" | "upd" | "del")[];
-    timing?: "bef" | "aft";
-    conditions: any[];
-    assignments: any[];
-    filters: any[];
-    sorts: any[];
-    pageSize: number;
-};