@zhubangyun/lowcode-core 5.10.91 → 5.10.220

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.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;
@@ -29,7 +28,7 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
       thisRequiredInJSE: true,
       components: components,
       appHelper: {
-        utils: utils,
+        utils: window.utils,
         requestHandlersMap: {
           fetch: createFetchHandler()
         }

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

@@ -1,6 +1,6 @@
 import { BaseRequestOptions, ManyResult, OneResult, RestApi, RestSearchParams } from "./rest-api";
 import { AxiosRequestConfig } from "axios";
-export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): Promise<RestFormApi<any>>;
+export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): RestFormApi<any>;
 export declare class RestFormApi<DataType> extends RestApi<DataType> {
     private readonly formId;
     private readonly fieldId?;

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

@@ -1,43 +1,25 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { RestApi } from "./rest-api";
 import { getSchema } from "./index";
 import { assembleAssociationField, convertSaveData, handleFilterRules } from "./form-api.utils";
 import { formApi } from "../cache";
-export function getFormApi(_x, _x2, _x3) {
-  return _getFormApi.apply(this, arguments);
-}
-function _getFormApi() {
-  _getFormApi = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(formId, fieldId, mock) {
-    var key;
-    return _regeneratorRuntime.wrap(function _callee9$(_context9) {
-      while (1) switch (_context9.prev = _context9.next) {
-        case 0:
-          if (typeof mock != "boolean") {
-            if (typeof window.__mock == "boolean") {
-              mock = window.__mock;
-            }
-          }
-          key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
-            return !!key;
-          }).join("_");
-          _context9.next = 4;
-          return formApi.getInstance(key, {
-            mock: mock,
-            fieldId: fieldId,
-            formId: formId
-          });
-        case 4:
-          return _context9.abrupt("return", _context9.sent);
-        case 5:
-        case "end":
-          return _context9.stop();
-      }
-    }, _callee9);
-  }));
-  return _getFormApi.apply(this, arguments);
+export function getFormApi(formId, fieldId, mock) {
+  if (typeof mock != "boolean") {
+    if (typeof window.__mock == "boolean") {
+      mock = window.__mock;
+    }
+  }
+  var key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
+    return !!key;
+  }).join("_");
+  return formApi.getInstance(key, {
+    mock: mock,
+    fieldId: fieldId,
+    formId: formId
+  });
 }
 export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   function RestFormApi(formId, fieldId, mock) {
@@ -139,7 +121,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee2, this);
     }));
-    function handleRequestConfig(_x4) {
+    function handleRequestConfig(_x) {
       return _handleRequestConfig.apply(this, arguments);
     }
     return handleRequestConfig;
@@ -187,7 +169,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee3, this);
     }));
-    function search(_x5) {
+    function search(_x2) {
       return _search.apply(this, arguments);
     }
     return search;
@@ -212,7 +194,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee4, this);
     }));
-    function getById(_x6, _x7) {
+    function getById(_x3, _x4) {
       return _getById.apply(this, arguments);
     }
     return getById;
@@ -229,7 +211,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee5, this);
     }));
-    function save(_x8, _x9) {
+    function save(_x5, _x6) {
       return _save.apply(this, arguments);
     }
     return save;
@@ -246,7 +228,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee6, this);
     }));
-    function create(_x10, _x11) {
+    function create(_x7, _x8) {
       return _create.apply(this, arguments);
     }
     return create;
@@ -263,7 +245,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee7, this);
     }));
-    function update(_x12, _x13, _x14) {
+    function update(_x9, _x10, _x11) {
       return _update.apply(this, arguments);
     }
     return update;
@@ -280,7 +262,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee8, this);
     }));
