@next-core/brick-kit 2.156.4 → 2.156.6

package/dist/index.esm.js

@@ -10288,104 +10288,36 @@ function listenOnTrackingContext(brick, trackingContextList, context) {
   }
 }
 
-function ExpandCustomForm(_x, _x2, _x3, _x4) {
-  return _ExpandCustomForm.apply(this, arguments);
-}
+function ExpandCustomForm(formData, brickConf, isPreview, context) {
+  var formContext = new CustomFormContext();
+  formData = initFormContext(formData, brickConf, isPreview);
 
-function _ExpandCustomForm() {
-  _ExpandCustomForm = _asyncToGenerator$3(function* (formData, brickConf, isPreview, context) {
-    var errorBrick = {
-      brick: "presentational-bricks.brick-illustration",
-      properties: {
-        category: "default",
-        header: {
-          title: "参数错误"
-        },
-        mode: "guide",
-        name: "search-empty"
-      }
-    };
-    var formContext = new CustomFormContext();
+  if (Array.isArray(formData.context)) {
+    formContext.formState.syncDefine(formData.context, _objectSpread(_objectSpread({}, context), {}, {
+      formContextId: formContext.id
+    }), {});
+  }
 
-    if (isPreview && formData.formSchema && formData.formSchema.brick === "forms.general-form") {
-      var _formData$formSchema$;
+  return getFinalStoryBoard(formData, brickConf, isPreview, formContext);
+}
+function AsyncExpandCustomForm(_x, _x2, _x3, _x4) {
+  return _AsyncExpandCustomForm.apply(this, arguments);
+}
 
-      brickConf["properties"] = _objectSpread(_objectSpread({}, brickConf.properties), (_formData$formSchema$ = formData.formSchema.properties) === null || _formData$formSchema$ === void 0 ? void 0 : _formData$formSchema$.previewConf);
-    }
+function _AsyncExpandCustomForm() {
+  _AsyncExpandCustomForm = _asyncToGenerator$3(function* (formData, brickConf, isPreview, context) {
+    var formContext = new CustomFormContext();
+    formData = initFormContext(formData, brickConf, isPreview);
 
     if (Array.isArray(formData.context)) {
-      formData.context.forEach(item => {
-        if (brickConf.properties[item.name] !== undefined) {
-          item.value = brickConf.properties[item.name];
-        }
-      });
-
-      if (brickConf.properties.condition) {
-        formData.context.push({
-          name: "condition",
-          value: brickConf.properties.condition
-        });
-      }
-
       yield formContext.formState.define(formData.context, _objectSpread(_objectSpread({}, context), {}, {
         formContextId: formContext.id
       }), {});
     }
 
-    try {
-      var formStoryboard = getStoryboard([formData.formSchema], [], formData.fields, isPreview, formContext.id);
-      formStoryboard[0] = _.isEmpty(formStoryboard[0]) ? errorBrick : formStoryboard[0];
-
-      if (formStoryboard[0].brick === "forms.general-form" && brickConf.events) {
-        var _formStoryboard$0$eve;
-
-        var brickConfEvents = brickConf.events;
-        var events = (_formStoryboard$0$eve = formStoryboard[0].events) !== null && _formStoryboard$0$eve !== void 0 ? _formStoryboard$0$eve : {};
-        Object.keys(brickConfEvents).forEach(item => {
-          var newEvents = Array.isArray(events[item]) ? events[item] : [events[item]];
-          var itemEvents = Array.isArray(brickConfEvents[item]) ? brickConfEvents[item] : [brickConfEvents[item]];
-          events[item] = _.compact([...newEvents, ...itemEvents]);
-        });
-        formStoryboard[0].events = events;
-      }
-
-      return _objectSpread(_objectSpread({}, brickConf), {}, {
-        brick: "div",
-        slots: {
-          "": {
-            bricks: [{
-              brick: "basic-bricks.micro-view",
-              properties: {
-                style: {
-                  padding: "12px"
-                }
-              },
-              slots: {
-                content: {
-                  bricks: formStoryboard,
-                  type: "bricks"
-                }
-              }
-            }],
-            type: "bricks"
-          }
-        }
-      });
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.warn(error.message);
-      return {
-        brick: "div",
-        slots: {
-          "": {
-            bricks: [errorBrick],
-            type: "bricks"
-          }
-        }
-      };
-    }
+    return getFinalStoryBoard(formData, brickConf, isPreview, formContext);
   });
-  return _ExpandCustomForm.apply(this, arguments);
+  return _AsyncExpandCustomForm.apply(this, arguments);
 }
 
 function getDefaultProperties(_name, fields) {
@@ -10683,6 +10615,99 @@ function getStoryboard(datasource, result, fields, isPreview, formContextId) {
 
   return result;
 }
+function initFormContext(formData, brickConf, isPreview) {
+  if (isPreview && formData.formSchema && formData.formSchema.brick === "forms.general-form") {
+    var _formData$formSchema$;
+
+    brickConf["properties"] = _objectSpread(_objectSpread({}, brickConf.properties), (_formData$formSchema$ = formData.formSchema.properties) === null || _formData$formSchema$ === void 0 ? void 0 : _formData$formSchema$.previewConf);
+  }
+
+  if (Array.isArray(formData.context)) {
+    formData.context.forEach(item => {
+      if (brickConf.properties[item.name] !== undefined) {
+        item.value = brickConf.properties[item.name];
+      }
+    });
+
+    if (brickConf.properties.condition) {
+      formData.context.push({
+        name: "condition",
+        value: brickConf.properties.condition
+      });
+    }
+  }
+
+  return formData;
+}
+function getFinalStoryBoard(formData, brickConf, isPreview, formContext) {
+  var result = null;
+  var errorBrick = {
+    brick: "presentational-bricks.brick-illustration",
+    properties: {
+      category: "default",
+      header: {
+        title: "参数错误"
+      },
+      mode: "guide",
+      name: "search-empty"
+    }
+  };
+
+  try {
+    var formStoryboard = getStoryboard([formData.formSchema], [], formData.fields, isPreview, formContext.id);
+    formStoryboard[0] = _.isEmpty(formStoryboard[0]) ? errorBrick : formStoryboard[0];
+
+    if (formStoryboard[0].brick === "forms.general-form" && brickConf.events) {
+      var _formStoryboard$0$eve;
+
+      var brickConfEvents = brickConf.events;
+      var events = (_formStoryboard$0$eve = formStoryboard[0].events) !== null && _formStoryboard$0$eve !== void 0 ? _formStoryboard$0$eve : {};
+      Object.keys(brickConfEvents).forEach(item => {
+        var newEvents = Array.isArray(events[item]) ? events[item] : [events[item]];
+        var itemEvents = Array.isArray(brickConfEvents[item]) ? brickConfEvents[item] : [brickConfEvents[item]];
+        events[item] = _.compact([...newEvents, ...itemEvents]);
+      });
+      formStoryboard[0].events = events;
+    }
+
+    result = _objectSpread(_objectSpread({}, brickConf), {}, {
+      brick: "div",
+      slots: {
+        "": {
+          bricks: [{
+            brick: "basic-bricks.micro-view",
+            properties: {
+              style: {
+                padding: "12px"
+              }
+            },
+            slots: {
+              content: {
+                bricks: formStoryboard,
+                type: "bricks"
+              }
+            }
+          }],
+          type: "bricks"
+        }
+      }
+    });
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.warn(error.message);
+    result = {
+      brick: "div",
+      slots: {
+        "": {
+          bricks: [errorBrick],
+          type: "bricks"
+        }
+      }
+    };
+  }
+
+  return result;
+}
 
 class LocationContext {
   constructor(kernel, location) {
@@ -11187,7 +11212,7 @@ class LocationContext {
 
       if (brick.type === formRenderer) {
         var formData = JSON.parse(brick.properties.formData);
-        expandedBrickConf = yield ExpandCustomForm(formData, brickConf, brick.properties.isPreview, context);
+        expandedBrickConf = yield AsyncExpandCustomForm(formData, brickConf, brick.properties.isPreview, context);
         yield _this7.kernel.loadDynamicBricksInBrickConf(expandedBrickConf);
       }
 
@@ -13119,6 +13144,7 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
   var innerRefCallbackRef = useRef();
   var elementRef = useRef();
   var templateRef = useRef();
+  var formRef = useRef();
   var tplTagName = getTagNameOfCustomTemplate(useBrick.brick, (_internalApiGetCurren = _internalApiGetCurrentContext().app) === null || _internalApiGetCurren === void 0 ? void 0 : _internalApiGetCurren.id);
   var isBrickAvailable = React.useMemo(() => {
     if (isObject(useBrick.if) && !isPreEvaluated(useBrick.if)) {
@@ -13147,7 +13173,14 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
     _internalApiLoadDynamicBricksInBrickConf(useBrick).catch(handleHttpError);
 
     var brick = getCurrentRunTimeBrick(useBrick, tplTagName, data);
-    templateRef.current = expandTemplateInUseBrick(useBrick, tplTagName, brick); // Let `transform` works still.
+    templateRef.current = expandTemplateInUseBrick(useBrick, tplTagName, brick);
+
+    if (useBrick.brick === formRenderer) {
+      var _useBrick$properties;
+
+      formRef.current = ExpandCustomForm((_useBrick$properties = useBrick.properties) === null || _useBrick$properties === void 0 ? void 0 : _useBrick$properties.formData, useBrick, false);
+    } // Let `transform` works still.
+
 
     transformProperties(brick.properties, data, useBrick.transform, useBrick.transformFrom, undefined, {
       allowInject: true
@@ -13210,7 +13243,7 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
 
     handleProxyOfCustomTemplate(brick);
 
-    if (element.$$typeof !== "custom-template") {
+    if (!["formRenderer", "custom-template"].includes(element.$$typeof)) {
       if (!useBrick.brick.includes("-")) {
         element.$$typeof = "native";
       } else if (!customElements.get(useBrick.brick)) {
@@ -13290,10 +13323,10 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
     innerRefCallbackRef.current(element);
   }, []);
   var childConfs = useMemo(() => {
-    var _templateRef$current;
+    var _ref7, _templateRef$current;
 
-    return slotsToChildren(((_templateRef$current = templateRef.current) !== null && _templateRef$current !== void 0 ? _templateRef$current : useBrick).slots);
-  }, [templateRef.current, useBrick]);
+    return slotsToChildren(((_ref7 = (_templateRef$current = templateRef.current) !== null && _templateRef$current !== void 0 ? _templateRef$current : formRef.current) !== null && _ref7 !== void 0 ? _ref7 : useBrick).slots);
+  }, [templateRef.current, formRef.current, useBrick]);
 
   if (!isBrickAvailable) {
     return null;
@@ -13326,11 +13359,11 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
  * @param props - 属性。
  */
 
-function BrickAsComponent(_ref7) {
+function BrickAsComponent(_ref8) {
   var {
     useBrick,
     data
-  } = _ref7;
+  } = _ref8;
 
   if (Array.isArray(useBrick)) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, useBrick.map((item, index) => /*#__PURE__*/React.createElement(SingleBrickAsComponent, {
@@ -13351,8 +13384,8 @@ function slotsToChildren(slots) {
     return [];
   }
 
-  return Object.entries(slots).flatMap(_ref8 => {
-    var [slot, slotConf] = _ref8;
+  return Object.entries(slots).flatMap(_ref9 => {
+    var [slot, slotConf] = _ref9;
     return Array.isArray(slotConf.bricks) ? slotConf.bricks.map(child => _objectSpread(_objectSpread({}, child), {}, {
       properties: _objectSpread(_objectSpread({}, child.properties), {}, {
         slot
@@ -13372,19 +13405,20 @@ function transformEvents(data, events) {
 // eslint-disable-next-line react/display-name
 
 
-var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/forwardRef(function LegacySingleBrickAsComponent(_ref9, ref) {
+var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/forwardRef(function LegacySingleBrickAsComponent(_ref10, ref) {
   var _internalApiGetCurren2, _templateRef$current$2, _templateRef$current4;
 
   var {
     useBrick,
     data,
     refCallback
-  } = _ref9;
+  } = _ref10;
   var firstRunRef = useRef(true);
   var innerRefCallbackRef = useRef();
   var elementRef = useRef();
   var templateRef = useRef();
   var tplTagName = getTagNameOfCustomTemplate(useBrick.brick, (_internalApiGetCurren2 = _internalApiGetCurrentContext().app) === null || _internalApiGetCurren2 === void 0 ? void 0 : _internalApiGetCurren2.id);
+  var formRef = useRef();
   var isBrickAvailable = React.useMemo(() => {
     if (isObject(useBrick.if) && !isPreEvaluated(useBrick.if)) {
       // eslint-disable-next-line
@@ -13417,15 +13451,22 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
     _internalApiLoadDynamicBricksInBrickConf(useBrick).catch(handleHttpError);
 
     var brick = getCurrentRunTimeBrick(useBrick, tplTagName, data);
-    templateRef.current = expandTemplateInUseBrick(useBrick, tplTagName, brick); // Let `transform` works still.
+    templateRef.current = expandTemplateInUseBrick(useBrick, tplTagName, brick);
+
+    if (useBrick.brick === formRenderer) {
+      var _useBrick$properties2;
+
+      formRef.current = ExpandCustomForm((_useBrick$properties2 = useBrick.properties) === null || _useBrick$properties2 === void 0 ? void 0 : _useBrick$properties2.formData, useBrick, false);
+    } // Let `transform` works still.
+
 
     transformProperties(brick.properties, data, useBrick.transform, useBrick.transformFrom, undefined, {
       allowInject: true
     }); // 设置 properties refProperty值
 
     if (useBrick[symbolForComputedPropsFromProxy]) {
-      Object.entries(useBrick[symbolForComputedPropsFromProxy]).forEach(_ref11 => {
-        var [propName, propValue] = _ref11;
+      Object.entries(useBrick[symbolForComputedPropsFromProxy]).forEach(_ref12 => {
+        var [propName, propValue] = _ref12;
         set(brick.properties, propName, propValue);
       });
     }
@@ -13445,7 +13486,7 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
   }), [useBrick, data, isBrickAvailable, tplTagName]);
 
   var dispatchLifeCycleEvent = /*#__PURE__*/function () {
-    var _ref12 = _asyncToGenerator$3(function* (event, handlers, brick) {
+    var _ref13 = _asyncToGenerator$3(function* (event, handlers, brick) {
       for (var handler of [].concat(handlers)) {
         listenerFactory(handler, _objectSpread(_objectSpread({}, _internalApiGetCurrentContext()), {}, {
           tplContextId: useBrick[symbolForTplContextId]
@@ -13454,7 +13495,7 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
     });
 
     return function dispatchLifeCycleEvent(_x5, _x6, _x7) {
-      return _ref12.apply(this, arguments);
+      return _ref13.apply(this, arguments);
     };
   }();
 
@@ -13517,7 +13558,7 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
   }, [runtimeBrick, updateBrick]);
 
   innerRefCallbackRef.current = /*#__PURE__*/function () {
-    var _ref14 = _asyncToGenerator$3(function* (element) {
+    var _ref15 = _asyncToGenerator$3(function* (element) {
       elementRef.current = element;
       var brick;
 
@@ -13550,7 +13591,7 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
     });
 
     return function (_x8) {
-      return _ref14.apply(this, arguments);
+      return _ref15.apply(this, arguments);
     };
   }(); // ref https://reactjs.org/docs/refs-and-the-dom.html#caveats-with-callback-refs
 
@@ -13559,10 +13600,10 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
     innerRefCallbackRef.current(element);
   }, []);
   var childConfs = useMemo(() => {
-    var _templateRef$current3;
+    var _ref16, _templateRef$current3;
 
-    return slotsToChildren(((_templateRef$current3 = templateRef.current) !== null && _templateRef$current3 !== void 0 ? _templateRef$current3 : useBrick).slots);
-  }, [templateRef.current, useBrick]);
+    return slotsToChildren(((_ref16 = (_templateRef$current3 = templateRef.current) !== null && _templateRef$current3 !== void 0 ? _templateRef$current3 : formRef.current) !== null && _ref16 !== void 0 ? _ref16 : useBrick).slots);
+  }, [templateRef.current, formRef.current, useBrick]);
 
   if (!isBrickAvailable) {
     return null;