@next-core/brick-kit 2.139.0 → 2.140.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.140.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.139.0...@next-core/brick-kit@2.140.0) (2022-09-14)
+
+
+### Features
+
+* allow target/targetRef to be set as evaluable string ([ef06f22](https://github.com/easyops-cn/next-core/commit/ef06f22d8401880a7c450a04f09ed08c9748846c))
+
+
+
+
+
 # [2.139.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.138.0...@next-core/brick-kit@2.139.0) (2022-09-13)
 
 

package/dist/index.bundle.js

@@ -6718,24 +6718,42 @@
       }
 
       var targets = [];
+      var rawTarget = handler.target;
+      var rawTargetRef = handler.targetRef;
+      var computedTarget = rawTarget; // Allow `target` to be set as evaluable string.
 
-      if (typeof handler.target === "string") {
-        if (handler.target === "_self") {
+      if (typeof rawTarget === "string" ? brickUtils.isEvaluable(rawTarget) : isPreEvaluated(rawTarget)) {
+        computedTarget = computeRealValue(rawTarget, context);
+      }
+
+      if (typeof computedTarget === "string") {
+        if (computedTarget === "_self") {
           targets.push(runtimeBrick.element);
         } else if (handler.multiple) {
-          targets = Array.from(document.querySelectorAll(handler.target));
+          targets = Array.from(document.querySelectorAll(computedTarget));
         } else {
-          var found = document.querySelector(handler.target);
+          var found = document.querySelector(computedTarget);
 
           if (found !== null) {
             targets.push(found);
           }
         }
-      } else if (handler.target) {
-        targets.push(handler.target);
-      } else if (handler.targetRef) {
+      } else if (computedTarget) {
+        if (computedTarget instanceof HTMLElement) {
+          targets.push(computedTarget);
+        } else {
+          // eslint-disable-next-line no-console
+          console.error("unexpected target:", computedTarget);
+        }
+      } else if (rawTargetRef) {
+        var computedTargetRef = rawTargetRef; // Allow `targetRef` to be set as evaluable string.
+
+        if (typeof rawTargetRef === "string" ? brickUtils.isEvaluable(rawTargetRef) : isPreEvaluated(rawTargetRef)) {
+          computedTargetRef = computeRealValue(rawTargetRef, context, true);
+        }
+
         var tpl = getTplContext(context.tplContextId).getBrick().element;
-        targets.push(...[].concat(handler.targetRef).map(ref => {
+        targets.push(...[].concat(computedTargetRef).map(ref => {
           var _tpl$$$getElementByRe;
 
           return (_tpl$$$getElementByRe = tpl.$$getElementByRef) === null || _tpl$$$getElementByRe === void 0 ? void 0 : _tpl$$$getElementByRe.call(tpl, ref);
@@ -6744,7 +6762,7 @@
 
       if (targets.length === 0) {
         // eslint-disable-next-line no-console
-        console.error("target not found:", handler.target || handler.targetRef);
+        console.error("target not found:", rawTarget || rawTargetRef);
         return;
       }