-    function serviceUpdate(_x15, _x16) {
+    function serviceUpdate(_x12, _x13) {
       return _serviceUpdate.apply(this, arguments);
     }
     return serviceUpdate;

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/cache/index.d.ts

@@ -7,11 +7,12 @@ export declare class SchemaCache extends SingletonInstanceMap<any, {
     createInstance(key: string, options: any): Promise<any>;
 }
 export declare const schema: SchemaCache;
-export declare class FormApiCache extends SingletonInstanceMap<RestFormApi<any>, {
-    formId: string;
-    fieldId?: string;
-    mock?: boolean;
-}> {
-    createInstance(key: string, options?: any): Promise<RestFormApi<any>>;
+export declare class FormApiCache {
+    apiMap: Map<string, RestFormApi<any>>;
+    getInstance(key: string, options: {
+        formId: string;
+        fieldId?: string;
+        mock?: boolean;
+    }): RestFormApi<any>;
 }
 export declare const formApi: FormApiCache;

package/es/utils/cache/index.js

@@ -48,38 +48,22 @@ export var SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
   return SchemaCache;
 }(SingletonInstanceMap);
 export var schema = new SchemaCache();
-export var FormApiCache = /*#__PURE__*/function (_SingletonInstanceMap2) {
+export var FormApiCache = /*#__PURE__*/function () {
   function FormApiCache() {
-    return _SingletonInstanceMap2.apply(this, arguments) || this;
+    this.apiMap = new Map();
   }
-  _inheritsLoose(FormApiCache, _SingletonInstanceMap2);
   var _proto2 = FormApiCache.prototype;
-  _proto2.createInstance = /*#__PURE__*/function () {
-    var _createInstance2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(key, options) {
-      var _options, formId, fieldId, mock, formApi;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            if (options === void 0) {
-              options = {};
-            }
-            _options = options, formId = _options.formId, fieldId = _options.fieldId, mock = _options.mock;
-            formApi = new RestFormApi(formId, fieldId, mock);
-            _context2.next = 5;
-            return formApi.initialize();
-          case 5:
-            return _context2.abrupt("return", formApi);
-          case 6:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    function createInstance(_x3, _x4) {
-      return _createInstance2.apply(this, arguments);
+  _proto2.getInstance = function getInstance(key, options) {
+    if (this.apiMap.has(key)) {
+      return this.apiMap.get(key);
     }
-    return createInstance;
-  }();
+    var formId = options.formId,
+      fieldId = options.fieldId,
+      mock = options.mock;
+    var formApi = new RestFormApi(formId, fieldId, mock);
+    this.apiMap.set(key, formApi);
+    return formApi;
+  };
   return FormApiCache;
-}(SingletonInstanceMap);
+}();
 export var formApi = new FormApiCache();

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(),

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.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;
@@ -34,7 +33,7 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
       thisRequiredInJSE: true,
       components: components,
       appHelper: {
-        utils: _utils["default"],
+        utils: window.utils,
         requestHandlersMap: {
           fetch: (0, _lowcodeDatasourceFetchHandler.createFetchHandler)()
         }

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

@@ -1,6 +1,6 @@
 import { BaseRequestOptions, ManyResult, OneResult, RestApi, RestSearchParams } from "./rest-api";
 import { AxiosRequestConfig } from "axios";
-export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): Promise<RestFormApi<any>>;
+export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): RestFormApi<any>;
 export declare class RestFormApi<DataType> extends RestApi<DataType> {
     private readonly formId;
     private readonly fieldId?;

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

@@ -6,44 +6,26 @@ exports.RestFormApi = void 0;
 exports.getFormApi = getFormApi;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _restApi = require("./rest-api");
 var _index = require("./index");
 var _formApi = require("./form-api.utils");
 var _cache = require("../cache");
-function getFormApi(_x, _x2, _x3) {
-  return _getFormApi.apply(this, arguments);
-}
-function _getFormApi() {
-  _getFormApi = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(formId, fieldId, mock) {
-    var key;
-    return _regenerator["default"].wrap(function _callee9$(_context9) {
-      while (1) switch (_context9.prev = _context9.next) {
-        case 0:
-          if (typeof mock != "boolean") {
-            if (typeof window.__mock == "boolean") {
-              mock = window.__mock;
-            }
-          }
-          key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
-            return !!key;
-          }).join("_");
-          _context9.next = 4;
-          return _cache.formApi.getInstance(key, {
-            mock: mock,
-            fieldId: fieldId,
-            formId: formId
-          });
-        case 4:
-          return _context9.abrupt("return", _context9.sent);
-        case 5:
-        case "end":
-          return _context9.stop();
-      }
-    }, _callee9);
-  }));
-  return _getFormApi.apply(this, arguments);
+function getFormApi(formId, fieldId, mock) {
+  if (typeof mock != "boolean") {
+    if (typeof window.__mock == "boolean") {
+      mock = window.__mock;
+    }
+  }
+  var key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
+    return !!key;
+  }).join("_");
+  return _cache.formApi.getInstance(key, {
+    mock: mock,
+    fieldId: fieldId,
+    formId: formId
+  });
 }
 var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   function RestFormApi(formId, fieldId, mock) {
@@ -145,7 +127,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee2, this);
     }));
-    function handleRequestConfig(_x4) {
+    function handleRequestConfig(_x) {
       return _handleRequestConfig.apply(this, arguments);
     }
     return handleRequestConfig;
@@ -193,7 +175,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee3, this);
     }));
