@next-core/brick-kit 2.159.5 → 2.160.0

package/dist/index.bundle.js

@@ -840,6 +840,7 @@
           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 {
@@ -11564,13 +11565,15 @@
   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__default["default"](_objectSpread__default["default"]({}, useBrick), {}, {
@@ -11580,7 +11583,8 @@
     });
     var runtimeContext = _internalApiGetCurrentContext();
     listenOnTrackingContext(brick, trackingContextList, _objectSpread__default["default"](_objectSpread__default["default"]({}, runtimeContext), {}, {
-      tplContextId
+      tplContextId,
+      formContextId
     }));
     return brick;
   };
@@ -11631,7 +11635,8 @@
     var requireSuspense = React.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;
       }
@@ -11649,7 +11654,7 @@
       }
       _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);
@@ -11675,7 +11680,8 @@
           brick: useBrick.brick,
           lifeCycle: useBrick.lifeCycle
         }, brick, _objectSpread__default["default"](_objectSpread__default["default"]({}, _internalApiGetCurrentContext()), {}, {
-          tplContextId: useBrick[symbolForTplContextId]
+          tplContextId: useBrick[symbolForTplContextId],
+          formContextId: useBrick[symbolForFormContextId]
         }));
       }
       return brick;
@@ -11684,7 +11690,8 @@
       var _ref4 = _asyncToGenerator__default["default"](function* (event, handlers, brick) {
         for (var handler of [].concat(handlers)) {
           listenerFactory(handler, _objectSpread__default["default"](_objectSpread__default["default"]({}, _internalApiGetCurrentContext()), {}, {
-            tplContextId: useBrick[symbolForTplContextId]
+            tplContextId: useBrick[symbolForTplContextId],
+            formContextId: useBrick[symbolForFormContextId]
           }), brick)(event);
         }
       });
@@ -11697,6 +11704,9 @@
       var {
         [symbolForTplContextId]: tplContextId
       } = useBrick;
+      var {
+        [symbolForFormContextId]: formContextId
+      } = useBrick;
       if (useBrick.iid) {
         element.dataset.iid = useBrick.iid;
       }
@@ -11704,7 +11714,8 @@
       unbindListeners(element);
       if (brick.events) {
         bindListeners(element, transformEvents(data, brick.events), _objectSpread__default["default"](_objectSpread__default["default"]({}, _internalApiGetCurrentContext()), {}, {
-          tplContextId
+          tplContextId,
+          formContextId
         }));
       }
       // 设置proxyEvent
@@ -11878,7 +11889,8 @@
     var requireSuspense = React.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;
       }
@@ -11901,7 +11913,7 @@
       }
       _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);