@next-core/brick-kit 2.156.5 → 2.156.6

package/dist/index.bundle.js

@@ -10287,104 +10287,36 @@
     }
   }
 
-  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__default["default"](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__default["default"](_objectSpread__default["default"]({}, 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__default["default"](_objectSpread__default["default"]({}, brickConf.properties), (_formData$formSchema$ = formData.formSchema.properties) === null || _formData$formSchema$ === void 0 ? void 0 : _formData$formSchema$.previewConf);
-      }
+  function _AsyncExpandCustomForm() {
+    _AsyncExpandCustomForm = _asyncToGenerator__default["default"](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__default["default"](_objectSpread__default["default"]({}, context), {}, {
           formContextId: formContext.id
         }), {});
       }
 
-      try {
-        var formStoryboard = getStoryboard([formData.formSchema], [], formData.fields, isPreview, formContext.id);
-        formStoryboard[0] = ___default["default"].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] = ___default["default"].compact([...newEvents, ...itemEvents]);
-          });
-          formStoryboard[0].events = events;
-        }
-
-        return _objectSpread__default["default"](_objectSpread__default["default"]({}, 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) {
@@ -10682,6 +10614,99 @@
 
     return result;
   }
+  function initFormContext(formData, brickConf, isPreview) {
+    if (isPreview && formData.formSchema && formData.formSchema.brick === "forms.general-form") {
+      var _formData$formSchema$;
+
+      brickConf["properties"] = _objectSpread__default["default"](_objectSpread__default["default"]({}, 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] = ___default["default"].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] = ___default["default"].compact([...newEvents, ...itemEvents]);
+        });
+        formStoryboard[0].events = events;
+      }
+
+      result = _objectSpread__default["default"](_objectSpread__default["default"]({}, 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) {
@@ -11186,7 +11211,7 @@
 
         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);
         }
 
@@ -13118,6 +13143,7 @@
     var innerRefCallbackRef = React.useRef();
     var elementRef = React.useRef();
     var templateRef = React.useRef();
+    var formRef = React.useRef();
     var tplTagName = getTagNameOfCustomTemplate(useBrick.brick, (_internalApiGetCurren = _internalApiGetCurrentContext().app) === null || _internalApiGetCurren === void 0 ? void 0 : _internalApiGetCurren.id);
     var isBrickAvailable = React__default["default"].useMemo(() => {
       if (brickUtils.isObject(useBrick.if) && !isPreEvaluated(useBrick.if)) {
@@ -13146,7 +13172,14 @@
       _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
@@ -13209,7 +13242,7 @@
 
       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)) {
@@ -13289,10 +13322,10 @@
       innerRefCallbackRef.current(element);
     }, []);
     var childConfs = React.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;
@@ -13325,11 +13358,11 @@
    * @param props - 属性。
    */
 
-  function BrickAsComponent(_ref7) {
+  function BrickAsComponent(_ref8) {
     var {
       useBrick,
       data
-    } = _ref7;
+    } = _ref8;
 
     if (Array.isArray(useBrick)) {
       return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, useBrick.map((item, index) => /*#__PURE__*/React__default["default"].createElement(SingleBrickAsComponent, {
@@ -13350,8 +13383,8 @@
       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__default["default"](_objectSpread__default["default"]({}, child), {}, {
         properties: _objectSpread__default["default"](_objectSpread__default["default"]({}, child.properties), {}, {
           slot
@@ -13371,19 +13404,20 @@
   // eslint-disable-next-line react/display-name
 
 
-  var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React__default["default"].memo( /*#__PURE__*/React.forwardRef(function LegacySingleBrickAsComponent(_ref9, ref) {
+  var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React__default["default"].memo( /*#__PURE__*/React.forwardRef(function LegacySingleBrickAsComponent(_ref10, ref) {
     var _internalApiGetCurren2, _templateRef$current$2, _templateRef$current4;
 
     var {
       useBrick,
       data,
       refCallback
-    } = _ref9;
+    } = _ref10;
     var firstRunRef = React.useRef(true);
     var innerRefCallbackRef = React.useRef();
     var elementRef = React.useRef();
     var templateRef = React.useRef();
     var tplTagName = getTagNameOfCustomTemplate(useBrick.brick, (_internalApiGetCurren2 = _internalApiGetCurrentContext().app) === null || _internalApiGetCurren2 === void 0 ? void 0 : _internalApiGetCurren2.id);
+    var formRef = React.useRef();
     var isBrickAvailable = React__default["default"].useMemo(() => {
       if (brickUtils.isObject(useBrick.if) && !isPreEvaluated(useBrick.if)) {
         // eslint-disable-next-line
@@ -13416,15 +13450,22 @@
       _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);
         });
       }
@@ -13444,7 +13485,7 @@
     }), [useBrick, data, isBrickAvailable, tplTagName]);
 
     var dispatchLifeCycleEvent = /*#__PURE__*/function () {
-      var _ref12 = _asyncToGenerator__default["default"](function* (event, handlers, brick) {
+      var _ref13 = _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]
@@ -13453,7 +13494,7 @@
       });
 
       return function dispatchLifeCycleEvent(_x5, _x6, _x7) {
-        return _ref12.apply(this, arguments);
+        return _ref13.apply(this, arguments);
       };
     }();
 
@@ -13516,7 +13557,7 @@
     }, [runtimeBrick, updateBrick]);
 
     innerRefCallbackRef.current = /*#__PURE__*/function () {
-      var _ref14 = _asyncToGenerator__default["default"](function* (element) {
+      var _ref15 = _asyncToGenerator__default["default"](function* (element) {
         elementRef.current = element;
         var brick;
 
@@ -13549,7 +13590,7 @@
       });
 
       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
 
@@ -13558,10 +13599,10 @@
       innerRefCallbackRef.current(element);
     }, []);
     var childConfs = React.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;