@next-core/brick-kit 2.135.1 → 2.136.2

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.136.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.136.1...@next-core/brick-kit@2.136.2) (2022-09-06)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
+## [2.136.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.136.0...@next-core/brick-kit@2.136.1) (2022-09-05)
+
+
+### Bug Fixes
+
+* fix missing runtime brick in event callback ([a5b70be](https://github.com/easyops-cn/next-core/commit/a5b70be68bc6a856b78992320518d0a0e6a41128))
+
+
+
+
+
+# [2.136.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.135.1...@next-core/brick-kit@2.136.0) (2022-09-05)
+
+
+### Features
+
+* support context/state load/refresh callback ([4dfdd8b](https://github.com/easyops-cn/next-core/commit/4dfdd8bc8e91430a99857154237bae290c685329))
+
+
+
+
+
 ## [2.135.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.135.0...@next-core/brick-kit@2.135.1) (2022-09-02)
 
 **Note:** Version bump only for package @next-core/brick-kit

package/dist/index.bundle.js

@@ -1971,7 +1971,7 @@
       return (_this$data$get = this.data.get(name)) === null || _this$data$get === void 0 ? void 0 : _this$data$get.value;
     }
 
-    updateValue(name, value, method) {
+    updateValue(name, value, method, callback) {
       var _item$eventTarget2;
 
       if (!this.data.has(name)) {
@@ -1994,36 +1994,58 @@
         // eslint-disable-next-line no-console
         console.error("Unexpected storyboard context \"".concat(name, "\", expected \"free-variable\", received \"").concat(item.type, "\"."));
         return;
-      } // Todo(steve): support callback for refresh/load.
-
+      }
 
       if (method === "refresh" || method === "load") {
         if (!item.load) {
           throw new Error("You can not ".concat(method, " the storyboard context \"").concat(name, "\" which has no resolve."));
         }
 
-        if ((item.loaded || item.loading) && method === "load") {
-          // Do not load again.
-          return;
+        var promise;
+
+        if (method === "load") {
+          // Try to reuse previous request when calling `load`.
+          if (item.loaded) {
+            promise = Promise.resolve(item.value);
+          } else if (item.loading) {
+            promise = item.loading;
+          }
         }
 
-        item.loading = true; // Defaults to ignore cache when refreshing.
+        if (!promise) {
+          promise = item.loading = item.load(_objectSpread__default["default"]({
+            cache: method === "load" ? "default" : "reload"
+          }, value)); // Do not use the chained promise, since the callbacks need the original promise.
 
-        item.load(_objectSpread__default["default"]({
-          cache: method === "load" ? "default" : "reload"
-        }, value)).then(val => {
-          var _item$eventTarget;
+          promise.then(val => {
+            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", {
+              detail: item.value
+            }));
+          }, err => {
+            // Let users to override error handling.
+            if (!(callback !== null && callback !== void 0 && callback.error)) {
+              handleHttpError(err);
+            }
+          });
+        }
+
+        if (callback) {
+          var callbackFactory = eventCallbackFactory(callback, () => this.getResolveOptions(_internalApiGetCurrentContext()).mergedContext, null);
+          promise.then(val => {
+            callbackFactory("success")({
+              value: val
+            });
+            callbackFactory("finally")();
+          }, err => {
+            callbackFactory("error")(err);
+            callbackFactory("finally")();
+          });
+        }
 
-          item.loading = false;
-          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", {
-            detail: item.value
-          }));
-        }, err => {
-          item.loading = false;
-          handleHttpError(err);
-        });
         return;
       }
 
@@ -2321,6 +2343,22 @@
   });
   var getMedia = () => MEDIA;
 
+  var FormContextMap = new Map();
+  class CustomFormContext {
+    constructor() {
+      _defineProperty__default["default"](this, "formState", void 0);
+
+      _defineProperty__default["default"](this, "id", _.uniqueId("form-ctx-"));
+
+      FormContextMap.set(this.id, this);
+      this.formState = new StoryboardContextWrapper();
+    }
+
+  }
+  function getCustomFormContext(formContextId) {
+    return FormContextMap.get(formContextId);
+  }
+
   var symbolForRaw = Symbol.for("pre.evaluated.raw");
   var symbolForContext = Symbol.for("pre.evaluated.context");
   function isPreEvaluated(raw) {
@@ -2393,6 +2431,7 @@
     var attemptToVisitData = attemptToVisitGlobals.has("DATA");
     var attemptToVisitTpl = attemptToVisitGlobals.has("TPL");
     var attemptToVisitState = attemptToVisitGlobals.has("STATE");
+    var attemptToVisitFormState = attemptToVisitGlobals.has("FORM_STATE");
     var attemptToVisitTplOrState = attemptToVisitTpl || attemptToVisitState; // Ignore evaluating if `event` is missing in context.
     // Since it should be evaluated during events handling.
 
@@ -2444,6 +2483,20 @@
       }
     }
 
