@next-core/brick-kit 2.118.3 → 2.118.4

package/dist/index.esm.js

@@ -5,7 +5,7 @@ import _asyncToGenerator$4 from '@babel/runtime/helpers/asyncToGenerator';
 import _defineProperty$1 from '@babel/runtime/helpers/defineProperty';
 import React, { useState, useEffect, useRef, forwardRef, useImperativeHandle, useMemo, useContext, createContext, useReducer, useCallback } from 'react';
 import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, scanPermissionActionsInStoryboard, precookFunction, cook, resolveContextConcurrently, syncResolveContextConcurrently, shouldAllowRecursiveEvaluations, preevaluate, inject, deepFreeze, createProviderClass, loadScript, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, matchPath, scanAppGetMenuInAny, asyncProcessBrick, restoreDynamicTemplates, mapCustomApisToNameAndNamespace, scanCustomApisInStoryboard } from '@next-core/brick-utils';
-import lodash, { set, get, difference, identity, uniqueId, cloneDeep, isNil, sortBy, merge, pick, orderBy, omit, findLastIndex, clamp, isEmpty, noop, isObject as isObject$1, isString } from 'lodash';
+import lodash, { set, get, difference, identity, uniqueId, cloneDeep, clamp, isNil, sortBy, merge, pick, orderBy, omit, findLastIndex, noop, isObject as isObject$1, isString } from 'lodash';
 import { http, HttpResponseError, HttpFetchError } from '@next-core/brick-http';
 import moment from 'moment';
 import { pipes } from '@next-core/pipes';
@@ -2540,13 +2540,224 @@ function evaluate(raw) {
   }
 }
 
+function isBasicProperty(propRef) {
+  return !!propRef.refProperty;
+}
+function isTransformableProperty(propRef) {
+  return !!propRef.refTransform;
+}
+function isMergeableProperty(propRef) {
+  return !!propRef.mergeProperty;
+}
+function isRefProperty(propRef) {
+  return !!propRef.ref;
+}
+function isVariableProperty(propRef) {
+  return !!propRef.asVariable;
+}
+
 var customTemplateRegistry = new Map();
 var appRegistered = new Set();
 var symbolForComputedPropsFromProxy = Symbol.for("tpl.computedPropsFromProxy");
 var symbolForRefForProxy = Symbol.for("tpl.refForProxy");
 var symbolForTplContextId = Symbol.for("tpl.contextId");
 
