@next-core/brick-kit 2.157.1 → 2.157.3

package/dist/index.bundle.js

@@ -869,10 +869,12 @@
         }
         var contextNames = brickUtils.trackContext(raw);
         var stateNames = brickUtils.trackState(raw);
-        if (contextNames || stateNames) {
+        var formStateNames = brickUtils.trackFormState(raw);
+        if (contextNames || stateNames || formStateNames) {
           options.trackingContextList.push({
             contextNames,
             stateNames,
+            formStateNames,
             propName: k,
             propValue: v
           });
@@ -1717,10 +1719,12 @@
   }
 
   class StoryboardContextWrapper {
-    constructor(tplContextId) {
+    constructor(tplContextId, formContextId) {
       _defineProperty__default["default"](this, "data", new Map());
       _defineProperty__default["default"](this, "tplContextId", void 0);
+      _defineProperty__default["default"](this, "formContextId", void 0);
       this.tplContextId = tplContextId;
+      this.formContextId = formContextId;
     }
     set(name, item) {
       if (this.data.has(name)) {
@@ -1781,7 +1785,7 @@
             var _item$eventTarget;
             item.loaded = true;
             item.value = val;
-            (_item$eventTarget = item.eventTarget) === null || _item$eventTarget === void 0 ? void 0 : _item$eventTarget.dispatchEvent(new CustomEvent(this.tplContextId ? "state.change" : "context.change", {
+            (_item$eventTarget = item.eventTarget) === null || _item$eventTarget === void 0 ? void 0 : _item$eventTarget.dispatchEvent(new CustomEvent(this.formContextId ? "formstate.change" : this.tplContextId ? "state.change" : "context.change", {
               detail: item.value
             }));
           }, err => {
@@ -1816,7 +1820,7 @@
           item.value = value;
         }
       }
-      (_item$eventTarget2 = item.eventTarget) === null || _item$eventTarget2 === void 0 ? void 0 : _item$eventTarget2.dispatchEvent(new CustomEvent(this.tplContextId ? "state.change" : "context.change", {
+      (_item$eventTarget2 = item.eventTarget) === null || _item$eventTarget2 === void 0 ? void 0 : _item$eventTarget2.dispatchEvent(new CustomEvent(this.formContextId ? "formstate.change" : this.tplContextId ? "state.change" : "context.change", {
         detail: item.value
       }));
     }
@@ -1952,7 +1956,7 @@
     };
     if (contextConf.onChange) {
       for (var handler of [].concat(contextConf.onChange)) {
-        newContext.eventTarget.addEventListener(storyboardContextWrapper.tplContextId ? "state.change" : "context.change", listenerFactory(handler, mergedContext, brick));
+        newContext.eventTarget.addEventListener(storyboardContextWrapper.formContextId ? "formstate.change" : storyboardContextWrapper.tplContextId ? "state.change" : "context.change", listenerFactory(handler, mergedContext, brick));
       }
     }
     if (contextConf.track) {
@@ -1962,7 +1966,7 @@
       for (var dep of deps) {
         var _eventTarget;
         var ctx = storyboardContextWrapper.get().get(dep);
-        ctx === null || ctx === void 0 ? void 0 : (_eventTarget = ctx.eventTarget) === null || _eventTarget === void 0 ? void 0 : _eventTarget.addEventListener(isTemplateState ? "state.change" : "context.change", () => {
+        ctx === null || ctx === void 0 ? void 0 : (_eventTarget = ctx.eventTarget) === null || _eventTarget === void 0 ? void 0 : _eventTarget.addEventListener(storyboardContextWrapper.formContextId ? "formstate.change" : isTemplateState ? "state.change" : "context.change", () => {
           if (load) {
             storyboardContextWrapper.updateValue(contextConf.name, {
               cache: "default"
@@ -2057,7 +2061,7 @@
       _defineProperty__default["default"](this, "formState", void 0);
       _defineProperty__default["default"](this, "id", _.uniqueId("form-ctx-"));
       FormContextMap.set(this.id, this);
-      this.formState = new StoryboardContextWrapper();
+      this.formState = new StoryboardContextWrapper("", this.id);
     }
   }
   function getCustomFormContext(formContextId) {
@@ -2677,10 +2681,12 @@
           var raw = typeof propValue === "string" ? propValue : getPreEvaluatedRaw(propValue);
           var contextNames = brickUtils.trackContext(raw);
           var stateNames = brickUtils.trackState(raw);
-          if (contextNames || stateNames) {
+          var formStateNames = brickUtils.trackFormState(raw);
+          if (contextNames || stateNames || formStateNames) {
             trackingContextList.push({
               contextNames,
               stateNames,
+              formStateNames,
               propName,
               propValue
             });
@@ -5683,6 +5689,8 @@
         case "state.refresh":
         case "state.load":
           return builtinStateListenerFactory(method, handler.args, handler, handler.callback, context);
+        case "formstate.update":
+          return builtinFormStateListenerFactory(method, handler.args, handler, handler.callback, context);
         case "tpl.dispatchEvent":
           return builtinTplDispatchEventFactory(handler.args, handler, context);
         case "message.subscribe":
@@ -5775,6 +5783,13 @@
     }
     return getCustomTemplateContext(tplContextId);
   }
+  function getFormContext(formContextId) {
+    // istanbul ignore if
+    if (!formContextId) {
+      throw new Error("Calling tpl but no formContextId was found in context!");
+    }
+    return getCustomFormContext(formContextId);
+  }
   function builtinTplDispatchEventFactory(args, ifContainer, context) {
     return function (event) {
       if (!looseCheckIf(ifContainer, _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
@@ -5811,6 +5826,18 @@
       tplContext.state.updateValue(name, value, method === "update" ? "replace" : method, callback);
     };
   }
+  function builtinFormStateListenerFactory(method, args, ifContainer, callback, context) {
+    return function (event) {
+      if (!looseCheckIf(ifContainer, _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
+        event
+      }))) {
+        return;
+      }
+      var formContext = getFormContext(context.formContextId);
+      var [name, value] = argsFactory(args, context, event);
+      formContext.formState.updateValue(name, value, method === "update" ? "replace" : method, callback);
+    };
+  }
   function builtinLocationListenerFactory(method, args, ifContainer, context) {
     return function (event) {
       if (!looseCheckIf(ifContainer, _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
@@ -9009,6 +9036,14 @@
           _ctx === null || _ctx === void 0 ? void 0 : (_eventTarget2 = _ctx.eventTarget) === null || _eventTarget2 === void 0 ? void 0 : _eventTarget2.addEventListener("state.change", listener);
         }
       }
+      if (track.formStateNames) {
+        var formContext = getCustomFormContext(context.formContextId);
+        for (var _stateName of track.formStateNames) {
+          var _eventTarget3;
+          var _ctx2 = formContext.formState.get().get(_stateName);
+          _ctx2 === null || _ctx2 === void 0 ? void 0 : (_eventTarget3 = _ctx2.eventTarget) === null || _eventTarget3 === void 0 ? void 0 : _eventTarget3.addEventListener("formstate.change", listener);
+        }
+      }
     };
     for (var track of trackingContextList) {
       _loop(track);
@@ -9267,7 +9302,7 @@
         dataItem.properties = _objectSpread__default["default"](_objectSpread__default["default"]({}, dataItem.properties), {}, {
           className: "form-preview"
         });
-        dataItem.events = {
+        dataItem.events = _objectSpread__default["default"](_objectSpread__default["default"]({}, dataItem.events), {}, {
           "validate.error": [{
             action: "preview.debug",
             args: ["validate.error", "<% EVENT.detail %>"]
@@ -9276,7 +9311,7 @@
             action: "preview.debug",
             args: ["validate.success", "<% EVENT.detail %>"]
           }]
-        };
+        });
       }
       //数据初始化：与默认属性进行合并
       Object.keys(defaultProperties).forEach(item => {