@next-core/brick-kit 2.157.0 → 2.157.2

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), {}, {
@@ -6347,36 +6374,6 @@
     };
   }();
 
-  /**
-   * @description 独立小产品Runtime接口
-   * @endpoint GET /api/v1/micro_app_standalone/runtime/:appId
-   */
-  var RuntimeApi_runtimeMicroAppStandalone = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator__default["default"](function* (appId, options) {
-      return (/**! @contract easyops.api.micro_app_standalone.runtime.RuntimeMicroAppStandalone@1.0.1 */
-        (yield brickHttp.http.get("api/gateway/micro_app_standalone.runtime.RuntimeMicroAppStandalone/api/v1/micro_app_standalone/runtime/".concat(appId), options)).data
-      );
-    });
-    return function RuntimeApi_runtimeMicroAppStandalone(_x, _x2) {
-      return _ref.apply(this, arguments);
-    };
-  }();
-
-  /**
-   * @description 查询独立部署小产品
-   * @endpoint POST /api/v1/micro_app_standalone/search
-   */
-  var RuntimeApi_searchMicroAppStandalone = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator__default["default"](function* (data, options) {
-      return (/**! @contract easyops.api.micro_app_standalone.runtime.SearchMicroAppStandalone@1.0.1 */
-        (yield brickHttp.http.post("api/gateway/micro_app_standalone.runtime.SearchMicroAppStandalone/api/v1/micro_app_standalone/search", data, options)).data
-      );
-    });
-    return function RuntimeApi_searchMicroAppStandalone(_x, _x2) {
-      return _ref.apply(this, arguments);
-    };
-  }();
-
   /**
    * Merge `app.defaultConfig` and `app.userConfig` to `app.config`.
    *
@@ -6558,6 +6555,36 @@
     }
   }
 
+  /**
+   * @description 独立小产品Runtime接口
+   * @endpoint GET /api/v1/micro_app_standalone/runtime/:appId
+   */
+  var RuntimeApi_runtimeMicroAppStandalone = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator__default["default"](function* (appId, options) {
+      return (/**! @contract easyops.api.micro_app_standalone.runtime.RuntimeMicroAppStandalone@1.0.1 */
+        (yield brickHttp.http.get("api/gateway/micro_app_standalone.runtime.RuntimeMicroAppStandalone/api/v1/micro_app_standalone/runtime/".concat(appId), options)).data
+      );
+    });
+    return function RuntimeApi_runtimeMicroAppStandalone(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  /**
+   * @description 查询独立部署小产品
+   * @endpoint POST /api/v1/micro_app_standalone/search
+   */
+  var RuntimeApi_searchMicroAppStandalone = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator__default["default"](function* (data, options) {
+      return (/**! @contract easyops.api.micro_app_standalone.runtime.SearchMicroAppStandalone@1.0.1 */
+        (yield brickHttp.http.post("api/gateway/micro_app_standalone.runtime.SearchMicroAppStandalone/api/v1/micro_app_standalone/search", data, options)).data
+      );
+    });
+    return function RuntimeApi_searchMicroAppStandalone(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
   var _excluded$4 = ["feature_flags"],
     _excluded2$1 = ["featureFlags", "misc"];
   function standaloneBootstrap() {
@@ -6565,14 +6592,23 @@
   }
   function _standaloneBootstrap() {
     _standaloneBootstrap = _asyncToGenerator__default["default"](function* () {
-      var [bootstrapResult, confString, runtimeData] = yield Promise.all([brickHttp.http.get(window.BOOTSTRAP_FILE), brickHttp.http.get("".concat(window.APP_ROOT, "conf.yaml"), {
+      var requests = [brickHttp.http.get(window.BOOTSTRAP_FILE), brickHttp.http.get("".concat(window.APP_ROOT, "conf.yaml"), {
         responseType: "text"
-      }), yield BootstrapStandaloneApi_runtimeStandalone().catch(function (error) {
+      }), BootstrapStandaloneApi_runtimeStandalone().catch(function (error) {
         // make it not crash when the backend service is not updated.
         // eslint-disable-next-line no-console
         console.warn("request runtime api from api-gateway failed: ", error, ", something might went wrong running standalone micro app");
-        return undefined;
-      })]);
+        return;
+      })];
+      if (!window.NO_AUTH_GUARD) {
+        var matches;
+        var appId = window.APP_ID || (window.APP_ROOT && (matches = window.APP_ROOT.match(/^(?:\/next)?\/sa-static\/([^/]+)\/versions\//)) ? matches[1] : null);
+        if (appId) {
+          // No need to wait.
+          safeGetRuntimeMicroAppStandalone(appId);
+        }
+      }
+      var [bootstrapResult, confString, runtimeData] = yield Promise.all(requests);
       var conf;
       try {
         conf = confString ? yaml__default["default"].safeLoad(confString, {
@@ -6613,16 +6649,16 @@
         }
       }
       if (runtimeData) {
-        var runtimeSetings = runtimeData.settings;
-        if (!_.isEmpty(runtimeSetings)) {
+        var runtimeSettings = runtimeData.settings;
+        if (!_.isEmpty(runtimeSettings)) {
           // Merge Feature Flags
           if (!settings) {
-            settings = runtimeSetings;
+            settings = runtimeSettings;
           } else {
             // Merge Feature Flags & Misc
-            var rest = _objectWithoutProperties__default["default"](runtimeSetings, _excluded2$1);
-            settings.featureFlags = _objectSpread__default["default"](_objectSpread__default["default"]({}, settings.featureFlags), runtimeSetings.featureFlags);
-            settings.misc = _objectSpread__default["default"](_objectSpread__default["default"]({}, settings.misc), runtimeSetings.misc);
+            var rest = _objectWithoutProperties__default["default"](runtimeSettings, _excluded2$1);
+            settings.featureFlags = _objectSpread__default["default"](_objectSpread__default["default"]({}, settings.featureFlags), runtimeSettings.featureFlags);
+            settings.misc = _objectSpread__default["default"](_objectSpread__default["default"]({}, settings.misc), runtimeSettings.misc);
             settings = Object.assign(settings, rest);
           }
         }
@@ -6633,6 +6669,24 @@
     });
     return _standaloneBootstrap.apply(this, arguments);
   }
+  var appRuntimeDataMap = new Map();
+  function safeGetRuntimeMicroAppStandalone(_x) {
+    return _safeGetRuntimeMicroAppStandalone.apply(this, arguments);
+  }
+  function _safeGetRuntimeMicroAppStandalone() {
+    _safeGetRuntimeMicroAppStandalone = _asyncToGenerator__default["default"](function* (appId) {
+      if (appRuntimeDataMap.has(appId)) {
+        return appRuntimeDataMap.get(appId);
+      }
+      var promise = RuntimeApi_runtimeMicroAppStandalone(appId).catch(function (error) {
+        // make it not crash when the backend service is not updated.
+        // eslint-disable-next-line no-console
+        console.warn("request standalone runtime api from micro-app-standalone failed: ", error, ", something might went wrong running standalone micro app");
+      });
+      appRuntimeDataMap.set(appId, promise);
+    });
+    return _safeGetRuntimeMicroAppStandalone.apply(this, arguments);
+  }
 
   /**
    * Take input from [0, n] and return it as [0, 1]
@@ -8234,7 +8288,8 @@
           if (!window.NO_AUTH_GUARD) {
             var appRuntimeData;
             try {
-              appRuntimeData = yield RuntimeApi_runtimeMicroAppStandalone(storyboard.app.id);
+              // Note: the request maybe have fired already during bootstrap.
+              appRuntimeData = yield safeGetRuntimeMicroAppStandalone(storyboard.app.id);
             } catch (error) {
               // make it not crash when the backend service is not updated.
               // eslint-disable-next-line no-console
@@ -8981,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);