-    function search(_x5) {
+    function search(_x2) {
       return _search.apply(this, arguments);
     }
     return search;
@@ -218,7 +200,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee4, this);
     }));
-    function getById(_x6, _x7) {
+    function getById(_x3, _x4) {
       return _getById.apply(this, arguments);
     }
     return getById;
@@ -235,7 +217,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee5, this);
     }));
-    function save(_x8, _x9) {
+    function save(_x5, _x6) {
       return _save.apply(this, arguments);
     }
     return save;
@@ -252,7 +234,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee6, this);
     }));
-    function create(_x10, _x11) {
+    function create(_x7, _x8) {
       return _create.apply(this, arguments);
     }
     return create;
@@ -269,7 +251,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee7, this);
     }));
-    function update(_x12, _x13, _x14) {
+    function update(_x9, _x10, _x11) {
       return _update.apply(this, arguments);
     }
     return update;
@@ -286,7 +268,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
         }
       }, _callee8, this);
     }));
-    function serviceUpdate(_x15, _x16) {
+    function serviceUpdate(_x12, _x13) {
       return _serviceUpdate.apply(this, arguments);
     }
     return serviceUpdate;

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/cache/index.d.ts

@@ -7,11 +7,12 @@ export declare class SchemaCache extends SingletonInstanceMap<any, {
     createInstance(key: string, options: any): Promise<any>;
 }
 export declare const schema: SchemaCache;
-export declare class FormApiCache extends SingletonInstanceMap<RestFormApi<any>, {
-    formId: string;
-    fieldId?: string;
-    mock?: boolean;
-}> {
-    createInstance(key: string, options?: any): Promise<RestFormApi<any>>;
+export declare class FormApiCache {
+    apiMap: Map<string, RestFormApi<any>>;
+    getInstance(key: string, options: {
+        formId: string;
+        fieldId?: string;
+        mock?: boolean;
+    }): RestFormApi<any>;
 }
 export declare const formApi: FormApiCache;

package/lib/utils/cache/index.js

@@ -6,7 +6,7 @@ exports.schema = exports.formApi = exports.SchemaCache = exports.FormApiCache =
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
-var _SingletonInstanceMap3 = require("../common/SingletonInstanceMap");
+var _SingletonInstanceMap2 = require("../common/SingletonInstanceMap");
 var _api = require("../api");
 var _schema = require("./schema");
 var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
@@ -50,40 +50,24 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
     return createInstance;
   }();
   return SchemaCache;
-}(_SingletonInstanceMap3.SingletonInstanceMap);
+}(_SingletonInstanceMap2.SingletonInstanceMap);
 var schema = exports.schema = new SchemaCache();
-var FormApiCache = exports.FormApiCache = /*#__PURE__*/function (_SingletonInstanceMap2) {
+var FormApiCache = exports.FormApiCache = /*#__PURE__*/function () {
   function FormApiCache() {
-    return _SingletonInstanceMap2.apply(this, arguments) || this;
+    this.apiMap = new Map();
   }
-  (0, _inheritsLoose2["default"])(FormApiCache, _SingletonInstanceMap2);
   var _proto2 = FormApiCache.prototype;
-  _proto2.createInstance = /*#__PURE__*/function () {
-    var _createInstance2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(key, options) {
-      var _options, formId, fieldId, mock, formApi;
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            if (options === void 0) {
-              options = {};
-            }
-            _options = options, formId = _options.formId, fieldId = _options.fieldId, mock = _options.mock;
-            formApi = new _api.RestFormApi(formId, fieldId, mock);
-            _context2.next = 5;
-            return formApi.initialize();
-          case 5:
-            return _context2.abrupt("return", formApi);
-          case 6:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    function createInstance(_x3, _x4) {
-      return _createInstance2.apply(this, arguments);
+  _proto2.getInstance = function getInstance(key, options) {
+    if (this.apiMap.has(key)) {
+      return this.apiMap.get(key);
     }
-    return createInstance;
-  }();
+    var formId = options.formId,
+      fieldId = options.fieldId,
+      mock = options.mock;
+    var formApi = new _api.RestFormApi(formId, fieldId, mock);
+    this.apiMap.set(key, formApi);
+    return formApi;
+  };
   return FormApiCache;
-}(_SingletonInstanceMap3.SingletonInstanceMap);
+}();
 var formApi = exports.formApi = new FormApiCache();

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)(),

package/package.json

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