@next-core/brick-kit 2.135.1 → 2.136.2

package/dist/index.esm.js

@@ -1972,7 +1972,7 @@ class StoryboardContextWrapper {
     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)) {
@@ -1995,36 +1995,58 @@ class StoryboardContextWrapper {
       // 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({
+          cache: method === "load" ? "default" : "reload"
+        }, value)); // Do not use the chained promise, since the callbacks need the original promise.
 
-      item.load(_objectSpread({
-        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;
     }
 
@@ -2322,6 +2344,22 @@ mediaBreakpointMinWidthMap.forEach((minWidth, breakpoint) => {
 });
 var getMedia = () => MEDIA;
 
+var FormContextMap = new Map();
+class CustomFormContext {
+  constructor() {
+    _defineProperty$1(this, "formState", void 0);
+
+    _defineProperty$1(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) {
@@ -2394,6 +2432,7 @@ function evaluate(raw) {
   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.
 
@@ -2445,6 +2484,20 @@ function evaluate(raw) {
     }
   }
 
+  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,
@@ -2898,7 +2951,7 @@ var computeRealValue = (value, context, injectDeep, internalOptions) => {
 
     if (preEvaluated || 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]) {
@@ -6311,12 +6364,12 @@ function listenerFactory(handler, context, runtimeBrick) {
       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);
@@ -6445,7 +6498,7 @@ function builtinTplDispatchEventFactory(args, ifContainer, context) {
   };
 }
 
-function builtinContextListenerFactory(method, args, ifContainer, context) {
+function builtinContextListenerFactory(method, args, ifContainer, callback, context) {
   return function (event) {
     if (!looseCheckIf(ifContainer, _objectSpread(_objectSpread({}, context), {}, {
       event
@@ -6456,11 +6509,11 @@ function builtinContextListenerFactory(method, args, ifContainer, context) {
     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(_objectSpread({}, context), {}, {
       event
@@ -6470,7 +6523,7 @@ function builtinStateListenerFactory(method, args, ifContainer, context) {
 
     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);
   };
 }
 
@@ -6671,13 +6724,39 @@ function customListenerFactory(handler, ifContainer, context, runtimeBrick) {
   };
 }
 
+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$3(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
@@ -6704,45 +6783,17 @@ function _brickCallback() {
       };
     }();
 
-    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;
 
@@ -8256,6 +8307,7 @@ function applyColorTheme(options) {
 
 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();
@@ -9937,58 +9989,73 @@ function listenOnTrackingContext(brick, trackingContextList, context) {
   }
 }
 
-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$3(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(_objectSpread({}, context), {}, {
+        formContextId: formContext.id
+      }), {});
     }
-  };
 
-  try {
-    var formStoryboard = getStoryboard([formData.formSchema], [], formData.fields, isPreview);
-    formStoryboard[0] = _.isEmpty(formStoryboard[0]) ? errorBrick : formStoryboard[0];
-    return _objectSpread(_objectSpread({}, 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] = _.isEmpty(formStoryboard[0]) ? errorBrick : formStoryboard[0];
+      return _objectSpread(_objectSpread({}, 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];
 
@@ -10221,7 +10288,7 @@ function getDefaultProperties(_name, fields) {
     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,字段类型获取默认属性
@@ -10263,7 +10330,7 @@ function getStoryboard(datasource, result, fields, isPreview) {
     if (Array.isArray(dataItem.bricks)) {
       var _Object$keys;
 
-      resultItem["slots"] = _.groupBy(getStoryboard(dataItem.bricks, [], fields, isPreview), "mountPoint");
+      resultItem["slots"] = _.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],
@@ -10272,6 +10339,9 @@ function getStoryboard(datasource, result, fields, isPreview) {
       });
     }
 
+    resultItem = _objectSpread(_objectSpread({}, resultItem), {}, {
+      [symbolForFormContextId]: formContextId
+    });
     result[i] = resultItem;
   };
 
@@ -10328,7 +10398,8 @@ class LocationContext {
   getContext(_ref) {
     var {
       match,
-      tplContextId
+      tplContextId,
+      formContextId
     } = _ref;
     var auth = getAuth();
     var context = {
@@ -10348,7 +10419,8 @@ class LocationContext {
       flags: this.kernel.getFeatureFlags(),
       segues: this.segues,
       storyboardContext: this.storyboardContextWrapper.get(),
-      tplContextId
+      tplContextId,
+      formContextId
     };
     return context;
   }
@@ -10688,10 +10760,12 @@ class LocationContext {
 
       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.
 
 
@@ -10721,6 +10795,10 @@ class LocationContext {
         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);
@@ -10734,6 +10812,7 @@ class LocationContext {
         slotId,
         refForProxy: brickConf[symbolForRefForProxy],
         tplContextId,
+        formContextId,
         iid: brickConf.iid
       }, (_brickConf$lifeCycle = brickConf.lifeCycle) !== null && _brickConf$lifeCycle !== void 0 && _brickConf$lifeCycle.onScrollIntoView ? {
         lifeCycle: {
@@ -10779,8 +10858,8 @@ class LocationContext {
       }
 
       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);
       }