@next-core/brick-kit 2.159.4 → 2.160.0

package/dist/index.esm.js

@@ -841,6 +841,7 @@ function doTransform(data, to, options) {
         data
       };
       if (options !== null && options !== void 0 && options.tplContextId) runtimeContext.tplContextId = options.tplContextId;
+      if (options !== null && options !== void 0 && options.formContextId) runtimeContext.formContextId = options.formContextId;
       result = evaluate(to, runtimeContext, options === null || options === void 0 ? void 0 : options.evaluateOptions);
       dismissRecursiveMarkingInjected = shouldDismissRecursiveMarkingInjected(to);
     } else {
@@ -8107,8 +8108,11 @@ class Kernel {
         } = _this.bootstrapData;
         if (storyboard.dependsAll) {
           var dllPath = window.DLL_PATH || {};
+          yield loadScriptOfDll(Object.values(dllPath));
+          yield loadScriptOfBricksOrTemplates(brickPackages.map(item => item.filePath).concat(templatePackages.map(item => item.filePath)));
+          yield loadAllLazyBricks();
           return {
-            pendingTask: loadScriptOfDll(Object.values(dllPath)).then(() => loadScriptOfBricksOrTemplates(brickPackages.map(item => item.filePath).concat(templatePackages.map(item => item.filePath)))).then(() => loadAllLazyBricks())
+            pendingTask: Promise.resolve()
           };
         } else {
           // 先加载模板
@@ -8118,10 +8122,14 @@ class Kernel {
           var {
             dll,
             deps,
-            bricks
+            bricks,
+            byProcessors
           } = getDllAndDepsOfStoryboard(yield asyncProcessStoryboard(storyboard, brickTemplateRegistry, templatePackages), brickPackages, {
             ignoreBricksInUnusedCustomTemplates: true
           });
+          // 需要先阻塞加载 Custom Processors。
+          yield loadScriptOfDll(byProcessors.dll);
+          yield loadScriptOfBricksOrTemplates(byProcessors.deps);
           // 加载构件资源时，不再阻塞后续业务数据的加载，在挂载构件时再等待该任务完成。
           // 挂载构件可能包括：Provider 构件实时挂载、路由准备完成后的统一挂载等。
           return {
@@ -11558,13 +11566,15 @@ function expandTemplateInUseBrick(useBrick, tplTagName, brick, requireSuspense)
 var getCurrentRunTimeBrick = (useBrick, tplTagName, data) => {
   var trackingContextList = [];
   var tplContextId = useBrick[symbolForTplContextId];
+  var formContextId = useBrick[symbolForFormContextId];
   var transformOption = {
     // Keep lazy fields inside `useBrick` inside the `properties`.
     // They will be transformed by their `BrickAsComponent` later.
     $$lazyForUseBrick: true,
     trackingContextList,
     allowInject: true,
-    tplContextId
+    tplContextId,
+    formContextId
   };
   var properties = doTransform(data, cloneDeepWithInjectedMark(useBrick.properties) || {}, transformOption);
   var brick = _objectSpread(_objectSpread({}, useBrick), {}, {
@@ -11574,7 +11584,8 @@ var getCurrentRunTimeBrick = (useBrick, tplTagName, data) => {
   });
   var runtimeContext = _internalApiGetCurrentContext();
   listenOnTrackingContext(brick, trackingContextList, _objectSpread(_objectSpread({}, runtimeContext), {}, {
-    tplContextId
+    tplContextId,
+    formContextId
   }));
   return brick;
 };
@@ -11625,7 +11636,8 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
   var requireSuspense = useMemo(() => {
     var context;
     if (useBrick.brick === formRenderer) {
-      context = useBrick.properties.formData.context;
+      var formData = typeof useBrick.properties.formData === "string" ? JSON.parse(useBrick.properties.formData) : useBrick.properties.formData;
+      context = formData.context;
     } else if (tplTagName) {
       context = customTemplateRegistry.get(tplTagName).state;
     }
@@ -11643,7 +11655,7 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
     }
     _internalApiLoadDynamicBricksInBrickConf(useBrick).catch(handleHttpError);
     var brick = getCurrentRunTimeBrick(useBrick, tplTagName, data);
-    var expanded = useBrick.brick === formRenderer ? (requireSuspense ? AsyncExpandCustomForm : ExpandCustomForm)(useBrick.properties.formData, useBrick, false) : expandTemplateInUseBrick(useBrick, tplTagName, brick, requireSuspense);
+    var expanded = useBrick.brick === formRenderer ? (requireSuspense ? AsyncExpandCustomForm : ExpandCustomForm)(typeof useBrick.properties.formData === "string" ? JSON.parse(useBrick.properties.formData) : useBrick.properties.formData, useBrick, false) : expandTemplateInUseBrick(useBrick, tplTagName, brick, requireSuspense);
     if (requireSuspense) {
       setExpandedBrickConf(yield expanded);
       setSuspenseReady(true);
@@ -11669,7 +11681,8 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
         brick: useBrick.brick,
         lifeCycle: useBrick.lifeCycle
       }, brick, _objectSpread(_objectSpread({}, _internalApiGetCurrentContext()), {}, {
-        tplContextId: useBrick[symbolForTplContextId]
+        tplContextId: useBrick[symbolForTplContextId],
+        formContextId: useBrick[symbolForFormContextId]
       }));
     }
     return brick;
@@ -11678,7 +11691,8 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
     var _ref4 = _asyncToGenerator$3(function* (event, handlers, brick) {
       for (var handler of [].concat(handlers)) {
         listenerFactory(handler, _objectSpread(_objectSpread({}, _internalApiGetCurrentContext()), {}, {
-          tplContextId: useBrick[symbolForTplContextId]
+          tplContextId: useBrick[symbolForTplContextId],
+          formContextId: useBrick[symbolForFormContextId]
         }), brick)(event);
       }
     });
@@ -11691,6 +11705,9 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
     var {
       [symbolForTplContextId]: tplContextId
     } = useBrick;
+    var {
+      [symbolForFormContextId]: formContextId
+    } = useBrick;
     if (useBrick.iid) {
       element.dataset.iid = useBrick.iid;
     }
@@ -11698,7 +11715,8 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
     unbindListeners(element);
     if (brick.events) {
       bindListeners(element, transformEvents(data, brick.events), _objectSpread(_objectSpread({}, _internalApiGetCurrentContext()), {}, {
-        tplContextId
+        tplContextId,
+        formContextId
       }));
     }
     // 设置proxyEvent
@@ -11872,7 +11890,8 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
   var requireSuspense = useMemo(() => {
     var context;
     if (useBrick.brick === formRenderer) {
-      context = useBrick.properties.formData.context;
+      var formData = typeof useBrick.properties.formData === "string" ? JSON.parse(useBrick.properties.formData) : useBrick.properties.formData;
+      context = formData.context;
     } else if (tplTagName) {
       context = customTemplateRegistry.get(tplTagName).state;
     }
@@ -11895,7 +11914,7 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
     }
     _internalApiLoadDynamicBricksInBrickConf(useBrick).catch(handleHttpError);
     var brick = getCurrentRunTimeBrick(useBrick, tplTagName, data);
-    var expanded = useBrick.brick === formRenderer ? (requireSuspense ? AsyncExpandCustomForm : ExpandCustomForm)(useBrick.properties.formData, useBrick, false) : expandTemplateInUseBrick(useBrick, tplTagName, brick, requireSuspense);
+    var expanded = useBrick.brick === formRenderer ? (requireSuspense ? AsyncExpandCustomForm : ExpandCustomForm)(typeof useBrick.properties.formData === "string" ? JSON.parse(useBrick.properties.formData) : useBrick.properties.formData, useBrick, false) : expandTemplateInUseBrick(useBrick, tplTagName, brick, requireSuspense);
     if (requireSuspense) {
       setExpandedBrickConf(yield expanded);
       setSuspenseReady(true);