+    if (attemptToVisitFormState && runtimeContext.formContextId) {
+      var formContext = getCustomFormContext(runtimeContext.formContextId);
+      globalVariables.FORM_STATE = getDynamicReadOnlyProxy({
+        get(target, key) {
+          return formContext.formState.getValue(key);
+        },
+
+        ownKeys() {
+          return Array.from(formContext.formState.get().keys());
+        }
+
+      });
+    }
+
     var {
       app: currentApp,
       query,
@@ -2897,7 +2950,7 @@
 
       if (preEvaluated || brickUtils.isEvaluable(value)) {
         var runtimeContext = {};
-        var keys = ["event", "tplContextId", "overrideApp", "appendI18nNamespace"];
+        var keys = ["event", "tplContextId", "overrideApp", "appendI18nNamespace", "formContextId"];
 
         for (var key of keys) {
           if (context !== null && context !== void 0 && context[key]) {
@@ -6310,12 +6363,12 @@
         case "context.replace":
         case "context.refresh":
         case "context.load":
-          return builtinContextListenerFactory(method, handler.args, handler, context);
+          return builtinContextListenerFactory(method, handler.args, handler, handler.callback, context);
 
         case "state.update":
         case "state.refresh":
         case "state.load":
-          return builtinStateListenerFactory(method, handler.args, handler, context);
+          return builtinStateListenerFactory(method, handler.args, handler, handler.callback, context);
 
         case "tpl.dispatchEvent":
           return builtinTplDispatchEventFactory(handler.args, handler, context);
@@ -6444,7 +6497,7 @@
     };
   }
 
-  function builtinContextListenerFactory(method, args, ifContainer, context) {
+  function builtinContextListenerFactory(method, args, ifContainer, callback, context) {
     return function (event) {
       if (!looseCheckIf(ifContainer, _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
         event
@@ -6455,11 +6508,11 @@
       var storyboardContext = _internalApiGetStoryboardContextWrapper();
 
       var [name, value] = argsFactory(args, context, event);
-      storyboardContext.updateValue(name, value, method);
+      storyboardContext.updateValue(name, value, method, callback);
     };
   }
 
-  function builtinStateListenerFactory(method, args, ifContainer, context) {
+  function builtinStateListenerFactory(method, args, ifContainer, callback, context) {
     return function (event) {
       if (!looseCheckIf(ifContainer, _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
         event
@@ -6469,7 +6522,7 @@
 
       var tplContext = getTplContext(context.tplContextId);
       var [name, value] = argsFactory(args, context, event);
-      tplContext.state.updateValue(name, value, method === "update" ? "replace" : method);
+      tplContext.state.updateValue(name, value, method === "update" ? "replace" : method, callback);
     };
   }
 
@@ -6670,13 +6723,39 @@
     };
   }
 
+  function eventCallbackFactory(callback, getContext, runtimeBrick) {
+    return function callbackFactory(type) {
+      return function (result) {
+        if (callback !== null && callback !== void 0 && callback[type]) {
+          try {
+            var event = new CustomEvent("callback.".concat(type), {
+              detail: result
+            });
+            var context = getContext();
+            [].concat(callback[type]).forEach(eachHandler => {
+              listenerFactory(eachHandler, context, runtimeBrick)(event);
+            });
+          } catch (err) {
+            // Do not throw errors in `callback.success` or `callback.progress`,
+            // to avoid the following triggering of `callback.error`.
+            // eslint-disable-next-line
+            console.error(err);
+          }
+        } else if (type === "error") {
+          // eslint-disable-next-line
+          console.error("Unhandled callback error:", result);
+        }
+      };
+    };
+  }
+
   function brickCallback(_x2, _x3, _x4, _x5, _x6, _x7, _x8) {
     return _brickCallback.apply(this, arguments);
   }
 
   function _brickCallback() {
     _brickCallback = _asyncToGenerator__default["default"](function* (target, handler, method, context, runtimeBrick, event, options) {
-      var _handler$callback, _poll;
+      var _poll;
 
       if (typeof target[method] !== "function") {
         // eslint-disable-next-line no-console
@@ -6703,45 +6782,17 @@
         };
       }();
 
-      var {
-        success,
-        error,
-        finally: finallyHook,
-        progress
-      } = (_handler$callback = handler.callback) !== null && _handler$callback !== void 0 ? _handler$callback : {};
-
-      if (!(success || error || finallyHook || progress)) {
+      if (!handler.callback) {
         task();
         return;
       }
 
-      var callbackFactory = (eventType, specificHandler) => result => {
-        if (specificHandler) {
-          try {
-            var _event = new CustomEvent(eventType, {
-              detail: result
-            });
-
-            [].concat(specificHandler).forEach(eachHandler => {
-              listenerFactory(eachHandler, context, runtimeBrick)(_event);
-            });
-          } catch (err) {
-            // Do not throw errors in `callback.success` or `callback.progress`,
-            // to avoid the following triggering of `callback.error`.
-            // eslint-disable-next-line
-            console.error(err);
-          }
-        } else if (eventType === "callback.error") {
-          // eslint-disable-next-line
-          console.error("Unhandled callback error:", result);
-        }
-      };
-
+      var callbackFactory = eventCallbackFactory(handler.callback, () => context, runtimeBrick);
       var pollableCallback = {
-        progress: callbackFactory("callback.progress", progress),
-        success: callbackFactory("callback.success", success),
-        error: callbackFactory("callback.error", error),
-        finally: callbackFactory("callback.finally", finallyHook)
+        progress: callbackFactory("progress"),
+        success: callbackFactory("success"),
+        error: callbackFactory("error"),
+        finally: callbackFactory("finally")
       };
       var poll;
 
@@ -8255,6 +8306,7 @@
 
   var formRenderer = "form-renderer.form-renderer";
   var filterProperties = ["instanceId", "brick", "slots", "properties", "events", "if", "context", "bricks", "mountPoint"];
+  var symbolForFormContextId = Symbol.for("form.contextId");
 
   function collectRefsInTemplate(template) {
     var refMap = new Map();
@@ -9936,58 +9988,73 @@
     }
   }
 
-  function ExpandCustomForm(formData, brickConf, isPreview) {
-    var errorBrick = {
-      brick: "presentational-bricks.brick-illustration",
-      properties: {
-        category: "default",
-        header: {
-          title: "参数错误"
-        },
-        mode: "guide",
-        name: "search-empty"
+  function ExpandCustomForm(_x, _x2, _x3, _x4) {
+    return _ExpandCustomForm.apply(this, arguments);
+  }
+
+  function _ExpandCustomForm() {
+    _ExpandCustomForm = _asyncToGenerator__default["default"](function* (formData, brickConf, isPreview, context) {
+      var errorBrick = {
+        brick: "presentational-bricks.brick-illustration",
+        properties: {
+          category: "default",
+          header: {
+            title: "参数错误"
+          },
+          mode: "guide",
+          name: "search-empty"
+        }
+      };
+      var formContext = new CustomFormContext();
+
+      if (Array.isArray(formData.context)) {
+        yield formContext.formState.define(formData.context, _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
+          formContextId: formContext.id
+        }), {});
       }
-    };
 
-    try {
-      var formStoryboard = getStoryboard([formData.formSchema], [], formData.fields, isPreview);
-      formStoryboard[0] = ___default["default"].isEmpty(formStoryboard[0]) ? errorBrick : formStoryboard[0];
-      return _objectSpread__default["default"](_objectSpread__default["default"]({}, brickConf), {}, {
-        brick: "div",
-        slots: {
-          "": {
-            bricks: [{
-              brick: "basic-bricks.micro-view",
-              properties: {
-                style: {
-                  padding: "12px"
-                }
-              },
-              slots: {
-                content: {
-                  bricks: formStoryboard,
-                  type: "bricks"
+      try {
+        var formStoryboard = getStoryboard([formData.formSchema], [], formData.fields, isPreview, formContext.id);
+        formStoryboard[0] = ___default["default"].isEmpty(formStoryboard[0]) ? errorBrick : formStoryboard[0];
+        return _objectSpread__default["default"](_objectSpread__default["default"]({}, brickConf), {}, {
+          brick: "div",
+          slots: {
+            "": {
+              bricks: [{
+                brick: "basic-bricks.micro-view",
+                properties: {
+                  style: {
+                    padding: "12px"
+                  }
+                },
+                slots: {
+                  content: {
+                    bricks: formStoryboard,
+                    type: "bricks"
+                  }
                 }
-              }
-            }],
-            type: "bricks"
+              }],
+              type: "bricks"
+            }
           }
-        }
-      });
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.warn(error.message);
-      return {
-        brick: "div",
-        slots: {
-          "": {
-            bricks: [errorBrick],
-            type: "bricks"
+        });
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn(error.message);
+        return {
+          brick: "div",
+          slots: {
+            "": {
+              bricks: [errorBrick],
+              type: "bricks"
+            }
           }
-        }
-      };
-    }
+        };
+      }
+    });
+    return _ExpandCustomForm.apply(this, arguments);
   }
+
   function getDefaultProperties(_name, fields) {
     var field = fields.filter(item => item.fieldId === _name)[0];
 
@@ -10220,7 +10287,7 @@
       return defaultValue;
     } else return {};
   }
-  function getStoryboard(datasource, result, fields, isPreview) {
+  function getStoryboard(datasource, result, fields, isPreview, formContextId) {
     var _loop = function (i) {
       var dataItem = datasource[i];
       var resultItem = {}; //数据初始化：根据id,字段类型获取默认属性
@@ -10262,7 +10329,7 @@
       if (Array.isArray(dataItem.bricks)) {
         var _Object$keys;
 
-        resultItem["slots"] = ___default["default"].groupBy(getStoryboard(dataItem.bricks, [], fields, isPreview), "mountPoint");
+        resultItem["slots"] = ___default["default"].groupBy(getStoryboard(dataItem.bricks, [], fields, isPreview, formContextId), "mountPoint");
         (_Object$keys = Object.keys(resultItem["slots"])) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(item => {
           resultItem.slots[item] = {
             bricks: resultItem.slots[item],
@@ -10271,6 +10338,9 @@
         });
       }
 
+      resultItem = _objectSpread__default["default"](_objectSpread__default["default"]({}, resultItem), {}, {
+        [symbolForFormContextId]: formContextId
+      });
       result[i] = resultItem;
     };
 
@@ -10327,7 +10397,8 @@
     getContext(_ref) {
       var {
         match,
-        tplContextId
+        tplContextId,
+        formContextId
       } = _ref;
       var auth = getAuth();
       var context = {
@@ -10347,7 +10418,8 @@
         flags: this.kernel.getFeatureFlags(),
         segues: this.segues,
         storyboardContext: this.storyboardContextWrapper.get(),
-        tplContextId
+        tplContextId,
+        formContextId
       };
       return context;
     }
@@ -10687,10 +10759,12 @@
 
         var tplStack = _arguments.length > 4 && _arguments[4] !== undefined ? _arguments[4] : [];
         var tplContextId = brickConf[symbolForTplContextId];
+        var formContextId = brickConf[symbolForFormContextId];
 
         var context = _this6.getContext({
           match,
-          tplContextId
+          tplContextId,
+          formContextId
         }); // First, check whether the brick should be rendered.
 
 
@@ -10720,6 +10794,10 @@
           tplStack.push(tplTagName);
         }
 
+        if (brickConf.brick === formRenderer) {
+          brickConf.properties.formData = JSON.stringify(brickConf.properties.formData);
+        }
+
         var brick = {};
         yield _this6.storyboardContextWrapper.define(brickConf.context, context, brick);
         yield _this6.preCheckPermissions(brickConf, context);
@@ -10733,6 +10811,7 @@
           slotId,
           refForProxy: brickConf[symbolForRefForProxy],
           tplContextId,
+          formContextId,
           iid: brickConf.iid
         }, (_brickConf$lifeCycle = brickConf.lifeCycle) !== null && _brickConf$lifeCycle !== void 0 && _brickConf$lifeCycle.onScrollIntoView ? {
           lifeCycle: {
@@ -10778,8 +10857,8 @@
         }
 
         if (brick.type === formRenderer) {
-          var formData = brick.properties.formData;
-          expandedBrickConf = ExpandCustomForm(formData, brickConf, brick.properties.isPreview);
+          var formData = JSON.parse(brick.properties.formData);
+          expandedBrickConf = yield ExpandCustomForm(formData, brickConf, brick.properties.isPreview, context);
           yield _this6.kernel.loadDynamicBricksInBrickConf(expandedBrickConf);
         }