@zhubangyun/lowcode-core 5.10.91 → 5.10.211

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

@@ -16,10 +16,10 @@ export function LogErrorContent(props) {
         _Modal.destroyAll();
         _message.destroy();
         _notification.destroy();
-        (_window$utils = window.utils) === null || _window$utils === void 0 ? void 0 : _window$utils.showForm({
+        (_window$utils = window.utils) === null || _window$utils === void 0 ? void 0 : _window$utils.page.showForm({
           layout: "modal",
           form: {
-            id: "form_e3dbb9076a544f86a3bb6ec113e22494"
+            id: "40120d0c-2b35-4ae7-8711-acae048f1a0"
           },
           mode: "detail",
           dataId: props.requestId

package/es/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/es/components/react-render/index.js

@@ -3,7 +3,6 @@ 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";
 export var ReactRender = /*#__PURE__*/function (_PureComponent) {
   function ReactRender() {
     var _this;
@@ -17,8 +16,11 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
   }
   _inheritsLoose(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, _extends({
       key: this.key

package/es/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/es/utils/api/form-api.utils.js

@@ -33,7 +33,7 @@ export 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);
     }
   }
@@ -87,6 +87,7 @@ export 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$values = Object.values(value); _i < _Object$values.length; _i++) {
@@ -98,8 +99,13 @@ export function assembleAssociationFieldV2(data, refs) {
     }
   }
   loopAssembleAssociation(data);
-  handleEntityLabel(data);
 }
+
+/**
+ * 加载字段
+ * @param data
+ * @param dataMap
+ */
 export function assembleAssociationFieldDataV2(data, dataMap) {
   if (data == null) {
     return;
@@ -109,14 +115,16 @@ export function assembleAssociationFieldDataV2(data, dataMap) {
       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);
+    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;
+        var key = getDataKey(data);
+        var value = dataMap.get(key);
+        if (value) {
+          Object.assign(data, value);
+          delete data._load;
+        }
       }
     }
   }
@@ -152,4 +160,26 @@ export 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/es/utils/api/schema-api.js

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

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

@@ -8,10 +8,10 @@ export function PageLoadSchema(props) {
   var pageId = props.pageId,
     children = props.children;
   var cache = getSchemaFromCache(pageId);
-  var _useState = useState(true),
+  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(),
@@ -38,7 +38,7 @@ export function PageLoadSchema(props) {
     }
   }, []);
   if (cache) {
-    return children(schema);
+    return children(cache.data);
   }
   if (loading) {
     return /*#__PURE__*/React.createElement(PageLoading, {

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

@@ -36,8 +36,9 @@ export function renderElement(options) {
                 _onClose === null || _onClose === void 0 ? void 0 : _onClose();
               }
             }));
+            console.log("渲染", container, root, element);
             root.render(element);
-          case 7:
+          case 8:
           case "end":
             return _context.stop();
         }

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

@@ -21,10 +21,10 @@ function LogErrorContent(props) {
         _modal["default"].destroyAll();
         _message2["default"].destroy();
         _notification2["default"].destroy();
-        (_window$utils = window.utils) === null || _window$utils === void 0 ? void 0 : _window$utils.showForm({
+        (_window$utils = window.utils) === null || _window$utils === void 0 ? void 0 : _window$utils.page.showForm({
           layout: "modal",
           form: {
-            id: "form_e3dbb9076a544f86a3bb6ec113e22494"
+            id: "40120d0c-2b35-4ae7-8711-acae048f1a0"
           },
           mode: "detail",
           dataId: props.requestId

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/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

@@ -44,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);
     }
   }
@@ -98,6 +98,7 @@ 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$values = Object.values(value); _i < _Object$values.length; _i++) {
@@ -109,8 +110,13 @@ function assembleAssociationFieldV2(data, refs) {
     }
   }
   loopAssembleAssociation(data);
-  handleEntityLabel(data);
 }
+
+/**
+ * 加载字段
+ * @param data
+ * @param dataMap
+ */
 function assembleAssociationFieldDataV2(data, dataMap) {
   if (data == null) {
     return;
@@ -120,14 +126,16 @@ function assembleAssociationFieldDataV2(data, dataMap) {
       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);
+    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;
+        var key = getDataKey(data);
+        var value = dataMap.get(key);
+        if (value) {
+          Object.assign(data, value);
+          delete data._load;
+        }
       }
     }
   }
@@ -163,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/schema-api.js

@@ -16,15 +16,16 @@ function _getSchema() {
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          key = mock ? pageId + "_mock" : pageId;
-          _context.next = 3;
+          mock = getMock(mock);
+          key = mock ? pageId + ":mock" : pageId;
+          _context.next = 4;
           return _cache.schema.getInstance(key, {
             mock: mock,
             pageId: pageId
           });
-        case 3:
-          return _context.abrupt("return", _context.sent);
         case 4:
+          return _context.abrupt("return", _context.sent);
+        case 5:
         case "end":
           return _context.stop();
       }
@@ -36,6 +37,13 @@ function getSchemaFromCache(pageId, mock) {
   if (!pageId) {
     return null;
   }
+  mock = getMock(mock);
   var key = mock ? pageId + "_mock" : pageId;
   return _cache.schema.get(key);
+}
+function getMock(mock) {
+  if (typeof mock !== "boolean") {
+    mock = !!window.__mock;
+  }
+  return mock;
 }

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

@@ -13,10 +13,10 @@ function PageLoadSchema(props) {
   var pageId = props.pageId,
     children = props.children;
   var cache = (0, _schemaApi.getSchemaFromCache)(pageId);
-  var _useState = (0, _react.useState)(true),
+  var _useState = (0, _react.useState)(!cache),
     loading = _useState[0],
     setLoading = _useState[1];
-  var _useState2 = (0, _react.useState)(),
+  var _useState2 = (0, _react.useState)(cache === null || cache === void 0 ? void 0 : cache.data),
     schema = _useState2[0],
     setSchema = _useState2[1];
   var _useState3 = (0, _react.useState)(),
@@ -43,7 +43,7 @@ function PageLoadSchema(props) {
     }
   }, []);
   if (cache) {
-    return children(schema);
+    return children(cache.data);
   }
   if (loading) {
     return /*#__PURE__*/React.createElement(_pageLoading.PageLoading, {

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

@@ -41,8 +41,9 @@ function renderElement(options) {
                 _onClose === null || _onClose === void 0 ? void 0 : _onClose();
               }
             }));
+            console.log("渲染", container, root, element);
             root.render(element);
-          case 7:
+          case 8:
           case "end":
             return _context.stop();
         }

package/package.json

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