-function setupUseBrickInTemplate(props, tplContextId) {
+function propertyMerge(conf, value, object) {
+  return propertyMergeAll(conf.$$mergeBase, Object.fromEntries(conf.$$mergeBase.proxies.map(proxy => [proxy.$$reversedRef, proxy === conf ? value : object[proxy.$$reversedRef]])));
+}
+function propertyMergeAll(mergeBase, object) {
+  if (mergeBase.mergeType === "array") {
+    return propertyMergeAllOfArray(mergeBase, object);
+  }
+
+  if (mergeBase.mergeType === "object") {
+    return propertyMergeAllOfObject(mergeBase, object);
+  } // istanbul ignore next: should never reach
+
+
+  throw new TypeError("unsupported mergeType: \"".concat(mergeBase.mergeType, "\""));
+}
+
+function propertyMergeAllOfArray(_ref, object) {
+  var _, _proxy$mergeArgs;
+
+  var {
+    baseValue,
+    context,
+    proxies
+  } = _ref;
+  // Use an approach like template-literal's quasis:
+  // `quasi0${0}quais1${1}quasi2...`
+  // Every quasi can be merged with multiple items.
+  var computedBaseValue = Array.isArray(baseValue) ? computeRealValue(baseValue, context, true, {
+    $$lazyForUseBrick: true
+  }) : [];
+  var quasis = [];
+  var size = computedBaseValue.length + 1;
+
+  for (var i = 0; i < size; i += 1) {
+    quasis.push([]);
+  }
+
+  for (var proxy of proxies) {
+    var position = void 0;
+
+    switch (proxy.mergeMethod) {
+      case "append":
+        position = computedBaseValue.length;
+        break;
+
+      case "prepend":
+        position = 0;
+        break;
+
+      case "insertAt":
+        // Defaults to `-1`.
+        position = (_ = (_proxy$mergeArgs = proxy.mergeArgs) === null || _proxy$mergeArgs === void 0 ? void 0 : _proxy$mergeArgs[0]) !== null && _ !== void 0 ? _ : -1;
+
+        if (position < 0) {
+          // It's counted from the end if position is negative.
+          position += quasis.length;
+        }
+
+        position = clamp(position, 0, computedBaseValue.length);
+        break;
+      // istanbul ignore next: should never reach
+
+      default:
+        throw new TypeError("unsupported mergeMethod: \"".concat(proxy.mergeMethod, "\" for mergeType \"").concat(proxy.mergeType, "\""));
+    }
+
+    var patchValue = object[proxy.$$reversedRef];
+
+    if (!Array.isArray(patchValue)) {
+      patchValue = [];
+    }
+
+    quasis[position].push(...patchValue);
+  }
+
+  return quasis.flatMap((item, index) => index < computedBaseValue.length ? item.concat(computedBaseValue[index]) : item);
+}
+
+function propertyMergeAllOfObject(_ref2, object) {
+  var {
+    baseValue,
+    proxies,
+    context
+  } = _ref2;
+  var computedBaseValue = isObject(baseValue) ? computeRealValue(baseValue, context, true) : {};
+  return proxies.reduce((acc, proxy) => {
+    switch (proxy.mergeMethod) {
+      case "extend":
+        return _objectSpread(_objectSpread({}, acc), object[proxy.$$reversedRef]);
+      // istanbul ignore next: should never reach
+
+      default:
+        throw new TypeError("unsupported mergeMethod: \"".concat(proxy.mergeMethod, "\" for mergeType \"").concat(proxy.mergeType, "\""));
+    }
+  }, computedBaseValue);
+}
+
+function setupTemplateProxy(proxyContext, ref, slots) {
+  var computedPropsFromProxy = {};
+  var refForProxy;
+  var {
+    reversedProxies,
+    templateProperties,
+    externalSlots,
+    templateContextId,
+    proxyBrick
+  } = proxyContext;
+
+  if (ref && reversedProxies) {
+    refForProxy = {};
+    proxyBrick.proxyRefs.set(ref, refForProxy); // Reversed proxies are used for expand storyboard before rendering page.
+
+    if (reversedProxies.properties.has(ref)) {
+      Object.assign(computedPropsFromProxy, Object.fromEntries(reversedProxies.properties.get(ref).flatMap(propRef => {
+        // `propValue` is computed.
+        var propValue = templateProperties === null || templateProperties === void 0 ? void 0 : templateProperties[propRef.$$reversedRef];
+
+        if (isTransformableProperty(propRef)) {
+          return Object.entries(preprocessTransformProperties({
+            [propRef.$$reversedRef]: propValue
+          }, propRef.refTransform));
+        }
+
+        if (isBasicProperty(propRef)) {
+          return [[propRef.refProperty, propValue]];
+        } // Ignore Variable properties.
+        // And mergeable properties are processed later.
+
+
+        return [];
+      }).filter(propRef => propRef[1] !== undefined))); // Brick properties can be merged multiple times.
+
+      if (reversedProxies.mergeBases.has(ref)) {
+        Object.assign(computedPropsFromProxy, Object.fromEntries(Array.from(reversedProxies.mergeBases.get(ref).entries()).map(_ref => {
+          var [mergeProperty, mergeBase] = _ref;
+          return [mergeProperty, propertyMergeAll(mergeBase, templateProperties !== null && templateProperties !== void 0 ? templateProperties : {})];
+        }).filter(item => item[1] !== undefined)));
+      }
+    } // Use an approach like template-literal's quasis:
+    // `quasi0${0}quais1${1}quasi2...`
+    // Every quasi (indexed by `refPosition`) can be slotted with multiple bricks.
+
+
+    var quasisMap = new Map();
+
+    if (reversedProxies.slots.has(ref)) {
+      for (var item of reversedProxies.slots.get(ref)) {
+        var _item$refPosition, _externalSlots$item$$, _externalSlots$item$$2;
+
+        if (!quasisMap.has(item.refSlot)) {
+          var quasis = []; // The size of quasis should be the existed slotted bricks' size plus one.
+
+          var size = hasOwnProperty(slots, item.refSlot) ? slots[item.refSlot].bricks.length + 1 : 1;
+
+          for (var i = 0; i < size; i += 1) {
+            quasis.push([]);
+          }
+
+          quasisMap.set(item.refSlot, quasis);
+        }
+
+        var expandableSlot = quasisMap.get(item.refSlot);
+        var refPosition = (_item$refPosition = item.refPosition) !== null && _item$refPosition !== void 0 ? _item$refPosition : -1;
+        expandableSlot[clamp(refPosition < 0 ? expandableSlot.length + refPosition : refPosition, 0, expandableSlot.length - 1)].push(...((_externalSlots$item$$ = externalSlots === null || externalSlots === void 0 ? void 0 : (_externalSlots$item$$2 = externalSlots[item.$$reversedRef]) === null || _externalSlots$item$$2 === void 0 ? void 0 : _externalSlots$item$$2.bricks) !== null && _externalSlots$item$$ !== void 0 ? _externalSlots$item$$ : []));
+      }
+    }
+
+    var _loop = function (slotName, _quasis) {
+      if (!hasOwnProperty(slots, slotName)) {
+        slots[slotName] = {
+          type: "bricks",
+          bricks: []
+        };
+      }
+
+      var slotConf = slots[slotName];
+      slotConf.bricks = _quasis.flatMap((bricks, index) => index < slotConf.bricks.length ? bricks.concat(slotConf.bricks[index]) : bricks);
+
+      if (slotConf.bricks.length === 0) {
+        delete slots[slotName];
+      }
+    };
+
+    for (var [slotName, _quasis] of quasisMap.entries()) {
+      _loop(slotName, _quasis);
+    }
+  }
+
+  return {
+    [symbolForComputedPropsFromProxy]: computedPropsFromProxy,
+    [symbolForRefForProxy]: refForProxy,
+    [symbolForTplContextId]: templateContextId
+  };
+}
+
+function setupUseBrickInTemplate(props, proxyContext) {
   function walk(props) {
     if (!props) {
       return;
@@ -2568,16 +2779,22 @@ function setupUseBrickInTemplate(props, tplContextId) {
   }
 
   function setup(item) {
-    item[symbolForTplContextId] = tplContextId;
+    var {
+      ref,
+      slots: slotsInTemplate
+    } = item;
+    item.slots = Object.fromEntries(Object.entries(slotsInTemplate !== null && slotsInTemplate !== void 0 ? slotsInTemplate : {}).map(_ref => {
+      var _slotConf$bricks;
+
+      var [slotName, slotConf] = _ref;
+      return [slotName, {
+        type: "bricks",
+        bricks: ((_slotConf$bricks = slotConf.bricks) !== null && _slotConf$bricks !== void 0 ? _slotConf$bricks : []).map(setup)
+      }];
+    }));
+    Object.assign(item, setupTemplateProxy(proxyContext, ref, item.slots));
     walk(item.properties);
-
-    if (item.slots) {
-      Object.values(item.slots).forEach(slot => {
-        if (Array.isArray(slot.bricks)) {
-          slot.bricks.forEach(setup);
-        }
-      });
-    }
+    return item;
   }
 
   walk(props);
@@ -2637,7 +2854,9 @@ function setProperties(bricks, properties, context, injectDeep) {
   var realProps = computeRealProperties(properties, context, injectDeep);
 
   if (context.tplContextId) {
-    setupUseBrickInTemplate(realProps, context.tplContextId);
+    setupUseBrickInTemplate(realProps, {
+      templateContextId: context.tplContextId
+    });
   }
 
   if (!Array.isArray(bricks)) {
@@ -10519,22 +10738,6 @@ class Router {
 
 }
 
-function isBasicProperty(propRef) {
-  return !!propRef.refProperty;
-}
-function isTransformableProperty(propRef) {
-  return !!propRef.refTransform;
-}
-function isMergeableProperty(propRef) {
-  return !!propRef.mergeProperty;
-}
-function isRefProperty(propRef) {
-  return !!propRef.ref;
-}
-function isVariableProperty(propRef) {
-  return !!propRef.asVariable;
-}
-
 function collectRefsInTemplate(template) {
   var refMap = new Map();
   collectRefsInBrickConfs(template.bricks, refMap);
@@ -10566,103 +10769,6 @@ function collectRefsInBrickConf(brickConf, refMap) {
   }
 }
 
-function propertyMerge(conf, value, object) {
-  return propertyMergeAll(conf.$$mergeBase, Object.fromEntries(conf.$$mergeBase.proxies.map(proxy => [proxy.$$reversedRef, proxy === conf ? value : object[proxy.$$reversedRef]])));
-}
-function propertyMergeAll(mergeBase, object) {
-  if (mergeBase.mergeType === "array") {
-    return propertyMergeAllOfArray(mergeBase, object);
-  }
-
-  if (mergeBase.mergeType === "object") {
-    return propertyMergeAllOfObject(mergeBase, object);
-  } // istanbul ignore next: should never reach
-
-
-  throw new TypeError("unsupported mergeType: \"".concat(mergeBase.mergeType, "\""));
-}
-
-function propertyMergeAllOfArray(_ref, object) {
-  var _, _proxy$mergeArgs;
-
-  var {
-    baseValue,
-    context,
-    proxies
-  } = _ref;
-  // Use an approach like template-literal's quasis:
-  // `quasi0${0}quais1${1}quasi2...`
-  // Every quasi can be merged with multiple items.
-  var computedBaseValue = Array.isArray(baseValue) ? computeRealValue(baseValue, context, true, {
-    $$lazyForUseBrick: true
-  }) : [];
-  var quasis = [];
-  var size = computedBaseValue.length + 1;
-
-  for (var i = 0; i < size; i += 1) {
-    quasis.push([]);
-  }
-
-  for (var proxy of proxies) {
-    var position = void 0;
-
-    switch (proxy.mergeMethod) {
-      case "append":
-        position = computedBaseValue.length;
-        break;
-
-      case "prepend":
-        position = 0;
-        break;
-
-      case "insertAt":
-        // Defaults to `-1`.
-        position = (_ = (_proxy$mergeArgs = proxy.mergeArgs) === null || _proxy$mergeArgs === void 0 ? void 0 : _proxy$mergeArgs[0]) !== null && _ !== void 0 ? _ : -1;
-
-        if (position < 0) {
-          // It's counted from the end if position is negative.
-          position += quasis.length;
-        }
-
-        position = clamp(position, 0, computedBaseValue.length);
-        break;
-      // istanbul ignore next: should never reach
-
-      default:
-        throw new TypeError("unsupported mergeMethod: \"".concat(proxy.mergeMethod, "\" for mergeType \"").concat(proxy.mergeType, "\""));
-    }
-
-    var patchValue = object[proxy.$$reversedRef];
-
-    if (!Array.isArray(patchValue)) {
-      patchValue = [];
-    }
-
-    quasis[position].push(...patchValue);
-  }
-
-  return quasis.flatMap((item, index) => index < computedBaseValue.length ? item.concat(computedBaseValue[index]) : item);
-}
-
-function propertyMergeAllOfObject(_ref2, object) {
-  var {
-    baseValue,
-    proxies,
-    context
-  } = _ref2;
-  var computedBaseValue = isObject(baseValue) ? computeRealValue(baseValue, context, true) : {};
-  return proxies.reduce((acc, proxy) => {
-    switch (proxy.mergeMethod) {
-      case "extend":
-        return _objectSpread(_objectSpread({}, acc), object[proxy.$$reversedRef]);
-      // istanbul ignore next: should never reach
-
-      default:
-        throw new TypeError("unsupported mergeMethod: \"".concat(proxy.mergeMethod, "\" for mergeType \"").concat(proxy.mergeType, "\""));
-    }
-  }, computedBaseValue);
-}
-
 function collectMergeBases(conf, mergeBases, contextInTemplate, refToBrickConf) {
   var mergeBaseMap;
 
@@ -10857,15 +10963,6 @@ function expandBrickInTemplate(brickConfInTemplate, proxyContext) {
   } = brickConfInTemplate,
       restBrickConfInTemplate = _objectWithoutProperties(brickConfInTemplate, _excluded2);
 
-  var {
-    reversedProxies,
-    templateProperties,
-    externalSlots,
-    templateContextId,
-    proxyBrick
-  } = proxyContext;
-  var computedPropsFromProxy = {};
-  var refForProxy;
   var slots = Object.fromEntries(Object.entries(slotsInTemplate !== null && slotsInTemplate !== void 0 ? slotsInTemplate : {}).map(_ref => {
     var _slotConf$bricks;
 
@@ -10875,95 +10972,10 @@ function expandBrickInTemplate(brickConfInTemplate, proxyContext) {
       bricks: ((_slotConf$bricks = slotConf.bricks) !== null && _slotConf$bricks !== void 0 ? _slotConf$bricks : []).map(item => expandBrickInTemplate(item, proxyContext))
     }];
   }));
-  setupUseBrickInTemplate(brickConfInTemplate.properties, templateContextId);
-
-  if (ref) {
-    refForProxy = {};
-    proxyBrick.proxyRefs.set(ref, refForProxy); // Reversed proxies are used for expand storyboard before rendering page.
-
-    if (reversedProxies.properties.has(ref)) {
-      Object.assign(computedPropsFromProxy, Object.fromEntries(reversedProxies.properties.get(ref).flatMap(item => {
-        // `propValue` is computed.
-        var propValue = templateProperties === null || templateProperties === void 0 ? void 0 : templateProperties[item.$$reversedRef];
-
-        if (isTransformableProperty(item)) {
-          return Object.entries(preprocessTransformProperties({
-            [item.$$reversedRef]: propValue
-          }, item.refTransform));
-        }
-
-        if (isBasicProperty(item)) {
-          return [[item.refProperty, propValue]];
-        } // Ignore Variable properties.
-        // And mergeable properties are processed later.
-
-
-        return [];
-      }).filter(item => item[1] !== undefined)));
-    } // Brick properties can be merged multiple times.
-
-
-    if (reversedProxies.mergeBases.has(ref)) {
-      Object.assign(computedPropsFromProxy, Object.fromEntries(Array.from(reversedProxies.mergeBases.get(ref).entries()).map(_ref2 => {
-        var [mergeProperty, mergeBase] = _ref2;
-        return [mergeProperty, propertyMergeAll(mergeBase, templateProperties !== null && templateProperties !== void 0 ? templateProperties : {})];
-      }).filter(item => item[1] !== undefined)));
-    } // Use an approach like template-literal's quasis:
-    // `quasi0${0}quais1${1}quasi2...`
-    // Every quasi (indexed by `refPosition`) can be slotted with multiple bricks.
-
-
-    var quasisMap = new Map();
-
-    if (reversedProxies.slots.has(ref)) {
-      for (var item of reversedProxies.slots.get(ref)) {
-        var _item$refPosition, _externalSlots$item$$, _externalSlots$item$$2;
-
-        if (!quasisMap.has(item.refSlot)) {
-          var quasis = []; // The size of quasis should be the existed slotted bricks' size plus one.
-
-          var size = hasOwnProperty(slots, item.refSlot) ? slots[item.refSlot].bricks.length + 1 : 1;
-
-          for (var i = 0; i < size; i += 1) {
-            quasis.push([]);
-          }
-
-          quasisMap.set(item.refSlot, quasis);
-        }
-
-        var expandableSlot = quasisMap.get(item.refSlot);
-        var refPosition = (_item$refPosition = item.refPosition) !== null && _item$refPosition !== void 0 ? _item$refPosition : -1;
-        expandableSlot[clamp(refPosition < 0 ? expandableSlot.length + refPosition : refPosition, 0, expandableSlot.length - 1)].push(...((_externalSlots$item$$ = externalSlots === null || externalSlots === void 0 ? void 0 : (_externalSlots$item$$2 = externalSlots[item.$$reversedRef]) === null || _externalSlots$item$$2 === void 0 ? void 0 : _externalSlots$item$$2.bricks) !== null && _externalSlots$item$$ !== void 0 ? _externalSlots$item$$ : []));
-      }
-    }
-
-    var _loop = function (slotName, _quasis) {
-      if (!hasOwnProperty(slots, slotName)) {
-        slots[slotName] = {
-          type: "bricks",
-          bricks: []
-        };
-      }
-
-      var slotConf = slots[slotName];
-      slotConf.bricks = _quasis.flatMap((bricks, index) => index < slotConf.bricks.length ? bricks.concat(slotConf.bricks[index]) : bricks);
-
-      if (slotConf.bricks.length === 0) {
-        delete slots[slotName];
-      }
-    };
-
-    for (var [slotName, _quasis] of quasisMap.entries()) {
-      _loop(slotName, _quasis);
-    }
-  }
-
+  setupUseBrickInTemplate(brickConfInTemplate.properties, proxyContext);
   return _objectSpread(_objectSpread({}, restBrickConfInTemplate), {}, {
-    slots,
-    [symbolForComputedPropsFromProxy]: computedPropsFromProxy,
-    [symbolForRefForProxy]: refForProxy,
-    [symbolForTplContextId]: templateContextId
-  });
+    slots
+  }, setupTemplateProxy(proxyContext, ref, slots));
 }
 
 // Otherwise, return false.
@@ -11570,19 +11582,7 @@ function useLocation() {
   return location;
 }
 
-var setProxyRefForSlots = slots => {
-  slotsToChildren(slots).forEach(item => {
-    if (item[symbolForRefForProxy] !== undefined) {
-      item[symbolForRefForProxy].brick = item;
-    }
-
-    if (!isEmpty(item.slots)) {
-      setProxyRefForSlots(item.slots);
-    }
-  });
-};
-
-var setProxyRef = (useBrick, tplTagName, brick) => {
+var expandTemplateInUseBrick = (useBrick, tplTagName, brick) => {
   var template;
 
   if (tplTagName) {
@@ -11596,10 +11596,8 @@ var setProxyRef = (useBrick, tplTagName, brick) => {
       slots: useBrick.slots
     };
     template = expandCustomTemplate(tplConf, brick, _internalApiGetCurrentContext());
-    setProxyRefForSlots(template.slots);
   } else if (useBrick[symbolForRefForProxy]) {
     useBrick[symbolForRefForProxy].brick = brick;
-    setProxyRefForSlots(useBrick.slots);
   }
 
   return template;
@@ -11648,7 +11646,8 @@ var getCurrentRunTimeBrick = (useBrick, tplTagName, data) => {
  * @param props - 属性。
  */
 
-var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsComponent(_ref2) {
+
+var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsComponent(_ref) {
   var _internalApiGetCurren, _templateRef$current$, _templateRef$current, _templateRef$current2;
 
   var {
@@ -11656,7 +11655,7 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
     data,
     refCallback,
     immediatelyRefCallback
-  } = _ref2;
+  } = _ref;
   var templateRef = useRef();
   var tplTagName = getTagNameOfCustomTemplate(useBrick.brick, (_internalApiGetCurren = _internalApiGetCurrentContext().app) === null || _internalApiGetCurren === void 0 ? void 0 : _internalApiGetCurren.id);
   var isBrickAvailable = React.useMemo(() => {
@@ -11686,15 +11685,15 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
     _internalApiLoadDynamicBricksInBrickConf(useBrick).catch(handleHttpError);
 
     var brick = getCurrentRunTimeBrick(useBrick, tplTagName, data);
-    templateRef.current = setProxyRef(useBrick, tplTagName, brick); // Let `transform` works still.
+    templateRef.current = expandTemplateInUseBrick(useBrick, tplTagName, brick); // 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(_ref4 => {
-        var [propName, propValue] = _ref4;
+      Object.entries(useBrick[symbolForComputedPropsFromProxy]).forEach(_ref3 => {
+        var [propName, propValue] = _ref3;
         set(brick.properties, propName, propValue);
       });
     }
@@ -11713,7 +11712,7 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
     return brick;
   }), [useBrick, data, isBrickAvailable]);
   var innerRefCallback = React.useCallback( /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator$4(function* (element) {
+    var _ref4 = _asyncToGenerator$4(function* (element) {
       immediatelyRefCallback === null || immediatelyRefCallback === void 0 ? void 0 : immediatelyRefCallback(element);
 
       if (element) {
@@ -11749,7 +11748,7 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
         } // 设置proxyEvent
 
 
-        handleProxyOfCustomTemplate(brick); // handleProxyOfParentTemplate(brick, tplContextId);
+        handleProxyOfCustomTemplate(brick);
 
         if (element.$$typeof !== "custom-template") {
           if (!useBrick.brick.includes("-")) {
@@ -11764,7 +11763,7 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
     });
 
     return function (_x) {
-      return _ref5.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }(), [runtimeBrick, useBrick, data, refCallback, immediatelyRefCallback]);
 
@@ -11799,11 +11798,11 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
  * @param props - 属性。
  */
 
-function BrickAsComponent(_ref6) {
+function BrickAsComponent(_ref5) {
   var {
     useBrick,
     data
-  } = _ref6;
+  } = _ref5;
 
   if (Array.isArray(useBrick)) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, useBrick.map((item, index) => /*#__PURE__*/React.createElement(SingleBrickAsComponent, {
@@ -11824,8 +11823,8 @@ function slotsToChildren(slots) {
     return [];
   }
 
-  return Object.entries(slots).flatMap(_ref7 => {
-    var [slot, slotConf] = _ref7;
+  return Object.entries(slots).flatMap(_ref6 => {
+    var [slot, slotConf] = _ref6;
     return Array.isArray(slotConf.bricks) ? slotConf.bricks.map(child => _objectSpread(_objectSpread({}, child), {}, {
       properties: _objectSpread(_objectSpread({}, child.properties), {}, {
         slot
@@ -11845,14 +11844,14 @@ function transformEvents(data, events) {
 // eslint-disable-next-line react/display-name
 
 
-var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/forwardRef(function LegacySingleBrickAsComponent(_ref8, ref) {
+var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/forwardRef(function LegacySingleBrickAsComponent(_ref7, ref) {
   var _internalApiGetCurren2, _templateRef$current$2, _templateRef$current3, _templateRef$current4;
 
   var {
     useBrick,
     data,
     refCallback
-  } = _ref8;
+  } = _ref7;
   var brickRef = useRef();
   var templateRef = useRef();
   var tplTagName = getTagNameOfCustomTemplate(useBrick.brick, (_internalApiGetCurren2 = _internalApiGetCurrentContext().app) === null || _internalApiGetCurren2 === void 0 ? void 0 : _internalApiGetCurren2.id);
@@ -11888,15 +11887,15 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
     _internalApiLoadDynamicBricksInBrickConf(useBrick).catch(handleHttpError);
 
     var brick = getCurrentRunTimeBrick(useBrick, tplTagName, data);
-    templateRef.current = setProxyRef(useBrick, tplTagName, brick); // Let `transform` works still.
+    templateRef.current = expandTemplateInUseBrick(useBrick, tplTagName, brick); // 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(_ref10 => {
-        var [propName, propValue] = _ref10;
+      Object.entries(useBrick[symbolForComputedPropsFromProxy]).forEach(_ref9 => {
+        var [propName, propValue] = _ref9;
         set(brick.properties, propName, propValue);
       });
     }
@@ -11915,7 +11914,7 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
     return brick;
   }), [useBrick, data, isBrickAvailable]);
   var innerRefCallback = React.useCallback( /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator$4(function* (element) {
+    var _ref10 = _asyncToGenerator$4(function* (element) {
       brickRef.current = element;
 
       if (element) {
@@ -11951,7 +11950,7 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
         } // 设置proxyEvent
 
 
-        handleProxyOfCustomTemplate(brick); // handleProxyOfParentTemplate(brick, tplContextId);
+        handleProxyOfCustomTemplate(brick);
 
         if (element.$$typeof !== "custom-template") {
           if (!useBrick.brick.includes("-")) {
@@ -11966,7 +11965,7 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
     });
 
     return function (_x2) {
-      return _ref11.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }(), [runtimeBrick, useBrick, data, refCallback]);