@next-core/brick-kit 2.117.8 → 2.117.11

package/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.117.11](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.10...@next-core/brick-kit@2.117.11) (2022-04-15)
+
+
+### Bug Fixes
+
+* template preview with context ([f71bc07](https://github.com/easyops-cn/next-core/commit/f71bc07d1b5b0eea719d5886a177712dcb934c4c))
+
+
+
+
+
+## [2.117.10](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.9...@next-core/brick-kit@2.117.10) (2022-04-14)
+
+
+### Bug Fixes
+
+* put template preview route between specific ones and others ([923d6f3](https://github.com/easyops-cn/next-core/commit/923d6f3e71f4d9211516045e4b09b96c0c82285b))
+
+
+
+
+
+## [2.117.9](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.8...@next-core/brick-kit@2.117.9) (2022-04-14)
+
+
+### Bug Fixes
+
+* put template preview route before others ([bcb1cac](https://github.com/easyops-cn/next-core/commit/bcb1cac988befac5dab41c325921d7738bb8c306))
+* support setting targetRef as array ([ec822f3](https://github.com/easyops-cn/next-core/commit/ec822f37f881efe96a06b7fe53af17e6a40c79c6))
+
+
+
+
+
 ## [2.117.8](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.7...@next-core/brick-kit@2.117.8) (2022-04-14)
 
 

package/dist/index.bundle.js

@@ -6259,15 +6259,12 @@
       } else if (handler.target) {
         targets.push(handler.target);
       } else if (handler.targetRef) {
-        var _tpl$$$getElementByRe;
-
         var tpl = getTplContext(context.tplContextId).getBrick().element;
+        targets.push(...[].concat(handler.targetRef).map(ref => {
+          var _tpl$$$getElementByRe;
 
-        var _found = (_tpl$$$getElementByRe = tpl.$$getElementByRef) === null || _tpl$$$getElementByRe === void 0 ? void 0 : _tpl$$$getElementByRe.call(tpl, handler.targetRef);
-
-        if (_found) {
-          targets.push(_found);
-        }
+          return (_tpl$$$getElementByRe = tpl.$$getElementByRef) === null || _tpl$$$getElementByRe === void 0 ? void 0 : _tpl$$$getElementByRe.call(tpl, ref);
+        }).filter(Boolean));
       }
 
       if (targets.length === 0) {
@@ -8083,13 +8080,13 @@
         path: previewPath,
         bricks: [_objectSpread__default["default"]({
           brick: templateId
-        }, lodash.pick(settings, "properties", "events", "lifeCycle"))],
+        }, lodash.pick(settings, "properties", "events", "lifeCycle", "context"))],
         menu: false,
         exact: true
       };
 
       if (previewRouteIndex === -1) {
-        routes.push(newPreviewRoute);
+        routes.unshift(newPreviewRoute);
       } else {
         routes.splice(previewRouteIndex, 1, newPreviewRoute);
       }
@@ -10212,15 +10209,16 @@
           };
 
           try {
-            yield locationContext.mountRoutes( // Concat with a placeholder when loading template preview settings.
-            [{
+            var specificTemplatePreviewIndex = lodash.findLastIndex(storyboard.routes, route => route.path.startsWith("${APP.homepage}/_dev_only_/template-preview/"));
+            var mergedRoutes = [...storyboard.routes.slice(0, specificTemplatePreviewIndex + 1), {
               path: "${APP.homepage}/_dev_only_/template-preview/:templateId",
               bricks: [{
                 brick: "span"
               }],
               menu: false,
               exact: true
-            }].concat(storyboard.routes), undefined, mountRoutesResult);
+            }, ...storyboard.routes.slice(specificTemplatePreviewIndex + 1)];
+            yield locationContext.mountRoutes(mergedRoutes, undefined, mountRoutesResult);
           } catch (error) {
             // eslint-disable-next-line no-console
             console.error(error); // Redirect to login page if not logged in.