@next-core/brick-kit 2.104.5 → 2.104.6

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.104.6](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.5...@next-core/brick-kit@2.104.6) (2022-02-15)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
 ## [2.104.5](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.4...@next-core/brick-kit@2.104.5) (2022-02-15)
 
 

package/dist/index.bundle.js

@@ -1979,17 +1979,38 @@
 
       return _asyncToGenerator__default["default"](function* () {
         if (Array.isArray(contextConfs)) {
-          yield brickUtils.resolveContextConcurrently(contextConfs, contextConf => resolveStoryboardContext(contextConf, coreContext, _this, brick));
+          var {
+            mergedContext,
+            keyword
+          } = _this.getResolveOptions(coreContext);
+
+          yield brickUtils.resolveContextConcurrently(contextConfs, contextConf => resolveStoryboardContext(contextConf, mergedContext, _this, brick), keyword);
         }
       })();
     }
 
     syncDefine(contextConfs, coreContext, brick) {
       if (Array.isArray(contextConfs)) {
-        brickUtils.syncResolveContextConcurrently(contextConfs, contextConf => syncResolveStoryboardContext(contextConf, coreContext, this, brick));
+        var {
+          mergedContext,
+          keyword
+        } = this.getResolveOptions(coreContext);
+        brickUtils.syncResolveContextConcurrently(contextConfs, contextConf => syncResolveStoryboardContext(contextConf, mergedContext, this, brick), keyword);
       }
     }
 
+    getResolveOptions(coreContext) {
+      return this.tplContextId ? {
+        mergedContext: _objectSpread__default["default"](_objectSpread__default["default"]({}, coreContext), {}, {
+          tplContextId: this.tplContextId
+        }),
+        keyword: "STATE"
+      } : {
+        mergedContext: coreContext,
+        keyword: "CTX"
+      };
+    }
+
   }
 
   function resolveStoryboardContext(_x, _x2, _x3, _x4) {
@@ -2024,23 +2045,23 @@
   }
 
   function _resolveNormalStoryboardContext() {
-    _resolveNormalStoryboardContext = _asyncToGenerator__default["default"](function* (contextConf, coreContext, storyboardContextWrapper, brick) {
-      if (!looseCheckIf(contextConf, coreContext)) {
+    _resolveNormalStoryboardContext = _asyncToGenerator__default["default"](function* (contextConf, mergedContext, storyboardContextWrapper, brick) {
+      if (!looseCheckIf(contextConf, mergedContext)) {
         return false;
       }
 
       var isResolve = false;
-      var value = getDefinedTemplateState(contextConf, storyboardContextWrapper, brick);
+      var value = getDefinedTemplateState(!!storyboardContextWrapper.tplContextId, contextConf, brick);
 
       if (value === undefined) {
         if (contextConf.resolve) {
-          if (looseCheckIf(contextConf.resolve, coreContext)) {
+          if (looseCheckIf(contextConf.resolve, mergedContext)) {
             isResolve = true;
             var valueConf = {};
             yield _internalApiGetResolver().resolveOne("reference", _objectSpread__default["default"]({
               transform: "value",
               transformMapArray: false
-            }, contextConf.resolve), valueConf, null, coreContext);
+            }, contextConf.resolve), valueConf, null, mergedContext);
             value = valueConf.value;
           } else if (!brickUtils.hasOwnProperty(contextConf, "value")) {
             return false;
@@ -2048,18 +2069,18 @@
         }
 
         if (!isResolve && contextConf.value !== undefined) {
-          value = computeRealValue(contextConf.value, coreContext, true);
+          value = computeRealValue(contextConf.value, mergedContext, true);
         }
       }
 
-      resolveFreeVariableValue(value, contextConf, coreContext, storyboardContextWrapper, brick);
+      resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick);
       return true;
     });
     return _resolveNormalStoryboardContext.apply(this, arguments);
   }
 
-  function syncResolveStoryboardContext(contextConf, coreContext, storyboardContextWrapper, brick) {
-    if (!looseCheckIf(contextConf, coreContext)) {
+  function syncResolveStoryboardContext(contextConf, mergedContext, storyboardContextWrapper, brick) {
+    if (!looseCheckIf(contextConf, mergedContext)) {
       return false;
     }
 
@@ -2067,23 +2088,23 @@
       throw new Error("resolve is not allowed here");
     }
 
-    var value = getDefinedTemplateState(contextConf, storyboardContextWrapper, brick);
+    var value = getDefinedTemplateState(!!storyboardContextWrapper.tplContextId, contextConf, brick);
 
     if (value === undefined) {
-      value = computeRealValue(contextConf.value, coreContext, true);
+      value = computeRealValue(contextConf.value, mergedContext, true);
     }
 
-    resolveFreeVariableValue(value, contextConf, coreContext, storyboardContextWrapper, brick);
+    resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick);
     return true;
   }
 
-  function getDefinedTemplateState(contextConf, storyboardContextWrapper, brick) {
-    if (storyboardContextWrapper.tplContextId && brick.properties && brickUtils.hasOwnProperty(brick.properties, contextConf.name)) {
+  function getDefinedTemplateState(isTemplateState, contextConf, brick) {
+    if (isTemplateState && brick.properties && brickUtils.hasOwnProperty(brick.properties, contextConf.name)) {
       return brick.properties[contextConf.name];
     }
   }
 
-  function resolveFreeVariableValue(value, contextConf, coreContext, storyboardContextWrapper, brick) {
+  function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick) {
     var newContext = {
       type: "free-variable",
       value,
@@ -2093,13 +2114,7 @@
 
     if (contextConf.onChange) {
       for (var handler of [].concat(contextConf.onChange)) {
-        if (storyboardContextWrapper.tplContextId) {
-          newContext.eventTarget.addEventListener("state.change", listenerFactory(handler, _objectSpread__default["default"](_objectSpread__default["default"]({}, coreContext), {}, {
-            tplContextId: storyboardContextWrapper.tplContextId
-          }), brick));
-        } else {
-          newContext.eventTarget.addEventListener("context.change", listenerFactory(handler, coreContext, brick));
-        }
+        newContext.eventTarget.addEventListener(storyboardContextWrapper.tplContextId ? "state.change" : "context.change", listenerFactory(handler, mergedContext, brick));
       }
     }